From ffbe5aec8fae4d6dc506d8f03e1a9258c7aca494 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 3 Jan 2025 10:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=AE=9A=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  12 +-
 api/dining-hall.js           |   9 ++
 pages.json                   |  39 ++---
 pages/advanceOrder/index.vue | 275 +++++++++++++++++++++++++++++++++++
 pages/index.vue              |   2 +-
 pages/remainingSum/index.vue |   2 +-
 pages/system.vue             | 201 ++++++++++++++++++-------
 pages/work/index.vue         |   9 +-
 static/images/time.png       | Bin 0 -> 959 bytes
 9 files changed, 466 insertions(+), 83 deletions(-)
 create mode 100644 pages/advanceOrder/index.vue
 create mode 100644 static/images/time.png

diff --git a/App.vue b/App.vue
index 575107d..9e2f3af 100644
--- a/App.vue
+++ b/App.vue
@@ -32,17 +32,11 @@ export default {
 <style lang="scss">
 @import '@/uni_modules/uview-ui/index.scss';
 @import '@/static/scss/index.scss';
-page {
-  box-sizing: border-box;
-  background-color: #fff;
-  height: auto;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
 ::v-deep .uni-system-preview-image {
   z-index: 10080 !important;
 }
-.u-navbar__content__right__text {
-  color: $u-primary !important;
+* {
+  margin: 0;
+  padding: 0;
 }
 </style>
diff --git a/api/dining-hall.js b/api/dining-hall.js
index 499537a..57ded2d 100644
--- a/api/dining-hall.js
+++ b/api/dining-hall.js
@@ -16,4 +16,13 @@ export function getAccountBalance(params) {
     method: 'get',
     params
   });
+}
+
+// 获取菜单列表
+export function getMenuList(params) {
+  return request({
+    url: '/leopen/recipe/query',
+    method: 'get',
+    params
+  });
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 66a96f6..fe1a482 100644
--- a/pages.json
+++ b/pages.json
@@ -180,24 +180,29 @@
       }
     },
     {
-    	"path" : "pages/remainingSum/index",
-    	"style" : 
-    	{
-    		"navigationStyle": "custom"
-    	}
+      "path": "pages/remainingSum/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
-	{
-		"path": "pages/code/index",
-		"style": {
-			"navigationBarTitleText": "个人二维码"
-		}
-	},
-	{
-		"path": "pages/weeklyMenu/index",
-		"style": {
-			"navigationBarTitleText": "一周菜谱"
-		}
-	}
+    {
+      "path": "pages/code/index",
+      "style": {
+        "navigationBarTitleText": "个人二维码"
+      }
+    },
+    // {
+    //   "path": "pages/weeklyMenu/index",
+    //   "style": {
+    //     "navigationBarTitleText": "一周菜谱"
+    //   }
+    // },
+    {
+      "path": "pages/advanceOrder/index",
+      "style": {
+        "navigationBarTitleText": "预订单"
+      }
+    }
   ],
   "tabBar": {
     "color": "#000000",
diff --git a/pages/advanceOrder/index.vue b/pages/advanceOrder/index.vue
new file mode 100644
index 0000000..616288a
--- /dev/null
+++ b/pages/advanceOrder/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <view>
+    <div class="top-cont flex justify-between align-center">
+      <div class="flex align-center">
+        <u-icon name="../../static/images/time.png" size="16"></u-icon>
+        <span style="margin-left: 5px">{{ newDate }}</span>
+      </div>
+      <div class="top-right-cont">
+        <span class="right-item" :class="{ active: active == 1 }" @click="active = 1">自取</span>
+        <span class="right-item" :class="{ active: active == 2 }" @click="active = 2">外卖</span>
+      </div>
+    </div>
+
+    <div class="balance-area" v-for="(book, index) in cookbook" :key="index">
+      <div class="left-balance" :class="{ active: current == index }" @click="scrollToDetail(index)">
+        {{ handleRecipeType(book.recipeType) }}
+      </div>
+      <div
+        class="right-balance"
+        :ref="'detail-' + index + '-' + itemIndex"
+        v-for="(item, itemIndex) in book.recipeDetailList"
+        :key="itemIndex"
+      >
+        <div class="top-name">{{ item.intervalName }}</div>
+				<div v-for="(food, foodIndex) in item.mealList">
+					{{ food.mealName }}
+				</div>
+      </div>
+    </div>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      current: 0,
+      newDate: '',
+      active: 1, // 1 自取 2 外卖
+      // 菜谱
+      cookbook: [
+        {
+          recipeType: 1, // 菜谱类型(1默认,2按天,3按周,4按月)
+          // 菜谱详情
+          recipeDetailList: [
+            {
+              intervalName: '午餐', // 餐次名称
+              // 菜品列表
+              mealList: [
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                }
+              ]
+            }
+          ]
+        },
+        {
+          recipeType: 2, // 菜谱类型(1默认,2按天,3按周,4按月)
+          // 菜谱详情
+          recipeDetailList: [
+            {
+              intervalName: '晚餐', // 餐次名称
+              // 菜品列表
+              mealList: [
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                }
+              ]
+            }
+          ]
+        },
+        {
+          recipeType: 3, // 菜谱类型(1默认,2按天,3按周,4按月)
+          // 菜谱详情
+          recipeDetailList: [
+            {
+              intervalName: '默认', // 餐次名称
+              // 菜品列表
+              mealList: [
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                },
+                {
+                  mealName: '西红柿炒鸡蛋', // 菜品名称
+                  imageUrl: 'https://img.yzcdn.cn/vant/apple-1.jpg', // 菜品图片
+                  saleNum: 100,
+                  supplyNum: 100, // 库存
+                  restrictNum: 2, // 限购数量
+                  salePrice: 10.2 // 菜品价格
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  },
+  onLoad() {
+    this.getNowFormatDate()
+  },
+  methods: {
+    // 获取当前时间
+    getNowFormatDate() {
+      let date = new Date()
+      let year = date.getFullYear()
+      let month = (date.getMonth() + 1).toString().padStart(2, '0')
+      let day = date.getDate().toString().padStart(2, '0')
+      let week = date.getDay()
+      let weeks = ['日', '一', '二', '三', '四', '五', '六']
+      this.newDate = `${month}-${day} 星期${weeks[week]}`
+    },
+    // 处理recipeType
+    handleRecipeType(type) {
+      if (type === 1) {
+        return '默认'
+      } else if (type === 2) {
+        return '按天'
+      } else if (type === 3) {
+        return '按周'
+      } else if (type === 4) {
+        return '按月'
+      }
+    },
+    scrollToDetail(index) {
+      console.log('🚀 ~ scrollToDetail ~ index', index)
+			this.current = index
+      const detailElement = this.$refs['detail-' + index + '-0'][0]
+      if (detailElement) {
+        detailElement.scrollIntoView({ behavior: 'smooth' })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+page {
+  /* padding-top: env(safe-area-inset-top); */
+  background: #f9fbff;
+}
+.top-cont {
+  padding: 0 16px 16px;
+  background: #fff;
+  .top-right-cont {
+    background: rgba(15, 39, 75, 0.05);
+    border-radius: 11px 11px 11px 11px;
+    display: flex;
+    justify-content: space-around;
+    color: #0f274b;
+    font-size: 12px;
+    .right-item {
+      padding: 3px 10px;
+      border-radius: 11px 11px 11px 11px;
+      cursor: pointer;
+      &.active {
+        background: linear-gradient(180deg, #ffae82 0%, #ff6816 100%);
+        color: #fff;
+      }
+    }
+  }
+}
+.balance-area {
+  display: flex;
+
+  .left-balance {
+    width: 88px;
+    height: 44px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 500;
+    font-size: 14px;
+    color: #0f274b;
+
+    &.active {
+      background: #fff;
+    }
+  }
+
+  .right-balance {
+    width: calc(100vw - 88px);
+    /* min-height: 90vh; */
+    overflow: auto;
+    padding: 0 8px;
+    background-color: #fff;
+    .top-name {
+      height: 44px;
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(15, 39, 75, 0.6);
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/pages/index.vue b/pages/index.vue
index 1e121c6..e48c94d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -90,7 +90,7 @@
 			goToOrder() {
 				// 跳转到订餐页面
 				uni.navigateTo({
-					url: '/pages/order/index'
+					url: '/pages/advanceOrder/index'
 				})
 			},
 			goCode() {
diff --git a/pages/remainingSum/index.vue b/pages/remainingSum/index.vue
index 65d442a..ad83374 100644
--- a/pages/remainingSum/index.vue
+++ b/pages/remainingSum/index.vue
@@ -174,7 +174,7 @@ export default {
     justify-content: space-between;
     .box-item {
       margin-bottom: 12px;
-      width: 109px;
+      width: 30%;
       height: 66px;
       border-radius: 4px 4px 4px 4px;
       border: 1px solid rgba(15, 39, 75, 0.4);
diff --git a/pages/system.vue b/pages/system.vue
index 033937b..1359362 100644
--- a/pages/system.vue
+++ b/pages/system.vue
@@ -1,68 +1,167 @@
 <template>
-  <view class="system">
-    <div class="top-img">
-      <u-image src="../static/images/system/top.png" width="351px" height="146px" />
-    </div>
-    <div class="cont-img">
-      <div class="item" @click="handleItem(1)">
-				<u-icon name="../static/images/system/1.png" size="38"></u-icon>
-        <div>就餐服务</div>
-      </div>
-      <div class="item">
-				<u-icon name="../static/images/system/2.png" size="38"></u-icon>
-        <div>志愿者服务</div>
-      </div>
-      <div class="item">
-				<u-icon name="../static/images/system/3.png" size="38"></u-icon>
-        <div>驿站服务</div>
-      </div>
-    </div>
+  <view class="index_main" :style="{ minHeight: screenH + 'px' }">
+    <view class="back-top"></view>
+    <!-- 轮播图 -->
+    <view class="swiper_nav">
+      <swiper autoplay :duration="1000">
+        <swiper-item v-for="(item, index) in swiperImg" :key="index">
+          <image :src="item" style="width: 100%; height: 100%"></image>
+        </swiper-item>
+      </swiper>
+    </view>
+    <!-- 皖送e餐 志愿者服务 -->
+    <view class="main_menu">
+      <view class="main_menu_item" v-for="(item, index) in firstMenus" :key="index" @click="handleItem(index)">
+        <image :src="item.icon"></image>
+        <view class="main_menu_name">{{ item.name }}</view>
+      </view>
+    </view>
   </view>
 </template>
 
 <script>
 export default {
   data() {
-    return {}
+    return {
+      screenH: '',
+      swiperImg: [require('../static/images/system/top.png')],
+      firstMenus: [
+        {
+          name: '就餐服务',
+          icon: require('../static/images/system/1.png')
+        },
+        {
+          name: '志愿者服务',
+          icon: require('../static/images/system/2.png')
+        },
+        {
+          name: '驿站服务',
+          icon: require('../static/images/system/3.png')
+        }
+      ]
+    }
   },
-	methods: {
-		handleItem(index) {
-			if (index === 1) {
-				this.$tab.reLaunch('/pages/index')
-			}
-		}
-	}
+  mounted() {
+    uni.getSystemInfo({
+      success: res => {
+        this.screenH = res.windowHeight
+      }
+    })
+  },
+  methods: {
+    handleItem(index) {
+      if (index === 0) {
+        this.$tab.reLaunch('/pages/index')
+      }
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 page {
   min-height: 100vh;
-	background-image: url("../static/images/system/bg.png");
+  background-image: url('../static/images/system/bg.png');
 }
-.system {
-  padding: 18px;
-	.top-img {
-		display: flex;
-		justify-content: center;
-	}
-	.cont-img {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 15px;
-		.item {
-			padding: 15px 0;
-			width: 109px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			background-color: #fff;
-			border-radius: 10px;
-			div {
-				margin-top: 10px;
-			}
-		}
-	}
+.index_main {
+  /* background: #f2f6fa; */
+  overflow: auto;
+  padding: 24rpx 0;
+  box-sizing: border-box;
+}
+.back-top {
+  position: fixed;
+  width: 100%;
+  height: 578rpx;
+  /* background: linear-gradient(180deg, #d2eaff 0%, rgba(208, 233, 254, 0) 100%); */
+  top: 0;
+  left: 0;
+}
+.swiper_nav {
+  width: 100%;
+  height: 300rpx;
+  /* background: #ffffff; */
+  border-radius: 20rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+}
+.main_menu {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 24px;
+  padding: 0 12rpx;
+  box-sizing: border-box;
+}
+.main_menu_item {
+  z-index: 99;
+  margin: 0 12rpx;
+  padding: 28rpx 0;
+  flex: 1;
+  height: 208rpx;
+  background: #ffffff;
+  border-radius: 20rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  .main_menu_name {
+    font-family: PingFang SC, PingFang SC;
+    font-weight: bold;
+    font-size: 30rpx;
+    color: #0e1a24;
+    font-style: normal;
+    text-transform: none;
+  }
+  image {
+    display: flex;
+    width: 88rpx;
+    height: 88rpx;
+    border-radius: 34rpx;
+  }
+}
+.yiz_menu {
+  width: calc(100% - 48rpx);
+  min-height: 480rpx;
+  background: #ffffff;
+  border-radius: 20rpx;
+  margin-top: 24rpx;
+  margin-left: 24rpx;
+}
+.yiz_menu_tle {
+  font-family: PingFang SC, PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #0e1a24;
+  font-style: normal;
+  text-transform: none;
+  padding: 28rpx 28rpx 0 28rpx;
+}
+.yiz_menu_nav {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  .yiz_menu_nav_item {
+    width: calc(100% / 4);
+    margin-top: 48rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    image {
+      display: block;
+      width: 88rpx;
+      height: 88rpx;
+      border-radius: 34rpx;
+    }
+    .yiz_menu_name {
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #0e1a24;
+      font-style: normal;
+      text-transform: none;
+      margin-top: 20rpx;
+    }
+  }
 }
 </style>
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 02fec8d..718f4a1 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -24,7 +24,8 @@
       </div>
     </div>
 
-    <div style="margin-top: 91px; padding: 0 16px;">
+    <div style="height: 56px;"></div>
+    <div style="padding: 0 16px;">
       <div class="order-list" v-for="(item, index) in tableList" :key="index">
         <div class="flex justify-between">
           <div class="order-source">订单来源：{{ item.sourceType }}</div>
@@ -201,14 +202,14 @@ export default {
 
 <style lang="scss" scoped>
 .content {
-  /* padding: 0 16px; */
   background: #f9fbff;
+  height: 100%;
   min-height: 100vh;
-  /* position: relative; */
 
   .top-wrapper {
     position: fixed;
-    top: 44px;
+    /* top: 44px; */
+    top: 0;
     width: 100vw;
     background: #f9fbff;
     z-index: 999;
diff --git a/static/images/time.png b/static/images/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd6f630077e66f06b4b0a2cbcff5a1a1e411e986
GIT binary patch
literal 959
zcmV;w13>(VP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH15`;wK~#7F?N>i@
z5>XJ}ec&H-OwQ5RSmaU!7#sNr*eQuK_YFe2lu|iXA)kPhu?ndyLt#k9igel~9U;!-
z**Q*}xx{}c@YcNp9+x8r9HG<S49wl$zPG>kZr|?j0RD9#i~%EQnE*}xDH9agAR;!@
zqX)Ju*$@&V6EGfGDb;8!p&*NgnE`H+2r5EcTeGVr36mgTn3kcgHwuW5g%DsO#Zib1
zBw!>L(>&2OPiJ_{Hrq;octF&2w;VBQ0I3v{O#606BB`8R+bxAAU?iVsiPUD#LbBDO
z?Dvnm`!JAnhR4CGmxv<Beyi<ljZDCZKeGtMwhpb-`uXv04nklmo>@i2ybgr;#IC-r
z`28Y%!8yYT=#6vf1}DmM@K+ELzrP;u-?%sL1WvmK0xNds;p@6B>t4U8f1pwgW)7wf
zUMsI%7Jydnrvb!LXVeyMoL2lk&e*BMg2CJTg7=z}`F4TL%U&Phy>V9G%XX4M!P`KS
z|FZ56aW=^7{AefV%;k>YxsCZuDv*G)dVNj3_jgqw3cYFtv=m67eT*EC49ePZ&`v&V
zA6bFcr38$W<s_ZyhUaPq69(r~rxu`jb1pO6M*!;0-n&6MfJuW3SNAd+A+w)=0$uHh
zMChh63<A}e<|2ft$@DxFm(#JDBQwS#tvo3DtVP`TvV5sOl3t)E35C?pQ5i5{C=%1%
zYijifcnVQd>cU7O1;c=J!qu%9{M?twM5%7!k2ZfD_S`&}PGnBp0z+V*)pqW}1Tmdh
z;JKYsM)K^aJlC~fr~?F8>d-QrRtyt@(;*??h+iNe6zSr_=XMh&1R~TGRtU8gNWeZW
zv&f)g=hoy#Qh+OhcQOxp^;ER0doqxKYq)hir^_aHvCafz2j`%j)sytE-a(%psDG~3
zV>9s&09pg4V>1b?pVlf6CU|0Topr^_?mZGM+edrv{eA-^nIo;xn+KAmReo5LYU@Zh
zf6T5ev?SA$#TQwcse)f<x|z(iy<1-0BE#pL)sN*Du&tJ|2I<J*vOM|JR7yDdE(;;x
zB%Jv3GiS@nz`ip2hlwWAC%wI4B`GSkuvPp~dv`d>yyJbEnQ5aLjXlN)I^P2ZDU{6?
h%KAz96Z}U=`~`7tcAH!JPNe_<002ovPDHLkV1gp-xfcKc

literal 0
HcmV?d00001