订单

pages/my/addressManage/addressManage.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     addressList:[],
-    selectAddress:''
+    selectAddress:'',
+    selectIndex:-1
   },
   // 获取地址列表
   getAddressList(){
@@ -30,16 +31,9 @@ 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],
-        addressList
+        selectIndex:index
     })
     this.changeBack();
  },
@@ -51,17 +45,23 @@ Page({
         // 获取上一页实例
         const prevPage = pages[pages.length - 2];
         // 监听返回按钮
-        wx.enableAlertBeforeUnload({
-            message: '确定修改为当前地址？',
+        wx.showModal({
+            title:"提示",
+            content: '确定修改为当前地址？',
             success: (res) => {
                 console.log(res);
                 // 返回前传递参数给上一页
-                if (prevPage) {
+                if (res.confirm && prevPage) {
                     prevPage.setData({
                         returnData:this.data.selectAddress
                     })
+                    wx.navigateBack()
+                }else{
+                    this.setData({
+                        selectAddress:'',
+                        selectIndex:-1
+                    })
                 }
-                wx.navigateBack()
             }
         })
     }

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}}" data-index="{{index}}" catchtap="onCheckboxChange"/>
+        <checkbox checked="{{selectIndex == index || item.defaultFlag}}" data-index="{{index}}" catchtap="onCheckboxChange"/>
         <view class="content">
             <view>
               <text>{{item.recipient}} </text>

pages/my/myOrder/myOrder.js

@@ -7,7 +7,14 @@ Page({
    * 页面的初始数据
    */
   data: {
-    tab:["全部订单","未支付","未发货","未收货","已收货","完成"],
+    tab:[
+        {title:"全部订单",status:''},
+        {title:"已支付",status:'PLAYED'},
+        {title:"已取消",status:'CANCELLED'},
+        {title:"已发货",status:'DELIVERED'},
+        {title:"已收货",status:'RECEIVED'},
+        {title:"完成",status:'FINISHED'}
+    ],
     selectTab:0,
     pageNum:1,
   },
@@ -17,10 +24,15 @@ Page({
     this.setData({
         selectTab:index
     })
+    this.getOrderLists(this.data.tab[index].status);
   },
   // 获取订单列表
-  getOrderLists(){
-      API.getOrderLists({pageNum:this.data.pageNum,pageSize:10}).then(res=>{
+  getOrderLists(status){
+      API.getOrderLists({pageNum:this.data.pageNum,pageSize:10,status}).then(res=>{
+          res.orderDTOS.forEach(item=>{
+              let stats = {PLAYED:"已支付",CANCELLED:"已取消",DELIVERED:"已发货",RECEIVED:"已收货",FINISHED:"完成",ORDERED:"已下单"};
+              item.statusName = stats[item.orderStatus]
+          })
           this.setData({
               orderList:res.orderDTOS
           })

pages/my/myOrder/myOrder.wxml

@@ -3,7 +3,7 @@
    
    <!-- 菜单切换 -->
    <view class="tab">
-      <view class="itemTab {{selectTab === index?'selectTab':''}}" wx:for="{{tab}}" wx:key="index" data-index="{{index}}" bindtap="switchTab">{{item}}</view>
+      <view class="itemTab {{selectTab === index?'selectTab':''}}" wx:for="{{tab}}" wx:key="index" data-index="{{index}}" bindtap="switchTab">{{item.title}}</view>
    </view>
 
    <!-- 订单列表 -->
@@ -30,12 +30,13 @@
           <view class="operateView">
              <view class="status">
                 <text class="name">状态</text>
-                <text>未收货</text>
+                <text>{{item.statusName}}</text>
              </view>
              <image class="editIcon" src="/images/my/edit.png" mode="" data-orderId="{{item.orderId}}" catchtap="goOrderDetail"/>
              <image class="logistics" src="/images/my/logistics.png" mode=""/>
           </view>
        </view>
+       <text class="tips" wx:if="{{orderList.length === 0}}">~没有数据~</text>
    </view>
 
    <!-- 商品总价 -->

pages/my/myOrder/myOrder.wxss

@@ -78,6 +78,12 @@
   height: 50rpx;
   margin-left: 40rpx;
 }
+.myOrder .tips{
+    width: 100%;
+    text-align: center;
+    margin: 30rpx 0;
+    display: block;
+}
 
 /* 商品总价 */
 .myOrder .totalPrice{