核销餐券,去掉评价

app.json

@@ -1,89 +1,90 @@
 {
-  "pages": [
-    "pages/home/index",
-    "pages/food/index",
-    "pages/calorie/index",
-    "pages/reserve/index",
-    "pages/my/index",
-    "pages/basic/index",
-    "pages/history/index",
-    "pages/history/detail",
-    "pages/news/index",
-    "pages/news/detail",
-    "pages/login/index"
-  ],
-  "usingComponents": {
-    "van-button": "/miniprogram_npm/vant-weapp/button/index",
-    "van-row": "/miniprogram_npm/vant-weapp/row/index",
-    "van-col": "/miniprogram_npm/vant-weapp/col/index",
-    "van-datetime-picker": "/miniprogram_npm/vant-weapp/datetime-picker/index",
-    "van-picker": "/miniprogram_npm/vant-weapp/picker/index",
-    "van-popup": "/miniprogram_npm/vant-weapp/popup/index",
-    "van-radio": "/miniprogram_npm/vant-weapp/radio/index",
-    "van-radio-group": "/miniprogram_npm/vant-weapp/radio-group/index",
-    "van-action-sheet": "/miniprogram_npm/vant-weapp/action-sheet/index",
-    "van-search": "/miniprogram_npm/vant-weapp/search/index",
-    "van-tree-select": "/miniprogram_npm/vant-weapp/tree-select/index",
-    "van-overlay": "/miniprogram_npm/vant-weapp/overlay/index",
-    "van-dialog": "/miniprogram_npm/vant-weapp/dialog/index",
-    "van-tab": "/miniprogram_npm/vant-weapp/tab/index",
-    "van-tabs": "/miniprogram_npm/vant-weapp/tabs/index",
-    "van-stepper": "/miniprogram_npm/vant-weapp/stepper/index",
-    "van-collapse": "/miniprogram_npm/vant-weapp/collapse/index",
-    "van-collapse-item": "/miniprogram_npm/vant-weapp/collapse-item/index",
-    "van-cell": "/miniprogram_npm/vant-weapp/cell/index",
-    "van-cell-group": "/miniprogram_npm/vant-weapp/cell-group/index",
-    "van-toast": "/miniprogram_npm/vant-weapp/toast/index",
-    "van-field": "/miniprogram_npm/vant-weapp/field/index",
-    "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox/index",
-    "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group/index",
-    "van-loading": "/miniprogram_npm/vant-weapp/loading/index",
-    "van-icon": "/miniprogram_npm/vant-weapp/icon/index",
-    "van-nav-bar": "/miniprogram_npm/vant-weapp/nav-bar/index",
-    "van-tabbar": "/miniprogram_npm/vant-weapp/tabbar/index",
-    "van-tabbar-item": "/miniprogram_npm/vant-weapp/tabbar-item/index",
-    "van-rate": "/miniprogram_npm/vant-weapp/rate/index",
-    "van-circle": "/miniprogram_npm/@vant/weapp/circle/index"
-  },
-  "tabBar": {
-    "custom": true,
-    "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/home/index",
-        "iconPath": "image/home1.png",
-        "selectedIconPath": "image/home2.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/reserve/index",
-        "iconPath": "image/reserve1.png",
-        "selectedIconPath": "image/reserve2.png",
-        "text": "订餐"
-      },
-      {
-        "pagePath": "pages/news/index",
-        "iconPath": "image/news1.png",
-        "selectedIconPath": "image/news2.png",
-        "text": "新闻"
-      },
-      {
-        "pagePath": "pages/my/index",
-        "iconPath": "image/my1.png",
-        "selectedIconPath": "image/my2.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "节俭会",
-    "navigationBarTextStyle": "black",
-    "navigationStyle": "custom"
-  },
-  "sitemapLocation": "sitemap.json"
+    "pages": [
+        "pages/home/index",
+        "pages/food/index",
+        "pages/calorie/index",
+        "pages/reserve/index",
+        "pages/my/index",
+        "pages/basic/index",
+        "pages/history/index",
+        "pages/history/detail",
+        "pages/news/index",
+        "pages/news/detail",
+        "pages/login/index",
+        "pages/writeoff/index"
+    ],
+    "usingComponents": {
+        "van-button": "/miniprogram_npm/vant-weapp/button/index",
+        "van-row": "/miniprogram_npm/vant-weapp/row/index",
+        "van-col": "/miniprogram_npm/vant-weapp/col/index",
+        "van-datetime-picker": "/miniprogram_npm/vant-weapp/datetime-picker/index",
+        "van-picker": "/miniprogram_npm/vant-weapp/picker/index",
+        "van-popup": "/miniprogram_npm/vant-weapp/popup/index",
+        "van-radio": "/miniprogram_npm/vant-weapp/radio/index",
+        "van-radio-group": "/miniprogram_npm/vant-weapp/radio-group/index",
+        "van-action-sheet": "/miniprogram_npm/vant-weapp/action-sheet/index",
+        "van-search": "/miniprogram_npm/vant-weapp/search/index",
+        "van-tree-select": "/miniprogram_npm/vant-weapp/tree-select/index",
+        "van-overlay": "/miniprogram_npm/vant-weapp/overlay/index",
+        "van-dialog": "/miniprogram_npm/vant-weapp/dialog/index",
+        "van-tab": "/miniprogram_npm/vant-weapp/tab/index",
+        "van-tabs": "/miniprogram_npm/vant-weapp/tabs/index",
+        "van-stepper": "/miniprogram_npm/vant-weapp/stepper/index",
+        "van-collapse": "/miniprogram_npm/vant-weapp/collapse/index",
+        "van-collapse-item": "/miniprogram_npm/vant-weapp/collapse-item/index",
+        "van-cell": "/miniprogram_npm/vant-weapp/cell/index",
+        "van-cell-group": "/miniprogram_npm/vant-weapp/cell-group/index",
+        "van-toast": "/miniprogram_npm/vant-weapp/toast/index",
+        "van-field": "/miniprogram_npm/vant-weapp/field/index",
+        "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox/index",
+        "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group/index",
+        "van-loading": "/miniprogram_npm/vant-weapp/loading/index",
+        "van-icon": "/miniprogram_npm/vant-weapp/icon/index",
+        "van-nav-bar": "/miniprogram_npm/vant-weapp/nav-bar/index",
+        "van-tabbar": "/miniprogram_npm/vant-weapp/tabbar/index",
+        "van-tabbar-item": "/miniprogram_npm/vant-weapp/tabbar-item/index",
+        "van-rate": "/miniprogram_npm/vant-weapp/rate/index",
+        "van-circle": "/miniprogram_npm/@vant/weapp/circle/index"
+    },
+    "tabBar": {
+        "custom": true,
+        "color": "#7A7E83",
+        "selectedColor": "#3cc51f",
+        "borderStyle": "black",
+        "backgroundColor": "#ffffff",
+        "list": [
+            {
+                "pagePath": "pages/home/index",
+                "iconPath": "image/home1.png",
+                "selectedIconPath": "image/home2.png",
+                "text": "首页"
+            },
+            {
+                "pagePath": "pages/reserve/index",
+                "iconPath": "image/reserve1.png",
+                "selectedIconPath": "image/reserve2.png",
+                "text": "订餐"
+            },
+            {
+                "pagePath": "pages/news/index",
+                "iconPath": "image/news1.png",
+                "selectedIconPath": "image/news2.png",
+                "text": "新闻"
+            },
+            {
+                "pagePath": "pages/my/index",
+                "iconPath": "image/my1.png",
+                "selectedIconPath": "image/my2.png",
+                "text": "我的"
+            }
+        ]
+    },
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "节俭会",
+        "navigationBarTextStyle": "black",
+        "navigationStyle": "custom"
+    },
+    "sitemapLocation": "sitemap.json"
 }

