feat(pages) feat 商品上下架

app.json

@@ -46,7 +46,8 @@
     "pages/groupmeallist/invoicesList/invoicesList",
     "pages/groupmeallist/addinvoices/addinvoices",
     "pages/groupmeallist/submitOrder/submitOrder",
-    "pages/groupmeallist/goodsManagement/goodsManagement",
+    "pages/groupmeallist/goodsManagements/goodsManagements",
+    "pages/groupmeallist/goodsManagementStore/goodsManagementStore",
     "pages/groupmeallist/address/address",
     "pages/groupmeallist/addOrEditaddress/addOrEditaddress",
     "pages/groupmeallist/couponlist/couponlist"

app.wxss

@@ -61,6 +61,7 @@
 .page {
   width: 100%;
   height: 100%;
+  background-color: #F7F7F7;
   /* background-color: #F7F7F7; */
   /* overflow-y: auto; */
 }

pages/groupmeallist/orderDetail/orderDetail.js

@@ -1,99 +1,305 @@
 // pages/groupmeallist/orderDetail/orderDetail.js
+import order from '../../../api/order'
+const cache = require('../../../utils/cache.js');
+import Activity from '../../../api/activity';
+const app = getApp()
+import storeGoods from '../../../api/storeGoods'
+import base from "../../../utils/base";
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        orderGoodList:[{},{},{},{}],
-        showAllSku:false
-    },
-    //全部显示和收起
-    handleFlodExtend() {
-        this.setData({
-           showAllSku: !this.data.showAllSku
-        })
-    },
-    // 取消订单
-    cancelOrder(){
-
-        wx.showModal({
-            title: '提示',
-            content: '确认取消订单？',
-            confirmColor:'#AFD250',
-            success (res) {
-              if (res.confirm) {
-                console.log('用户点击确定')
-              } else if (res.cancel) {
-                console.log('用户点击取消')
-              }
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    orderGoodList: [{}, {}, {}, {}],
+    showAllSku: false,
+    orderInfo: {},
+    orderSn: '',
+    orderGoodList:[], //spu-sku商品信息
+  },
+  //全部显示和收起
+  handleFlodExtend() {
+    this.setData({
+      showAllSku: !this.data.showAllSku
+    })
+  },
+  // 取消订单
+  cancelOrder() {
+    let orderSn = this.data.orderSn
+
+    let _self = this
+
+    wx.showModal({
+      title: '提示',
+      content: '确认取消订单？',
+      confirmColor: '#AFD250',
+      success(res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+
+          order.cancelOrder({
+            orderSn: orderSn,
+            mobile: cache.getMobile(),
+          }).then(res => {
+            if (res.code == 200) {
+              console.log('进入 刷新页面')
+              _self.reloadPage(orderSn);
             }
-          })
+          }).catch(_ => {})
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+
+  },
+
+// 点击复制
+copywxtap: function (event) {
+  // var wxChat = event.currentTarget.dataset.wechatid //接收wxml传过来的数据
+  wx.showToast({
+    title: '复制成功',
+  })
+
+// 下方为微信开发文档中的复制 API
+  wx.setClipboardData({
+    data: this.data.orderSn, //复制的数据
+    success: function (res) {
+      wx.getClipboardData({
+        success: function (res) {
+          console.log(res.data) //打印赋值的数据
+        }
+      })
+    }
+  })
+},
+ /**
+     * 打电话
+     */
+    callMobile(e) {
+      let phone = e.currentTarget.dataset.mobile;
+      wx.makePhoneCall({
+          phoneNumber: phone 
+      })
+  },
+
+  // 申请退款
+  goTorefund() {
+    wx.navigateTo({
+      url: '/pages/groupmeallist/refund/refund',
+    })
+
+
+
 
-    },
-    // 申请退款
-    goTorefund(){
-        wx.navigateTo({
-          url: '/pages/groupmeallist/refund/refund',
+  },
+
+  //立即支付
+  handelToPay(e) {
+    let orderSn = this.data.orderSn;
+    console.log(orderSn)
+
+    storeGoods.getPayParams({
+      orderSn: orderSn,
+      payCode: "SIHAIYOULONG",
+      openId: Activity.getOpenId(),
+      isOrderPayment: true,
+      orderInfoPath: "/pages/orderDetail/orderDetail?sn=" + orderSn,
+      productDetailPath: "../storeGoods/storeGoods",
+    }).then(res => {
+      if (res.code == 200) {
+        this.rousePayment(res.data, this.data.orderInfo)
+      }
+    }).catch(_ => {
+      console.log(_)
+    })
+  },
+  rousePayment(payParam, order) {
+    let _self = this;
+    wx.requestOrderPayment({
+      timeStamp: payParam.wxPrePay.timeStamp,
+      package: payParam.wxPrePay.pack,
+      nonceStr: payParam.wxPrePay.nonceStr,
+      signType: payParam.wxPrePay.signType,
+      paySign: payParam.wxPrePay.paySign,
+      orderInfo: payParam.orderInfo,
+      success: function (res) {
+        //支付成功，跳转领取成功页面
+        OrderApi.getPayStatus(order.orderSn);
+        app.showToast("支付成功")
+        order.state = 2
+        order.stateText = "已支付"
+        _self.setData({
+          orderInfo: order
         })
+      },
+      fail: function (res) {
+        app.showToast("支付失败")
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if (options.sn) {
+      this.reloadPage(options.sn)
+    }
+  },
 
+  reloadPage(orderSn) {
+    this.setData({
+      orderSn
+    })
 
+    this.getOrderdetail();
+  },
+  /**
+   * 获取订单详情
+   */
+  async getOrderdetail() {
+    let _self = this;
+    try {
+      let orderRes = await order.getOrderDetail({
+        orderSn: _self.data.orderSn,
+        mobile: cache.getMobile()
+      });
+      if (orderRes.code == 200 && orderRes.msg == "success") {
+        let orderInfo = orderRes.data;
+        orderInfo.originPrice = (parseFloat(orderInfo.payPrice) / 100).toFixed(2)
+        _self.setData({
+          orderInfo: orderInfo,
+        })
+        //组建spu sku
+        _self.createOrderGoodList(orderInfo.orderGoodsList)
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  },
 
 
-    },
-    /**
-     * 生命周期函数--监听页面加载
+     /**
+     * 组建spu sku
+     * @param {*} list 
      */
-    onLoad: function (options) {
+    createOrderGoodList(list) {
 
-    },
+      console.log("进入详情")
+      console.log(list)
+      let _self = this;
+      if(list.length==0) {
+          return;
+      }
+      let orderGoodList = [];
+      for(let a=0;a<list.length;a++) { //最外层
+          //某一个商品种类
+          let goodList = list[a];
+          //sku-list
+          let orderGoodsSkuList = goodList.orderGoodsSkuList;
+          for(let b=0;b<orderGoodsSkuList.length;b++) {
+              let orderGood = {};
+              orderGood.productName = goodList.productName;
+              let orderGoodsSku = orderGoodsSkuList[b];
+              let text = '';
+            if(orderGoodsSku.comboSkuList !=null && orderGoodsSku.comboSkuList.length>0)
+              {
+                  console.log("进入套餐拼接")
+                  text = "套餐:"
+                  let productName = ''
+                  let specValue = []
+                  let num =''
+                  orderGoodsSku.comboSkuList.forEach(function(comboSkuList, index){
+                      comboSkuList.skuList.forEach(function(skuList,skuindex){
+                          productName = skuList.productName
+                          num = skuList.num
+                          if(skuList.specList != null){
+                          let specList = JSON.parse(skuList.specList);
+                          if (base.isArray(specList)) {
+                              specList.forEach(function(specList,skuindex){
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
+                                  specValue.push(specList.specValue +" X"+num) 
 
-    },
+                              })
+                          }
+                      }else{
+                          specValue.push(productName +" X"+num) 
+                      }
+                      })
+                  }
+                  )
+                  specValue = specValue.join('、') || ""
+              text = text +"("+specValue+")"
+           
+              }
+              orderGood.num = orderGoodsSkuList[b].num;
+              orderGood.allFee = base.fenToYuan(orderGoodsSkuList[b].price * orderGoodsSkuList[b].num)
+              orderGood.skuText = text
+              orderGoodList.push(orderGood)
+          }
+      }
+      _self.setData({
+          orderGoodList:orderGoodList
+      })
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
+      console.log(this.data.orderGoodList)
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
 
-    },
+  },
+  // 详情和收起
+  changeCollapseOrDetail: function (e) {
+    let idx = e.currentTarget.dataset.idx;
+    var that = this;
+    that.data.orderGoodList[idx].show = !that.data.orderGoodList[idx].show
+    that.setData({
+      orderGoodList: that.data.orderGoodList
+    });
+    console.log("购物车详情");
+    console.log(that.data.orderGoodList);
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
+  },
 
-    },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
+  },
 
-    },
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
+  },
 
-    },
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
+  },
 
-    },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
+  },
 
