Merge branch 'pre' of http://git.dgtis.com/sunlupeng/pointsMall

src/views/HomeView/RedeemView.vue

@@ -372,30 +372,34 @@ export default {
         },
         changeDeliveryType(val){
             this.disabled = true;
+            // if(val==''){
+            //     this.total = this.data.price;
+            //     this.skuCount = 1;
+            //     this.disabled = true;
+            // }
+            if(val=='0' || val==''){
+                this.total = this.data.price;
+                this.skuCount = 1;
+            }
             if(val=='1'){
+                debugger
                 if(this.data.productAttribute=='exchange_logo'){
                     this.total = this.data.price * this.skuCount + 180;
                     this.dialogFormOrderInfo = true;
                 }
-                if(this.contactInfo){
+                if(this.address){
                     this.addressDetail = true;
                     this.disabled = false;
                 }
             }
-            if(val=='2' || val=='3' || val=='4'){
+            if(val=='2' || val=='3'){
                 this.total = this.data.price;
                 this.skuCount = 1;
                 this.disabled = false;
             }
-            if(val=='0'){
-                this.total = this.data.price;
-                this.skuCount = 1;
-                this.disabled = true;
-            }
-            if(val==''){
+            if(val=='4'){
                 this.total = this.data.price;
                 this.skuCount = 1;
-                this.disabled = true;
             }
         },
         setTab() {
@@ -417,9 +421,9 @@ export default {
             if (activeName == 'goodsNotice') {
                 integralInfo({ skuId: skuId }).then(response => {
                     this.data = response.data.data;
-                    this.contactInfo = response.data.data.contactInfo;
                     this.deliveryTypeList = response.data.data.dictDataList;
                     this.reclaimAddrList = response.data.data.reclaimAddrList;
+                    this.contactInfo = response.data.data.contactInfo;
                     if(this.contactInfo){
                         this.name = this.contactInfo.contact;
                         this.phone = this.contactInfo.contactPhone;