Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !134

src/pages/addAddress/addAddress.js

@@ -22,7 +22,9 @@ wxService.page({
       userId:'',
       name:'',
       phone:'',
-      fullArea:'',
+      province:'',
+      city: '',
+      district: '',
       address:'',
       type:1
     },
@@ -86,12 +88,14 @@ wxService.page({
             userId: data.userId,
             name: data.name,
             phone: data.phone,
-            fullArea: data.fullArea,
+            province: data.province,
+            city: data.city,
+            district: data.district,
             address: data.address,
             type: data.type
           },
           isSelect: data.type,
-          cityView: data.fullArea
+          cityView: data.province + ' ' + data.city + ' ' + data.district
         })
         wxService.getC1().then((c1) => {
           return wxService.Promise.all([wxService.Promise.resolve(c1), wxService.getC2ByC1('北京'), wxService.getC3ByC2('北京北京市')])
@@ -115,10 +119,15 @@ wxService.page({
     console.log(citys)
     if (citys) {
       const cityView = [citys[0][multiIndex[0]], citys[1][multiIndex[1]], citys[2][multiIndex[2]]].join(' ')
+      
       this.setData({
         multiIndex,
-        cityView
+        cityView,
+        'params.province': citys[0][multiIndex[0]],
+        'params.city': citys[1][multiIndex[1]],
+        'params.district': citys[2][multiIndex[2]]
       })
+      
     }
   },
 
@@ -202,7 +211,9 @@ wxService.page({
         userId: memberId,
         name: e.detail.value.name,
         phone: e.detail.value.phone,
-        fullArea: this.data.cityView,
+        province: this.data.params.province,
+        city: this.data.params.city,
+        district: this.data.params.district,
         address: e.detail.value.address,
         type: this.data.isSelect ? 1 : 0
       }

src/utils/Http.js

@@ -89,7 +89,8 @@ class Http {
         method: 'GET',
         header: {
           'buyer-token': this.getToken(),
-          'TENTACLE_CONTENT': this.getTentacle()
+          // 'TENTACLE_CONTENT': this.getTentacle(),
+          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas
       })
@@ -99,7 +100,9 @@ class Http {
         method: 'GET',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          'TENTACLE_CONTENT': this.getTentacle()
+          // 'TENTACLE_CONTENT': this.getTentacle(),
+          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
+
         },
         data: parmas
       })
@@ -117,7 +120,8 @@ class Http {
         method: 'POST',
         header: {
           'buyer-token': this.getToken(),
-          'TENTACLE_CONTENT': this.getTentacle()
+          // 'TENTACLE_CONTENT': this.getTentacle()
+          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas,
         channel: channel
@@ -128,7 +132,8 @@ class Http {
         method: 'POST',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          'TENTACLE_CONTENT': this.getTentacle()
+          // 'TENTACLE_CONTENT': this.getTentacle()
+          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas,
         channel: channel