-    }
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
 })

pages/groupmeallist/orderDetail/orderDetail.wxml

@@ -2,23 +2,27 @@
 
     <view class="detail_top flex-column">
         <!-- 待支付状态 -->
-        <!-- <view class="detail_top flex-column">
-            <view style="font-size: 32rpx;font-weight: 700;text-align: left;color: #000000;">待支付</view>
-            <view style="margin-top: 15rpx;font-weight: 400;text-align: left;font-size: 32rpx;">剩余支付时间 00:44:51</view>
-            <view class="order_goods_bottom" style="margin-top: 44rpx;">
+        <view class="detail_top flex-column">
+            <view style="font-size: 36rpx;font-weight: 700;text-align: left;color: #000000;">{{orderInfo.stateText}}</view>
+            <!-- <view style="margin-top: 15rpx;font-weight: 400;text-align: left;font-size: 32rpx;">剩余支付时间 00:44:51</view> -->
+            <view class="order_goods_bottom" style="margin-top: 44rpx;" wx:if="{{orderInfo.state ==1}}">
                 <view class="canel_order" catchtap="cancelOrder">取消订单</view>
-                <view class="pay_order">立即支付</view>
+                <view class="pay_order" catchtap="handelToPay">立即支付</view>
             </view>
-        </view> -->
+
+            <view class="order_goods_bottom" style="margin-top: 44rpx;" wx:if="{{orderInfo.state ==2}}">
+                <view class="Request_a_refund" catchtap="goTorefund">申请退款</view>
+            </view>
+        </view>
         <!-- 待备餐详情  -->
-        <view class="detail_top flex-column">
+        <!-- <view class="detail_top flex-column">
             <view style="font-size: 32rpx;font-weight: 700;text-align: left;color: #000000;">待备餐</view>
             <view style="margin-top: 16rpx;font-weight: 700;text-align: left;font-size: 62rpx;">2105</view>
             <view style="margin-top: 16rpx;font-weight: 400;text-align: left;font-size: 32rpx;">取单号</view>
             <view class="order_goods_bottom">
                 <view class="Request_a_refund" catchtap="goTorefund">申请退款</view>
             </view>
-        </view>
+        </view> -->
 
 
     </view>
@@ -26,8 +30,8 @@
 
     <view class="detail_center">
         <view class="detail_stroe flex-row">