pages/history/detail.js

@@ -95,7 +95,7 @@ Page({
   },
   // 创建二维码
   initQrCode(id) {
-    const url = `${app.globalData.publicUrl}/st/api/order/useMeal/${id}`;
+    const url = `/order/useMeal/${id}`;
     // const url = `${app.globalData.publicUrl}/api/st/dining/order/useMeal/${id}`;
     var qrcode = new QRCode(`myQrcode`, {
       text: url,

pages/history/index.js

@@ -23,12 +23,12 @@ Page({
   },
   detail: function (data) {
     const { id, label, date, isuse } = data.currentTarget.dataset;
+    console.log(isuse)
     let url = '';
-    if (isuse == '0' || isuse == '1' || isuse == '2' || isuse == '3') {
+    if (!isuse) {
       url = `/pages/history/detail?id=${id}&label=${label}&date=${date}`;
     } else {
-      url = null;
-      wx.showToast({ title: '未订餐' });
+      url=`评价页?menu_id=`
     }
     if (!url) return;
     wx.redirectTo({ url });

pages/history/index.wxml

@@ -10,8 +10,10 @@
         data-isuse="{{item[meal.key].list.length>0?item[meal.key].is_use:''}}" bindtap="detail">
         <view class="label">
           <text>{{meal.label}}</text>
-          <text
-            wx:if="{{item[meal.key].list.length>0}}">{{item[meal.key].is_use=='0'?"待使用":item[meal.key].is_use=='1'?"待评价":item[meal.key].is_use=='2'?"已完成":"失效"}}</text>
+          <!-- <text
+            wx:if="{{item[meal.key].list.length>0}}">{{item[meal.key].is_use=='0'?"待使用":item[meal.key].is_use=='1'?"待评价":item[meal.key].is_use=='2'?"已完成":"失效"}}</text> -->
+            <text
+            wx:if="{{item[meal.key].list.length>0}}">{{item[meal.key].is_use=='0'?"待使用":item[meal.key].is_use=='1'?"已完成":"失效"}}</text>
           <text wx:else>未订餐</text>
         </view>
         <history-list list="{{item[meal.key].list}}"></history-list>

pages/my/index.js

@@ -1,7 +1,6 @@
 // pages/home/index.js
-const app = getApp()
+const app = getApp();
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -9,80 +8,75 @@ Page({
     height: app.globalData.height * 2 + 25,
     windowHeight: app.globalData.windowHeight,
     navbarData: {
-      name: '我的'
+      name: '我的',
     },
+    is_admin: false,
   },
   // 跳转页面
   routeBtn: function (e) {
     let type = e.currentTarget.dataset.type;
     if (type == '1') {
       wx.redirectTo({
-        url: `/pages/basic/index?id=${app.globalData.wxInfo._id}`
-      })
+        url: `/pages/basic/index?id=${app.globalData.wxInfo._id}`,
+      });
     } else if (type == '2') {
       wx.redirectTo({
-        url: `/pages/history/index?openid=${app.globalData.wxInfo.openid}`
-      })
+        url: `/pages/history/index?openid=${app.globalData.wxInfo.openid}`,
+      });
+    } else if(type=='3'){
+      wx.redirectTo({
+        url: `/pages/writeoff/index`,
+      });
     }
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-   
+    const wxInfo = app.globalData.wxInfo;
+    this.setData({
+      is_admin: wxInfo.is_admin || false,
+    });
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-
-  },
+  onReady: function () {},
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    if (typeof this.getTabBar === 'function' &&
-      this.getTabBar()) {
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
-        selected: 3
-      })
+        selected: 3,
+      });
     }
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
-
-  },
+  onHide: function () {},
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
-
-  },
+  onUnload: function () {},
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
-
-  },
+  onPullDownRefresh: function () {},
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-
-  },
+  onReachBottom: function () {},
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
-  }
-})
+  onShareAppMessage: function () {},
+});

