Browse Source

修改状态按钮

mabaoyi 7 months ago
parent
commit
f57cc59395

+ 2 - 2
pageC/orderForm/component/refundCard.vue

@@ -34,7 +34,7 @@
     <view
       class="commodity-information"
       v-for="item in itemInfo.order_goods"
-      @click="$emit('toRefundDetail', item)"
+      @click.stop="$emit('toRefundDetail', item)"
     >
       <view class="commodity-1" v-if="item.refund">
         <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
@@ -91,7 +91,7 @@
                   item.refund.status == 0 ||
                   item.refund.status == 3
                 "
-                @click="$emit('toRefundDetail', item)"
+                @click.stop="$emit('toRefundDetail', item)"
               >
                 售后详情
               </button>

+ 3 - 1
pageC/orderFormDetail/orderFormDetail.vue

@@ -296,7 +296,9 @@ export default {
       uni.$u.http
         .post(`/api/order/order_del`, { order_id: this.orderDetail.id })
         .then((res) => {
-          this.getDetail();
+          uni.navigateBack({
+            delta: 1,
+          });
           this.show = false;
           uni.showToast({
             title: "删除成功",

+ 1 - 1
pageD/orderFormManage/component/detailCard.vue

@@ -76,7 +76,7 @@
       </button> -->
       <button
         class="btn-1"
-        v-if="itemInfo.simplify_status == 'merdelivered'"
+        v-if="itemInfo.order_goods[0].delivery_status == 'merdelivered'"
         @click.stop="toGoods"
       >
         发货

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/refundCard.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderFormDetail/orderFormDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/orderFormManage/component/detailCard.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/orderForm/component/refundCard.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/orderFormDetail/orderFormDetail.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/pageD/components/agreePopup.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u--input": "/uview-ui/components/u--input/u--input"
-  }
+  },
+  "component": true
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pageD/orderDetail/component/commodityDetail.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/orderFormManage/component/detailCard.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

Some files were not shown because too many files changed in this diff