update

pages/reserve/index.js

@@ -40,14 +40,15 @@ Page({
       dinner: { reserve: 0, list: [], },
     },
     // 时间选择范围
-    picker: {}
+    picker: {},
+    loading: false,
   },
   // 选择日期
-  bindDateChange: function (e) {
+  bindDateChange: async function (e) {
     console.log('picker发送选择改变，携带值为', e.detail.value)
     this.setData({ today: e.detail.value })
-    this.searchDate();
-    this.searchOrder();
+    await this.searchDate();
+    await this.searchOrder();
   },
   // 禁止左右滑动
   stopTab: function (e) {
@@ -130,8 +131,10 @@ Page({
    */
   menuNumOpera(type, num, id) {
     let list = this.data[`${type}List`];
+    console.log(list)
     const li = list.findIndex(f => f._id === id)
     const ld = list.find(f => f._id === id)
+    console.log(li, id)
     if (ld) {
       ld.num = num;
       list.splice(li, 1, ld)
@@ -190,47 +193,24 @@ Page({
     if (data._id) url = `${app.globalData.publicUrl}/api/st/dining/order/update/${data._id}`
     else url = `${app.globalData.publicUrl}/api/st/dining/order`;
     const res = await app.$post(uri, data);
-    console.log(res);
-    // wx.request({
-    //   url,
-    //   method: "post",
-    //   header: {
-    //     'x-tenant': app.globalData.tenant
-    //   },
-    //   data,
-    //   success: res => {
-    //     if (res.data.errcode == 0) {
-    //       wx.showToast({
-    //         title: '完成点餐',
-    //       })
-    //     }
-
-    //   },
-    //   error: err => {
-    //     wx.showToast({
-    //       title: err.msg,
-    //       icon: 'error'
-    //     })
-    //   }
-    // })
 
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: async function (options) {
     this.searchST();
     let today = moment().add(1, 'days').format('YYYY-MM-DD');
     let endday = moment().add(1, 'months').format('YYYY-MM-DD');
     this.setData({ today: today, picker: { start: today, end: endday } })
-    this.searchDate();
-    this.searchOrder();
+    await this.searchDate();
+    await this.searchOrder();
   },
   // 查询时间
   searchDate: async function () {
+    this.setData({ loading: false })
     let today = this.data.today;
     const res = await app.$get(`${app.globalData.publicUrl}/api/st/dining/arrange/getByDate?date=${today}`)
-    console.log(res);
     const { arrange } = res.data;
     if (!arrange) return;
     let { breakfast, lunch, dinner } = arrange
@@ -242,32 +222,6 @@ Page({
       lunchList: lunch,
       dinnerList: dinner
     })
-    // wx.request({
-    //   url: `${app.globalData.publicUrl}/api/st/dining/arrange/getByDate?date=${today}`,
-    //   method: "get",
-    //   header: {
-    //     'x-tenant': app.globalData.tenant
-    //   },
-    //   success: res => {
-    //     const { arrange } = res.data.data;
-    //     if (!arrange) return;
-    //     let { breakfast, lunch, dinner } = arrange
-    //     breakfast = this.dealImg(breakfast)
-    //     lunch = this.dealImg(lunch)
-    //     dinner = this.dealImg(dinner)
-    //     this.setData({
-    //       breakfastList: breakfast,
-    //       lunchList: lunch,
-    //       dinnerList: dinner
-    //     })
-    //   },
-    //   error: err => {
-    //     wx.showToast({
-    //       title: err.msg,
-    //       icon: 'error'
-    //     })
-    //   }
-    // })
   },
   dealImg(list) {
     for (let i of list) {
@@ -309,30 +263,7 @@ Page({
     if (robj.breakfast && robj.breakfast.list && robj.breakfast.list.length > 0) this.dealOrderToMenu('breakfast', robj.breakfast.list)
     if (robj.lunch && robj.lunch.list && robj.lunch.list.length > 0) this.dealOrderToMenu('lunch', robj.lunch.list)
     if (robj.dinner && robj.dinner.list && robj.dinner.list.length > 0) this.dealOrderToMenu('dinner', robj.dinner.list)
-    // wx.request({
-    //   url: `${app.globalData.publicUrl}/api/st/dining/order/getByOpenid?date=${today}&openid=${openid}`,
-    //   method: "get",
-    //   header: {
-    //     'x-tenant': app.globalData.tenant
-    //   },
-    //   success: res => {
-    //     const { data } = res.data
-    //     if (!data) return
-    //     this.setData({
-    //       form: res.data.data,
-    //     })
-    //     const robj = res.data.data
-    //     if (robj.breakfast && robj.breakfast.list && robj.breakfast.list.length > 0) this.dealOrderToMenu('breakfast', robj.breakfast.list)
-    //     if (robj.lunch && robj.lunch.list && robj.lunch.list.length > 0) this.dealOrderToMenu('lunch', robj.lunch.list)
-    //     if (robj.dinner && robj.dinner.list && robj.dinner.list.length > 0) this.dealOrderToMenu('dinner', robj.dinner.list)
-    //   },
-    //   error: err => {
-    //     wx.showToast({
-    //       title: err.msg,
-    //       icon: 'error'
-    //     })
-    //   }
-    // })
+    this.setData({ loading: true })
   },
   /**
    * 将点过的单还原,继续修改
@@ -343,7 +274,10 @@ Page({
     console.log(type, list)
     if (list.length <= 0) return;
     const menu = this.data[`${type}List`]
-    if (!menu) return;
+    if (!menu) {
+      console.log('没找到菜单')
+      return;
+    }
     for (const o of list) {
       const { num, _id } = o
       this.menuNumOpera(type, num, _id)

pages/reserve/index.wxml

@@ -11,7 +11,7 @@
       </view>
     </view>
   </view>
-  <view class="two">
+  <view class="two" wx:if="{{loading}}">
     <view class="swiper-tab">
       <view class="swiper-tab-item {{currentTab==0?'active':''}}" data-current="0" bindtap="clickTab">点餐</view>
       <view class="swiper-tab-item {{currentTab==1?'active':''}}" data-current="1" bindtap="clickTab">评价</view>