From 8d48f2f55453635bf60e5e00d1e4746288e9da67 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/design/design.wxml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index f6b125c..d7700a6 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -10,10 +10,14 @@
       <image class="icon" src="../../static/icon/design_ic_phone.png" mode="widthFix"></image>
       <van-field type="number" class="input" custom-style="background-color: #F6F6F6;" model:value="{{ phone }}" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable maxlength="{{ 11 }}" />
     </view>
-    <view class="line" bindtap="chooseCity">
+    <view class="line">
       <image class="icon" src="../../static/icon/design_ic_city.png" mode="widthFix"></image>
-      <view wx:if="{{addr.areaCode}}" class="city">{{addr.provinceName}}{{addr.cityName}}{{addr.areaName}}</view>
-      <view wx:else class="placeholder9 city">璇烽�夋嫨鍦板尯</view>
+      <picker class="city_picler" mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
+        <view class="placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
+        <view class="picker" hidden="{{ !addr.cityName }}">
+          {{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
+        </view>
+      </picker>
       <image class="arrow_right" src="../../static/icon/arrow_right.png" mode="widthFix"></image>
     </view>
     <view class="btn" bindtap="onSubmit">绔嬪嵆鎶ュ悕</view>

--
Gitblit v1.9.3