Merge remote-tracking branch 'origin/master'

k94314517

2024-08-01 9d3e12b88c3b5556a9b186e7afcc813236cc126a

 wechat_jiaxuan/pages/design/design.js

@@ -13,11 +13,11 @@
   */
  data: {
    name: '',
    phone: '', 
    
    phone: '',  
    showAreaList: false,
    areaList: [],
    addr: {},
    addrValues:[],
    fieldNames: {
      text: 'name',
      value: 'id',
@@ -44,8 +44,10 @@
          areaCode: res.result.ad_info.adcode + '00',
          areaName: res.result.ad_info.district,
        }
        this.setData({ addr })

        this.setData({ addr,addrValues:
          [res.result.ad_info.adcode.slice(0,2) + '0000',
          res.result.ad_info.adcode.slice(0,4) + '00',
          res.result.ad_info.adcode]  })    
      }
    })
    const member =  wx.getStorageSync('member')
@@ -154,37 +156,8 @@
    // getArea({
    //   "level": "",
    //   "pid": ""
    // }).then(res => {
    //   var tl = []
    //   if(res && res.data && res.data.length){
    //       res.data.forEach(element => { 
    //           let tc = []
    //           if(element.children &&element.children.length){
    //             element.children.forEach(c => { 
    //               let ta = []
    //               if(c.children &&c.children.length){
    //                 c.children.forEach(a => { 
    //                   ta.push({
    //                     name: a.name,
    //                     id: a.id 
    //                   })
    //                 })
    //               }
    //               tc.push({
    //                 name: c.name,
    //                 id: c.id,
    //                 children:ta,
    //               })
    //             })
    //           }
    //           tl.push({
    //             name: element.name,
    //             id: element.id,
    //             children: tc,
    //           })
    //       });
    //   }
    //   this.setData({areaList: tl})
    // }).then(res => {  
    //   this.setData({areaList: res.data})
    //   console.log(this.data.areaList)
    // })
    getDictData({