소스 검색

fix:订单中过期订单的问题

sunshine1130 4 년 전
부모
커밋
a64758f1d2
2개의 변경된 파일12개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 1
      api/order.js
  2. 7 1
      pages/order/order.js

+ 5 - 1
api/order.js

@@ -3,7 +3,7 @@ import request from '../utils/request.js'
 class order extends request {
 class order extends request {
 
 
     static async getOrderList(page = 1, pageSize = 10, orderStatus, writeOffStatus) {
     static async getOrderList(page = 1, pageSize = 10, orderStatus, writeOffStatus) {
-        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderAtatus=${orderStatus}&writeOffStatus=${writeOffStatus}`)
+        const res = await this.getRequest(`${this.BASE_URL}Order/index?page=${page}&pageSize=${pageSize}&orderStatus=${orderStatus}&writeOffStatus=${writeOffStatus}`)
 
 
         return res.data
         return res.data
     }
     }
@@ -26,6 +26,10 @@ class order extends request {
         const res = await this.postRequest(`${this.BASE_URL}Order/deleteOrder?orderId=${id}`)
         const res = await this.postRequest(`${this.BASE_URL}Order/deleteOrder?orderId=${id}`)
         return res.data
         return res.data
     }
     }
+    static async closeOrder(id) {
+        const res = await this.postRequest(`${this.BASE_URL}Order/closeOrder?orderId=${id}`)
+        return res
+    }
 
 
 }
 }
 
 

+ 7 - 1
pages/order/order.js

@@ -38,6 +38,7 @@ Page({
   createTimeClock: function () {
   createTimeClock: function () {
     var self = this;
     var self = this;
     let order = this.data.order;
     let order = this.data.order;
+    let orderId = this.data.orderId;
     console.log(order.createTime)
     console.log(order.createTime)
     let orderCreateTime = new Date(order.createTime);
     let orderCreateTime = new Date(order.createTime);
     let endTime = orderCreateTime.getTime() + 15 * 60 * 1000;
     let endTime = orderCreateTime.getTime() + 15 * 60 * 1000;
@@ -48,6 +49,7 @@ Page({
       let timer = endTime - nowTime;
       let timer = endTime - nowTime;
       if (timer < 1) {
       if (timer < 1) {
         clearInterval(timerID);
         clearInterval(timerID);
+        orderApi.closeOrder(orderId);
         order.status = 3;
         order.status = 3;
         self.setData({
         self.setData({
           order
           order
@@ -65,13 +67,17 @@ Page({
     }, 500);
     }, 500);
   },
   },
   cancelOrder: function () {
   cancelOrder: function () {
+    let orderId = this.data.orderId;
+    let order = this.data.order;
     var self = this;
     var self = this;
     wx.showModal({
     wx.showModal({
       title: '是否确认取消订单?',
       title: '是否确认取消订单?',
       success(res) {
       success(res) {
         if (res.confirm) {
         if (res.confirm) {
+          orderApi.closeOrder(orderId);
+          order.status = 3;
           self.setData({
           self.setData({
-            orderStatus: 3
+            order
           })
           })
         } else if (res.cancel) {}
         } else if (res.cancel) {}