Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !81

src/component/sharePoster/sharePoster.js

@@ -40,6 +40,7 @@ Component({
    * 组件的方法列表
    */
   methods: {
+   
     //下载产品图片
     getAvaterInfo: function () {
       wx.showLoading({

src/pages/addAddress/addAddress.js

@@ -64,6 +64,7 @@ wxService.page({
     wxService.getC1().then((c1) => {
       return wxService.Promise.all([wxService.Promise.resolve(c1), wxService.getC2ByC1('北京'), wxService.getC3ByC2('北京北京市')])
     }).then(res => {
+      console.log(res)
       const citys = res.map(item => {
         return [...item]
       })
@@ -93,6 +94,7 @@ wxService.page({
         wxService.getC1().then((c1) => {
           return wxService.Promise.all([wxService.Promise.resolve(c1), wxService.getC2ByC1('北京'), wxService.getC3ByC2('北京北京市')])
         }).then(res => {
+         
           const citys = res.map(item => {
             return [...item]
           })
@@ -108,6 +110,7 @@ wxService.page({
   bindMultiPickerChange(e) {
     const citys = this.data.citys
     const multiIndex = e.detail.value
+    console.log(citys)
     if (citys) {
       const cityView = [citys[0][multiIndex[0]], citys[1][multiIndex[1]], citys[2][multiIndex[2]]].join(' ')
       this.setData({
@@ -118,6 +121,7 @@ wxService.page({
   },
 
   bindMultiPickerColumnChange(e) {
+    console.log(e)
     const detail = e.detail
     const index = detail.value
     let cityName = ''

src/pages/myAddress/myAddress.js

@@ -3,6 +3,7 @@ const app = getApp()
 const wxService = require('../../utils/wxService')
 const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo
+const { memberId } = wx.getStorageSync('_baseUserInfo')
 
 wxService.page({
 
@@ -33,9 +34,10 @@ wxService.page({
   },
 
   // 获取地址列表
-  getAddressList(){
-    const { memberId } = wx.getStorageSync('_baseUserInfo')
-    wxService.post(`/member/addressManage/getall?userId=${memberId}`).then(res => {
+  getAddressList(){ 
+    wxService.post(`/member/addressManage/getall`,{
+      userId: memberId
+    }).then(res => {
       if (!res) return false
       const { result, data } = res.data
       if (result == 0) {
@@ -67,8 +69,12 @@ wxService.page({
   //设置默认地址
   settingDefalutAddress(e){
     console.log(e)
+    let params = {
+      userId: memberId,
+      id: e.currentTarget.dataset.id
+    }
     if(!e.currentTarget.dataset.type){
-      wxService.post(`/member/addressManage/getall?userId=${memberId}`).then(res => {
+      wxService.post(`/member/addressManage/setTolerant`,params).then(res => {
         if (!res) return false
         const { result, data } = res.data
         if (result == 0) {
@@ -142,7 +148,9 @@ wxService.page({
       success: function (res) {
         if (res.confirm) {
           console.log('用户点击确定')
-          wxService.post(`/member/addressManage/delete?id=${id}`).then(res => {
+          wxService.post(`/member/addressManage/delete`,{
+            id: id
+          }).then(res => {
             const { result, data } = res.data
             if (result == 0) {
               wx.showToast({

src/pages/myAddress/myAddress.wxml

@@ -12,7 +12,7 @@
           {{item.name}} {{item.phone}}
         </view>
         <view class="address-detail">{{item.fullArea}} {{item.address}}</view>
-        <view class="default-address" bindtap="settingDefalutAddress" data-type="{{item.type}}">
+        <view class="default-address" bindtap="settingDefalutAddress" data-type="{{item.type}}" data-id="{{item.id}}">
           <view class="{{item.type == 1 ? 'theme-color' : ''}} circle-radio"  >
             <image wx:if="{{item.type == 1}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
           </view>