-            <view class="detail_stroe_name">上海浦东金高路店</view>
-            <view style="margin-top: 22rpx;">
+            <view class="detail_stroe_name">{{orderInfo.storeName}}</view>
+            <view style="margin-top: 22rpx;" catchtap="callMobile" data-mobile="{{orderInfo.store.liaisonPhone}}">
                 <image style="width:65rpx;height:65rpx;margin-right: 24rpx;margin-top: 19rpx;" src="/images/groupmeallist/phone_icon.png"></image>
             </view>
 
@@ -40,18 +44,19 @@
 
                 <view class="goods_detail flex-row">
                     <view class="flex-row">
-                        <view class="for_detail_good_title">清爽夏日套餐<span style="color:#AFD250;margin-left:10rpx;font-size:22rpx">x1</span> </view>
-                        <view style="font-size: 24rpx;font-weight: 400;text-align: center;color: #9b9b9b;margin-left: 14rpx;border-bottom: 1rpx #9B9B9B solid;"> {{cartSkuMapData[index].show == true ? '收起' : '详情'}}</view>
+                        <view class="for_detail_good_title">{{item.productName}}<span style="color:#AFD250;margin-left:10rpx;font-size:22rpx">x{{item.num}}</span> </view>
+                        <view style="font-size: 24rpx;font-weight: 400;text-align: center;color: #9b9b9b;margin-left: 14rpx;border-bottom: 1rpx #9B9B9B solid;" catchtap="changeCollapseOrDetail" data-idx="{{idx}}"> {{orderGoodList[idx].show == true ? '收起' : '详情'}}</view>
                     </view>
 
-                    <view class="for_detail_good_price">￥ 58.8</view>
+                    <view class="for_detail_good_price">￥ {{item.allFee}}</view>
 
                 </view>
                 <!-- 套餐详情 -->
-                <view class="combo_detail">
-                    杨枝甘露清爽版
+                <view class="combo_detail {{orderGoodList[idx].show != true ?'hide':''}}">
+                    <!-- 杨枝甘露清爽版
                     <span style="font-size: 20rpx;">（大杯/常温/标准糖）</span>
-                    <span style="color:#AFD250;margin-left:10rpx;font-size:22rpx">x1</span>
+                    <span style="color:#AFD250;margin-left:10rpx;font-size:22rpx">x1</span> -->
+                    {{item.skuText}}
                 </view>
 
             </view>
@@ -60,7 +65,7 @@
 
         </view>
 
-        <view catchtap="handleFlodExtend">
+        <view catchtap="handleFlodExtend" wx:if="{{orderGoodList.length >3}}">
 
             <block wx:if="{{showAllSku}}">
                 <view class="exten-flod"> 收起
@@ -69,7 +74,7 @@
 
             </block>
             <block wx:else>
-                <view class="exten-flod">查看全部（5）
+                <view class="exten-flod">查看全部（{{orderGoodList.length}}）
                     <image style="width:19rpx;height:10rpx;" src="/images/groupmeallist/bottom_icom.png" />
                 </view>
 
@@ -84,15 +89,17 @@
                 <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #000000;margin-left: 13rpx;">优惠券</view>
             </view>
 
-            <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #d65065;margin-right: 31rpx;">-¥4</view>
+            <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #d65065;margin-right: 31rpx;" wx:if="{{orderInfo.couponDiscount.discountPrice>0}}">¥-{{orderInfo.couponDiscount.discountPriceY}}</view>
+            <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #d65065;margin-right: 31rpx;" class="discount_pay_top_right" wx:else="">¥0</view>
         </view>
 
         <view style="width: 93%; border-bottom: 1px #e2e2e2 solid; margin: auto;margin-top: 13rpx;"></view>
 
         <view class="all_price flex-row">
-            <view>已优惠 <sapn style="font-size: 28rpx;font-weight: 400;text-align: left;color: #d65065;margin-right: 31rpx;">-¥4</sapn>
+            <view> <span wx:if="{{orderInfo.couponDiscount.discountPrice>0}}">已优惠</span>
+                <sapn style="font-size: 28rpx;font-weight: 400;text-align: left;color: #d65065;margin-right: 31rpx;" wx:if="{{orderInfo.couponDiscount.discountPrice>0}}">¥-{{orderInfo.couponDiscount.discountPriceY}}</sapn>
                 合计 ¥
-                <sapn style="font-size: 38rpx;font-weight: 400;text-align: left;color: #000000;margin-right: 22rpx;">11</sapn>
+                <sapn style="font-size: 38rpx;font-weight: 400;text-align: left;color: #000000;margin-right: 22rpx;">{{orderInfo.totalOriPriceY}}</sapn>
             </view>
 
         </view>
@@ -100,18 +107,18 @@
 
 
 
-    
+
     <view class="store_information flex-column" style="  margin-top: 33rpx;">
         <view class="store_information_top">门店信息</view>
         <!-- <view style="width: 93%; border-bottom: 1px #e2e2e2 solid; margin: auto;margin-top: 24rpx;"></view> -->
         <view class="orderSn flex-row">
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">门店名称</view>
-            <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 27rpx;margin-top: 21rpx;">上海浦东金高路店</view>
+            <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 27rpx;margin-top: 21rpx;">{{orderInfo.storeName}}</view>
         </view>
         <view class="flex-row" style="justify-content: space-between;margin-top: 5rpx;">
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">门店地址</view>
             <view style="margin-top: 26rpx;">
-                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;">高行镇金高路1128号</span>
+                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;">{{orderInfo.store.address}}</span>
             </view>
 
         </view>
@@ -119,14 +126,14 @@
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">联系方式</view>
             <view style="margin-top: 26rpx;">
 
-                <view class="flex-row">
-                    <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;">186-2100-3075</span>
+                <view class="flex-row" style="margin-right: 26rpx;">
+                    <span style="font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;">{{orderInfo.store.liaisonPhone}}</span>
 
