Browse Source

优化食堂菜单左侧栏展示问题

elis 2 years ago
parent
commit
ab2736c810

+ 1 - 1
nnzwminiapp/pages/ourCanteen/canteen.wxml

@@ -2,7 +2,7 @@
 	<view wx:if="{{isLoading}}" style="display: flex;justify-content: center;align-items: center;height: 100%;">
 		<t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
 	</view>
-	<view wx:if="{{!isLoading && !canteenEmpty}}" class="cont-width first" bindtap="toMenu" wx:for="{{canteenList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-name="{{item.canteenName}}" data-item="{{item.id}}">
+	<view wx:if="{{!isLoading && !canteenEmpty}}" class="cont-width first" bindtap="toMenu" wx:for="{{canteenList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-time = "{{item.timeFrame}}" data-name="{{item.canteenName}}" data-item="{{item.id}}">
 		<view class="cont-bg">
 			<image style="height: 100%;width:100%" mode="scaleToFill" src="{{item.canteenPhotoPath ? baseUrl + item.canteenPhotoPath : imgUrl + 'cont_bg.png'}}" binderror="imageError" data-index="{{index}}"></image>
 		</view>

+ 3 - 2
nnzwminiapp/pages/ourCanteen/ourCanteen.js

@@ -144,10 +144,11 @@ Page({
 
 	toMenu: function (e) {
 		var canteenId = e.currentTarget.dataset.item;
-		var canteenName = e.currentTarget.dataset.name;
+    var canteenName = e.currentTarget.dataset.name;
+    var time = e.currentTarget.dataset.time;
 		if (canteenId && canteenId != '') {
 			wx.navigateTo({
-				url: `/pagesPublic/pages/menu/menu?canteenId=${canteenId}&canteenName=${canteenName}`
+				url: `/pagesPublic/pages/menu/menu?canteenId=${canteenId}&canteenName=${canteenName}&time=${time}`
 			})
 		}
 

+ 43 - 26
nnzwminiapp/pagesPublic/pages/menu/menu.js

@@ -343,49 +343,25 @@ Page({
       var lunch = []
       var dinner = []
       var takeout = []
-      let timePeriodMealarr = []
+      
       
       for (var i = 0; i < menuList.length; i++) {
-        let timePeriodMeal = {
-          name: "",
-          icon: "",
-          value: "",
-          timer: "",
-        }
         switch (menuList[i].timeName) {
           case '早餐':
             breakfast = menuList[i].foods
-            timePeriodMeal.icon =  this.data.imgUrl+'breakfast.png'
-            timePeriodMeal.value = 0
-            timePeriodMeal.name = '早餐'
             break
           case '午餐':
             lunch = menuList[i].foods
-            timePeriodMeal.icon =  this.data.imgUrl+'lunch.png'
-            timePeriodMeal.value = 1
-            timePeriodMeal.name = '午餐'
             break
           case '晚餐':
             dinner = menuList[i].foods
-            timePeriodMeal.icon =  this.data.imgUrl+'lunch.png'
-            timePeriodMeal.value = 2
-            timePeriodMeal.name = '晚餐'
             break
           case '外卖':
             takeout = menuList[i].foods
-            timePeriodMeal.icon =  this.data.imgUrl+'take_out.png'
-            timePeriodMeal.name = '外卖预告'
-            timePeriodMeal.value = 3
-            timePeriodMeal.timer = menuList[i].timeQuantum
             break
         }
-        timePeriodMealarr.push(timePeriodMeal)
       }
-      console.log(timePeriodMealarr);
-      this.setData({
-        timePeriodMeals:timePeriodMealarr
-      })
-      console.log(this.data.timePeriodMeals);
+
       var breakfastCanteen = []
       var lunchCanteen = []
       var dinnerCanteen = []
@@ -534,6 +510,47 @@ Page({
       'canteenId': options.canteenId,
       canteenName: options.canteenName
     })
+    let time = options.time
+    let times =  time.split("/")
+    let timePeriodMealarr = []
+    // debugger
+    for (let i = 0; i < times.length; i++) {
+      const element = times[i];
+      let timePeriodMeal = {
+        name: "",
+        icon: "",
+        value: "",
+        timer: "",
+      }
+      switch (element) {
+        case '早':
+          timePeriodMeal.icon = this.data.imgUrl + 'breakfast.png'
+          timePeriodMeal.value = 0
+          timePeriodMeal.name = '早餐'
+          break
+        case '中':
+          timePeriodMeal.icon = this.data.imgUrl + 'lunch.png'
+          timePeriodMeal.value = 1
+          timePeriodMeal.name = '午餐'
+          break
+        case '晚':
+          timePeriodMeal.icon = this.data.imgUrl + 'lunch.png'
+          timePeriodMeal.value = 2
+          timePeriodMeal.name = '晚餐'
+          break
+        case '外卖':
+          timePeriodMeal.icon = this.data.imgUrl + 'take_out.png'
+          timePeriodMeal.name = '外卖预告'
+          timePeriodMeal.value = 3
+          // timePeriodMeal.timer = menuList[i].timeQuantum
+          break
+      }
+      timePeriodMealarr.push(timePeriodMeal)
+    }
+      this.setData({
+        timePeriodMeals: timePeriodMealarr
+      })
+    
     wx.setNavigationBarTitle({
       title: options.canteenName
     })