yann пре 5 месеци
родитељ
комит
61fffd4dc7

+ 34 - 1
pages/my/addressManage/addressManage.js

@@ -25,11 +25,22 @@ Page({
       wx.navigateTo({
         url: '/pages/my/addAddress/addAddress',
       })
-  }, 
+  },
+ // 监听地址选中
+ onCheckboxChange(e){
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+        selectAddress:this.data.addressList[index]
+    })
+ },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+      console.log(options);
+      this.setData({
+        moldify:options.moldify
+      })
   },
 
   /**
@@ -43,6 +54,28 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    // if(this.data.moldify){
+    //     // 获取页面栈
+    //     const pages = getCurrentPages()
+    //     // 获取上一页实例
+    //     const prevPage = pages[pages.length - 2];
+    //     // 监听返回按钮
+    //     wx.enableAlertBeforeUnload({
+    //         message: '确定修改为当前地址?',
+    //         success: () => {
+    //         // 返回前传递参数给上一页
+    //         if (prevPage) {
+    //             prevPage.setData({
+    //                 returnData: {
+    //                     key: 'address',
+    //                     from: this.data.selectAddress
+    //                 }
+    //             })
+    //         }
+    //         wx.navigateBack()
+    //         }
+    //     })
+    // }
     this.getAddressList();
   },
 

+ 1 - 1
pages/my/addressManage/addressManage.wxml

@@ -6,7 +6,7 @@
    </view>
    <view class="addressList">
     <view class="itemAddress" wx:for="{{addressList}}" wx:key="id">
-        <checkbox checked="{{item.defaultFlag}}"/>
+        <checkbox checked="{{item.defaultFlag}}" data-index="{{index}}" catchtap="onCheckboxChange"/>
         <view class="content">
             <view>
               <text>{{item.recipient}} </text>

+ 17 - 1
pages/order/orderDetail/orderDetail.js

@@ -16,10 +16,26 @@ Page({
         //   console.log(res);
           this.setData({
               orderDetail:res.orderDTO,
-              prods:res.orderDetailDTOS
+              prods:res.orderDTO.orderDetailDTOS
           })
       })
   },
+  // 复制订单号
+  copy(e){
+      let no = e.currentTarget.dataset.no;
+      wx.setClipboardData({
+        data: no+"",
+        success (res) {
+          console.log(res);
+        }
+      })
+  },
+  //  进入地址管理
+  goAddressMange(){
+      wx.navigateTo({
+        url: '/pages/my/addressManage/addressManage?moldify=true',
+      })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

+ 9 - 0
pages/order/orderDetail/orderDetail.wxml

@@ -15,3 +15,12 @@
 <!-- 商品 -->
 <existProduct prods="{{prods}}"></existProduct>
 
+<!-- 物流单号 -->
+<view class="logisticsNo">
+  <text>物流单号</text>
+  <view>
+    <text>123456780</text>
+    <text data-no="{{1234567}}" catchtap="copy"> / 复制</text>
+  </view>
+</view>
+

+ 8 - 0
pages/order/orderDetail/orderDetail.wxss

@@ -21,4 +21,12 @@
     width: 30rpx;
     transform: rotate(180deg);
     margin: 0 20px;
+}
+
+/* 物流单号 */
+.logisticsNo{
+    display: flex;
+    justify-content: space-between;
+    padding: 0 40rpx;
+    line-height: 100rpx;
 }

+ 4 - 0
service/api.js

@@ -297,5 +297,9 @@ export const API = {
     // 获取订单详情
     getOrderDetail:function(playload){
         return http.get("/api/store/order/detail",playload)
+    },
+    // 订单地址修改
+    orderAddressModify:function(playload){
+        return http.post("/api/store/order/changeAddress",playload)
     }
 }