-                    <view style="height: 19rpx; border-left: 1px #e2e2e2 solid; margin: auto;margin-left: 25rpx;margin-right: 15rpx;"></view>
-                    <span class="copy_button" style="color: #AFD250;">
+                    <!-- <view style="height: 19rpx; border-left: 1px #e2e2e2 solid; margin: auto;margin-left: 25rpx;margin-right: 15rpx;"></view>
+                    <span class="copy_button" style="color: #AFD250;" >
                         <image style="width: 25rpx;height: 27rpx;margin-top: 5rpx;" src="/images/groupmeallist/phone_icon.png"></image>
                         联系商家
-                    </span>
+                    </span> -->
                 </view>
             </view>
 
@@ -137,7 +144,9 @@
     <!--  -->
     <view class="way flex-row">
         <view style="font-size: 28rpx;font-weight: 700;text-align: left;color: #000000;margin-left: 29rpx;">用餐方式</view>
-        <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #000000;margin-right: 23rpx;">门店自取</view>
+        <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #000000;margin-right: 23rpx;" wx:if="{{orderInfo.dinnerType==1}}">门店自取</view>
+        <view style="font-size: 28rpx;font-weight: 400;text-align: left;color: #000000;margin-right: 23rpx;" wx:if="{{orderInfo.dinnerType==2}}">外送到家</view>
+
     </view>
 
 
@@ -147,21 +156,22 @@
         <view class="orderSn flex-row">
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">订单编号</view>
             <view style="margin-top: 26rpx;">
-                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;">D4816460408184929451</span>
-                <span class="copy_button" style="  margin-top: 26.5rpx;">复制</span>
+                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;">{{orderSn}}</span>
+                <span class="copy_button" style="  margin-top: 26.5rpx;" catchtap="copywxtap">复制</span>
             </view>
         </view>
         <view class="flex-row" style="justify-content: space-between;margin-top: 35rpx;">
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">下单时间</view>
             <view style="margin-top: 26rpx;">
-                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;">2022-05-09 11:58:30</span>
+                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;">{{orderInfo.createTime}}</span>
             </view>
 
         </view>
         <view class="flex-row" style="justify-content: space-between;margin-top: 25rpx; height: 37rpx;">
             <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">备注信息</view>
             <view style="margin-top: 26rpx;">
-                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;">无</span>
+                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;" wx:if=" {{orderInfo.remark != ''}}">{{orderInfo.remark}}</span>
+                <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;margin-right: 26rpx;" wx:if=" {{orderInfo.remark == ''}}">无</span>
             </view>
 
         </view>

pages/groupmeallist/orderDetail/orderDetail.wxss

@@ -1,6 +1,6 @@
 .detail_top {
     width: 709rpx;
-    min-height: 279rpx;
+    min-height: 79rpx;
     background: #ffffff;
     border-radius: 25rpx;
     margin: auto;
@@ -17,7 +17,7 @@
     flex-flow: row nowrap;
     justify-content: center !important;
     align-self: center !important;
-    margin-top: 27rpx;
+    margin-top: 44rpx;
     line-height: 59rpx;
     text-align: center;
     margin-top: 11rpx;
@@ -78,11 +78,12 @@
 
 .detail_center {
     width: 709rpx;
-    min-height: 929rpx;
+    /* min-height: 529rpx; */
     background: #ffffff;
     border-radius: 25rpx;
     margin: auto;
     margin-top: 16rpx;
+    padding-bottom: 25rpx;
 
 }
 
@@ -149,7 +150,9 @@
     width: 700rpx;
 
 }
