fix: use same page for appointment & my address

pages/address/address.js

@@ -5,14 +5,21 @@ Page({
    * 页面的初始数据
    */
   data: {
-    addressList: [1,1,1]
+    addressList: [1,1,1],
+    dialogshow: false,
+    formPage: '',
+    formback:0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    console.log(options);
+    this.setData({
+      formPage: options.form,
+      formback: options.back
+    })
   },
 
   /**
@@ -26,7 +33,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    
   },
 
   /**
@@ -44,17 +51,28 @@ Page({
   },
 
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
+   * 点击地址Item 我的地址进入不做处理 预约页面进入返回预约页面
    */
-  onPullDownRefresh() {
-
+  handleAddressChose () {
+    if (this.data.formback == '1') {
+      wx.navigateBack()
+    }
   },
 
   /**
-   * 页面上拉触底事件的处理函数
+   * 用户点击删除地址按钮
    */
-  onReachBottom() {
-
+  handleDelAddres(e) {
+    // var delId = e.currentTarget.dataset.id
+    this.setData({
+      dialogshow: true
+    })
+  },
+  handleConfirm () {},
+  handleCancel () {
+    this.setData({
+      dialogshow: false
+    })
   },
 
   /**
@@ -62,7 +80,7 @@ Page({
    */
   handleAddressAdd() {
     wx.navigateTo({
-      url: '/pages/addressAdd/addressAdd',
+      url: '/pages/addressAdd/addressAdd?form=address',
     })
   }
 })

pages/address/address.wxml

@@ -1,7 +1,7 @@
 <!--pages/checkAddress/handleAddCheck.wxml-->
 <view class="address-content">
   <view class="main-content">
-    <view class="addrss-item" wx:for="{{addressList}}" wx:key="index">
+    <view class="addrss-item" wx:for="{{addressList}}" wx:key="index" bindtap="handleAddressChose">
       <view class="top userinfo">
         <view class="username ittflex-jcs">
           <text class="name">测试用户</text>
@@ -14,7 +14,7 @@
           <image class="btn-icon" src="./../../imaes/bianji@2x.png"></image>
           <text class="btn-text">编辑</text>
         </view>
-        <view class="delete-btn btn ittflex">
+        <view class="delete-btn btn ittflex" data-id="10010" bindtap="handleDelAddres">
           <image class="btn-icon" src="./../../imaes/shanchu@2x.png"></image>
           <text class="btn-text">删除</text>
         </view>
@@ -22,4 +22,16 @@
     </view>
   </view>
   <view class="add-address-btn itt-btn" bindtap="handleAddressAdd">新增检测地址</view>
+  <van-dialog
+    title="确定要删除吗？"
+    show="{{ dialogshow }}"
+    show-cancel-button
+    confirm-button-text="确定"
+    confirm-button-color="#333"
+    cancel-button-text="取消"
+    cancel-button-color="#666"
+    bind:confirm="handleConfirm"
+    bind:cancel="handleCancel"
+  >
+  </van-dialog>
 </view>

pages/address/address.wxss

@@ -13,14 +13,14 @@
 }
 .addrss-item {
   width: 100%;
-  height: 232rpx;
+  min-height: 232rpx;
   border-radius: 20rpx;
   background-color: #fff;
   margin-top: 20rpx;
 }
 .top {
   width: 100%;
-  height: 156rpx;
+  min-height: 156rpx;
   border-bottom: 1rpx solid #eee;
 }
 .username {
@@ -42,7 +42,7 @@
   font-size: 26rpx;
   font-weight: 400;
   color: #333333;
-  text-indent: 30rpx;
+  padding: 0 30rpx;
 }
 .button {
   height: 72rpx;

pages/appointment/appointment.js

@@ -23,7 +23,7 @@ Page({
    */
   handleChoseAddress() {
     wx.navigateTo({
-      url: '/pages/addressCheck/addressCheck',
+      url: '/pages/address/address?form=appointment&back=1',
     })
   },