From e56f52adaaa03fdc8267a886b2fc4d98336dce68 Mon Sep 17 00:00:00 2001
From: 1037621594 <1037621594@qq.com>
Date: Fri, 16 Aug 2019 16:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=20(#256)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update index.vue

修复了商品分类无法切换的bug

* Update index.vue

阻止冒泡事件，修复了点击去支付后跳转到支付页面又执行上层列表点击事件跳到订单详情页面

* Update api.js

修正CartUpdate为url地址而不是函数名

* Update index.vue

去掉了订单列表按钮所有冒泡事件，修正了取消订单调用取消订单接口，而不是删除接口
---
 litemall-vue/src/views/user/order-list/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/litemall-vue/src/views/user/order-list/index.vue b/litemall-vue/src/views/user/order-list/index.vue
index 3b1fe275..03aa929b 100644
--- a/litemall-vue/src/views/user/order-list/index.vue
+++ b/litemall-vue/src/views/user/order-list/index.vue
@@ -38,7 +38,7 @@
                  class="footer_btn">
               <van-button size="small"
                           v-if="el.handleOption.cancel"
-                          @click="cancelOrder(el.id)">取消订单</van-button>
+                          @click.stop="cancelOrder(el.id)">取消订单</van-button>
               <van-button size="small"
                           v-if="el.handleOption.pay"
                           type="danger"
@@ -46,17 +46,17 @@
               <van-button size="small"
                           v-if="el.handleOption.refund"
                           type="danger"
-                          @click="refundOrder(el.id)">退款</van-button>
+                          @click.stop="refundOrder(el.id)">退款</van-button>
               <van-button size="small"
                           v-if="el.handleOption.confirm"
                           type="danger"
-                          @click="confirmOrder(el.id)">确认收货</van-button>
+                          @click.stop="confirmOrder(el.id)">确认收货</van-button>
               <van-button size="small"
                           v-if="el.handleOption.delete"
-                          @click="delOrder(el.id)">删除订单</van-button>
+                          @click.stop="delOrder(el.id)">删除订单</van-button>
               <van-button size="small"
                           v-if="el.handleOption.comment"
-                          @click="commentOrder(el.id)">去评价</van-button>
+                          @click.stop="commentOrder(el.id)">去评价</van-button>
             </div>
 
           </van-panel>
@@ -131,7 +131,7 @@ export default {
       this.$dialog
         .confirm({ message: '确定要取消该订单吗?' })
         .then(() => {
-          orderDelete({ orderId: id }).then(() => {
+          orderCancel({ orderId: id }).then(() => {
             this.init();
             this.$toast('已取消该订单');
           });