components/existProduct-list/existProduct-list.js

@@ -22,7 +22,16 @@ Component({
   },
 
   methods:{
-
+    // 复制订单号
+    copy(e){
+        let no = e.currentTarget.dataset.no;
+        wx.setClipboardData({
+        data: no+"",
+        success (res) {
+            console.log(res);
+        }
+        })
+    },
   },
   ready(){
 

components/existProduct-list/existProduct-list.wxml

@@ -12,5 +12,13 @@
                         <text class="num">x{{item.quantity}}</text>
                     </view>
                 </view>
+                <!-- 物流单号 -->
+                <view class="logisticsNo" wx:if="{{item.orderDetailExprs.length > 0}}">
+                    <text>物流单号</text>
+                    <view>
+                        <text>{{item.orderDetailExprs[0].expressNo}}</text>
+                        <text data-no="{{item.orderDetailExprs[0].expressNo}}" catchtap="copy"> / 复制</text>
+                    </view>
+                </view>
             </view>
     </view>

components/existProduct-list/existProduct-list.wxss

@@ -5,16 +5,18 @@
     margin: auto;
 }
 .itemProd{
-    height: 224rpx;
+    /* min-height: 224rpx; */
+    padding: 40rpx 0;
     border-bottom: 1rpx solid #EFEFEF;
-    display: flex;
-    align-items: center;
+    /* display: flex; */
+    /* align-items: center; */
+    /* flex-direction: column; */
 }
 /* 商品信息 */
 .goods-info {
-    flex: 1;
+    width: 100%;
     display: flex;
-    margin-left: 10px;
+    margin-left: 20rpx;
     position: relative;
 }
 .goods-info image {
@@ -34,4 +36,11 @@
     position: absolute;
     right: 10rpx;
     bottom: 0;
+}
+/* 物流单号 */
+.logisticsNo{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin: 30rpx 0 0 20rpx;
 }

pages/my/addressManage/addressManage.js

@@ -7,7 +7,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    addressList:[]
+    addressList:[],
+    selectAddress:''
   },
   // 获取地址列表
   getAddressList(){
@@ -29,9 +30,41 @@ Page({
  // 监听地址选中
  onCheckboxChange(e){
     let index = e.currentTarget.dataset.index;
+    let addressList = this.data.addressList;
+    addressList.forEach((item,index2)=>{
+        item.defaultFlag = false;
+        if(index2 === index){
+            item.defaultFlag = true;
+        }
+    })
     this.setData({
-        selectAddress:this.data.addressList[index]
+        selectAddress:this.data.addressList[index],
+        addressList
     })
+    this.changeBack();
+ },
+ // 监听返回
+ changeBack(){
+    if(this.data.moldify){
+        // 获取页面栈
+        const pages = getCurrentPages()
+        // 获取上一页实例
+        const prevPage = pages[pages.length - 2];
+        // 监听返回按钮
+        wx.enableAlertBeforeUnload({
+            message: '确定修改为当前地址？',
+            success: (res) => {
+                console.log(res);
+                // 返回前传递参数给上一页
+                if (prevPage) {
+                    prevPage.setData({
+                        returnData:this.data.selectAddress
+                    })
+                }
+                wx.navigateBack()
+            }
+        })
+    }
  },
   /**
    * 生命周期函数--监听页面加载
@@ -54,28 +87,6 @@ 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();
   },
 

pages/order/orderDetail/orderDetail.js

@@ -20,22 +20,23 @@ Page({
           })
       })
   },
-  // 复制订单号
-  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',
       })
   },
+  // 修改地址
+  editOrderAddress(address){
+      let orderId = this.data.orderDetail.orderId;
+      API.orderAddressModify({orderId,userAddressId:address.userAddressId}).then(res=>{
+          wx.showToast({
+            title: '地址修改成功',
+            icon:"success"
+          })
+          this.getOrderDetail(orderId);
+      })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -55,7 +56,16 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    if (currentPage.data.returnData) {
+      let address = currentPage.data.returnData;
+      console.log('收到返回参数:', currentPage.data.returnData)
+      // 使用参数...
+      this.editOrderAddress(address);
+      // 清除参数避免重复触发
+      currentPage.setData({ returnData: null })
+    }
   },
 
   /**

pages/order/orderDetail/orderDetail.wxml

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

pages/order/orderDetail/orderDetail.wxss

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