修改bug

src/components/address-select/index.vue

@@ -18,7 +18,7 @@
                     <div class="c-list__content">
                         <img
                             class="c-list__icon"
-                            src="/static/share/icon_3.jpg"
+                            src="/static/share/add.png"
                             alt
                         />
                         <div class="c-list__text">添加地址</div>
@@ -57,9 +57,6 @@ export default {
             const self = this;
 
             self.show = true;
-            // self.price = price
-            // self.distribution = distribution
-            // self.vip = vip
             self.callback = callback;
         },
 
@@ -69,15 +66,15 @@ export default {
 
             self.show = false;
 
-            if (self.fn.getType(self.callback) === "function") {
-                self.callback();
-            }
         },
 
 
         // 点击
         tabClick(type){
-            self.$emit("share", type);
+            this.$emit("share", type);
+            if(this.callback){
+                this.callback(type);
+            }
         }
     },
 

src/pages/address/form.vue

@@ -82,6 +82,7 @@ export default {
                 longitude: "", // 经度
                 zipCode: "",
             },
+            isOrder: false,
         };
     },
 
@@ -114,6 +115,12 @@ export default {
     },
     onShow() {
         let self = this;
+
+        if (this.$mp.query.isOrder == "1") {
+            this.isOrder = true;
+        } else {
+            this.isOrder = false;
+        }
     },
 
     // 函数
