Merge remote-tracking branch 'origin/master'

jiangping

2024-08-02 5ac7d3df974d24124c9e3d321530a48bfe5f4aab

Merge remote-tracking branch 'origin/master'

 wechat_jiaxuan/pages/design/design.wxml

@@ -18,7 +18,7 @@
          {{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
        </view>
      </picker> -->
      <areaSel  bindchange="regionChange" placeholder="请选择所在区域" value="{{ addrValues }}"  /> 
      <areaSel class="city_picler" bindchange="regionChange" placeholder="请选择所在区域" value="{{ addrValues }}"  /> 
      <image class="arrow_right" src="../../static/icon/arrow_right.png" mode="widthFix"></image>
    </view> 
    <view class="btn" bindtap="onSubmit">立即报名</view>

 wechat_jiaxuan/pages/userinfo/index.js

@@ -22,6 +22,7 @@
    district: '',
    housearea: '',
    
    addrValues: [],
    addr: {},
    areaData: [],

@@ -114,6 +115,7 @@
        longitude: res.data.longitude || '',
        district: res.data.district || '',
        housearea: res.data.housearea || '',
        addrValues: [res.data.provinceCode, res.data.cityCode, res.data.areaCode],
        addr: {
          provinceCode: res.data.provinceCode,
          provinceName: res.data.provinceName,
@@ -129,21 +131,37 @@
      this.setData({ areaData: res.data })
    })
  },
  positionChange (e) {
    console.log(e.detail.value)
    const names = e.detail.value
    const codes = e.detail.code
    let addr = {
      provinceCode: codes[0] + '00',
      provinceName: names[0],
      cityCode: codes[1] + '00',
      cityName: names[1],
      areaCode: codes[2] + '00',
      areaName: names[2],
    }
    this.setData({ addr })
    console.log('addr', this.data.addr);
  regionChange(e) {
    console.log(e) 
    if(e.detail.value &&e.detail.value.length ==3){
      var tn = e.detail.label.split("-")
      const addr = {
        provinceCode: e.detail.value[0] ,
        provinceName: tn[0],
        cityCode:  e.detail.value[1] ,
        cityName:  tn[1],
        areaCode: e.detail.value[2] ,
        areaName:  tn[2]
      }
      this.setData({ addr, showAreaList: false })
      console.log('selectedOptions', addr);
    } 
  },
  // positionChange (e) {
  //   console.log(e.detail.value)
  //   const names = e.detail.value
  //   const codes = e.detail.code
  //   let addr = {
  //     provinceCode: codes[0] + '00',
  //     provinceName: names[0],
  //     cityCode: codes[1] + '00',
  //     cityName: names[1],
  //     areaCode: codes[2] + '00',
  //     areaName: names[2],
  //   }
  //   this.setData({ addr })
  //   console.log('addr', this.data.addr);
  // },
  getBindchooseavatar(e) {
    console.log('e', e);
    var that = this

 wechat_jiaxuan/pages/userinfo/index.wxml

@@ -24,7 +24,7 @@
      <view class="val">
        <view class="picker" style="width: 100%">
          <view class="picker_wrap">
            <areaSel class="city_picler" bindchange="regionChange" placeholder="请选择所在区域" value="{{['210000000','210500000','210501000']}}" />
            <areaSel class="city_picler" bindchange="regionChange" placeholder="请选择所在区域"  value="{{ addrValues }}" />
            <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
          </view>
          <!-- <picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">