修改配送费

src/pages/order/affirm.vue

@@ -252,14 +252,17 @@
                     <div class="list__price">{{ '¥' + (express.postage || '0.00') }}</div>
                 </div>
             </li>-->
-            <li class="list__item" v-if="curTab === 2 && deliveryConfig.deliveryFee">
+            <li
+                class="list__item"
+                v-if="curTab === 2 && deliveryConfig.deliveryFee"
+            >
                 <div class="list__left">
                     <div class="list__title">配送费：</div>
                     <!-- <div class="list__text">{{ deliveryConfig.deliveryFee }}</div> -->
                 </div>
                 <div class="list__right">
                     <div class="list__price">
-                        + ¥{{ deliveryConfig.deliveryFee | minuteToRmb }}
+                        + ¥{{ deliveryConfig.deliveryFee }}
                     </div>
                 </div>
             </li>
@@ -270,7 +273,7 @@
                 </div>
                 <div class="list__right">
                     <div class="list__price">
-                        + ¥{{ deliveryConfig.packageFee | minuteToRmb }}
+                        + ¥{{ deliveryConfig.packageFee }}
                     </div>
                 </div>
             </li>
@@ -318,10 +321,7 @@
                 <block v-else>
                     最低{{ minPrice }}元打包，还差{{ minChaPrice }}元，
                 </block>
-                <a
-                    @click="
-                        jump({ isTabBer: true, path: '/pages/goods/index' })
-                    "
+                <a @click="jump({ isTabBer: true, path: '/pages/goods/index' })"
                     >去凑单</a
                 >
             </div>
@@ -526,14 +526,9 @@ export default {
                 }
             }
             // 自提地址获取
-            if (config.deliveryMethod.storePickUp) {
-                this.api.get("/order/GetLastAddress").then((res) => {
-                    if (res.data) {
-                        this.address2.userName = res.data.name;
-                        this.address2.telNumber = res.data.mobile;
-                    }
-                });
-            }
+            // if (config.deliveryMethod.storePickUp) {
+            // }
+            this.getLastAddress();
 
             // 初始化时间范围 [h,m]
             let gapMs = config.specifyTimeInterval * 1000 * 60;
@@ -600,6 +595,37 @@ export default {
             }
         },
 
+        getLastAddress(){
+            let self = this;
+            this.api
+                .get("/order/GetLastAddress", { deliveryMethod: this.curTab })
+                .then((res) => {
+                    if (res.data) {
+                        let data =res.data;
+                        if (this.curTab === 1) {
+                            this.address2.userName = res.data.name;
+                            this.address2.telNumber = res.data.mobile;
+                        } else {
+                            self.address = {
+                                ...data.address,
+                                provinceName: data.province,
+                                cityName: data.city,
+                                countyName: data.county,
+                                detailInfo: data.address,
+                                userName: data.name,
+                                telNumber: data.mobile,
+                                postalCode: data.zipCode,
+                                latitude: data.latitude,
+                                longitude: data.longitude,
+                                regionInfo: data.regionInfo,
+                                lastAddress: true, // 上次地址，用于提交订单判断
+                            };
+                            self.calDistance();
+                        }
+                    }
+                });
+        },
+
         // 获取地址是否超出距离
         calDistance() {
             if (!this.address) {
@@ -619,7 +645,10 @@ export default {
                 return;
             }
             // let originsLocation = this.deliverierPickUpAddress.location;
-            let originsLocation = this.deliverierPickUpAddress.longitude+ "," + this.deliverierPickUpAddress.latitude;
+            let originsLocation =
+                this.deliverierPickUpAddress.longitude +
+                "," +
+                this.deliverierPickUpAddress.latitude;
             let desctinationLocation =
                 this.address.longitude + "," + this.address.latitude;
 
@@ -704,6 +733,7 @@ export default {
                 });
             }
             this.curTab = val;
+            this.getLastAddress();
         },
 
         // 设置收货地址
@@ -743,23 +773,8 @@ export default {
                         self.getAddress(data.address);
                     } else {
                         // 上次下单地址
-                        if (data.address.latitude && data.address.longitude) {
-                            self.address = {
-                                ...data.address,
-                                provinceName: data.address.province,
-                                cityName: data.address.city,
-                                countyName: data.address.county,
-                                detailInfo: data.address.address,
-                                userName: data.address.name,
-                                telNumber: data.address.mobile,
-                                postalCode: data.address.zipCode,
-                                latitude: data.address.latitude,
-                                longitude: data.address.longitude,
-                                regionInfo: data.address.regionInfo,
-                                lastAddress: true, // 上次地址，用于提交订单判断
-                            };
-                            self.calDistance();
-                        }
+                        // if (data.address.latitude && data.address.longitude) {
+                        // }
                     }
 
                     self.goodsList = data.itemList;
@@ -968,12 +983,12 @@ export default {
                 pointPrice: Number(self.integralDeduction),
                 postage:
                     this.curTab === 2
-                        ? this.deliveryConfig.deliveryFee / 100 || 0
+                        ? this.deliveryConfig.deliveryFee || 0
                         : 0,
                 couponReceiveId: self.coupon.receiveId || "",
                 remark: self.remark,
 
-                packageFee: this.deliveryConfig.packageFee / 100,
+                packageFee: this.deliveryConfig.packageFee,
                 storeId: this.activeShop.store.id,
                 deliveryMethod: this.curTab,
                 deliveryStartTime: this.deliveryTime()[0],
@@ -1072,10 +1087,7 @@ export default {
     computed: {
         // 门店位置
         deliverierPickUpAddress() {
-            console.log(
-                this.$store.state.common.activeShop.store,
-                55
-            );
+            console.log(this.$store.state.common.activeShop.store, 55);
             return this.$store.state.common.activeShop.store;
         },
         // 门店位置
@@ -1158,6 +1170,7 @@ export default {
             if (!this.$store.state.common.storeConfig.deliveryConfig) {
                 return this.fn.showToast("获取店铺配置错误");
             }
+            console.log(this.$store.state.common.storeConfig.deliveryConfig);
             return this.$store.state.common.storeConfig.deliveryConfig;
         },
 
@@ -1285,7 +1298,7 @@ export default {
             }
             // 配送费：
             if (self.deliveryConfig.deliveryFee) {
-                sum += Number(self.deliveryConfig.deliveryFee) / 100;
+                sum += Number(self.deliveryConfig.deliveryFee);
             }
 
             return parseFloat(sum).toFixed(2);
@@ -1298,11 +1311,11 @@ export default {
             sum = sum - self.integralDeduction;
             // 打包费
             if (self.deliveryConfig.packageFee) {
-                sum += Number(self.deliveryConfig.packageFee) / 100;
+                sum += Number(self.deliveryConfig.packageFee);
             }
             // 配送费：
             if (self.deliveryConfig.deliveryFee && this.curTab === 2) {
-                sum += Number(self.deliveryConfig.deliveryFee) / 100;
+                sum += Number(self.deliveryConfig.deliveryFee);
             }
 
             return parseFloat(sum).toFixed(2);

src/pages/user/index.vue

@@ -279,7 +279,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.65</p>
+            <p class="text">0.0.68</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
         <wyg-bottom-tab