|
|
@@ -17,28 +17,45 @@
|
|
17
|
17
|
:value="item.id"
|
|
18
|
18
|
/>
|
|
19
|
19
|
</div>
|
|
20
|
|
- <div class="info">
|
|
21
|
|
- <my-image
|
|
22
|
|
- :src="item.productImage"
|
|
23
|
|
- class="img"
|
|
24
|
|
- ></my-image>
|
|
25
|
|
- <div class="data">
|
|
26
|
|
- <div class="tit">
|
|
27
|
|
- {{ item.productName }}
|
|
|
20
|
+ <div class="main">
|
|
|
21
|
+ <div class="info">
|
|
|
22
|
+ <my-image
|
|
|
23
|
+ :src="item.productImage"
|
|
|
24
|
+ class="img"
|
|
|
25
|
+ ></my-image>
|
|
|
26
|
+ <div class="data">
|
|
|
27
|
+ <div class="tit">
|
|
|
28
|
+ {{ item.productName }}
|
|
|
29
|
+ </div>
|
|
|
30
|
+ <div>
|
|
|
31
|
+ <span class="num"
|
|
|
32
|
+ >数量：x {{ item.count }}</span
|
|
|
33
|
+ >
|
|
|
34
|
+ <span class="num" v-if="item.skuName"
|
|
|
35
|
+ >规格： {{ item.skuName }}</span
|
|
|
36
|
+ >
|
|
|
37
|
+ </div>
|
|
|
38
|
+ <div class="des">
|
|
|
39
|
+ 支付金额：
|
|
|
40
|
+ <span class="price"
|
|
|
41
|
+ >￥{{
|
|
|
42
|
+ item.payAmount | minuteToRmb
|
|
|
43
|
+ }}</span
|
|
|
44
|
+ >
|
|
|
45
|
+ </div>
|
|
28
|
46
|
</div>
|
|
29
|
|
- <div>
|
|
30
|
|
- <span class="num"
|
|
31
|
|
- >数量：x {{ item.count }}</span
|
|
32
|
|
- >
|
|
33
|
|
- <span class="num" v-if="item.skuName"
|
|
34
|
|
- >规格： {{ item.skuName }}</span
|
|
35
|
|
- >
|
|
|
47
|
+ </div>
|
|
|
48
|
+ <div
|
|
|
49
|
+ class="difference"
|
|
|
50
|
+ v-if="item.refundAmount && item.actualPickingWeight"
|
|
|
51
|
+ >
|
|
|
52
|
+ <div class="name">
|
|
|
53
|
+ 已退差价：￥{{
|
|
|
54
|
+ item.refundAmount | minuteToRmb
|
|
|
55
|
+ }}
|
|
36
|
56
|
</div>
|
|
37
|
|
- <div class="des">
|
|
38
|
|
- 支付金额：
|
|
39
|
|
- <span class="price"
|
|
40
|
|
- >￥{{ item.payAmount | minuteToRmb }}</span
|
|
41
|
|
- >
|
|
|
57
|
+ <div class="">
|
|
|
58
|
+ 已退重量：{{ item.actualPickingWeight || "0" }}g
|
|
42
|
59
|
</div>
|
|
43
|
60
|
</div>
|
|
44
|
61
|
</div>
|
|
|
@@ -178,8 +195,7 @@ export default {
|
|
178
|
195
|
if (res.success) {
|
|
179
|
196
|
this.fn.showToast("提交成功");
|
|
180
|
197
|
this.router.back();
|
|
181
|
|
- }else{
|
|
182
|
|
-
|
|
|
198
|
+ } else {
|
|
183
|
199
|
this.fn.showToast(
|
|
184
|
200
|
"提交失败：" + res.message
|
|
185
|
201
|
);
|
|
|
@@ -190,7 +206,7 @@ export default {
|
|
190
|
206
|
},
|
|
191
|
207
|
|
|
192
|
208
|
// 退差价
|
|
193
|
|
- disparity(){
|
|
|
209
|
+ disparity() {
|
|
194
|
210
|
if (this.submitLoading) {
|
|
195
|
211
|
return;
|
|
196
|
212
|
}
|
|
|
@@ -198,9 +214,9 @@ export default {
|
|
198
|
214
|
return this.fn.showToast("请选择退货项");
|
|
199
|
215
|
}
|
|
200
|
216
|
let arr = [];
|
|
201
|
|
- for(id of this.curGoodItemIds){
|
|
202
|
|
- for(let item of this.orderData.orderItems){
|
|
203
|
|
- if(item.id === id){
|
|
|
217
|
+ for (id of this.curGoodItemIds) {
|
|
|
218
|
+ for (let item of this.orderData.orderItems) {
|
|
|
219
|
+ if (item.id === id) {
|
|
204
|
220
|
arr.push(item);
|
|
205
|
221
|
}
|
|
206
|
222
|
}
|
|
|
@@ -209,20 +225,20 @@ export default {
|
|
209
|
225
|
disparityData: arr,
|
|
210
|
226
|
});
|
|
211
|
227
|
let id = this.orderData.orderInfo.id;
|
|
212
|
|
- console.log(this.orderData,id);
|
|
|
228
|
+ console.log(this.orderData, id);
|
|
213
|
229
|
this.router.replace({
|
|
214
|
|
- path:'/pages/index/disparity',
|
|
215
|
|
- query:{
|
|
216
|
|
- orderId:id
|
|
217
|
|
- }
|
|
218
|
|
- })
|
|
|
230
|
+ path: "/pages/index/disparity",
|
|
|
231
|
+ query: {
|
|
|
232
|
+ orderId: id,
|
|
|
233
|
+ },
|
|
|
234
|
+ });
|
|
219
|
235
|
},
|
|
220
|
236
|
|
|
221
|
237
|
// 取消订单
|
|
222
|
238
|
cancelOrder(flag) {
|
|
223
|
|
- let str = '确认取消该订单，并全部退款';
|
|
224
|
|
- if(flag === true){
|
|
225
|
|
- str = '你已选中所有商品，确认后将取消订单全部退款';
|
|
|
239
|
+ let str = "确认取消该订单，并全部退款";
|
|
|
240
|
+ if (flag === true) {
|
|
|
241
|
+ str = "你已选中所有商品，确认后将取消订单全部退款";
|
|
226
|
242
|
}
|
|
227
|
243
|
let val = this.orderData;
|
|
228
|
244
|
this.fn
|
|
|
@@ -277,6 +293,9 @@ export default {
|
|
277
|
293
|
for (let item of this.orderData.orderItems) {
|
|
278
|
294
|
if (item.id === id) {
|
|
279
|
295
|
num += item.payAmount;
|
|
|
296
|
+ if(item.refundAmount){
|
|
|
297
|
+ num-=item.refundAmount;
|
|
|
298
|
+ }
|
|
280
|
299
|
}
|
|
281
|
300
|
}
|
|
282
|
301
|
}
|
|
|
@@ -353,6 +372,10 @@ export default {
|
|
353
|
372
|
.checkbox {
|
|
354
|
373
|
transform: scale(0.8);
|
|
355
|
374
|
}
|
|
|
375
|
+
|
|
|
376
|
+ .main {
|
|
|
377
|
+ width: 100%;
|
|
|
378
|
+ }
|
|
356
|
379
|
.info {
|
|
357
|
380
|
width: 100%;
|
|
358
|
381
|
display: flex;
|
|
|
@@ -431,4 +454,16 @@ export default {
|
|
431
|
454
|
font-size: px(44);
|
|
432
|
455
|
}
|
|
433
|
456
|
}
|
|
|
457
|
+.difference {
|
|
|
458
|
+ display: flex;
|
|
|
459
|
+ justify-content: space-between;
|
|
|
460
|
+ align-items: center;
|
|
|
461
|
+ background-color: #e9e9e9;
|
|
|
462
|
+ color: #666;
|
|
|
463
|
+ padding: px(20) px(10);
|
|
|
464
|
+ font-size: px(38);
|
|
|
465
|
+ .link {
|
|
|
466
|
+ text-decoration: underline;
|
|
|
467
|
+ }
|
|
|
468
|
+}
|
|
434
|
469
|
</style>
|
