|
@@ -252,25 +252,25 @@
|
252
|
252
|
<div class="list__price">{{ '¥' + (express.postage || '0.00') }}</div>
|
253
|
253
|
</div>
|
254
|
254
|
</li>-->
|
255
|
|
- <li class="list__item" v-if="curTab === 2 && orderData.deliveryFee">
|
|
255
|
+ <li class="list__item" v-if="curTab === 2 && deliveryConfig.deliveryFee">
|
256
|
256
|
<div class="list__left">
|
257
|
257
|
<div class="list__title">配送费:</div>
|
258
|
258
|
<!-- <div class="list__text">{{ deliveryConfig.deliveryFee }}</div> -->
|
259
|
259
|
</div>
|
260
|
260
|
<div class="list__right">
|
261
|
261
|
<div class="list__price">
|
262
|
|
- + ¥{{ orderData.deliveryFee | minuteToRmb }}
|
|
262
|
+ + ¥{{ deliveryConfig.deliveryFee | minuteToRmb }}
|
263
|
263
|
</div>
|
264
|
264
|
</div>
|
265
|
265
|
</li>
|
266
|
|
- <li class="list__item" v-if="orderData.packageFee">
|
|
266
|
+ <li class="list__item" v-if="deliveryConfig.packageFee">
|
267
|
267
|
<div class="list__left">
|
268
|
268
|
<div class="list__title">打包费:</div>
|
269
|
269
|
<!-- <div class="list__text">{{ deliveryConfig.packageFee }}</div> -->
|
270
|
270
|
</div>
|
271
|
271
|
<div class="list__right">
|
272
|
272
|
<div class="list__price">
|
273
|
|
- + ¥{{ orderData.packageFee | minuteToRmb }}
|
|
273
|
+ + ¥{{ deliveryConfig.packageFee | minuteToRmb }}
|
274
|
274
|
</div>
|
275
|
275
|
</div>
|
276
|
276
|
</li>
|
|
@@ -968,12 +968,12 @@ export default {
|
968
|
968
|
pointPrice: Number(self.integralDeduction),
|
969
|
969
|
postage:
|
970
|
970
|
this.curTab === 2
|
971
|
|
- ? this.orderData.deliveryFee / 100 || 0
|
|
971
|
+ ? this.deliveryConfig.deliveryFee / 100 || 0
|
972
|
972
|
: 0,
|
973
|
973
|
couponReceiveId: self.coupon.receiveId || "",
|
974
|
974
|
remark: self.remark,
|
975
|
975
|
|
976
|
|
- packageFee: this.orderData.packageFee / 100,
|
|
976
|
+ packageFee: this.deliveryConfig.packageFee / 100,
|
977
|
977
|
storeId: this.activeShop.store.id,
|
978
|
978
|
deliveryMethod: this.curTab,
|
979
|
979
|
deliveryStartTime: this.deliveryTime()[0],
|
|
@@ -1280,12 +1280,12 @@ export default {
|
1280
|
1280
|
let sum = self.totalAmount;
|
1281
|
1281
|
// 打包费
|
1282
|
1282
|
|
1283
|
|
- if (self.orderData.packageFee) {
|
1284
|
|
- sum += Number(self.orderData.packageFee);
|
|
1283
|
+ if (self.deliveryConfig.packageFee) {
|
|
1284
|
+ sum += Number(self.deliveryConfig.packageFee);
|
1285
|
1285
|
}
|
1286
|
1286
|
// 配送费:
|
1287
|
|
- if (self.orderData.deliveryFee) {
|
1288
|
|
- sum += Number(self.orderData.deliveryFee) / 100;
|
|
1287
|
+ if (self.deliveryConfig.deliveryFee) {
|
|
1288
|
+ sum += Number(self.deliveryConfig.deliveryFee) / 100;
|
1289
|
1289
|
}
|
1290
|
1290
|
|
1291
|
1291
|
return parseFloat(sum).toFixed(2);
|
|
@@ -1297,12 +1297,12 @@ export default {
|
1297
|
1297
|
let sum = self.totalAmount;
|
1298
|
1298
|
sum = sum - self.integralDeduction;
|
1299
|
1299
|
// 打包费
|
1300
|
|
- if (self.orderData.packageFee) {
|
1301
|
|
- sum += Number(self.orderData.packageFee) / 100;
|
|
1300
|
+ if (self.deliveryConfig.packageFee) {
|
|
1301
|
+ sum += Number(self.deliveryConfig.packageFee) / 100;
|
1302
|
1302
|
}
|
1303
|
1303
|
// 配送费:
|
1304
|
|
- if (self.orderData.deliveryFee && this.curTab === 2) {
|
1305
|
|
- sum += Number(self.orderData.deliveryFee) / 100;
|
|
1304
|
+ if (self.deliveryConfig.deliveryFee && this.curTab === 2) {
|
|
1305
|
+ sum += Number(self.deliveryConfig.deliveryFee) / 100;
|
1306
|
1306
|
}
|
1307
|
1307
|
|
1308
|
1308
|
return parseFloat(sum).toFixed(2);
|