Merge branch 'master' of http://git.izouma.com/panhui/card-wechat

src/pages/confirmorder.vue

@@ -61,7 +61,7 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>邮费</p>
-                <p class="box-buttom-p">¥10</p>
+                <p class="box-buttom-p">¥0</p>
             </div>
         </div>
         <div class="box-buttom">

src/pages/orderdetails.vue

@@ -69,7 +69,7 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>邮费</p>
-                <p class="box-buttom-p">¥10</p>
+                <p class="box-buttom-p">¥0</p>
             </div>
         </div>
         <div class="box-buttom">
@@ -177,6 +177,7 @@
                 <div
                     v-if="this.status.orderStatus === 'CANCELED'"
                     class="box-btn-left2"
+                    @click="cancel"
                     :style="{ backgroundImage: `url(/native/imgs/btn_03@3x.png)` }"
                 >
                     取消订单