From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/unpackage/dist/dev/mp-weixin/pages/new-address/new-address.wxml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/new-address/new-address.wxml b/small-program/unpackage/dist/dev/mp-weixin/pages/new-address/new-address.wxml
index 6a44215..9d31838 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/new-address/new-address.wxml
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/new-address/new-address.wxml
@@ -1 +1 @@
-<view class="box data-v-75935d96"><view class="list data-v-75935d96"><view class="list-item data-v-75935d96"><view class="list-item-label data-v-75935d96">鏀朵欢浜�</view><view class="list-item-input data-v-75935d96"><input type="text" placeholder="璇疯緭鍏ユ敹浠朵汉濮撳悕" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form']]]]]}}" value="{{form.name}}" bindinput="__e" class="data-v-75935d96"/></view></view><view class="list-item data-v-75935d96"><view class="list-item-label data-v-75935d96">鑱旂郴鐢佃瘽</view><view class="list-item-input data-v-75935d96"><input type="text" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form']]]]]}}" value="{{form.phone}}" bindinput="__e" class="data-v-75935d96"/></view></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="list-item data-v-75935d96" bindtap="__e"><view class="list-item-label data-v-75935d96">鎵�鍦ㄥ湴鍖�</view><view class="list-item-sele data-v-75935d96"><text style="{{'color:'+(form.areaName?'#333333':'')+';'}}" class="data-v-75935d96">{{form.areaName?form.areaName:'璇烽�夋嫨'}}</text><u-icon vue-id="3cd8d630-1" name="arrow-right" color="#B2B2B2" size="16" class="data-v-75935d96" bind:__l="__l"></u-icon></view></view><view data-event-opts="{{[['tap',[['chooseLocation',['$event']]]]]}}" class="list-item data-v-75935d96" bindtap="__e"><view class="list-item-label data-v-75935d96">璇︾粏鍦板潃</view><view class="list-item-sele data-v-75935d96"><text style="{{'color:'+(form.addr?'#333333':'')+';'}}" class="data-v-75935d96">{{form.addr?form.addr:'璇烽�夋嫨'}}</text><u-icon vue-id="3cd8d630-2" name="arrow-right" color="#B2B2B2" size="16" class="data-v-75935d96" bind:__l="__l"></u-icon></view></view><view class="list-item data-v-75935d96" style="display:flex;align-items:center;justify-content:space-between;"><view class="list-item-label data-v-75935d96">璁句负榛樿鍦板潃</view><u-switch bind:input="__e" vue-id="3cd8d630-3" activeValue="{{1}}" inactiveValue="{{0}}" value="{{form.isDefault}}" data-event-opts="{{[['^input',[['__set_model',['$0','isDefault','$event',[]],['form']]]]]}}" class="data-v-75935d96" bind:__l="__l"></u-switch></view><block wx:if="{{type===1}}"><view class="box-footer data-v-75935d96"><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn2 data-v-75935d96" bindtap="__e">淇濆瓨</view></view></block><block wx:if="{{type===2}}"><view class="box-footer data-v-75935d96"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="btn1 data-v-75935d96" bindtap="__e">鍒犻櫎</view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn2 data-v-75935d96" bindtap="__e">淇濆瓨</view></view></block></view><block wx:if="{{$root.g0}}"><u-picker vue-id="3cd8d630-4" show="{{show}}" confirmColor="#ff2c36" keyName="text" columns="{{columns}}" data-ref="uPicker" data-event-opts="{{[['^confirm',[['confirm']]],['^change',[['changeHandler']]],['^cancel',[['e2']]]]}}" bind:confirm="__e" bind:change="__e" bind:cancel="__e" class="data-v-75935d96 vue-ref" bind:__l="__l"></u-picker></block><u-modal vue-id="3cd8d630-5" show="{{show1}}" title="绯荤粺鎻愮ず" content="纭鍒犻櫎褰撳墠鏀惰揣鍦板潃鍚�?" confirmColor="#004096" showConfirmButton="{{true}}" showCancelButton="{{true}}" data-event-opts="{{[['^confirm',[['dele']]],['^cancel',[['e3']]]]}}" bind:confirm="__e" bind:cancel="__e" class="data-v-75935d96" bind:__l="__l"></u-modal></view>
\ No newline at end of file
+<view class="box data-v-75935d96"><view class="list data-v-75935d96"><view class="list-item data-v-75935d96"><view class="list-item-label data-v-75935d96">鏀朵欢浜�</view><view class="list-item-input data-v-75935d96"><input type="text" placeholder="璇疯緭鍏ユ敹浠朵汉濮撳悕" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form']]]]]}}" value="{{form.name}}" bindinput="__e" class="data-v-75935d96"/></view></view><view class="list-item data-v-75935d96"><view class="list-item-label data-v-75935d96">鑱旂郴鐢佃瘽</view><view class="list-item-input data-v-75935d96"><input type="text" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form']]]]]}}" value="{{form.phone}}" bindinput="__e" class="data-v-75935d96"/></view></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="list-item data-v-75935d96" bindtap="__e"><view class="list-item-label data-v-75935d96">鎵�鍦ㄥ湴鍖�</view><view class="list-item-sele data-v-75935d96"><text style="{{'color:'+(form.areaName?'#333333':'')+';'}}" class="data-v-75935d96">{{form.areaName?form.areaName:'璇烽�夋嫨'}}</text><u-icon vue-id="3cd8d630-1" name="arrow-right" color="#B2B2B2" size="16" class="data-v-75935d96" bind:__l="__l"></u-icon></view></view><view data-event-opts="{{[['tap',[['chooseLocation',['$event']]]]]}}" class="list-item data-v-75935d96" bindtap="__e"><view class="list-item-label data-v-75935d96">璇︾粏鍦板潃</view><view class="list-item-sele data-v-75935d96"><text style="{{'color:'+(form.addr?'#333333':'')+';'}}" class="data-v-75935d96">{{form.addr?form.addr:'璇烽�夋嫨'}}</text><u-icon vue-id="3cd8d630-2" name="arrow-right" color="#B2B2B2" size="16" class="data-v-75935d96" bind:__l="__l"></u-icon></view></view><view class="list-item data-v-75935d96" style="display:flex;align-items:center;justify-content:space-between;"><view class="list-item-label data-v-75935d96">璁句负榛樿鍦板潃</view><u-switch bind:input="__e" vue-id="3cd8d630-3" activeValue="{{1}}" inactiveValue="{{0}}" value="{{form.isDefault}}" data-event-opts="{{[['^input',[['__set_model',['$0','isDefault','$event',[]],['form']]]]]}}" class="data-v-75935d96" bind:__l="__l"></u-switch></view><block wx:if="{{type===1}}"><view class="box-footer data-v-75935d96"><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn2 data-v-75935d96" bindtap="__e">淇濆瓨</view></view></block><block wx:if="{{type===2}}"><view class="box-footer data-v-75935d96"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="btn1 data-v-75935d96" bindtap="__e">鍒犻櫎</view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn2 data-v-75935d96" bindtap="__e">淇濆瓨</view></view></block></view><block wx:if="{{$root.g0}}"><u-picker vue-id="3cd8d630-4" show="{{show}}" confirmColor="#ff2c36" keyName="text" columns="{{columns}}" data-ref="uPicker" data-event-opts="{{[['^confirm',[['confirm']]],['^change',[['changeHandler']]],['^cancel',[['e2']]]]}}" bind:confirm="__e" bind:change="__e" bind:cancel="__e" class="data-v-75935d96 vue-ref" bind:__l="__l"></u-picker></block><u-modal vue-id="3cd8d630-5" show="{{show1}}" title="绯荤粺鎻愮ず" content="纭鍒犻櫎褰撳墠鏀惰揣鍦板潃鍚�?" confirmColor="#004096" showConfirmButton="{{true}}" showCancelButton="{{true}}" data-event-opts="{{[['^confirm',[['dele']]],['^cancel',[['e3']]]]}}" bind:confirm="__e" bind:cancel="__e" class="data-v-75935d96" bind:__l="__l"></u-modal></view>
\ No newline at end of file

--
Gitblit v1.9.3