feat():增加服务开始和结束的按钮

api/order.js

@@ -3,12 +3,12 @@ import request from '../utils/request.js'
 class order extends request {
 
     static async getOrderList(page = 1, pageSize = 10, orderStatus, writeOffStatus,foodOrder=2) {
-        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderStatus=${orderStatus}&writeOffStatus=${writeOffStatus}&foodOrder=${foodOrder}`)
+        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderStatus=${orderStatus}&pay=${writeOffStatus}&foodOrder=${foodOrder}`)
 
         return res.data
     }
     static async getDiscussOffOrderList(page = 1, pageSize = 10, orderStatus, writeOffStatus) {
-        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderStatus=${orderStatus}&writeOffStatus=${writeOffStatus}&discussStatus=1`)
+        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderStatus=${orderStatus}&pay=${writeOffStatus}`)
         return res.data
     }
 
@@ -50,6 +50,16 @@ class order extends request {
         return res.data
     }
 
+    static async startServer(orderId) {
+        const res = await this.postRequest(`${this.BASE_URL}Order/serverStart`,{orderId:orderId})
+        return res.data
+    }
+
+    static async endServer(orderId) {
+        const res = await this.postRequest(`${this.BASE_URL}Order/serverComplete`,{orderId:orderId})
+        return res.data
+    }
+
 }
 
 export default order

pages/order/order.wxml

@@ -80,5 +80,7 @@
         <view class="pay-btn" wx:if="{{order.status==1}}" bindtap="payOrder">确认支付</view>
         <view class="delete-btn" bindtap="deleteOrder" wx:if="{{order.status==3}}">删除订单</view>
         <view class="xiaofei" wx:if="{{order.status==2  && order.writeOffStatus==1}}">待消费</view>
+        <view class="xiaofei" bindtap="startService" wx:if="{{order.allocateOrderStatus == 2}}">开始服务</view>
+        <view class="xiaofei" bindtap="endService" wx:if="{{order.allocateOrderStatus == 3}}">结束服务</view>
     </view>
 </view>

pages/order/order.wxss

@@ -1,5 +1,7 @@
 .container {
   background-color: #F7F7F7;
+  height: 100%;
+  overflow-y: auto;
 }
 
 .container .timer {
@@ -96,10 +98,11 @@
 }
 
 .container .shop-info {
-  height: 350rpx;
+  height: 371rpx;
   margin-top: 20rpx;
   padding: 20rpx 30rpx;
   background-color: #fff;
+  margin-bottom: 75rpx;
 }
 
 .container .shop-info .shop {
@@ -134,6 +137,7 @@
   justify-content: flex-end;
   align-items: center;
   border-top: 1rpx solid #ECECEC;
+  background-color: #FFF;
 }
 
 .container .order-btn .confirm-btn,

pages/personorder/personorder.js

@@ -20,11 +20,11 @@ Page({
         title: '全部'
       },
       {
-        title: '待消费'
-      },
-      {
-        title: '待评价'
+        title: '已支付'
       },
+      // {
+      //   title: '待评价'
+      // },
       {
         title: '已完成'
       },
@@ -78,7 +78,7 @@ Page({
     let pageNo = this.data.pageNo;
     let tabs = this.data.tabs;
     let pageSum = this.data.pageSum;
-    // 获取代消费订单
+    // 获取已支付订单
     var orderList = await orderApi.getOrderList(pageNo[1], 10, 2, 1,0);
     var list = orderList.list;
     if (!tabs[1].list) {
@@ -106,7 +106,7 @@ Page({
     let tabs = this.data.tabs;
     let pageSum = this.data.pageSum;
     // 获取代消费订单
-    var orderList = await orderApi.getDiscussOffOrderList(pageNo[2], 10, 2, 2);
+    var orderList = await orderApi.getDiscussOffOrderList(pageNo[2], 10, 5, 2);
     var list = orderList.list;
     if (!tabs[2].list) {
       tabs[2].list = []
@@ -208,6 +208,33 @@ Page({
     })
 
   },
+  startServer: async function (e) {
+    var orderId = e.currentTarget.dataset.orderid;
+    await orderApi.startServer(orderId)
+    if (this.data.activeTab  == 1){
+      await this.getwriteOffOrderList()
+    }else {
+      await this.getAllOrderList()
+    }
+    wx.showToast({
+      title: '服务开始',
+    })
+
+  },
+  endServer: async function (e) {
+    var orderId = e.currentTarget.dataset.orderid;
+    await orderApi.endServer(orderId)
+    if (this.data.activeTab  == 1){
+      await this.getwriteOffOrderList()
+    }else {
+      await this.getAllOrderList()
+    }
+   
+    wx.showToast({
+      title: '服务结束',
+    })
+
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/personorder/personorder.wxml

@@ -51,13 +51,15 @@
                                 <view class="buy-again btn f14" data-shopid="{{item.storeId}}"
                                     data-productid="{{item.productId}}" data-productimg="{{item.productImg}}"
                                     data-productname="{{item.productName}}" data-price="{{item.orderMoney}}"
-                                    catchtap="buyAgain" wx:if="{{item.status==2&&item.writeOffStatus==2}}">再来一单
+                                    catchtap="buyAgain" wx:if="{{item.status==2&&item.writeOffStatus==2&&allocateOrderStatus==4}}">再来一单
                                 </view>
                                 <view class="comment btn f14"
-                                    wx:if="{{item.status==2&&item.writeOffStatus==2&&item.discussId==''}}"
+                                    wx:if="{{item.status==2&&item.writeOffStatus==2&&item.discussId==''&&allocateOrderStatus==4}}"
                                     data-orderid="{{item.id}}" data-shopid="{{item.storeId}}"
                                     data-productid="{{item.productId}}" bindtap="gotoComment">评价</view>
                                 <view class="pay btn f14" data-orderId="{{item.id}}" bindtap="payOrder" wx:if="{{item.status==1}}">付款</view>
+                                <view wx:if="{{item.allocateOrderStatus==2}}" class="pay btn f14" data-orderId="{{item.id}}" catchtap="startServer">开始服务</view>
+                                <view wx:if="{{item.allocateOrderStatus==3}}" class="pay btn f14" data-orderId="{{item.id}}" catchtap="endServer">结束服务</view>
                                 <view class="pay btn f14" data-orderId="{{item.id}}" catchtap="showOrderInfo">查看详情</view>
                             </view>
                         </view>

utils/request.js

@@ -145,6 +145,7 @@ class request {
                         }
                         if (res.data.code === 901) {
                             _self.HEAD.token = ''
+                            // wx.setStorageSync('token', '')
                         }
                         //其它错误，提示用户错误信息
                         if (this._errorHandler != null) {