修改nug

releaselog.md

@@ -1,5 +1,5 @@
 
-# 0.3.2 (20.12.4 11:00)
+# 0.3.2 (20.12.4 11:00)  0.3.21
 ### 修改bug
 
 # 0.3.1 (20.12.3 18:00)

src/pages/index/difference.vue

@@ -54,15 +54,21 @@
                                     item.refundAmount | minuteToRmb
                                 }}
                             </div>
-                            <div class="">已退重量：{{item.actualPickingWeight || '0'}}g</div>
+                            <div class="">
+                                已退重量：{{ item.actualPickingWeight || "0" }}g
+                            </div>
                         </div>
                     </div>
                 </label>
             </checkbox-group>
         </div>
         <div class="btn-box">
-            <span class="btn"  v-if="!allInvalid" @click="disparity">退差价</span>
-            <span class="btn allInvalid" v-if="allInvalid">没有可退差价商品</span>
+            <span class="btn" v-if="!allInvalid" @click="disparity"
+                >退差价</span
+            >
+            <span class="btn allInvalid" v-if="allInvalid"
+                >没有可退差价商品</span
+            >
         </div>
     </div>
 </template>
@@ -81,7 +87,7 @@ export default {
             curReason: "",
             curGoodItemIds: [],
             submitLoading: false,
-            allInvalid:false,
+            allInvalid: false,
         };
     },
 
@@ -120,13 +126,13 @@ export default {
                     }
                 }
             }
-            let num =0;
-            for(let item of d.orderItems){
-                if(item.invalid){
+            let num = 0;
+            for (let item of d.orderItems) {
+                if (item.invalid) {
                     num++;
                 }
             }
-            if(num === d.orderItems.length){
+            if (num === d.orderItems.length) {
                 this.allInvalid = true;
             }
             d.orderItems.sort((a, b) => (a.invalid ? 1 : -1));
@@ -218,18 +224,6 @@ export default {
         user() {
             return this.$store.state.user.user;
         },
-        refundNum() {
-            let num = 0;
-            for (let id of this.curGoodItemIds) {
-                for (let item of this.orderData.orderItems) {
-                    if (item.id === id) {
-                        num += item.payAmount;
-                    }
-                }
-            }
-            num = num.toFixed(2);
-            return num;
-        },
     },
 
     // 数据监听
@@ -279,7 +273,7 @@ export default {
         background-color: #f3f3f3;
         color: #666;
     }
-    .allInvalid{
+    .allInvalid {
         background-color: #e9e9e9;
         color: #666;
     }
@@ -294,6 +288,10 @@ export default {
         border-bottom: 1px solid #f1f1f1;
         &.invalid {
             background-color: #efefef;
+
+            .difference {
+                background-color: #e9e9e9;
+            }
         }
     }
     .check {
@@ -389,7 +387,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    background-color: #e9e9e9;
+    background-color: #efefef;
     color: #666;
     padding: px(20) px(10);
     font-size: px(38);

src/pages/index/index.vue

@@ -369,7 +369,7 @@
                                     </ul>
                                 </div>
 
-                                <div class="order__btns" v-if="tab !== 5">
+                                <div class="order__btns" v-if="tab !== 6 && tab !== 5">
                                     <div
                                         class="btn tel"
                                         @click="makePhone(order)"

src/pages/index/refund.vue

@@ -17,28 +17,45 @@
                             :value="item.id"
                         />
                     </div>
-                    <div class="info">
-                        <my-image
-                            :src="item.productImage"
-                            class="img"
-                        ></my-image>
-                        <div class="data">
-                            <div class="tit">
-                                {{ item.productName }}
+                    <div class="main">
+                        <div class="info">
+                            <my-image
+                                :src="item.productImage"
+                                class="img"
+                            ></my-image>
+                            <div class="data">
+                                <div class="tit">
+                                    {{ item.productName }}
+                                </div>
+                                <div>
+                                    <span class="num"
+                                        >数量：x {{ item.count }}</span
+                                    >
+                                    <span class="num" v-if="item.skuName"
+                                        >规格： {{ item.skuName }}</span
+                                    >
+                                </div>
+                                <div class="des">
+                                    支付金额：
+                                    <span class="price"
+                                        >￥{{
+                                            item.payAmount | minuteToRmb
+                                        }}</span
+                                    >
+                                </div>
                             </div>
-                            <div>
-                                <span class="num"
-                                    >数量：x {{ item.count }}</span
-                                >
-                                <span class="num" v-if="item.skuName"
-                                    >规格： {{ item.skuName }}</span
-                                >
+                        </div>
+                        <div
+                            class="difference"
+                            v-if="item.refundAmount && item.actualPickingWeight"
+                        >
+                            <div class="name">
+                                已退差价：￥{{
+                                    item.refundAmount | minuteToRmb
+                                }}
                             </div>
-                            <div class="des">
-                                支付金额：
-                                <span class="price"
-                                    >￥{{ item.payAmount | minuteToRmb }}</span
-                                >
+                            <div class="">
+                                已退重量：{{ item.actualPickingWeight || "0" }}g
                             </div>
                         </div>
                     </div>
@@ -178,8 +195,7 @@ export default {
                                 if (res.success) {
                                     this.fn.showToast("提交成功");
                                     this.router.back();
-                                }else{
-                                    
+                                } else {
                                     this.fn.showToast(
                                         "提交失败：" + res.message
                                     );
@@ -190,7 +206,7 @@ export default {
         },
 
         // 退差价
-        disparity(){
+        disparity() {
             if (this.submitLoading) {
                 return;
             }
@@ -198,9 +214,9 @@ export default {
                 return this.fn.showToast("请选择退货项");
             }
             let arr = [];
-            for(id of this.curGoodItemIds){
-                for(let item of this.orderData.orderItems){
-                    if(item.id === id){
+            for (id of this.curGoodItemIds) {
+                for (let item of this.orderData.orderItems) {
+                    if (item.id === id) {
                         arr.push(item);
                     }
                 }
@@ -209,20 +225,20 @@ export default {
                 disparityData: arr,
             });
             let id = this.orderData.orderInfo.id;
-            console.log(this.orderData,id);
+            console.log(this.orderData, id);
             this.router.replace({
-                path:'/pages/index/disparity',
-                query:{
-                    orderId:id
-                }
-            })
+                path: "/pages/index/disparity",
+                query: {
+                    orderId: id,
+                },
+            });
         },
 
         // 取消订单
         cancelOrder(flag) {
-            let str = '确认取消该订单，并全部退款';
-            if(flag === true){
-                str = '你已选中所有商品，确认后将取消订单全部退款';
+            let str = "确认取消该订单，并全部退款";
+            if (flag === true) {
+                str = "你已选中所有商品，确认后将取消订单全部退款";
             }
             let val = this.orderData;
             this.fn
@@ -277,6 +293,9 @@ export default {
                 for (let item of this.orderData.orderItems) {
                     if (item.id === id) {
                         num += item.payAmount;
+                        if(item.refundAmount){
+                            num-=item.refundAmount;
+                        }
                     }
                 }
             }
@@ -353,6 +372,10 @@ export default {
     .checkbox {
         transform: scale(0.8);
     }
+    
+    .main {
+        width: 100%;
+    }
     .info {
         width: 100%;
         display: flex;
@@ -431,4 +454,16 @@ export default {
         font-size: px(44);
     }
 }
+.difference {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #e9e9e9;
+    color: #666;
+    padding: px(20) px(10);
+    font-size: px(38);
+    .link {
+        text-decoration: underline;
+    }
+}
 </style>

src/pages/manage/index.vue

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