@@ -123,7 +130,7 @@ export default {
             // 判断定位权限
             uni.getSetting({
                 success: function (res) {
-                    console.log(res,'1234')
+                    console.log(res, "1234");
                     if (res.authSetting["scope.userLocation"] === false) {
                         self.fn
                             .showModal({
@@ -179,7 +186,6 @@ export default {
         },
 
         submit() {
-            console.log(this.form.isDefault);
             if (!this.form.regionInfo) {
                 return this.fn.showToast("请选择地址");
             }
@@ -206,6 +212,12 @@ export default {
                 this.api.post("/Address/Edit", data).then((res) => {
                     if (res.success) {
                         this.fn.showToast("保存成功");
+                        if (this.isOrder) {
+                            data.id = res.data;
+                            this.$store.commit("common/update", {
+                                addressData: data,
+                            });
+                        }
                         this.router.back();
                     } else {
                         this.fn.showModal({
@@ -220,6 +232,12 @@ export default {
                 this.api.post("/Address/Add", this.form).then((res) => {
                     if (res.success) {
                         this.fn.showToast("保存成功");
+                        if (this.isOrder) {
+                            this.form.id = res.data;
+                            this.$store.commit("common/update", {
+                                addressData: this.form,
+                            });
+                        }
                         this.router.back();
                     } else {
                         this.fn.showModal({

src/pages/address/index.vue

@@ -10,7 +10,7 @@
                             <!-- <span class="tag" v-if="item.isDefault">默认</span> -->
                         </div>
                         <div class="address__text" v-if="item.regionInfo">
-                            {{item.regionInfo}} {{ item.address }}
+                            {{ item.regionInfo }} {{ item.address }}
                         </div>
                         <div class="address__text" v-else>
                             {{ item.province }} {{ item.city }}
@@ -41,18 +41,17 @@ export default {
         return {
             addressList: null,
             isReq: false,
-            isOrder:false, // 是否订单进入
+            isOrder: false, // 是否订单进入
         };
     },
 
-    onLoad(opts){
-        console.log(this.$mp.query.isOrder)
-        if(this.$mp.query.isOrder =='1'){
-        this.isOrder =true;
-        }else{
-            this.isOrder =false;
+    onLoad(opts) {
+        console.log(this.$mp.query.isOrder);
+        if (this.$mp.query.isOrder == "1") {
+            this.isOrder = true;
+        } else {
+            this.isOrder = false;
         }
-
     },
 
     async onShow() {
@@ -79,9 +78,9 @@ export default {
             this.$store.commit("common/update", {
                 addressData: val,
             });
-            if(this.isOrder){
+            if (this.isOrder) {
                 this.router.back();
-            }else{
+            } else {
                 this.router.push({
                     path: "/pages/address/form",
                     query: {
@@ -100,7 +99,6 @@ export default {
 
     // 数据计算
     computed: {
-        
         // 判断主题  1:红色  2：绿色
         theme() {
             return this.$store.state.common.theme;
@@ -197,7 +195,7 @@ export default {
         border: 1px solid #27a34f;
     }
 }
-.tag{
+.tag {
     font-size: px(30);
     padding: 0 px(10);
     line-height: px(44);

src/pages/goods/list2.vue

@@ -414,6 +414,7 @@ export default {
             shopGoodAsc: -1,
             shopGoodSort: -1,
             shopGoodsList: [],
+            cartList:[]
         };
     },
 
@@ -465,6 +466,7 @@ export default {
             self.getActivityList();
         } else {
             self.getShopGoodsList();
+            this.getCartLsit();
         }
     },
 
@@ -478,6 +480,7 @@ export default {
                 this.getActivityList();
             } else {
                 this.getShopGoodsList();
+                this.getCartLsit();
             }
         },
 
@@ -489,6 +492,7 @@ export default {
                 this.getActivityList();
             } else {
                 this.getShopGoodsList();
+                this.getCartLsit();
             }
         },
 
@@ -500,6 +504,7 @@ export default {
                 self.getMoreActivity();
             } else {
                 this.getShopMoreGoods();
+                this.getCartLsit();
             }
         },
         // 设置排序
@@ -872,10 +877,34 @@ export default {
 
                     self.shopGoodsList = res.data.data;
                     self.loading = true;
-                    this.setGoodsList();
+                    self.setGoodsList();
                     uni.hideLoading();
                 });
         },
+        
+        setGoodsList() {
+            // 删除全部
+            for (let item of this.goodsList) {
+                item.cart = null;
+            }
+            // 重新赋值
+            for (let item of this.shopGoodsList) {
+                for (let cart of this.cartList) {
+                    if (cart.productId === item.id) {
+                        if(item.skus.length === 0){
+                            item.cart = cart;
+                        }else{
+                            if(item.cart){
+                                item.cart.push(cart);
+                            }else{
+                                item.cart = [cart];
+                            }
+                        }
+                    }
+                }
+            }
+            this.goodsList = [...this.goodsList];
+        },
 
         // 获取更多商品
         getShopMoreGoods() {
@@ -897,6 +926,7 @@ export default {
 
                     self.shopGoodsList = self.shopGoodsList.concat(res.data.data);
                     this.setShopGoodsList();
+                    this.setGoodsList();
                 });
         },
     },

src/pages/order/affirm.vue

@@ -135,7 +135,8 @@
                     <i class="iconfont iconarrow address__arrows"></i>
                 </div>
             </div>
-            <div class="address-null" v-else @click="setAddress">
+            <!-- v-else -->
+            <div class="address-null" v-else @click="openAddress">
                 <div class="address-null__title">请填写收货地址</div>
                 <i class="iconfont iconarrow address-null__arrows"></i>
             </div>
@@ -148,7 +149,7 @@
                     placeholder="详细地址，例1层101室"
                 />
             </div>
-            <div class="my-address" v-if="address && productSource!='1'">
+            <div class="my-address" v-if="address && productSource != '1'">
                 <span>收货人：</span>
                 <input
                     class="my-address__input"
@@ -157,7 +158,7 @@
                     placeholder="收货人"
                 />
             </div>
-            <div class="my-address" v-if="address && productSource!='1'">
+            <div class="my-address" v-if="address && productSource != '1'">
                 <span>手机号：</span>
                 <input
                     class="my-address__input"
@@ -435,7 +436,7 @@ import AddressSelect from "../../components/address-select/index";
 
 export default {
     name: "",
-    components: { FInputNumber, MyImage, OCoupon,AddressSelect },
+    components: { FInputNumber, MyImage, OCoupon, AddressSelect },
     // 数据
     data() {
         return {
@@ -502,6 +503,9 @@ export default {
             this.$store.commit("common/update", {
                 addressData: null,
             });
+            if(this.$refs.addressSelect){
+                this.$refs.addressSelect.close();
+            }
         }
     },
 
@@ -630,7 +634,7 @@ export default {
 
         // 获取地址是否超出距离
         calDistance() {
-            if (!this.address || this.productSource=='1') {
+            if (!this.address || this.productSource == "1") {
                 return;
             }
             if (!this.address.longitude || !this.address.latitude) {
@@ -987,9 +991,9 @@ export default {
                 deliveryEndTime: this.deliveryTime()[1],
                 productSource: Number(this.productSource), // 0-商家商品1-优选商品
             };
-            if(this.productSource==='1'){
+            if (this.productSource === "1") {
                 sendData.deliveryMethod = 0;
-            }else{
+            } else {
                 sendData.deliveryMethod = this.curTab;
             }
             // 配送
@@ -1078,6 +1082,70 @@ export default {
                 return this.curTime.date;
             }
         },
+
+        // 打开地址
+        openAddress() {
+            const self = this;
+            console.log(self.$refs.addressSelect);
+            self.$refs.addressSelect.open((val) => {
+                if (val === "add") {
+                    const self = this;
+                    this.router.push({
+                        path: "/pages/address/form",
+                        query: {
+                            isOrder: "1",
+                        },
+                    });
+                } else {
+                    uni.chooseAddress({
+                        success(addressRes) {
+                            if (addressRes.errMsg === "chooseAddress:ok") {
+                                let address = {
+                                    regionInfo:
+                                        addressRes.provinceName +
+                                        addressRes.cityName +
+                                        addressRes.countyName,
+                                    province: addressRes.provinceName,
+                                    city: addressRes.cityName,
+                                    county: addressRes.countyName,
+                                    address: addressRes.detailInfo,
+                                    name: addressRes.userName,
+                                    // mobile: "17343041879",
+                                    mobile: addressRes.telNumber,
+                                };
+                                self.api
+                                    .post("/Address/Add", address)
+                                    .then((res) => {
+                                        if (res.success) {
+                                            // self.fn.showToast("保存成功");
+                                            address.id = res.data;
+                                            self.address = {
+                                                ...address,
+                                                provinceName: address.province,
+                                                cityName: address.city,
+                                                countyName: address.county,
+                                                detailInfo: address.address,
+                                                userName: address.name,
+                                                telNumber: address.mobile,
+                                                regionInfo: address.regionInfo,
+                                            };
+                                            self.$refs.addressSelect.close();
+                                        } else {
+                                            self.fn.showModal({
+                                                title: "保存失败",
+                                                content: res.message,
+                                                showCancel: false,
+                                            });
+                                        }
+                                    });
+                            } else {
+                                this.fn.showToast("选择地址失败");
+                            }
+                        },
+                    });
+                }
+            });
+        },
     },
 
     // 数据计算
@@ -1343,15 +1411,6 @@ export default {
 
             return sum;
         },
-
-        // 打开地址
-        oprenAddress() {
-            const self = this;
-
-            self.$refs.openAddress.open((val) => {
-                console.log(val);
-            });
-        },
     },
 
     // 数据监听

src/pages/user/index.vue

@@ -279,7 +279,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.89</p>
+            <p class="text">0.0.9</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
     </div>