pages/my/index.wxml

@@ -14,5 +14,6 @@
   <view class="two">
     <van-cell title="我的信息" is-link bind:click="routeBtn" data-type="1" />
     <van-cell title="历史记录" is-link bind:click="routeBtn" data-type="2" />
+    <van-cell wx:if="{{is_admin}}" title="核销餐券" is-link bind:click="routeBtn" data-type="3" />
   </view>
 </view>

pages/reserve/index.wxml

@@ -14,7 +14,7 @@
   <view class="two">
     <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>
+      <!-- <view class="swiper-tab-item {{currentTab==1?'active':''}}" data-current="1" bindtap="clickTab">评价</view> -->
     </view>
     <swiper current="{{currentTab}}" style="height:{{windowHeight-height-138}}px">
       <swiper-item catchtouchmove="stopTab">

pages/writeoff/index.js

@@ -0,0 +1,91 @@
+// pages/writeoff/index.js
+const app = getApp();
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+      height: app.globalData.height * 2 + 25,
+      windowHeight: app.globalData.windowHeight,
+      navbarData: {
+        name: '核销餐券',
+      },
+    },
+    back: function () {
+      wx.switchTab({
+        url: '/pages/my/index',
+      });
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+    async toUse(){
+      console.log(1)
+      wx.scanCode({
+        onlyFromCamera: true,
+        scanType:['qrCode'],
+        success: async (res)=> {
+          console.log(res)
+          const uri = res.result;
+          const result = await app.$get(uri);
+          if(result) wx.showToast({ title: '核销完成', icon: 'success' });
+        },
+        fail:async(e)=>{}
+      })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

pages/writeoff/index.json

@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+      "nav-bar": "/commpents/navbar/index"
+    }
+}

pages/writeoff/index.wxml

@@ -0,0 +1,6 @@
+<nav-bar navbar-data='{{navbarData}}' bind:back="back"></nav-bar>
+<view class="main" style="padding-top:{{height}}px;height:{{windowHeight-height}}px">
+  <view class="btn" style="padding:10rpx">
+    <button type="primary" bindtap="toUse">核销</button>
+  </view>
+</view>

pages/writeoff/index.wxss

@@ -0,0 +1 @@
+/* pages/writeoff/index.wxss */