解决冲突

pageC/applicationRefund/applicationRefund.vue

@@ -24,10 +24,10 @@
           </view>
           <view class="commodity-price" v-if="goodsDetail.goods">
             <text style="font-size: 20rpx">￥</text>
-            <text>{{ goodsDetail.goods.unit_price.split(".")[0] }}</text
+            <text>{{ refund_price.split(".")[0] }}</text
             >.
             <text style="font-size: 20rpx">{{
-              goodsDetail.goods.unit_price.split(".")[1]
+              refund_price.split(".")[1]
             }}</text>
           </view>
         </view>
@@ -55,11 +55,9 @@
           v-if="goodsDetail.goods"
         >
           <text style="font-size: 20rpx">￥</text>
-          <text>{{ goodsDetail.goods.amount.split(".")[0] }}</text
+          <text>{{ refund_price.split(".")[0] }}</text
           >.
-          <text style="font-size: 20rpx">{{
-            goodsDetail.goods.amount.split(".")[1]
-          }}</text>
+          <text style="font-size: 20rpx">{{ refund_price.split(".")[1] }}</text>
         </view>
       </view>
     </view>
@@ -119,7 +117,8 @@ export default {
       goodsDetail: {},
       imgList: [],
       fileList6: [],
-      btnShow: true,
+      btnShow: true, //上传图片时，该字段改为false，用来判断图片是否上传完毕
+      refund_price: "", //计算后的退款金额
     };
   },
   onLoad(options) {
@@ -191,6 +190,18 @@ export default {
       });
     },
 
+    //获取退款金额
+    getRefundMoney(orderId) {
+      uni.$u.http
+        .post(`/api/order/calculate_refund_weight`, {
+          order_id: orderId,
+          order_goods_id: this.orderId,
+        })
+        .then((res) => {
+          this.refund_price = res.refund_price;
+        });
+    },
+
     //获取订单商品信息
     getDetail() {
       uni.$u.http
@@ -199,6 +210,7 @@ export default {
         })
         .then((res) => {
           this.goodsDetail = res;
+          this.getRefundMoney(res.id);
         });
     },
 

pageC/refundDetail/component/refundSuccessful.vue

@@ -5,11 +5,11 @@
       <view class="commodity-price">
         <text style="font-size: 20rpx">￥</text>
         <text>{{
-          refundDetail.goods[0].refund.refund_price.split(".")[0]
+          refundDetail.goods[0].refund.actual_refund_price.split(".")[0]
         }}</text
         >.
         <text style="font-size: 20rpx">{{
-          refundDetail.goods[0].refund.refund_price.split(".")[1]
+          refundDetail.goods[0].refund.actual_refund_price.split(".")[1]
         }}</text>
       </view>
     </view>
@@ -20,11 +20,11 @@
       <view class="commodity-price">
         <text style="font-size: 20rpx">￥</text>
         <text>{{
-          refundDetail.goods[0].refund.refund_price.split(".")[0]
+          refundDetail.goods[0].refund.actual_refund_price.split(".")[0]
         }}</text
         >.
         <text style="font-size: 20rpx">{{
-          refundDetail.goods[0].refund.refund_price.split(".")[1]
+          refundDetail.goods[0].refund.actual_refund_price.split(".")[1]
         }}</text>
       </view>
     </view>

pageD/afterSalesDetail/afterSalesDetail.vue

@@ -50,8 +50,9 @@
     <view
       class="footer"
       v-if="
-        orderInformation.goods[0].refund.status == '0' ||
-        orderInformation.goods[0].refund.status == '3'
+        (orderInformation.goods[0].refund.status == '0' ||
+          orderInformation.goods[0].refund.status == '3') &&
+        !orderInformation.goods[0].refund.is_send
       "
     >
       <button class="btn-1" @click="refuseApplication">拒绝申请</button

pageD/afterSalesManage/component/detailCard.vue

@@ -67,14 +67,18 @@
       </button>
       <button
         class="btn-1"
