From 245dd6f1b9a206019ba1680b5214d3bbcd870d72 Mon Sep 17 00:00:00 2001
From: Sanakey <714737083@qq.com>
Date: 星期二, 13 十月 2020 18:02:37 +0800
Subject: [PATCH] 位置服务更新

---
 pages/address/address.wxml |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pages/address/address.wxml b/pages/address/address.wxml
index aa2b2d8..6cd3ca1 100644
--- a/pages/address/address.wxml
+++ b/pages/address/address.wxml
@@ -1,8 +1,21 @@
 <!--pages/address/address.wxml-->
 
 <view class="container">
+  <view class="padding">
+    <van-button wx:if="{{!location}}" plain type="warning" bind:click="selectLocation" block>閫夋嫨鏀惰揣鍦板潃 > </van-button>
+    <van-cell class="address-cell" wx:else center title="{{location.name}}" label="{{location.address}}" >
+      <van-button plain type="warning" bind:click="selectLocation" size="small">淇敼鍦板潃</van-button>
+    </van-cell>
+  </view>
   <form bindsubmit="bindSave">
     <view class="form-box">
+      <view class="addr-details">
+        <view class="label">闂ㄧ墝鍦板潃</view>
+        <view class="label-right">
+          <!--<input class="input" type="text" placeholder="琛楅亾闂ㄧ墝淇℃伅"/>-->
+          <textarea name="street" auto-height placeholder="琛楅亾闂ㄧ墝淇℃伅" value="{{addressData.street}}{{wxaddress.detailInfo}}" />
+        </view>
+      </view>
       <view class="row-wrap">
         <view class="label">鑱旂郴浜�</view>
         <view class="label-right">
@@ -16,21 +29,15 @@
         </view>
       </view>
       
-      <view class="row-wrap"  > <!-- bindtap="selectCity" -->
+      <!-- <view class="row-wrap"  >
         <view class="label">閫夋嫨鍦板尯</view>
         <picker mode="region" bindchange="bindRegionChange" name="area" value="{{region}}" custom-item="{{customItem}}">
           <view class="picker">
             {{region[0]||wxaddress.provinceName}}锛寋{region[1]||wxaddress.cityName}}锛寋{region[2]||wxaddress.countyName}}
           </view>
         </picker>
-      </view>
-      <view class="addr-details">
-        <view class="label">琛楅亾鍦板潃</view>
-        <view class="label-right">
-          <!--<input class="input" type="text" placeholder="琛楅亾闂ㄧ墝淇℃伅"/>-->
-          <textarea name="street" auto-height placeholder="琛楅亾闂ㄧ墝淇℃伅" value="{{addressData.street}}{{wxaddress.detailInfo}}" />
-        </view>
-      </view>
+      </view> -->
+      
       <view class="row-wrap" wx:if="{{isShowPostcode}}">
         <view class="label">閭斂缂栧彿</view>
         <view class="label-right">
@@ -38,9 +45,9 @@
         </view>
       </view>
     </view>
-    <button type="warn" class="save-btn" formType="submit">淇濆瓨</button>
-    <button wx:if="{{edit}}" type="primary" class="save-btn" bindtap="readFromWx">浠庡井淇¤鍙�</button>
-    <button type="default" class="save-btn" bindtap="deleteAddress" data-id="{{addressData.id}}" wx:if="{{!edit}}">鍒犻櫎璇ュ湴鍧�</button>
+    <button type="primary" class="save-btn" formType="submit">淇濆瓨</button>
+    <!-- <button wx:if="{{edit}}" type="primary" class="save-btn" bindtap="readFromWx">浠庡井淇¤鍙�</button> -->
+    <button type="default" class="save-btn" bindtap="deleteAddress" data-id="{{addressData.id}}" wx:if="{{!edit&&!hidebtn}}">鍒犻櫎璇ュ湴鍧�</button>
     <button type="default" class="cancel-btn" bindtap="bindCancel">鍙栨秷</button>
   </form>
 </view>
\ No newline at end of file

--
Gitblit v1.8.0