-
+.hide{
+    display: none !important;
+   }
 .for_detail_good_price {
 
     font-size: 32rpx;
@@ -161,7 +164,7 @@
 }
 
 .combo_detail {
-    /* width: 168px; */
+    width: 268px;
     height: 32rpx;
     font-size: 24rpx;
     font-weight: 400;

pages/groupmeallist/storeGoods/storeGoods.js

@@ -1,6 +1,8 @@
 import CustomPage from '../../../base/CustomPage'
 import storeGoods from '../../../api/storeGoods'
 
+import OrderApi from '../../../api/order'
+
 import {
   getCurrDistance
 } from '../../../utils/location'
@@ -17,7 +19,8 @@ CustomPage({
       store: null,
       distance: null,
       title: 'vtabs',
-      path: 'page/weui/example/vtabs/vtabs'
+      path: 'page/weui/example/vtabs/vtabs',
+      showViewDel:false
     }
   },
   data: {
@@ -57,6 +60,39 @@ CustomPage({
 
 
   },
+  handleEmptyCart() {
+    this.onChangeShowStateDelTrue()
+    OrderApi.emptyCart({
+     
+        storeId:  cache.getStoreId(),
+        mobile:  user.getMobileCache()
+        // tableId: user.getTableId(),
+        // orderMode: this.data.orderMode
+    }).then(res => {
+        if (res.code == 200) {
+            this.loadCartData()
+            this.setData({
+              isShowCartPannel:false
+            })
+        }
+    }).catch(_ => {})
+},
+
+
+    //关闭删除弹出层
+    onChangeShowStateDelTrue: function () {
+      this.setData({
+          showViewDel: false
+      })
+  },
+// 清空购物车
+  onChangeShowStateDelFalse(){
+    var that = this;
+    that.setData({
+        showViewDel: true
+    })
+
+  },
   // 商品详情
   gotoGoodDetails(e) {
     let idx = e.currentTarget.dataset.index;

pages/groupmeallist/storeGoods/storeGoods.wxml

@@ -120,6 +120,18 @@
         </view>
       </view>
     </view>
+
+    <!-- 清空购物车弹出层 -->
+<view wx:if="{{showViewDel}}" class="commodity_attr_box_delAll flex-column_start_center">
+    <view class="commodity_attr_box_delAll_text">是否清空购物车？</view>
+    <view class="commodity_attr_box_view_Two flex-row">
+        <view class="view_one" catchtap="handleEmptyCart">清空</view>
+        <view class="view_two" bindtap="onChangeShowStateDelTrue">取消</view>
+    </view>
+</view>
+
+<!-- 全部删除弹出层 -->
+<view wx:if="{{showViewDel}}" class="commodity_screen_del"></view>
   </view>
 
 

pages/groupmeallist/storeGoods/storeGoods.wxss

@@ -349,4 +349,68 @@ margin-top: 7rpx;
     margin-left: 28rpx;
     margin-top: 10rpx;
     /* padding-bottom: 10rpx; */
-  }
+  }
+  .commodity_attr_box_delAll {
+    width: 540rpx;
+    height: 340rpx;
+    overflow: hidden;
+    position: fixed;
+    z-index: 2000;
+    background-color: #fff;
+    padding-top: 20rpx;
+    border-radius: 10px;
+    color: black;
+    left: calc((100vw - 540rpx) / 2);
+    top: calc((100vh - 340rpx) / 2);
+    text-align: center;
+  }
+  .commodity_attr_box_delAll_text{
+    width: 256rpx;
+    height: 45rpx;
+    font-size: 32rpx;
+    font-weight: bold;
+    line-height: 45rpx;
+    color: #000000;
+    margin-top: 106rpx;
+  }
+  .commodity_attr_box_view_Two{
+    width: 100%;
+    height: 89rpx;
+    border-top: 2rpx solid #707070;
+    margin-top: 100rpx;
+    
+}
+
+.view_one{
+  width: 50%;
+  height: 89rpx;
+  font-size: 32rpx;
+  color: #FE7253;
+  text-align: center;
+  line-height: 89rpx;
+  border-right: 2rpx solid #707070;
+}
+
+.view_two{
+  width: 50%;
+  height: 89rpx;
+  font-size: 32rpx;
+  color: black;
+  text-align: center;
+  line-height: 89rpx;
+
+
+}
+
+.commodity_screen_del {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.67;
+  overflow: hidden;
+  z-index: 1150;
+  color: #fff;
+}

pages/groupmeallist/submitOrder/submitOrder.js

@@ -1,9 +1,11 @@
 // pages/groupmeallist/submitOrder/submitOrder.js
 import storeGoods from '../../../api/storeGoods'
 const cache = require('../../../utils/cache.js');
-
+import Activity from '../../../api/activity';
 const user = require('../../../utils/user.js');
 import base from '../../../utils/base'
+
+const app = getApp()
 Page({
 
     /**
@@ -212,12 +214,12 @@ Page({
     goToPay(order) {
         const storeInfo = cache.getCurrStore()
 
-        console.log(user.getUserInfo().openid,)
+        // console.log(user.getUserInfo().openid,)
         console.log(storeInfo)
         storeGoods.getPayParams({
             orderSn: order.orderSn,
             payCode: storeInfo.payCode,
-            openId: user.getUserInfo().openid,
+            openId: Activity.getOpenId(),
             isOrderPayment: true,
             orderInfoPath: "../orderDetail/orderDetail?sn=" + order.orderSn,
             productDetailPath: "../storeGoods/storeGoods",   
@@ -241,13 +243,14 @@ Page({
             success: function (res) {
               //支付成功，跳转领取成功页面
               console.log("支付成功，跳到订单详情页面")
-              OrderApi.getPayStatus(order.orderSn);
+              storeGoods.getPayStatus(order.orderSn);
               app.showToast("支付成功")
               wx.redirectTo({
                 url: '../orderDetail/orderDetail?sn=' + order.orderSn,
               })
             },
             fail: function (res) {
+                console.log("未支付")
                 app.showToast("支付失败")
                 wx.redirectTo({
                     url: '../orderDetail/orderDetail?sn=' + order.orderSn,

pages/welfareMall/historical/historical.js

@@ -1,7 +1,20 @@
 // pages/welfareMall/historical/historical.js
 import WelfareMall from '../../../api/welfareMall'
-import { parseTime } from '../../../utils/util'
-import {getMobileCache, getPhoneNumber as getPhoneNumberSync, getColor} from '../../../utils/user'
+import order from '../../../api/order'
+import storeGoods from '../../../api/storeGoods'
+import Activity from '../../../api/activity';
+const cache = require('../../../utils/cache.js');
+import {
+  parseTime
+} from '../../../utils/util'
+import base from "../../../utils/base";
+import {
+  getMobileCache,
+  getPhoneNumber as getPhoneNumberSync,
+  getColor
+} from '../../../utils/user'
+
+const app = getApp()
 Page({
 
   /**
@@ -10,59 +23,185 @@ Page({
   data: {
     page: 1,
     pageSize: 10,
+    tpage: 1,
+    tpageSize: 10,
+
     lock: false,
     noResult: false,
     noMore: false,
+    tnoResult: false,
+    tnoMore: false,
     mobileTop: 'TONY WU',
     orderList: [],
+    torderList: [],
     config: {},
-    currentData:0,
+    currentData: 0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: async function (options) {
-    this.getOrderList();
-    let info =  await getColor();
-    this.setData({
-      config:info.config
+    
+  },
+
+  handleCancelOrder(e) {
+    let orderSn = e.currentTarget.dataset.ord;
+    console.log("取消订单")
+    let that = this;
+    wx.showModal({
+        title: '',
+        content: '是否确定取消订单？',
+        success: function(sm) {
+            if (sm.confirm) {
+                console.log("确定了")
+                order.cancelOrder({
+                    orderSn: orderSn,
+                    mobile: cache.getMobile(),
+                }).then(res => {
+                    if (res.code == 200) {
+                        that.getTOrderList()
+                    }
+                }).catch(_ => {})
+
+            } else if (sm.cancel) {
+
+            }
+        }
+    })
+},
+  //立即支付
+  handelToPay(e) {
+    let orderSn = e.currentTarget.dataset.ord;
+    console.log(orderSn)
+  
+    storeGoods.getPayParams({
+      orderSn: orderSn,
+      payCode: "SIHAIYOULONG",
+      openId: Activity.getOpenId(),
+      isOrderPayment: true,
+      orderInfoPath: "/pages/orderDetail/orderDetail?sn=" + orderSn,
+      productDetailPath: "../storeGoods/storeGoods",
+    }).then(res => {
+      if (res.code == 200) {
+        this.rousePayment(res.data, this.data.orderInfo)
+      }
+    }).catch(_ => {
+      console.log(_)
+    })
+  },
+  rousePayment(payParam, order) {
+    let _self = this;
+    wx.requestOrderPayment({
+      timeStamp: payParam.wxPrePay.timeStamp,
+      package: payParam.wxPrePay.pack,
+      nonceStr: payParam.wxPrePay.nonceStr,
+      signType: payParam.wxPrePay.signType,
+      paySign: payParam.wxPrePay.paySign,
+      orderInfo: payParam.orderInfo,
+      success: function (res) {
+        //支付成功，跳转领取成功页面
+        OrderApi.getPayStatus(order.orderSn);
+        app.showToast("支付成功")
+        order.state = 2
+        order.stateText = "已支付"
+        _self.setData({
+          orderInfo: order
+        })
+      },
+      fail: function (res) {
+        app.showToast("支付失败")
+      }
     })
-    console.log(info)
   },
+  // 申请退款
+  goTorefund() {
+    wx.navigateTo({
+      url: '/pages/groupmeallist/refund/refund',
+    })
 
+
+
+
+  },
+  // 团餐订单
+  async getTOrderList() {
+
+    try {
+
+      let _self = this;
+      let listRes = await order.getOrderList({
+        mobile: getMobileCache(),
+        page: this.data.tpage,
+        pageSize: this.data.tpageSize,
+
+      });
+
+
+      if (listRes.code == 200) {
+        let list = listRes.data;
+
+        if (base.isEmpty(list) || list.length == 0) {
+          if (this.data.page == 1) {
+            this.setData({
+              tnoResult: true
+            })
+          } else {
+            this.setData({
+              tnoMore: true
+            })
+          }
+          return
+        }
+
+        list.map((item, index) => {
+          item.showPrice = (parseFloat(item.payPrice) / 100).toFixed(2);
+        })
+        console.log("准备重新塞值了")
+        console.log(list)
+        _self.setData({
+          torderList: _self.data.torderList.concat(...list)
+        })
+        console.log("重新塞值了")
+        console.log(list)
+      }
+    } catch (error) {
+      console.log("订单报错");
+      console.log(error);
+    }
+  },
   // 订单数据
-  getOrderList: function() {
+  getOrderList: function () {
     WelfareMall.getOrderList({
       page: this.data.page,
       pageSize: this.data.pageSize,
       mobile: getMobileCache(),
     }).then(res => {
-        if (res.code == 200) {
-            this.userOrderListView(res.data)
-        }
-        this.data.lock = false
+      if (res.code == 200) {
+        this.userOrderListView(res.data)
+      }
+      this.data.lock = false
     }).catch(_ => {
-        console.log(_)
-        this.data.lock = false
+      console.log(_)
+      this.data.lock = false
     })
-},
+  },
 
-  userOrderListView: function(data) {
+  userOrderListView: function (data) {
     if (!Array.isArray(data) || data.length == 0) {
-        console.log("订单列表数据为空");
-        if (this.data.page == 1) {
-            this.setData({
-                mobileTop:getMobileCache(),
-                noResult: true
-            })
-        } else {
-            this.setData({
-                mobileTop:getMobileCache(),
-                noMore: true
-            })
-        }
-        return
+      console.log("订单列表数据为空");
+      if (this.data.page == 1) {
+        this.setData({
+          mobileTop: getMobileCache(),
+          noResult: true
+        })
+      } else {
+        this.setData({
+          mobileTop: getMobileCache(),
+          noMore: true
+        })
+      }
+      return
     }
     // data.forEach(v => {
     //     let payeTime = v.payedAt
@@ -71,10 +210,10 @@ Page({
 
     this.data.orderList = this.data.orderList.concat(...data)
     this.setData({
-        mobileTop:getMobileCache(),
-        orderList: this.data.orderList
+      mobileTop: getMobileCache(),
+      orderList: this.data.orderList
     })
-  }, 
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -86,8 +225,32 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: async function () {
+    this.getOrderList();
+    this.getTOrderList();
+    let info = await getColor();
+    this.setData({
+      config: info.config
+    })
+    console.log(info)
+  },
 
+
+
+      /**
+     * 跳转订单详情
+     * @param {*} e 
+     */
+    orderDetail(e) {
+
+      this.setData({
+          torderList:[]
+      })
+
+      let ordersn = e.currentTarget.dataset.sn;
+      wx.navigateTo({
+        url: '/pages/groupmeallist/orderDetail/orderDetail?sn='+ordersn,
+      })
   },
 
   /**
@@ -121,7 +284,7 @@ Page({
   getCompletion(e) {
     const url = "../order/orderCompletion?ordersn=" + e.currentTarget.dataset.ordersn
     wx.navigateTo({
-        url
+      url
     })
   },
 
@@ -131,28 +294,28 @@ Page({
   onShareAppMessage: function () {
 
   },
-    //点击切换，滑块index赋值
-    checkCurrent:function(e){
-      const that = this;
-   
-      if (that.data.currentData === e.target.dataset.current){
-          return false;
-      }else{
-   
-        that.setData({
-          currentData: e.target.dataset.current
-        })
-      }
-    },
+  //点击切换，滑块index赋值
+  checkCurrent: function (e) {
+    const that = this;
+
+    if (that.data.currentData === e.target.dataset.current) {
+      return false;
+    } else {
 
-         //获取当前滑块的index
-  bindchange:function(e){
-    const that  = this;
+      that.setData({
+        currentData: e.target.dataset.current
+      })
+    }
+  },
+
+  //获取当前滑块的index
+  bindchange: function (e) {
+    const that = this;
     that.setData({
       currentData: e.detail.current
     })
   },
-  bottomefficientList(){
+  bottomefficientList() {
     if (this.data.lock || this.data.noMore) {
       return
     }
@@ -161,14 +324,19 @@ Page({
     this.getOrderList();
 
   },
-  bottomefficientListbyOrder(){
-
+  bottomefficientListbyOrder() {
+    let _self = this;
+    console.log("上拉刷新")
+    _self.setData({
+      tpage: _self.data.tpage + 1
+    })
+    _self.getTOrderList()
   },
 
-  goToOrderDetail(){
-      wx.navigateTo({
-        url: '/pages/groupmeallist/orderDetail/orderDetail',
-      })
+  goToOrderDetail() {
+    wx.navigateTo({
+      url: '/pages/groupmeallist/orderDetail/orderDetail',
+    })
 
 
   }

pages/welfareMall/historical/historical.wxml

@@ -14,49 +14,73 @@
       <swiper-item>
         <scroll-view style="height: 95%;" scroll-y="true" bindscrolltolower="bottomefficientListbyOrder">
           <view>
-            <view class="orderDiv flex-column" catchtap="goToOrderDetail">
+            <view class="orderDiv flex-column"  wx:for="{{torderList}}" wx:key="index" data-sn="{{item.orderSn}}" catchtap="orderDetail">
               <view class="orderDiv_title flex-row">
-                <view class="order_store_name">上海浦东金高路店</view>
-                <view class="order_state">待支付</view>
+                <view class="order_store_name">{{item.store.storeName}}</view>
+                <view class="order_state">{{item.stateText}}</view>
               </view>
               <view class="order_way flex-row">
                 <view class="order_way_wx">微信小程序</view>
                 <!-- 存在堂食 和 外卖俩种 -->
-                <view class="order_way_Doshoku">堂食</view>
+                <view class="order_way_Doshoku">
+                  <span wx:if="{{item.dinnerType == 2}}">外卖</span>
+                  <span wx:if="{{item.dinnerType == 1}}">堂食</span>
+
+
+                </view>
 
               </view>
               <!-- 存在循环 -->
 
               <view class="order_goods flex-row">
-                <view class="order_goods_left flex-row">
+                <view class="order_goods_left flex-row" wx:if="{{item.orderGoodsList.length == 1}}">
                   <view style="margin-left: 38rpx;">
                     <image style="width: 132rpx; height: 132rpx;" src="/images/groupmeallist/order_good.png"></image>
                   </view>
-                  <view style="font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-left:21rpx">清爽夏日套餐</view>
+                  <view style="font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-left:21rpx">{{item.orderGoodsList[0].productName}}</view>
                 </view>
+                <view class="flex-row" style="height:162rpx ;width: 500rpx;justify-content: flex-start;overflow-x: hidden;" wx:if="{{item.orderGoodsList.length > 1}}">
+                  <view class="order_goods_left flex-row"  wx:for="{{item.orderGoodsList}}" wx:for-item="good" wx:key="index">
+                    <view style="margin-left: 38rpx;" class="flex-column">
+                      <image style="width: 112rpx; height: 112rpx;" src="/images/groupmeallist/order_good.png"></image>
+                      <view style="width:112rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-top: 5rpx;">{{item.orderGoodsList[0].productName}}</view>
+                    </view>
+                  </view>
+                </view>
+
+
 
                 <view class="order_goods_right">
-                  <view style="font-size: 32rpx;font-weight: 700;">¥ 20.0</view>
-                  <view style="font-size: 24rpx;font-weight: 400;color: #9d9d9d;margin-top:8rpx">共1件</view>
+                  <view style="font-size: 32rpx;font-weight: 700;">¥ {{item.showPrice}}</view>
+                  <view style="font-size: 24rpx;font-weight: 400;color: #9d9d9d;margin-top:8rpx">共{{item.orderGoodsList.length}}件</view>
                 </view>
 
               </view>
 
-              <view class="pick_order_Num">
+              <!-- <view class="pick_order_Num" wx:if="{{item.state == 2}}">
                 <view style="font-size: 24rpx;font-weight: 400;color: #989898;margin-left: 26rpx;">取单号</view>
                 <view style="font-size: 32rpx;font-weight: 700;color: #444444;margin-left: 44rpx;">2105</view>
 
-              </view>
+              </view> -->
 
               <view class="order_goods_bottom">
-                <!-- <view class="canel_order">取消订单</view>
-                <view class="pay_order">立即支付</view> -->
+                <view class="flex-row" wx:if="{{item.state == 1}}">
+                  <view class="canel_order" data-ord="{{item.orderSn}}" catchtap="handleCancelOrder">取消订单</view>
+                  <view class="pay_order"  data-ord="{{item.orderSn}}" catchtap="handelToPay" >立即支付</view>
+                </view>
+
 
-                <view class="Request_a_refund">申请退款</view>
+                <view class="Request_a_refund" wx:if="{{item.state == 2}}" catchtap="goTorefund">申请退款</view>
+                <view class="Request_a_refund" wx:if="{{item.state == 4}}">退款记录</view>
 
               </view>
+
+              <view class="no_result" wx:if="{{tnoResult}}">———— 抱歉，您暂无历史订单 ————</view>
+              <view class="no_result" wx:if="{{tnoMore}}">—— 人家也是有底线的 ——</view>
             </view>
+
           </view>
+
         </scroll-view>
 
       </swiper-item>

pages/welfareMall/historical/historical.wxss

@@ -165,6 +165,17 @@ height: 31px; */
   align-items: flex-start !important;
 }
 
+.listgoods {
+  /* margin-left: 38rpx; */
+  /* height: 132rpx;
+  width: 500rpx; */
+  justify-content: flex-start;
+  align-items: flex-start;
+  /* overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap; */
+
+}
 
 .order_goods_right {
   /* width: 100rpx;
@@ -173,72 +184,76 @@ height: 31px; */
   margin-right: 20rpx;
   display: flex;
   flex-flow: column nowrap;
-  justify-content:center !important;
+  justify-content: center !important;
   align-self: center !important;
   text-align: right;
 }
-.order_goods_bottom{
+
+.order_goods_bottom {
   width: 100%;
   height: 50rpx;
   display: flex;
   flex-flow: row nowrap;
-  justify-content:flex-end !important;
+  justify-content: flex-end !important;
   align-self: center !important;
   margin-top: 27rpx;
   line-height: 50rpx;
   text-align: center;
   margin-bottom: 28rpx;
 }
-.canel_order{
+
+.canel_order {
   width: 143rpx;
-height: 50rpx;
-background: #ffffff;
-border: 1rpx solid #707070;
-border-radius: 11rpx;  
-margin-right: 19rpx;
+  height: 50rpx;
+  background: #ffffff;
+  border: 1rpx solid #707070;
+  border-radius: 11rpx;
+  margin-right: 19rpx;
 
 
-font-size: 24rpx;
-line-height: 50rpx;
+  font-size: 24rpx;
+  line-height: 50rpx;
 
-font-weight: 400;
-text-align: center;
-color: #000000;
+  font-weight: 400;
+  text-align: center;
+  color: #000000;
 
 }
-.pay_order{
+
+.pay_order {
   width: 143rpx;
-height: 50rpx;
-background: #B9D25C;
+  height: 50rpx;
+  background: #B9D25C;
 
-border-radius: 11rpx;  
+  border-radius: 11rpx;
 
-margin-right: 20rpx;
-font-size: 24rpx;
-line-height: 50rpx;
-border: 1rpx solid #B9D25C;
-font-weight: 400;
-text-align: center;
-color: white;
+  margin-right: 20rpx;
+  font-size: 24rpx;
+  line-height: 50rpx;
+  border: 1rpx solid #B9D25C;
+  font-weight: 400;
+  text-align: center;
+  color: white;
 
 }
 
-.Request_a_refund{
+.Request_a_refund {
   width: 143rpx;
-height: 50rpx;
-background: #ffffff;
-border: 1px solid #707070;
-border-radius: 11rpx;
+  height: 50rpx;
+  background: #ffffff;
+  border: 1px solid #707070;
+  border-radius: 11rpx;
 
-font-size: 24rpx;
-font-weight: 400;
-text-align: center;
-color: #000000;
-margin-right: 20rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  text-align: center;
+  color: #000000;
+  margin-right: 20rpx;
 
 
 }
-.pick_order_Num{
+
+.pick_order_Num {
   width: 679rpx;
   height: 90rpx;
   background: #f6f6f6;
@@ -252,6 +267,7 @@ margin-right: 20rpx;
   line-height: 90rpx;
   text-align: center;
 }
+
 /* 分割*/
 
 

pages/welfareMall/staff/isStaff.js

@@ -97,4 +97,12 @@ Page({
         url
     })
   },
+
+  toGoodsMM(){
+    wx.navigateTo({
+      url: '/pages/groupmeallist/goodsManagements/goodsManagements',
+    })
+
+
+  },
 })

pages/welfareMall/staff/isStaff.wxml

@@ -12,7 +12,13 @@
       <view class="noStaff-content flex-column">
         <view class="content-join" catchtap="toWriteOff"></view>
         <view class="content-partnership" wx:if="{{staffShow == 'have'}}" catchtap="toStaff"></view>
+        <view class="content-partnership" catchtap="toGoodsMM">
+          <image style="width: 676rpx;height: 246rpx;" src="https://cdn1.overseasdragon.com.cn/xcx-smdd/product_staff.png"></image>
+        </view>
+
       </view>
+
     </view>
+
   </custom-page>
-</page-wrap>
+</page-wrap>

pages/welfareMall/staff/isStaff.wxss

@@ -67,4 +67,5 @@ page{
   height: 246rpx;
   background-image: url(https://dy.shpr.top/welfareGo/write-off-staff.png);
   background-size: 100% 100%;
+  margin-bottom: 40rpx;
 }

project.private.config.json

@@ -555,6 +555,97 @@
                     "name": "",
                     "pathName": "pages/groupmeallist/addinvoices/addinvoices",
                     "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/submitOrder/submitOrder",
+                    "query": "addressvalue=xxxiie3232332121212&addressId=1",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/orderDetail/orderDetail",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/historical/historical",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/storeGoods/storeGoods",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/historical/historical",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/orderDetail/orderDetail",
+                    "query": "sn=654499421493156",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/orderDetail/orderDetail",
+                    "query": "sn=654499421493156",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/historical/historical",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/orderDetail/orderDetail",
+                    "query": "sn=654499421493156",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/staff/isStaff",
+                    "query": "shopowner=have",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/goodsManagements/goodsManagements",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/goodsManagementStore/goodsManagementStore",
+                    "query": "way=1",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/goodsManagements/goodsManagements",
+                    "query": "",
                     "scene": null,
                     "launchMode": "default"
                 }

utils/user.js

@@ -1,10 +1,4 @@
 import WelfareMall from '../api/welfareMall'
-
-
-
-
-
-
 function getUserInfo() {
     return wx.getStorageSync('userInfo') || null;
 }