Kaynağa Gözat

fix: judge address is use or not

wangyuan 2 yıl önce
ebeveyn
işleme
bcae185b10

+ 4 - 1
api/address.js

@@ -5,6 +5,7 @@ const addAddressURL = '/add/address' // 新增地址
 const addressListURL = '/address/list' // 地址列表
 const deleteAddressURL = '/delete/address' // 删除地址
 const editAddressURL = '/edit/address' // 编辑地址
+const getRegionURL = '/get/region' // 获取可用的省市区
 
 export const addAddress =  (data) => wxRequest(addAddressURL, data)
 
@@ -12,4 +13,6 @@ export const addressList =  (data) => wxRequest(addressListURL, data)
 
 export const deleteAddress =  (data) => wxRequest(deleteAddressURL, data)
 
-export const editAddress =  (data) => wxRequest(editAddressURL, data)
+export const editAddress =  (data) => wxRequest(editAddressURL, data)
+
+export const getRegion =  (data) => wxRequest(getRegionURL, data)

+ 12 - 11
pages/address/address.js

@@ -85,23 +85,24 @@ Page({
     wx.navigateTo({
       url: '/pages/addressAdd/addressAdd?form=address&type=0&province=' + editProvice + '&city=' + editCity + '&county=' + editCounty + '&detailAddress=' + editDetailAddress + '&contactName=' + editContactName + '&contactPhone=' + editContactPhone + '&addressId=' + editAddressId
     })
-    console.log(value);
   },
 
   /**
    * 点击地址Item 我的地址进入不做处理 预约页面进入返回预约页面
    */
   handleAddressChose (e) {
-    if (this.data.formback == '1') {
-      const address = e.currentTarget.dataset.info
-      app.globalData.navigateBackParams.contactName = address.contactName
-      app.globalData.navigateBackParams.addressId = address.addressId
-      app.globalData.navigateBackParams.contactPhone = address.contactPhone
-      app.globalData.navigateBackParams.province = address.province
-      app.globalData.navigateBackParams.city = address.city
-      app.globalData.navigateBackParams.county = address.county
-      app.globalData.navigateBackParams.address = address.province + address.city + address.county + address.detailAddress
-      wx.navigateBack()
+    if (e.currentTarget.dataset.isEnable) {
+      if (this.data.formback == '1') {
+        const address = e.currentTarget.dataset.info
+        app.globalData.navigateBackParams.contactName = address.contactName
+        app.globalData.navigateBackParams.addressId = address.addressId
+        app.globalData.navigateBackParams.contactPhone = address.contactPhone
+        app.globalData.navigateBackParams.province = address.province
+        app.globalData.navigateBackParams.city = address.city
+        app.globalData.navigateBackParams.county = address.county
+        app.globalData.navigateBackParams.address = address.province + address.city + address.county + address.detailAddress
+        wx.navigateBack()
+      }
     }
   },
 

+ 18 - 16
pages/address/address.wxml

@@ -1,25 +1,27 @@
 <!--pages/checkAddress/handleAddCheck.wxml-->
 <view class="address-content">
   <view class="main-content">
-    <view class="addrss-item" wx:for="{{addressList}}" wx:key="index">
-      <view class="top userinfo" data-info="{{item}}" bindtap="handleAddressChose">
-        <view class="username ittflex-jcs">
-          <text class="name">{{item.contactName}}</text>
-          <text class="phone">{{item.contactPhone}}</text>
-        </view>
-        <view class="address-detail">{{item.province}}{{item.city}}{{item.county}}{{item.detailAddress}}</view>
-      </view>
-      <view class="actions button ittflex">
-        <view class="edit-btn btn ittflex" data-item="{{item}}" bindtap="handleEdit">
-          <image class="btn-icon" src="./../../imaes/bianji@2x.png"></image>
-          <text class="btn-text" >编辑</text>
+    <block wx:for="{{addressList}}" wx:key="index">
+      <view class="addrss-item {{item.isEnable ? '' : 'addrss-item-disabled'}}">
+        <view class="top userinfo" data-info="{{item}}" bindtap="handleAddressChose">
+          <view class="username ittflex-jcs">
+            <text class="name">{{item.contactName}}</text>
+            <text class="phone">{{item.contactPhone}}</text>
+          </view>
+          <view class="address-detail">{{item.province}}{{item.city}}{{item.county}}{{item.detailAddress}}</view>
         </view>
-        <view class="delete-btn btn ittflex" data-addressid="{{item.addressId}}" bindtap="handleDelAddres">
-          <image class="btn-icon" src="./../../imaes/shanchu@2x.png"></image>
-          <text class="btn-text">删除</text>
+        <view class="actions button ittflex">
+          <view class="edit-btn btn ittflex" data-item="{{item}}" bindtap="handleEdit">
+            <image class="btn-icon" src="./../../imaes/bianji@2x.png"></image>
+            <text class="btn-text" >编辑</text>
+          </view>
+          <view class="delete-btn btn ittflex" data-addressid="{{item.addressId}}" bindtap="handleDelAddres">
+            <image class="btn-icon" src="./../../imaes/shanchu@2x.png"></image>
+            <text class="btn-text">删除</text>
+          </view>
         </view>
       </view>
-    </view>
+    </block>
     <!-- <view class="outrang-text">超预约范围地址:</view>
     <view class="addrss-item out-rang-address-item" wx:for="{{outRangAddresList}}" wx:key="index">
       <view class="top userinfo" data-info="{{item}}" bindtap="handleAddressChose">

+ 6 - 0
pages/address/address.wxss

@@ -79,4 +79,10 @@
   height: 80rpx;
   border-radius: 10rpx;
   margin: 0 auto;
+}
+.addrss-item-disabled .name {
+  color: #999999;
+}
+.addrss-item-disabled .address-detail {
+  color: #999999;
 }

+ 24 - 2
pages/addressAdd/addressAdd.js

@@ -1,5 +1,5 @@
 // pages/addressAdd/addressAdd.js
-import { addAddress, editAddress } from '../../api/address'
+import { addAddress, editAddress, getRegion } from '../../api/address'
 Page({
 
   /**
@@ -12,9 +12,12 @@ Page({
     contactPhone: '',
     rangText: '',
     isEdit: false,
-    addressId: ''
+    addressId: '',
+    regionIndex: [0,0,0],
+    regionArray: [['浙江省','上海市'], ['杭州市','嘉定区'],['富阳区','嘉定区']]
   },
   onLoad (options) {
+    this.getRegionFn()
     if (options.type && options.type == 0) {
       wx.setNavigationBarTitle({
         title: '编辑地址',
@@ -29,6 +32,25 @@ Page({
       })
     }
   },
+
+  // 获取地址的有效氛围
+  getRegionFn () {
+    getRegion({}).then(res => {
+      console.log(res);
+    })
+  },
+
+  bindMultiPickerChange: function (e) {
+    console.log('picker发送选择改变,携带值为', e.detail.value)
+    this.setData({
+      regionIndex: e.detail.value
+    })
+  },
+
+  bindMultiPickerColumnChange (e) {
+    console.log(e);
+  },
+
   /**
    * 保存地址
    * **/

+ 6 - 0
pages/addressAdd/addressAdd.wxml

@@ -4,6 +4,12 @@
     <view class="form-item chose-region ittflex-jcb">
       <view class="label ittflex">所在区域</view>
       <view class="actions">
+      <!-- <picker class="my-picker" mode="multiSelector" value="{{regionIndex}}" range="{{regionArray}}" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange">
+        <view class="picker-item ittflex">
+              <text class="picker-text">{{regionArray[0][regionIndex[0]]}}{{regionArray[1][regionIndex[1]]}}{{regionArray[2][regionIndex[2]]}}</text>
+              <van-icon name="arrow" color="#999" style="margin-right: 30rpx;"/>
+            </view>
+      </picker> -->
         <picker class="my-picker" mode="region" value="{{region}}" bindchange="bindRegonPickerChange">
           <view class="picker-item ittflex">
               <text class="picker-text">{{region[0]}}{{region[1]}}{{region[2]}}</text>