退差价

a.txt

@@ -1,5 +1,5 @@
 VUE_APP_API_BASE_URL = https://delivery.ixiaokejia.com
-
+http://localhost:8076
 
 三方门店ID：5424_2705880
 门店名称：t_pK0XCn0TDQ

releaselog.md

@@ -1,4 +1,7 @@
 
+# 0.3.2 (20.12.4 11:00)
+### 修改bug
+
 # 0.3.1 (20.12.3 18:00)
 ### 退差价
 

src/pages/index/difference.vue

@@ -54,14 +54,15 @@
                                     item.refundAmount | minuteToRmb
                                 }}
                             </div>
-                            <div class="">已退重量：{{item.actualPickingWeight || '0'}}</div>
+                            <div class="">已退重量：{{item.actualPickingWeight || '0'}}g</div>
                         </div>
                     </div>
                 </label>
             </checkbox-group>
         </div>
         <div class="btn-box">
-            <span class="btn" @click="disparity">退差价</span>
+            <span class="btn"  v-if="!allInvalid" @click="disparity">退差价</span>
+            <span class="btn allInvalid" v-if="allInvalid">没有可退差价商品</span>
         </div>
     </div>
 </template>
@@ -80,6 +81,7 @@ export default {
             curReason: "",
             curGoodItemIds: [],
             submitLoading: false,
+            allInvalid:false,
         };
     },
 
@@ -118,6 +120,15 @@ export default {
                     }
                 }
             }
+            let num =0;
+            for(let item of d.orderItems){
+                if(item.invalid){
+                    num++;
+                }
+            }
+            if(num === d.orderItems.length){
+                this.allInvalid = true;
+            }
             d.orderItems.sort((a, b) => (a.invalid ? 1 : -1));
             return d;
         },
@@ -146,7 +157,6 @@ export default {
                 disparityData: arr,
             });
             let id = this.orderData.orderInfo.id;
-            console.log(this.orderData, id);
             this.router.push({
                 path: "/pages/index/disparity",
                 query: {
@@ -269,6 +279,10 @@ export default {
         background-color: #f3f3f3;
         color: #666;
     }
+    .allInvalid{
+        background-color: #e9e9e9;
+        color: #666;
+    }
 }
 .item-list {
     padding: px(20) px(40);

src/pages/index/disparity.vue

@@ -138,10 +138,10 @@ export default {
         submit() {
             for (let item of this.orderItems) {
                 if (!item.refund_price) {
-                    return this.fn.showToast(`请输入所有退款价格`);
+                    return this.fn.showToast(`请输入所有退款金额`);
                 }
                 if (!item.reality_weight) {
-                    return this.fn.showToast(`请输入所有退款重量`);
+                    return this.fn.showToast(`请输入所有实拣重量`);
                 }
                 console.log(item.refund_price, item.payAmount);
                 let refundAmount = parseInt(Number(item.refund_price) * 100);
@@ -181,8 +181,8 @@ export default {
                                 this.submitLoading = false;
                                 if (res.success) {
                                     this.fn.showToast("提交成功");
-                                    this.router.back(2);
-                                }else{
+                                    this.router.go(2);
+                                } else {
                                     this.fn.showToast(
                                         "提交失败：" + res.message
                                     );

src/pages/index/index.vue

@@ -99,7 +99,10 @@
                                                 </div>
                                                 <div class="date coll-r"></div>
                                             </div>
-                                            <div class="coll">
+                                            <div
+                                                class="coll"
+                                                v-if="afterSale.productInfo"
+                                            >
                                                 <div class="coll-l">
                                                     商品：{{
                                                         afterSale.productInfo
@@ -130,7 +133,10 @@
                                             </div>
                                             <div
                                                 class="btns"
-                                                v-if="afterSale.status === 1 || afterSale.status === 5"
+                                                v-if="
+                                                    afterSale.status === 1 ||
+                                                    afterSale.status === 5
+                                                "
                                             >
                                                 <span
                                                     class="btn"
@@ -275,10 +281,7 @@
                                 </div>
                                 <div class="tools">
                                     <!-- afterSaleStatus 根据售后信息里RefundType字段判断手动加的值 -->
-                                    <div
-                                        class="oper"
-                                        
-                                    >
+                                    <div class="oper">
                                         <!-- 只要有一条售后就不能申请取消订单 -->
                                         <!-- <span
                                             class="oper-btn"
@@ -286,17 +289,27 @@
                                             v-if="!order.noShowCancelOrder"
                                             >取消订单</span
                                         > -->
-                                        <span
-                                            class="oper-btn"
-                                            v-if="order.afterSaleStatus !== 'all'"
-                                            @click="refund(order)"
-                                            >退款</span
-                                        >
-                                        <span
-                                            class="oper-btn"
-                                            @click="refundDifference(order)"
-                                            >退差价</span
+                                        <black
+                                            v-if="
+                                                order.orderInfo.status !== 12 &&
+                                                order.orderInfo.status !== 11
+                                            "
                                         >
+                                            <span
+                                                class="oper-btn"
+                                                v-if="
+                                                    order.afterSaleStatus !==
+                                                    'all'
+                                                "
+                                                @click="refund(order)"
+                                                >退款</span
+                                            >
+                                            <span
+                                                class="oper-btn"
+                                                @click="refundDifference(order)"
+                                                >退差价</span
+                                            >
+                                        </black>
                                     </div>
                                     <div
                                         class="view-btn"
@@ -471,6 +484,13 @@ export default {
                     page: 1,
                     list: [],
                 },
+                {
+                    title: "售后",
+                    status: "99",
+                    num: 0,
+                    page: 1,
+                    list: [],
+                },
                 {
                     title: "已完成",
                     status: "9",
@@ -848,7 +868,7 @@ export default {
         },
 
         // 退差价
-        refundDifference(val){
+        refundDifference(val) {
             this.$store.commit("common/update", {
                 curOrder: val,
             });

src/pages/manage/index.vue

@@ -55,7 +55,7 @@
 
         <button class="btn" @click="layout">退出登录</button>
 
-        <div class="ver">0.3.1</div>
+        <div class="ver">0.3.2</div>
     </div>
 </template>