-        v-if="itemInfo.status == 0 || itemInfo.status == 3"
+        v-if="
+          (itemInfo.status == 0 || itemInfo.status == 3) && !itemInfo.is_send
+        "
         @click.stop="$emit('refuseRefund', itemInfo)"
       >
         拒绝申请
       </button>
       <button
         class="btn-3"
-        v-if="itemInfo.status == 0 || itemInfo.status == 3"
+        v-if="
+          (itemInfo.status == 0 || itemInfo.status == 3) && !itemInfo.is_send
+        "
         @click.stop="$emit('agreeRefund', itemInfo)"
       >
         同意退款

pageD/deliverGoods/deliverGoods.vue

@@ -115,11 +115,6 @@ export default {
   onLoad(options) {
     this.getDetail(options.id);
   },
-  watch: {
-    nameShow(newVal) {
-      console.log(newVal);
-    },
-  },
   methods: {
     //扫描二维码
     scanningNumber() {
@@ -147,7 +142,9 @@ export default {
 
     //过滤搜索结果
     searchExpress(e) {
-      // this.nameShow = true;
+      if (!e) {
+        this.expressCode = "";
+      }
       this.filterList = this.expressNameList
         .filter((item) => item.name.includes(e))
         .map((item) => item);
@@ -166,11 +163,17 @@ export default {
       this.name = value.name;
       this.expressCode = value.code;
       this.nameShow = false;
-      console.log(this.nameShow);
     },
 
     //团长发货
     immediateDelivery() {
+      if (this.nameShow || !this.expressCode) {
+        uni.showToast({
+          title: "请选择物流公司",
+          icon: "none",
+        });
+        return;
+      }
       uni.$u.http
         .post(`/api/order/merchant_delivery`, {
           order_id: this.orderDetail.id,

unpackage/dist/dev/mp-weixin/pageC/refundDetail/component/refundSuccessful.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{1238:function(e,n,t){"use strict";t.r(n);var r=t(1239),u=t(1241);for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);t(1243);var d,i=t(37),c=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"445aa55e",null,!1,r["components"],d);c.options.__file="pageC/refundDetail/component/refundSuccessful.vue",n["default"]=c.exports},1239:function(e,n,t){"use strict";t.r(n);var r=t(1240);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1240:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return d})),t.d(n,"recyclableRender",(function(){return f})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.refund_price.split(".")),r=e.refundDetail.goods[0].refund.refund_price.split("."),u=e.refundDetail.goods[0].refund.refund_price.split("."),f=e.refundDetail.goods[0].refund.refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u,g3:f}})},f=!1,d=[];u._withStripped=!0},1241:function(e,n,t){"use strict";t.r(n);var r=t(1242),u=t.n(r);for(var f in r)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(f);n["default"]=u.a},1242:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=r},1243:function(e,n,t){"use strict";t.r(n);var r=t(1244),u=t.n(r);for(var f in r)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(f);n["default"]=u.a},1244:function(e,n,t){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{1238:function(e,n,t){"use strict";t.r(n);var r=t(1239),u=t(1241);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1243);var f,d=t(37),i=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"445aa55e",null,!1,r["components"],f);i.options.__file="pageC/refundDetail/component/refundSuccessful.vue",n["default"]=i.exports},1239:function(e,n,t){"use strict";t.r(n);var r=t(1240);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1240:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return f})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.actual_refund_price.split(".")),r=e.refundDetail.goods[0].refund.actual_refund_price.split("."),u=e.refundDetail.goods[0].refund.actual_refund_price.split("."),c=e.refundDetail.goods[0].refund.actual_refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u,g3:c}})},c=!1,f=[];u._withStripped=!0},1241:function(e,n,t){"use strict";t.r(n);var r=t(1242),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1242:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=r},1243:function(e,n,t){"use strict";t.r(n);var r=t(1244),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1244:function(e,n,t){}}]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/refundDetail/component/refundSuccessful.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundSuccessful-create-component',