Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

 wechat_jiaxuan/pages/design/design.js

@@ -36,14 +36,15 @@
      success: (res) => {
        console.log('res', res);
        let addr = {
          // provinceCode: codes[0] + '00',
          provinceCode: res.result.ad_info.adcode.slice(0,2) + '000000',
          provinceName: res.result.ad_info.province,
          // cityCode: codes[1] + '00',
          cityCode: res.result.ad_info.adcode.slice(0,4) + '0000',
          cityName: res.result.ad_info.city,
          // areaCode: codes[2] + '00',
          areaCode: res.result.ad_info.adcode + '00',
          areaName: res.result.ad_info.district,
        }
        this.setData({ addr })

      }
    })
  },
@@ -78,15 +79,12 @@
      wx.showToast({
        title: '报名成功'
      })
      wx.switchTab({
        url: '/pages/index/index',
      })
      setTimeout(() => {
        wx.switchTab({
          url: '/pages/index/index',
        })
      }, 1000)
    })
  },
  // 显示城市弹窗
  chooseCity () {
    this.setData({ showAreaList: !this.data.showAreaList })
    console.log('chooseCity', this.data.showAreaList);
  },
  onFinish(e) {
    const { selectedOptions, value } = e.detail;
@@ -103,6 +101,7 @@
  },
  positionChange (e) {
    console.log(e.detail.value)
    console.log(e.detail.code)
    const names = e.detail.value
    const codes = e.detail.code
    let addr = {