Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/views/goodsDetail/index.vue

@@ -398,7 +398,7 @@ export default {
         return;
       }
     },
-    async init(detailParam) {
+    async init(detailParam, disabledSetAddress) {
       const [res] = await goods.detailInfo(detailParam);
       // canJoinGroupBuyAgain  groupStatus
       try {
@@ -452,7 +452,7 @@ export default {
             }
           });
         }
-        this.selectedAddress = res.receiverInfo || {};
+        if (!disabledSetAddress) this.selectedAddress = res.receiverInfo || {};
         this.specList = res.skuAtts || [];
         let li = [];
         this.specList.forEach(item => {
@@ -534,16 +534,10 @@ export default {
     changeAddress(address) {
       // 选取规格需要清空，init会重新赋值
       this.specSelected = [];
-      const detailParam = { ...this.$route.query };
-      this.detailParam = {
-        count: this.selectedGoods.skuNum,
-        skuNo: this.selectedGoods.skuId,
-        receiverId: address.addrReceiverId,
-        ...detailParam
-      };
+      this.selectedAddress = address;
+      this.detailParam = { ...this.$route.query };
+      this.init(this.detailParam, true);
       this.show = false;
-      console.log(this.detailParam);
-      this.init(this.detailParam);
     },
     // 选择商品规格
     getSelectedSkuNo(specSelected) {

src/views/order/createOrder.vue

@@ -133,15 +133,6 @@ export default {
         this.orderData = orderData;
         this.getConfirmOrderInfo();
       }
-      const orderAdder = this.$route.params.orderAdder;
-      if (orderAdder) {
-        this.handleAddressChange(this.$route.params.addressList);
-        return false;
-      }
-      const addressList = localStorage.get('addressList') || {};
-      if (addressList) {
-        this.handleAddressChange(addressList);
-      }
     },
     handleToAddress() {
       if (this.orderInfo.addrReceiverInfo) {
@@ -170,6 +161,7 @@ export default {
     },
     // 获取确认订单信息
     async getConfirmOrderInfo() {
+      console.log(this.orderData, 11223);
       const [data] = await order.confirmOrder(this.orderData);
       if (data) {
         const { addrReceiverInfo, calcFeeInfo, invalidSkuList, shopSkuList } = data;