From 1c7567483016bdce4abdad9084f56194b760155a Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Wed, 13 Aug 2025 18:01:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=B4=E5=B8=AD2.1=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/detail.vue |  2 --
 src/pages/tab/banquet/index.vue    | 46 ++++++------------------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 1ac442d..27480e2 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -216,8 +216,6 @@
               }
             ]"></wd-col-picker>
 
-
-
           <wd-input label="详细地址" prop="street_name" clearable v-model="orderInfo.street_name" placeholder="请填写详细地址"
             :rules="[
               {
diff --git a/src/pages/tab/banquet/index.vue b/src/pages/tab/banquet/index.vue
index e5fa740..897b1ee 100644
--- a/src/pages/tab/banquet/index.vue
+++ b/src/pages/tab/banquet/index.vue
@@ -29,23 +29,12 @@
           src="https://lihaiim.oss-cn-chengdu.aliyuncs.com/public/uploads/images/20250813/202508131655082b6295503.png" />
         <!-- <view class="text font-bold">找酒店</view> -->
       </wd-grid-item>
-
-      <wd-grid-item use-slot url="/pages/banquet/cook/detail?id=1&is_add=1">
-        <image class="wd-grid-item-img-cook" src="https://cdn.uviewui.com/uview/goods/1.jpg" />
-        <view class="text font-bold">张德标</view>
-      </wd-grid-item>
-      <wd-grid-item use-slot url="/pages/banquet/cook/detail?id=2&is_add=1">
-        <image class="wd-grid-item-img-cook" src="https://cdn.uviewui.com/uview/goods/1.jpg" />
-        <view class="text font-bold">张德标</view>
-      </wd-grid-item>
-      <wd-grid-item use-slot url="/pages/banquet/cook/detail?id=3&is_add=1">
-        <image class="wd-grid-item-img-cook" src="https://cdn.uviewui.com/uview/goods/1.jpg" />
-        <view class="text font-bold">张德标</view>
-      </wd-grid-item>
-      <wd-grid-item use-slot url="/pages/banquet/cook/detail?id=4&is_add=1">
-        <image class="wd-grid-item-img-cook" src="https://cdn.uviewui.com/uview/goods/1.jpg" />
-        <view class="text font-bold">张德标</view>
-      </wd-grid-item>
+      <view   v-for="(item, index) in matchedItems_sp" :key="index" >
+        <wd-grid-item use-slot :url="`/pages/banquet/cook/detail?id=${item.id}`">
+          <image class="wd-grid-item-img-cook" :src="`${item.certification.public_image ? item.certification.public_image : item.avatar }`" />
+          <view class="text font-bold">{{item.certification.public_name}}</view>
+        </wd-grid-item>
+      </view>
     </wd-grid>
 
   </view>
@@ -89,12 +78,12 @@ export default defineComponent({
 
     goTabCook () {
       uni.switchTab({
-        url: '/pages/banquet/cook/list'
+        url: '/pages/tab/banquet/cook'
       });
     },
     goTabHotel () {
       uni.switchTab({
-        url: '/pages/banquet/hotel/list'
+        url: '/pages/tab/banquet/hotel'
       });
     },
 
@@ -103,9 +92,6 @@ export default defineComponent({
     handleClick (e) {
       console.log(e)
     },
-    // onChange (e) {
-    //   console.log(e)
-    // },
 
     handleClickCategory (index: number) {
       this.categoryIndex = index;
@@ -118,26 +104,12 @@ export default defineComponent({
       this.$refs.pagingRefSP?.reload();
     },
 
-    // getCategoryList () {
-    //   CommonApi.commonGet('/api/dishes/category').catch((res) => {
-    //     if (res.code === 1) {
-    //       this.categoryList = res.data;
-    //       this.handleClickCategory(0)
-    //     } else {
-    //       uni.$u.toast(res.msg);
-    //     }
-    //   });
-    // },
- 
     //列表分页
     changeSP () {
-      // console.log(pageNo);
-      // this.search.page = pageNo;
       CommonApi.commonGet('/api/banquet/chef/list', this.search).catch((res) => {
         if (res.code === 1) {
           this.matchedItems_sp = res.data;
           // this.$refs.pagingRefSP?.complete(res.data);
-          // console.log(res);
         } else {
           uni.$u.toast(res.msg);
         }
@@ -148,7 +120,7 @@ export default defineComponent({
     goodsDetail (id: number) {
       console.log(id);
       uni.navigateTo({
-        url: `/pages/common/goods/detail?id=${id}&is_add=1`
+        url: `/pages/common/goods/detail?id=${id}`
       });
     },
 

From b31d1107b51479fe85c86a2f1cbf2c2f3619e294 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Thu, 14 Aug 2025 14:00:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=8F=9C=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                           |  22 +-
 src/pages/banquet/combo/detail.vue       |  15 +-
 src/pages/banquet/combo/dishes.vue       | 114 ++++++
 src/pages/banquet/combo/dishes_combo.vue | 113 ++++++
 src/pages/banquet/combo/index.vue        |  22 +-
 src/pages/banquet/cook/detail.vue        |  14 -
 src/pages/banquet/hotel/detail.vue       |  14 +-
 src/pages/banquet/order/detail.vue       | 489 ++++++++++++++++-------
 src/pages/banquet/order/list.vue         | 471 ++++++++--------------
 src/pages/tab/banquet/index.vue          |   4 +-
 src/pages/tab/user/index.vue             |   9 +-
 11 files changed, 779 insertions(+), 508 deletions(-)
 create mode 100644 src/pages/banquet/combo/dishes.vue
 create mode 100644 src/pages/banquet/combo/dishes_combo.vue

diff --git a/src/pages.json b/src/pages.json
index 386a3d4..0afd8d8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -93,7 +93,27 @@
             "navigationStyle": "custom"
           },
           "needLogin": true
-        }
+        },
+        {
+          "path": "combo/dishes",
+          "style": {
+            "navigationBarTitleText": "菜品详情",
+            "navigationStyle": "custom"
+          },
+          "needLogin": true
+        },
+
+        {
+          "path": "combo/dishes_combo",
+          "style": {
+            "navigationBarTitleText": "菜品套餐",
+            "navigationStyle": "custom"
+          },
+          "needLogin": true
+        },
+        
+
+        
       ]
     },
     {
diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 27480e2..95f611a 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -110,22 +110,21 @@
                     :round=false custom-class="margin-right-24" />
                 </template>
                 <template #title>
-                  <view class="h-60 flex">
+                  <view class="h-60 flex  font-bold">
                     <up-text size="28rpx" :text="`${item.dishes.name}`" :flex1="true" align="left" wordWrap="normal"
                       :show="true" prefixIcon="" customStyle="font-weight:bold"
                       iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
                     </up-text>
-                    <u-icon slot="right" label-color="red" :label="`￥${item.dishes.price}元`"></u-icon>
+                    <u-icon slot="right" label-color="#fa4e62" :label="`￥${item.dishes.price}元`"></u-icon>
                   </view>
                 </template>
                 <template #label>
-                  <view class="h-60 flex color-gray">
-
+                  <view class="h-60 flex color-gray ">
                     <up-text size="26rpx" :text="`${item.dishes.intro}`" :flex1="true" align="left" wordWrap="normal"
                       :show="true" prefixIcon="" customStyle=""
                       iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
                     </up-text>
-                    <u-icon slot="right" label-color="red" :label="`X${item.number}`"></u-icon>
+                    <u-icon slot="right" label-color="#fa4e62" :label="`X${item.number}`"></u-icon>
                   </view>
                 </template>
               </u-cell>
@@ -147,8 +146,8 @@
       <template #title>
         <view class="title font-size-32">
           <view>费用合计：</view>
-          <view class="title-tip">
-            <text class="font-size-32 color-red ">￥{{ totalPrice }}元</text>
+          <view class="title-tip ">
+            <text class="font-size-32  font-bold color-red" >￥{{ totalPrice }}元</text>
           </view>
         </view>
       </template>
@@ -158,7 +157,7 @@
       <view>厨师姓名：{{ server_user.public_name }}</view>
       <view>厨师联系方式：{{ server_user.phone }}</view>
       <template #footer>
-        <wd-button size="small" plain>查看详情</wd-button>
+        <!-- <wd-button size="small" plain>查看详情</wd-button> -->
       </template>
     </wd-card>
 
diff --git a/src/pages/banquet/combo/dishes.vue b/src/pages/banquet/combo/dishes.vue
new file mode 100644
index 0000000..12dd786
--- /dev/null
+++ b/src/pages/banquet/combo/dishes.vue
@@ -0,0 +1,114 @@
+<style>
+    .img {
+        width: 100%;
+        height: 420rpx;
+    }
+</style>
+<template>
+    <view class="fv-page flex-col" style="">
+        <up-navbar class="" style="" :autoBack="true" bgColor="#00000000" :fixed="true" titleColor="#595757FF"
+            leftIconColor="#FFFFFFFF">
+        </up-navbar>
+        <up-swiper v-if="imageList" height="420rpx" :list="imageList" indicator indicatorMode="dot" circular keyName="url" :autoplay="false"></up-swiper>
+        <wd-card type="rectangle">
+
+            <view class="font-size-32 font-bold">
+                <wd-text :text="matchedItems_sc.price" mode="price" type="error" prefix="￥" />
+                <wd-text size="24rpx" :text="matchedItems_sc.line_price" mode="price" decoration="line-through" prefix="￥" />
+            </view>
+            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.dishesCategory.name}}</wd-tag></view>
+            <view class="pt-2 color-coolgray font-size-24">
+                销量：{{matchedItems_sc.sales}}
+            </view>
+        </wd-card>
+        <wd-card type="rectangle">
+            <view class="color-black font-size-28 text-center">
+                菜品介绍
+            </view>
+            <view class="color-coolgray font-size-24">
+                {{matchedItems_sc.intro}}
+            </view>
+        </wd-card>
+
+
+        <wd-card type="rectangle">
+            <view class="color-black font-size-28 text-center">
+                菜品展示
+            </view>
+            <wd-grid :column="1">
+                <view v-for="(item, index) in imageList">
+                    <wd-grid-item use-slot>
+                        <image class="img" :src="item.url" />
+                    </wd-grid-item>
+                </view>
+            </wd-grid>
+        </wd-card>
+
+    </view>
+</template>
+
+<script lang="ts">
+    import {
+        defineComponent
+    } from "vue";
+    import {
+        CommonApi,
+        UserApi
+    } from "@/api";
+    import {
+        setToken,
+        getToken,
+        isLogin
+    } from '@/utils/auth';
+    import {
+        image
+    } from "@/uni_modules/uview-plus/libs/function/test";
+    import {
+        url
+    } from "inspector";
+    export default defineComponent({
+        data() {
+            return {
+                search: {
+                    id: 0,
+                },
+                is_add: 0, //是否显示购物车
+                matchedItems_sc: [],
+                imageList: [],
+            };
+        },
+        onLoad(option) {
+            // console.log(option);
+            this.search.id = option.id;
+            this.is_add = option.is_add | 0;
+            this.getCategoryList()
+        },
+        created() {
+
+        },
+        methods: {
+            getCategoryList() {
+                CommonApi.commonGet('/api/banquet/dishes/detail', this.search).catch((res) => {
+                    if (res.code === 1) {
+                        this.matchedItems_sc = res.data;
+
+                        console.log(res.data.images)
+                        res.data.images.forEach(item => {
+                            this.imageList.push({
+                                url: item,
+                                title: '',
+                                poster: item
+                            })
+
+                        })
+                        // console.log(this.imageList)
+                    } else {
+                        uni.$u.toast(res.msg);
+                    }
+                });
+            },
+ 
+        },
+
+    });
+</script>
\ No newline at end of file
diff --git a/src/pages/banquet/combo/dishes_combo.vue b/src/pages/banquet/combo/dishes_combo.vue
new file mode 100644
index 0000000..c727227
--- /dev/null
+++ b/src/pages/banquet/combo/dishes_combo.vue
@@ -0,0 +1,113 @@
+<style>
+    .img {
+        width: 100%;
+        height: 420rpx;
+    }
+</style>
+<template>
+    <view class="fv-page flex-col" style="">
+        <up-navbar class="" style="" :autoBack="true" bgColor="#00000000" :fixed="true" titleColor="#595757FF"
+            leftIconColor="#FFFFFFFF">
+        </up-navbar>
+        <up-swiper v-if="imageList" height="420rpx" :list="imageList" indicator indicatorMode="dot" circular keyName="url" :autoplay="false"></up-swiper>
+        <wd-card type="rectangle">
+
+            <view class="font-size-32 font-bold">
+                <wd-text :text="matchedItems_sc.price" mode="price" type="error" prefix="￥" />
+                <wd-text size="24rpx" :text="matchedItems_sc.line_price" mode="price" decoration="line-through" prefix="￥" />
+            </view>
+            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.dishesCategory.name}}</wd-tag></view>
+            <view class="pt-2 color-coolgray font-size-24">
+                销量：{{matchedItems_sc.sales}}
+            </view>
+        </wd-card>
+        <wd-card type="rectangle">
+            <view class="color-black font-size-28 text-center">
+                菜品介绍
+            </view>
+            <view class="color-coolgray font-size-24">
+                {{matchedItems_sc.intro}}
+            </view>
+        </wd-card>
+
+
+        <wd-card type="rectangle">
+            <view class="color-black font-size-28 text-center">
+                菜品展示
+            </view>
+            <wd-grid :column="1">
+                <view v-for="(item, index) in imageList">
+                    <wd-grid-item use-slot>
+                        <image class="img" :src="item.url" />
+                    </wd-grid-item>
+                </view>
+            </wd-grid>
+        </wd-card>
+
+    </view>
+</template>
+
+<script lang="ts">
+    import {
+        defineComponent
+    } from "vue";
+    import {
+        CommonApi,
+        UserApi
+    } from "@/api";
+    import {
+        setToken,
+        getToken,
+        isLogin
+    } from '@/utils/auth';
+    import {
+        image
+    } from "@/uni_modules/uview-plus/libs/function/test";
+    import {
+        url
+    } from "inspector";
+    export default defineComponent({
+        data() {
+            return {
+                search: {
+                    id: 0,
+                },
+                is_add: 0, //是否显示购物车
+                matchedItems_sc: [],
+                imageList: [],
+            };
+        },
+        onLoad(option) {
+            // console.log(option);
+            this.search.id = option.id;
+            this.is_add = option.is_add | 0;
+            this.getCategoryList()
+        },
+        created() {
+
+        },
+        methods: {
+            getCategoryList() {
+                CommonApi.commonGet('/api/banquet/dishes/detail', this.search).catch((res) => {
+                    if (res.code === 1) {
+                        this.matchedItems_sc = res.data;
+
+                        console.log(res.data.images)
+                        res.data.images.forEach(item => {
+                            this.imageList.push({
+                                url: item,
+                                title: '',
+                                poster: item
+                            })
+                        })
+                        // console.log(this.imageList)
+                    } else {
+                        uni.$u.toast(res.msg);
+                    }
+                });
+            },
+ 
+        },
+
+    });
+</script>
\ No newline at end of file
diff --git a/src/pages/banquet/combo/index.vue b/src/pages/banquet/combo/index.vue
index 0254c92..222d695 100644
--- a/src/pages/banquet/combo/index.vue
+++ b/src/pages/banquet/combo/index.vue
@@ -81,7 +81,7 @@ body {
       class="fv-page  flex-col">
 
       <view v-for="(item, index) in matchedItems_sp" :key="index">
-        <up-cell :border='false' @click="goodsDetail(item.id)">
+        <up-cell :border='false' @click="goodsDetail(item)">
           <template #icon>
             <up-image :src="item.image" width="140rpx" height="140rpx"></up-image>
           </template>
@@ -134,7 +134,7 @@ body {
     </wd-fab> -->
     <view class="flex-sub box-border flex" style="bottom: 10rpx;padding: 10rpx;">
       <view style="width:calc(100vw - 180rpx); margin: 0rpx 0rpx 0rpx 20rpx;" width="">
-        <text>已选{{ this.set_num }}餐,合计<text color-red>￥{{ totalPrice }}元</text></text>
+        <text>已选{{ this.set_num }}餐,合计<text class="color-red font-bold">￥{{ totalPrice }}元</text></text>
       </view>
 
       <up-button class="" style="" text="选好了" type="primary" color="#59CB56" shape="circle" size="small"
@@ -530,11 +530,19 @@ export default defineComponent({
 
     },
     //点击详情
-    goodsDetail (id: number) {
-      // console.log(id);
-      uni.navigateTo({
-        url: `/pages/common/goods/detail?id=${id}&is_add=1`
-      });
+    goodsDetail (item) {
+      console.log(item);
+      if (item.type === 1) {
+
+        uni.navigateTo({
+          url: `/pages/banquet/combo/dishes?id=${item.id}&is_add=1`
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/banquet/combo/dishes_combo?id=${item.id}&is_add=1`
+        });
+      }
+
     },
 
     //加入购物车
diff --git a/src/pages/banquet/cook/detail.vue b/src/pages/banquet/cook/detail.vue
index 16ca1d8..f2292b5 100644
--- a/src/pages/banquet/cook/detail.vue
+++ b/src/pages/banquet/cook/detail.vue
@@ -156,20 +156,6 @@ export default defineComponent({
         }
       });
     },
-    // //列表分页
-    // changeSP () {
-    //   // console.log(pageNo);
-    //   // this.search.page = pageNo;
-    //   CommonApi.commonGet('/api/dishes/dishes', this.search).catch((res) => {
-    //     if (res.code === 1) {
-    //       this.matchedItems_sp = res.data;
-    //       // this.$refs.pagingRefSP?.complete(res.data);
-    //     } else {
-    //       uni.$u.toast(res.msg);
-    //     }
-    //   });
-
-    // },
     //加入购物车
     addCart (id) {
       uni.navigateTo({
diff --git a/src/pages/banquet/hotel/detail.vue b/src/pages/banquet/hotel/detail.vue
index 2fed1e9..3ad60ef 100644
--- a/src/pages/banquet/hotel/detail.vue
+++ b/src/pages/banquet/hotel/detail.vue
@@ -53,7 +53,7 @@
                 </up-text>
                 <!-- <u-icon slot="right" label-color="red" :label="`X30`"></u-icon> -->
               </view>
-              <wd-button size="small"  @click="addCart(1)" >下单预定</wd-button>
+              <wd-button size="small" @click="addCart(1)">下单预定</wd-button>
             </template>
           </u-cell>
         </view>
@@ -115,7 +115,7 @@
               <view class="h-20 flex color-gray">
                 <wd-text size="24rpx" text="16354.156" mode="price" decoration="line-through" prefix="￥" />
                 <view style="margin-top: -20rpx;">
-                  <wd-button size="small" @click="addCart(1)"  >下单预定</wd-button>
+                  <wd-button size="small" @click="addCart(1)">下单预定</wd-button>
                 </view>
 
               </view>
@@ -195,13 +195,13 @@ export default defineComponent({
       });
 
     },
-    
+
     //加入购物车
     addCart (id) {
- 
+
       uni.navigateTo({
-				url: `/pages/banquet/combo/index??id=${id}`
-			});
+        url: `/pages/banquet/combo/index??id=${id}`
+      });
       // CommonApi.commonPost('/api/cart/add', {
       //   buy_now: false,
       //   dishes_id: this.search.id,
@@ -212,7 +212,7 @@ export default defineComponent({
       //     uni.navigateTo({
       //       url: '/pages/cart/index'
       //     });
- 
+
       //   } else {
       //     uni.$u.toast(res.msg);
       //   }
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 65c72d5..2ceb5cb 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -1,204 +1,391 @@
 <style lang='scss'>
-.ellipsis {
-  white-space: nowrap;
-  /* 防止文字换行 */
-  overflow: hidden;
-  /* 隐藏超出部分的文字 */
-  text-overflow: ellipsis;
-  /* 在末尾显示省略号 */
-  // width: 260rpx!important;
-  width: calc(100vw - 80rpx) !important;
-  /* 确保元素有宽度 */
-}
-.ellipsis_text {
-  // width: 340rpx !important;
-  // width: calc(100vw - 80rpx)!important;
-}
-.zp-l-text-rpx {
-  display: none !important;
+.custom-count-down {
+  display: inline-block;
+  width: 22px;
+  color: #ff3232;
+  font-size: 12px;
+  text-align: center;
+  background-color: #ff404021;
+  border-radius: 2px;
 }
 
-html,
-body {
-  height: 0px;
+.custom-count-down-colon {
+  display: inline-block;
+  margin: 0 4px;
+  color: #ff4040;
+}
+
+.cell-icon {
+  display: block;
+  box-sizing: border-box;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  background: url('https://img10.360buyimg.com/jmadvertisement/jfs/t1/71075/7/3762/1820/5d1f26d1E0d600b9e/a264c901943080ac.png') no-repeat;
+  background-size: cover;
 }
 </style>
 <template>
   <view>
-    <up-navbar class="  " style="font-weight: bold;" leftIcon="" title="食谱菜单" titleColor="#303133" bgColor="#FFFFFFFF"
-      titleWidth="600rpx" height="80rpx" leftIconSize="40rpx" leftIconColor="#303133" :safeAreaInsetTop="true"
-      :placeholder="true" :fixed="true"></up-navbar>
-    <up-search v-model="search.keyword" class="flex,flex-row p-1" style="" shape="round" bgColor="#f2f2f2"
-      placeholder="输入食谱" :clearabled="true" :showAction="false" inputAlign="left" borderColor="transparent"
-      searchIconColor="#909399" color="#606266" placeholderColor="#909399" searchIcon="search" margin="10rpx"
-      maxlength="-1" height="60rpx" @change="searchSP()">
-    </up-search>
-    <u-scroll-list :indicator="false">
-      <view class="scroll-list" style="flex-direction: row;width: 56px;">
-        <view class="scroll-list__goods-item  " v-for="(item, index) in categoryList" :key="index"
-          :class="(index === categoryIndex) ? 'row-active' : ''" @click="handleClickCategory(index)"
-          :style="{ backgroundColor: item.bgColor }">
-          <image class="scroll-list__goods-item__image"
-            :src="item.image ? item.image : 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png'"
-            :class="(index === categoryIndex) ? 'border-row-active' : ''"></image>
-          <text class="scroll-list__goods-item__text">{{ item.name }}</text>
+    <up-navbar :autoBack="true" style="font-weight: bold;" leftIcon="arrow-left" :title="`订单详情`" titleColor="#303133"
+      bgColor="#FFFFFFFF" titleWidth="600rpx" height="80rpx" leftIconSize="40rpx" leftIconColor="#303133"
+      :safeAreaInsetTop="true" :placeholder="true" :fixed="true">
+    </up-navbar>
+
+    <u-popup :show="propShowOrder" :round="10" mode="bottom" @close="close" customStyle="height:800rpx;">
+
+      <wd-cell-group border>
+        <view style="padding: 20rpx;">
+          <u-cell class="" style="line-height: 60rpx;" :border="true">
+            <template #title>
+              <view class="h-50  p-2 align-center font-blod" @click="close">
+                支付金额 <wd-text size="36rpx" bold text="16354.156" mode="price" type="error" prefix="￥" suffix="元" />
+              </view>
+              <view class="h-50   p-2  align-center">
+                剩余时间
+                <view style="display: inline-block;">
+                  <wd-count-down :time="(30 * 60 * 60 * 1000)">
+                    <template #default="{ current }">
+                      <span class="custom-count-down">{{ current.hours > 10 ? current.hours : '0' + current.hours
+                      }}</span>
+                      <span class="custom-count-down-colon">:</span>
+                      <span class="custom-count-down">{{ current.minutes }}</span>
+                      <span class="custom-count-down-colon">:</span>
+                      <span class="custom-count-down">{{ current.seconds }}</span>
+                    </template>
+                  </wd-count-down>
+                </view>
+              </view>
+
+            </template>
+          </u-cell>
+
+          <u-radio-group v-model="value">
+            <view class="h-60 flex" style="width: 100%; padding: 20rpx;">
+              <up-text size="36rpx" :text="`微信支付`" :flex1="true" align="left" wordWrap="normal" :show="true"
+                prefixIcon="weixin-fill" customStyle="font-weight:bold"
+                iconStyle="font-size:64rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
+              </up-text>
+              <!-- <u-icon size="48rpx" slot="right" label-color="red" :label="`￥2000.00元`"></u-icon> -->
+              <view style="display: inline-block;  float:right">
+                <u-radio iconSize="36rpx" size="36rpx" activeColor="#59CB56" label=""></u-radio>
+              </view>
+
+            </view>
+          </u-radio-group>
+
+
         </view>
-      </view>
-    </u-scroll-list>
+        <view class="prop-flex-bottom">
+          <up-button class="" style="" text="确认支付" type="primary" color="#59CB56" shape="circle" size="normal"
+            custom-style="width: calc(100vw - 100rpx);" @click="payOrder">
+          </up-button>
+        </view>
+      </wd-cell-group>
 
+    </u-popup>
+    <view v-for="(matchedItems, index) in matchedItems_sp" :key="index">
+      <wd-card>
+        <template #title>
+          <view class="title font-size-32 font-bold">
+            <view>第{{ parseInt(index) + 1 }}餐</view>
+            <view class="title-tip">
+              <!-- <text class="font-size-32 color-red font-bold ">￥213213.00元</text> -->
+            </view>
+          </view>
+          <view class="title font-size-28 pt-4">
+            <view>做宴时段：{{ matchedItems[0].banquet_date }}</view>
+            <view class="title-tip font-size-28">
+              做宴时段：{{ matchedItems[0].banquet_time }}
+            </view>
+          </view>
+        </template>
+        <view class="content  ">
+          <up-cell-group :border="false">
+            <view class="detail-box" style="border: none;padding: 0px;" v-for="(item, index) in matchedItems"
+              :key="index">
+              <u-cell :border="false">
+                <template #icon>
+                  <wd-img :width="60" :height="60" :src="item.dishes.images[0]" :enable-preview="true" :radius="8"
+                    :round=false custom-class="margin-right-24" />
+                </template>
+                <template #title>
+                  <view class="h-60 flex">
+                    <up-text size="28rpx" :text="`${item.dishes.name}`" :flex1="true" align="left" wordWrap="normal"
+                      :show="true" prefixIcon="" customStyle="font-weight:bold"
+                      iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
+                    </up-text>
+                    <u-icon slot="right" label-color="red" :label="`￥${item.dishes.price}元`"></u-icon>
+                  </view>
+                </template>
+                <template #label>
+                  <view class="h-60 flex color-gray">
 
-    <z-paging :fixed="false" height="calc(100vh - 440rpx)" width="200rpx" loading-more-default-text=""
-      style=" left:0; padding: 0px; position: fixed;" class="fv-page  flex-col px-4">
-      <u-scroll-list :indicator="false">
-        <view class="scroll-list" style="flex-direction:  column;">
-          <view class="scroll-list__goods-item-column  " v-for="(item, index) in tabList" :key="index"
-            :class="(index === childrenIndex) ? 'column-active' : ''" @click="handleChildrenClick(index)"
-            :style="{ backgroundColor: item.bgColor }">
-            <!-- <image class="scroll-list__goods-item__image" :src="item.image"></image> -->
-            <slot name="tabItem">
-            </slot>
-            <!-- <view style="padding: 20px 0px;">        </view> -->
-            <text class="scroll-list__goods-item__text">{{ item.name }}</text>
+                    <up-text size="26rpx" :text="`${item.dishes.intro}`" :flex1="true" align="left" wordWrap="normal"
+                      :show="true" prefixIcon="" customStyle=""
+                      iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
+                    </up-text>
+                    <u-icon slot="right" label-color="red" :label="`X${item.number}`"></u-icon>
+                  </view>
+                </template>
+              </u-cell>
+            </view>
+          </up-cell-group>
+
+        </view>
+        <!-- <template #footer>
+          <view>
+          <wd-button size="small" style="margin-right: 8px;">评价</wd-button>
+          <wd-button size="small" plain>立即使用</wd-button>
+        </view>
+        </template> -->
+      </wd-card>
+
+    </view>
+
+    <wd-card>
+      <template #title>
+        <view class="title font-size-32">
+          <view>费用合计：</view>
+          <view class="title-tip">
+            <text class="font-size-32 color-red ">￥{{ totalPrice }}元</text>
           </view>
         </view>
-      </u-scroll-list>
-    </z-paging>
-    <z-paging ref="pagingRefSP" v-model="matchedItems_sp" @query="changeSP" :fixed="false" height="calc(100vh - 440rpx)"
-      width="calc(100vw - 200rpx)" style="right: 0; background-color: #FFFFFFFF; position: fixed;"
-      class="fv-page  flex-col">
+      </template>
+    </wd-card>
 
-      <view v-for="(item, index) in matchedItems_sp" :key="index">
-        <up-cell :border='false' @click="goodsDetail(item.id)">
-          <template #icon>
-            <up-image :src="item.image" width="140rpx" height="140rpx"></up-image>
-          </template>
-          <template v-slot:title>
-              <view class="h-50 flex">
-                <up-text size="28rpx" :text="`${item.name}`" :flex1="true" align="left"
-                    wordWrap="normal" :show="true" prefixIcon=""
-                    iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-                </up-text>
-              </view>
- 
-            <view class="h-50 flex">
-							<up-text color="#767676" size="24rpx" :text="`主料：${item.intro}`"   :flex1="true"
-								align="left" wordWrap="normal" :show="true" prefixIcon=""
-								iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1"
-								decoration="none">
-							</up-text>
-            </view>
-            <view class="h-50  flex ellipsis_text"  >
-              <up-text color="#767676" size="24rpx" :text="`营养：${item.intro}`"  :flex1="true"
-								align="left" wordWrap="normal" :show="true" prefixIcon=""
-								iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1"
-								decoration="none">
-							</up-text>
-							<view  @click.stop="addCart(item.id)">
-								<u-icon  slot="right" label="" size="42rpx" name="plus-circle" color="#59CB56" labelColor="#59CB56"></u-icon>
-              </view>
-            </view>
-          </template>
-        </up-cell>
-      </view>
-    </z-paging>
+    <wd-card title="厨师信息">
+      <view>厨师姓名：{{ server_user.public_name }}</view>
+      <view>厨师联系方式：{{ server_user.phone }}</view>
+      <template #footer>
+        <wd-button size="small" plain>查看详情</wd-button>
+      </template>
+    </wd-card>
 
+    <wd-card>
+      <template #title>
+        <!-- <u-alert :show-icon="true" title="温馨提示:请确认酒席需求" type="" effect="dark" description=" "></u-alert> -->
+      </template>
+      <view>1.(不交定金)如若厨师接到更高价订单，可能会将您的订单取消。</view>
+      <view>2.(付定金)如若厨师的做席档期存在冲突，可能会致电与您沟通，并推荐您更换厨师。</view>
+      <view>3.如若档期冲突订单被厨师取消，定金将原路返回，请放心下单。</view>
+      <view>4.在此，感谢您对此平台以及厨师们的支持，您的支持就是我们前进的最大动力。</view>
+
+      <wd-form ref="form" :model="orderInfo" errorType="message">
+        <wd-cell-group border>
+
+          <view class="pb-4" />
+          <wd-input label="联系姓名" prop="customer_name" clearable v-model="orderInfo.customer_name" placeholder="请填写联系姓名"
+            :rules="[
+              {
+                required: false,
+                validator: (value: string) => {
+                  return /^[\u4e00-\u9fa5a-zA-Z0-9_]+$/.test(value)
+                },
+                message: '请输入姓名'
+              }
+            ]" />
+          <wd-input label="联系电话" prop="phone" clearable v-model="orderInfo.phone" placeholder="请填写联系电话"
+            :rules="[{ required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入有效手机号码' }]" />
+
+          <wd-select-picker label="宴席类型" prop="banquet_type" v-model="orderInfo.banquet_type" :columns="banquetType"
+            type="radio" :rules="[
+              {
+                required: false,
+                validator: (value: string) => {
+                  return /^[\u4e00-\u9fa5a-zA-Z0-9_]+$/.test(value)
+                },
+                message: '请选择宴席类型'
+              }
+            ]"></wd-select-picker>
+
+          <wd-col-picker label="做宴地址" v-model="orderInfo.district_name" prop="district_name" :columns="area"
+            :column-change="columnChange" placeholder="请填写做宴地址" @confirm="handleConfirm" :rules="[
+              {
+                required: false,
+                validator: (value: string) => {
+                  if (value.length > 0) {
+                    return true;
+                  }
+                  return false;
+
+                },
+                message: '做宴地址不能为空，请填写'
+              }
+            ]"></wd-col-picker>
+
+          <wd-input label="详细地址" prop="street_name" clearable v-model="orderInfo.street_name" placeholder="请填写详细地址"
+            :rules="[
+              {
+                required: false,
+                validator: (value: string) => {
+                  return /^[\u4e00-\u9fa5a-zA-Z0-9_]+$/.test(value)
+                },
+                message: '请输入详细地址'
+              }
+            ]" />
+          <wd-textarea label="备注" v-model="orderInfo.remark" placeholder="请填写备注" />
+
+          <!-- <wd-button plain hairline custom-style="width: calc(100vw - 100rpx);"
+            @click="handleSubmit(1)">确定预定（做席后再支付）</wd-button>
+          <wd-button hairline custom-style="width: calc(100vw - 100rpx);" @click="handleSubmit(1)">付定金锁定订单</wd-button> -->
+
+        </wd-cell-group>
+      </wd-form>
+
+      <!-- 一般的，检举内容由承办的党的委员会或纪律检查委员会将处理意见或复议、复查结论同申诉人见面，听取其意见。复议、复查的结论和决定，应交给申诉人一份。 -->
+      <template #footer>
+        <!-- <wd-button size="small" plain>查看详情</wd-button> -->
+      </template>
+    </wd-card>
   </view>
 </template>
 
 <script lang="ts">
+import { useColPickerData, useModal } from '@/hooks'
 import { defineComponent } from "vue";
 import { CommonApi, UserApi } from "@/api";
-import { setToken, getToken, isLogin } from '@/utils/auth';
+// import { setToken, getToken, isLogin } from '@/utils/auth';
+const { colPickerData, findChildrenByCode } = useColPickerData()
 export default defineComponent({
   data () {
     return {
-      search: {
-        category_id: '',
-        keyword: '',
-        page: 1,
-        limit: 10,
+      totalPrice: 0,
+      server_user: {
+        phone: '',
+        public_name: '',
+      },
+      order_id: 0,
+
+      address_string: '',
+      banquetType: this.getBanquetType(),
+      propShowOrder: false,
+      area: [],
+      value: [],
+      orderInfo: {
+        district_name: [],
+        street_name: '',
+        // cart_ids: [], 酒店
+        customer_name: '',
+        phone: '',
+        address: '',
+        remark: '',
+        banquet_type: '',
+        reservation_type: 1,
+        order_id: 0,
+        // table_number: 0, 酒店
+        // banquet_date: '', 酒店
       },
-      // keyword_sp: '',
-      categoryIndex: 0,
-      childrenIndex: 0,
-      categoryList: [],
-      tabList: [],
-      good_list: [],
       matchedItems_sp: [],
-    
+
     };
   },
-  onLoad () {
-    // if (isLogin()) {
-    this.getCategoryList()
-    // }
+  onLoad (option) {
+    this.order_id = option.id;;
+    this.orderInfo.order_id = option.id;
+    this.getOrderDetail()
+    this.getArea()
   },
   created () {
 
   },
   methods: {
-    handleClickCategory (index: number) {
-      this.categoryIndex = index;
-      this.tabList = this.categoryList[index].children;
-      this.handleChildrenClick(0);
+    close () {
+      this.propShowOrder = false;
     },
-    handleChildrenClick (index: number) {
-      this.childrenIndex = index;
-      this.search.category_id = this.tabList[index].id;
-      this.$refs.pagingRefSP?.reload();
+    //表单验证
+    handleSubmit (reservation_type) {
+      // console.log(this.orderInfo);
+      this.orderInfo.reservation_type = reservation_type; //付款类型
+      this.$refs.form.validate()
+        .then(({ valid, errors }) => {
+          if (valid) {
+            this.orderInfo.address = this.address_string + this.orderInfo.street_name;
+            console.log(this.orderInfo);
+            this.addOrder();
+          }
+        })
+        .catch((error) => {
+          console.log(error, 'error')
+        })
+
     },
 
-    getCategoryList () {
-      CommonApi.commonGet('/api/dishes/category').catch((res) => {
+    //提交订单
+    addOrder () {
+      CommonApi.commonPost('/api/banquet/order/createOrder', this.orderInfo).catch((res) => {
         if (res.code === 1) {
-          this.categoryList = res.data;
-          this.handleClickCategory(0)
+          this.propShowOrder = true;
         } else {
           uni.$u.toast(res.msg);
         }
       });
     },
-    //搜索事件
-    searchSP(){
-      this.$refs.pagingRefSP?.reload();
-      // this.changeSP(1);
+
+    // 微信支付
+    payOrder () {
+      this.close();
     },
-    //列表分页
-    changeSP (pageNo: number) {
-      console.log(pageNo);
-      this.search.page = pageNo;
-      CommonApi.commonGet('/api/dishes/dishes', this.search).catch((res) => {
+    //获取地址
+    getArea () {
+      this.area = [colPickerData.map(item => ({
+        value: item.value,
+        label: item.text
+      }))];
+    },
+    //选择地址后--记录地址字符串
+    handleConfirm (value) {
+      this.address_string = value.selectedItems.map(item => item.label).join('')
+    },
+    //地址改版事件
+    columnChange ({ selectedItem, resolve, finish }) {
+      try {
+        const areaData = findChildrenByCode(colPickerData, selectedItem.value);
+        if (areaData && areaData.length) {
+          resolve(areaData.map(item => ({
+            value: item.value,
+            label: item.text
+          })));
+        } else {
+          finish();
+        }
+      } catch (error) {
+        console.error('处理列变更时出错:', error);
+        finish(); // 确保在发生错误时也能完成操作以避免卡顿
+      }
+    },
+    //宴席类型
+    getBanquetType () {
+      CommonApi.commonGet('/api/banquet/dishes/banquetType').catch((res) => {
         if (res.code === 1) {
-          // this.matchedItems_sp = res.data;
-          this.$refs.pagingRefSP?.complete(res.data);
+          this.banquetType = res.data;
+          res.data.forEach(item => {
+            item.label = item.name;
+
+          });
+        } else {
+          uni.$u.toast(res.msg);
+        }
+      });
+    },
+    // //购物车验证
+    getOrderDetail () {
+      CommonApi.commonPost('/api/banquet/order/detail', { order_id: this.order_id }).catch((res) => {
+        if (res.code === 1) {
+
+            console.log(res)
+          // this.matchedItems_sp = res.data.cart_list;
+          // this.totalPrice = res.data.total_price;
+          // this.server_user.phone = res.data.server_user.certification.phone;
+          // this.server_user.public_name = res.data.server_user.certification.public_name;
+          // this.$refs.pagingRefSP?.complete(res.data);
           // console.log(res);
         } else {
           uni.$u.toast(res.msg);
         }
       });
- 
-    },
-    //点击详情
-    goodsDetail (id: number) {
-      console.log(id);
-      uni.navigateTo({
-        url: `/pages/common/goods/detail?id=${id}&is_add=1`
-      });
     },
 
-  //加入购物车
-  addCart (id) {
-      CommonApi.commonPost('/api/cart/add',{
-          buy_now: false,
-          dishes_id: id,
-      }).catch((res) => {
-          if (res.code === 1) {
-              uni.$u.toast('加入购物车成功');
-          } else {
-              uni.$u.toast(res.msg);
-          }
-      });
-  }
 
   },
 
diff --git a/src/pages/banquet/order/list.vue b/src/pages/banquet/order/list.vue
index 1b692b5..eaccadc 100644
--- a/src/pages/banquet/order/list.vue
+++ b/src/pages/banquet/order/list.vue
@@ -1,332 +1,175 @@
-<style lang='scss'>
+<style>
+.ellipsis {
+	/* 在末尾显示省略号 */
+	width: 420rpx;
+	/* 防止文字换行 */
+	overflow: hidden;
+	/* 隐藏超出部分的文字 */
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	/* 确保元素有宽度 */
+}
+
 html,
 body {
-  height: 0px;
-}
-
-.disabled-date>.wd-month__day-container>.wd-month__day-text {
-  color: #ffffff !important;
-}
-
-.disabled-date {
-  border-radius: var(--wot-calendar-active-border, 8px);
-  background: var(--wot-calendar-active-color, var(--wot-color-theme, #366cff));
-  // background-color: #78da1c;
-  /* 禁用日期的背景颜色 */
-  color: #ffffff;
-  /* 禁用日期的文字颜色 */
-  pointer-events: none;
-  /* 禁用日期的点击事件 */
-  // opacity: 0.5;
-  /* 禁用日期的透明度 */
-  text-decoration: line-through;
-  /* 禁用日期的文字带有删除线 */
+  height: 0rpx;
 }
 </style>
+
 <template>
-  <view>
-    <up-navbar class="  " style="font-weight: bold;" leftIcon="" title="食谱菜单" titleColor="#303133" bgColor="#FFFFFFFF"
-      titleWidth="600rpx" height="80rpx" leftIconSize="40rpx" leftIconColor="#303133" :safeAreaInsetTop="true"
-      :placeholder="true" :fixed="true"></up-navbar>
-    <up-search v-model="search.keyword" class="flex,flex-row p-1" style="" shape="round" bgColor="#f2f2f2"
-      placeholder="输入食谱" :clearabled="true" :showAction="false" inputAlign="left" borderColor="transparent"
-      searchIconColor="#909399" color="#606266" placeholderColor="#909399" searchIcon="search" margin="10rpx"
-      maxlength="-1" height="60rpx" @change="searchSP()">
-    </up-search>
-    <!-- <up-tabs v-model:current="currentTab" style="font-weight: bold;" :list="menu_list" key-name="name"
-      line-color="#18C936" line-width="80rpx" line-height="6rpx" line-bg-size="cover" :scrollable="true" /> -->
-    <!-- <u-scroll-list :indicator="false">
-      <view class="scroll-list" style="flex-direction: row;width: 56px;">
-        <view class="scroll-list__goods-item  " v-for="(item, index) in categoryList" :key="index"
-          :class="(index === categoryIndex) ? 'row-active' : ''" @click="handleClickCategory(index)"
-          :style="{ backgroundColor: item.bgColor }">
-          <image class="scroll-list__goods-item__image"
-            :src="item.image ? item.image : 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png'"
-            :class="(index === categoryIndex) ? 'border-row-active' : ''"></image>
-          <text class="scroll-list__goods-item__text">{{ item.name }}</text>
-        </view>
-      </view>
-    </u-scroll-list> -->
-    <wd-col-picker label="选择地址" v-model="value" :columns="area" :column-change="columnChange"
-      @confirm="handleConfirm"></wd-col-picker>
-    <wd-calendar :formatter="formatter" type="dates" :min-date="min_data" v-model="time_list"
-      @confirm="handleTimeConfirm" />
-    <wd-tabs v-model="currentTab" @change="handleChange" auto-line-width color="#59CB56" lineWidth="40rpx">
-      <block v-for="item in menu_list" :key="item">
-        <wd-tab :title="`${item.name}`" :name="item.id" setActive="item.name">
-          <view class="content">
-          </view>
-        </wd-tab>
-      </block>
-    </wd-tabs>
-    <!-- 
-  <wd-button>主要按钮</wd-button>
-  <wd-button type="success">成功按钮</wd-button>
-  <wd-button type="info">信息按钮</wd-button>
-  <wd-button type="warning">警告按钮</wd-button>
-  <wd-button type="error">危险按钮</wd-button> -->
-    <z-paging :fixed="false" height="calc(100vh - 440rpx)" width="200rpx" loading-more-default-text=""
-      style=" left:0; padding: 0px; position: fixed;" class="fv-page  flex-col px-4">
-      <u-scroll-list :indicator="false">
-        <view class="scroll-list" style="flex-direction:  column;">
-          <view class="scroll-list__goods-item-column  " v-for="(item, index) in tabList" :key="index"
-            :class="(index === childrenIndex) ? 'column-active' : ''" @click="handleChildrenClick(index)"
-            :style="{ backgroundColor: item.bgColor }">
-            <!-- <image class="scroll-list__goods-item__image" :src="item.image"></image> -->
-            <slot name="tabItem">
-            </slot>
-            <!-- <view style="padding: 20px 0px;">        </view> -->
-            <text class="scroll-list__goods-item__text">{{ item.name }}</text>
-          </view>
-        </view>
-      </u-scroll-list>
-    </z-paging>
-    <z-paging ref="pagingRefSP" v-model="matchedItems_sp" @query="changeSP" :fixed="false" height="calc(100vh - 440rpx)"
-      width="calc(100vw - 200rpx)" style="right: 0; background-color: #FFFFFFFF; position: fixed;"
-      class="fv-page  flex-col">
+	<view>
+		<up-navbar class="  " :autoBack="true"    style="font-weight: bold;"
+			leftIcon="arrow-left" title="订单列表" titleColor="#303133" bgColor="#FFFFFFFF" titleWidth="600rpx"
+			height="80rpx" leftIconSize="38rpx" leftIconColor="#303133" :safeAreaInsetTop="true" :placeholder="true"
+			:fixed="true"></up-navbar>
+		<up-search v-model="search_sp.keyword" class="flex,flex-row p-1" style="" shape="round" bgColor="#f2f2f2"
+			placeholder="输入订单编号" :clearabled="true" :showAction="false" inputAlign="left" borderColor="transparent"
+			searchIconColor="#909399" color="#606266" placeholderColor="#909399" searchIcon="search" margin="10rpx"
+			maxlength="-1" height="60rpx" @change="searchSP()">
+		</up-search>
 
-      <view v-for="(item, index) in matchedItems_sp" :key="index">
-        <up-cell :border='false' @click="goodsDetail(item.id)">
-          <template #icon>
-            <up-image :src="item.image" width="140rpx" height="140rpx"></up-image>
-          </template>
-          <template v-slot:title>
-            <view class="h-50 flex">
-              <up-text size="28rpx" :text="`${item.name}`" :flex1="true" align="left" wordWrap="normal" :show="true"
-                prefixIcon="" iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-              </up-text>
-            </view>
+		<z-paging :fixed="false" height="calc(100vh - 380rpx)" width="calc(100vw - 50rpx)"
+			:paging-style="{ 'background-color': '#FFFFFFFF', 'padding': '20rpx' }" ref="pagingRefSP"
+			v-model="matchedItems_sp" @query="changeSP" class="fv-page  flex-col ">
+			<view v-for="(item, index) in matchedItems_sp" :key="index">
+				<view class="address_box">
+					<view class=" pt-2 pb-2 ps-2 pe-2" style="">
+						<u-cell class="" style="line-height: 60rpx;" :border="false" @click="orderDetail(item.id)">
+							<template #title>
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" color="#59CB56"
+										:text="` 宴席时间：${item.delivery_date} ${item.delivery_time} `" :flex1="true"
+										align="left" prefixIcon="clock" wordWrap="normal" :show="true"
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+								</view>
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" color="#59CB56"
+										:text="`联系方式：${item.customer_name} ( ${item.phone})`" :flex1="true" align="left"
+										wordWrap="normal" :show="true" prefixIcon="map"
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+								</view>
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" :text="item.address" margin="40rpx" :flex1="true"
+										align="left" wordWrap="normal" :show="true" prefixIcon=""
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+									<!-- <view @click.stop="getopenLocation(item)">
+										<u-icon slot="right" label="查看地图" name="map"></u-icon>
+									</view> -->
+								</view>
 
-            <view class="h-50 flex">
-              <up-text color="#767676" size="24rpx" :text="`主料：${item.intro}`" :flex1="true" align="left"
-                wordWrap="normal" :show="true" prefixIcon=""
-                iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-              </up-text>
-            </view>
-            <view class="h-50  flex ellipsis_text">
-              <up-text color="#767676" size="24rpx" :text="`营养：${item.intro}`" :flex1="true" align="left"
-                wordWrap="normal" :show="true" prefixIcon=""
-                iconStyle="font-size:26rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-              </up-text>
-              <view @click.stop="addCart(item.id)">
-                <u-icon slot="right" label="" size="42rpx" name="plus-circle" color="#59CB56"
-                  labelColor="#59CB56"></u-icon>
-              </view>
-            </view>
-          </template>
-        </up-cell>
-      </view>
-    </z-paging>
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" :text="`订单编号：${item.order_sn}`" margin="40rpx"
+										:flex1="true" align="left" wordWrap="normal" :show="true" prefixIcon=""
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+								</view>
+
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" :text="`创建时间：${item.create_time}`" margin="40rpx"
+										:flex1="true" align="left" wordWrap="normal" :show="true" prefixIcon=""
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+								</view>
+								<view class="h-50 flex">
+									<up-text class="" size="26rpx" :text="`付款金额：￥${item.pay_amount}`" margin="40rpx"
+										:flex1="true" align="left" wordWrap="normal" :show="true" prefixIcon=""
+										iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1"
+										decoration="none">
+									</up-text>
+								</view>
+							</template>
+						</u-cell>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+
+		<up-button class="" style="" text="返回首页" type="primary" color="#59CB56" shape="circle" size="normal"
+			custom-style="width:calc(100vw - 50rpx)" @click="goBackHome">
+		</up-button>
+		<!-- </view> -->
+	</view>
 
-  </view>
 </template>
 
 <script lang="ts">
-// useColPickerData可以参考本章节顶部的介绍
-// 导入路径根据自己实际情况调整，万不可一贴了之
-
-import { useColPickerData } from '@/hooks'
-
-import { defineComponent } from "vue";
-import { CommonApi, UserApi } from "@/api";
-import { get } from 'http';
-// import { setToken, getToken, isLogin } from '@/utils/auth';
-const { colPickerData, findChildrenByCode } = useColPickerData()
-// const value = ref<string[]>([])
-
-// const area = ref<any[]>([
-
-// ])
-
-
+const CACHE_ADDRESS = {};
+import { CommonApi } from '@/api';
+import { getCityV2 } from '@/api/api.js';
+import { useLocation, useModal } from '@/hooks';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
-  data () {
-    return {
-      search: {
-        category_id: '',
-        keyword: '',
-        page: 1,
-        limit: 10,
-      },
-      //     area:  useColPickerData().colPickerData.map((item) => {
-      //   return {
-      //     value: item.value,
-      //     label: item.text
-      //   }
-      // }),
-      area: [],
-      value: [],
-      currentTab: 0, // tab索引
-      min_data: new Date().getTime(),
-      isDisabledDate: [1754755200000, 1754755200000],
-      time_list: [],
-      menu_list: [{ id: 0, name: '第一餐' }, { id: 1, name: '第二餐' }, { id: 2, name: '第三餐' }],
-      // keyword_sp: '',
-      categoryIndex: 0,
-      childrenIndex: 0,
-      categoryList: [],
-      tabList: [],
-      good_list: [],
-      matchedItems_sp: [],
+	data () {
+		return {
+			search_sp: {
+				keyword: '',
+				page: 1,
+				limit: 10,
+			},
+			matchedItems_sp: [],
+			addFrom_address: '',
+		};
+	},
+	onShow () {
+		//进入页面时刷新数据--避免加入购物车不显示
+		this.searchSP();
+	},
+	methods: {
 
-    };
-  },
-  onLoad () {
-    // if (isLogin()) {
-    this.getCategoryList()
-    // }
-
-    this.getArea()
-
-  },
-  created () {
-
-  },
-  methods: {
-
-    handleConfirm ({ value }) {
-      console.log(value)
-    },
-    getArea () {
-      try {
-        this.area = [colPickerData.map(item => ({
-          value: item.value,
-          label: item.text
-        }))];
-      } catch (error) {
-        console.error('获取区域数据时出错:', error);
-        uni.$u.toast('获取区域数据失败');
-      }
-    },
-
-    columnChange ({ selectedItem, resolve, finish }) {
-      try {
-        const areaData = findChildrenByCode(colPickerData, selectedItem.value);
-        if (areaData && areaData.length) {
-
-     
-          resolve(areaData.map(item => ({
-            value: item.value,
-            label: item.text
-          })));
-        } else {
-          finish();
-        }
-      } catch (error) {
-        console.error('处理列变更时出错:', error);
-        finish(); // 确保在发生错误时也能完成操作以避免卡顿
-      }
-    },
-
-    formatter (day) {
-      const date = new Date(day.date)
-      const now = new Date()
-      const year = date.getFullYear()
-      const month = date.getMonth()
-      const da = date.getDate()
-      const nowYear = now.getFullYear()
-      const nowMonth = now.getMonth()
-      const nowDa = now.getDate()
-
-      if (year === nowYear && month === nowMonth && da === nowDa) {
-        day.topInfo = '今天'
-      }
-      // const disabledDates = ['2025-08-05', '2023-08-15'];
-      // const formattedDate = `${year}-${month}-${da}`;
-      if (this.isDisabledDate.includes(day.date)) {
-        day.topInfo = '已预定';
-        day.disabled = true; // 禁用日期
-        day.disabled_class = 'disabled-date'; // 添加自定义样式类
-      }
-      // if (day.type === 'start') {
-      //   day.bottomInfo = '开始'
-      // }
-
-      // if (day.type === 'end') {
-      //   day.bottomInfo = '结束'
-      // }
-      // if (day.type === 'same') {
-      //   day.bottomInfo = '开始/结束'
-      // }
-      return day
-    },
-
-    handleTimeConfirm (res) {
-      console.log(res.value)
-      this.time_list = res.value
-
-    },
-    handleChange () {
-      this.$nextTick(() => { this.handleClickCategory(this.currentTab) });
-    },
-    handleClickCategory (index: number) {
-
-      console.log(index);
-      this.categoryIndex = index;
-      this.tabList = this.categoryList[index].children;
-      this.handleChildrenClick(0);
-    },
-    handleChildrenClick (index: number) {
-      this.childrenIndex = index;
-      this.search.category_id = this.tabList[index].id;
-      this.$refs.pagingRefSP?.reload();
-    },
-
-    getCategoryList () {
-      CommonApi.commonGet('/api/dishes/category').catch((res) => {
-        if (res.code === 1) {
-          this.categoryList = res.data;
-          this.handleClickCategory(0)
-        } else {
-          uni.$u.toast(res.msg);
-        }
-      });
-    },
-    //搜索事件
-    searchSP () {
-      this.$refs.pagingRefSP?.reload();
-      // this.changeSP(1);
-    },
-    //列表分页
-    changeSP (pageNo: number) {
-      // console.log(pageNo);
-      this.search.page = pageNo;
-      CommonApi.commonGet('/api/dishes/dishes', this.search).catch((res) => {
-        if (res.code === 1) {
-          // this.matchedItems_sp = res.data;
-          this.$refs.pagingRefSP?.complete(res.data);
-          // console.log(res);
-        } else {
-          uni.$u.toast(res.msg);
-        }
-      });
-
-    },
-    //点击详情
-    goodsDetail (id: number) {
-      // console.log(id);
-      uni.navigateTo({
-        url: `/pages/common/goods/detail?id=${id}&is_add=1`
-      });
-    },
-
-    //加入购物车
-    addCart (id) {
-      CommonApi.commonPost('/api/cart/add', {
-        buy_now: false,
-        dishes_id: id,
-      }).catch((res) => {
-        if (res.code === 1) {
-          uni.$u.toast('加入购物车成功');
-        } else {
-          uni.$u.toast(res.msg);
-        }
-      });
-    }
-
-  },
+		//搜索事件--直接刷新数据
+		searchSP () {
+			// this.getAddressInfoListData();
+			// console.log('搜索');
+			this.$refs.pagingRefSP?.reload();
+		},
+		//列表分页
+		changeSP (pageNo: number) {
 
+			console.log('列表分页',pageNo);
+			this.search_sp.page = pageNo;
+			console.log('列表分页',this.search_sp);
+			CommonApi.commonGet('/api/order/list', this.search_sp).catch((res) => {
+				if (res.code === 1) {
+					this.$refs.pagingRefSP?.complete(res.data);
+					// console.log('刷新页面');
+					// res.data.forEach((item) => {
+					// 	console.log(item);
+					// 	if (!this.createOrderData.cart_ids.includes(item.id)) {
+					// 		this.createOrderData.cart_ids.push(item.id);
+					// 	}
+					// });
+			
+				} else {
+					uni.$u.toast(res.msg);
+				}
+			});
+		},
 
+		// 打开地图
+		getopenLocation (res) {
+			useLocation().openLocation(res.latitude, res.longitude,res.address,res.address) 
+		},
+		//点击详情
+		orderDetail (id: number) {
+			uni.navigateTo({
+				url: `/pages/banquet/order/detail?id=${id}`
+			});
+		},
+		goBackHome () {
+			uni.switchTab({
+				// url: '/pages/index/index'
+				url: '/pages/tab/user/index'
+			});
+		}
+	},
 });
 </script>
diff --git a/src/pages/tab/banquet/index.vue b/src/pages/tab/banquet/index.vue
index 897b1ee..e595d9b 100644
--- a/src/pages/tab/banquet/index.vue
+++ b/src/pages/tab/banquet/index.vue
@@ -7,7 +7,7 @@
 
 .wd-grid-item-img-cook {
   width: 100%;
-  height: 180px;
+  height: 160px;
   border-radius: 20rpx;
 }
 </style>
@@ -16,7 +16,7 @@
     <up-navbar class="  " style="font-weight: bold;" leftIcon="" title="首页" titleColor="#303133" bgColor="#FFFFFFFF"
       titleWidth="600rpx" height="80rpx" leftIconSize="40rpx" leftIconColor="#303133" :safeAreaInsetTop="true"
       :placeholder="true" :fixed="true"></up-navbar>
-    <view style="padding:0px 20rpx"> <u-swiper radius="20rpx" height="360rpx" :list="swiperList" indicator
+    <view style="padding:0px 20rpx"> <u-swiper radius="20rpx" height="420rpx" :list="swiperList" indicator
         indicatorMode="dot" circular @click="handleClick"></u-swiper></view>
     <wd-grid :gutter="10" :column="2" clickable>
       <wd-grid-item use-slot @click="goTabCook">
diff --git a/src/pages/tab/user/index.vue b/src/pages/tab/user/index.vue
index 59452ce..8ea9e32 100644
--- a/src/pages/tab/user/index.vue
+++ b/src/pages/tab/user/index.vue
@@ -29,10 +29,10 @@
 
       <u-cell icon="" title="微信号" is-link right-icon="lock" :value="userStore.user.code" :border="false" size="large"
         custom-style="padding:20rpx;font-size:28rpx" />
-      <u-cell icon="order" title="宴席" is-link value="" :border="false" size="large"
+      <u-cell icon="order" title="我的订单" is-link value="" :border="false" size="large"
         custom-style="padding:20rpx;font-size:28rpx" @click="banquet" />
-      <u-cell icon="order" title="订单详情" is-link value="" :border="false" size="large"
-        custom-style="padding:20rpx;font-size:28rpx" @click="orderList" />
+      <!-- <u-cell icon="order" title="订单详情" is-link value="" :border="false" size="large"
+        custom-style="padding:20rpx;font-size:28rpx" @click="orderList" /> -->
     </view>
 
     <view class="bg-white p-2">
@@ -96,7 +96,8 @@ function orderList () {
 function banquet () {
   uni.$u.route({
     type: 'navigateTo',
-    url: '/pages/banquet/combo/index',
+    // url: '/pages/banquet/combo/index',
+    url: '/pages/banquet/order/list',
   });
 }
 

From 5972ef1248636e657f682ba42dea746f5015b3b9 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Thu, 14 Aug 2025 14:04:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=8F=9C=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/dishes.vue       | 6 +++---
 src/pages/banquet/combo/dishes_combo.vue | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/banquet/combo/dishes.vue b/src/pages/banquet/combo/dishes.vue
index 12dd786..7f656d4 100644
--- a/src/pages/banquet/combo/dishes.vue
+++ b/src/pages/banquet/combo/dishes.vue
@@ -16,7 +16,7 @@
                 <wd-text :text="matchedItems_sc.price" mode="price" type="error" prefix="￥" />
                 <wd-text size="24rpx" :text="matchedItems_sc.line_price" mode="price" decoration="line-through" prefix="￥" />
             </view>
-            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.dishesCategory.name}}</wd-tag></view>
+            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.tag_name}}</wd-tag></view>
             <view class="pt-2 color-coolgray font-size-24">
                 销量：{{matchedItems_sc.sales}}
             </view>
@@ -91,8 +91,8 @@
                 CommonApi.commonGet('/api/banquet/dishes/detail', this.search).catch((res) => {
                     if (res.code === 1) {
                         this.matchedItems_sc = res.data;
-
-                        console.log(res.data.images)
+                        this.matchedItems_sc.tag_name = res.data.dishesCategory.name;
+                        // console.log(res.data.images)
                         res.data.images.forEach(item => {
                             this.imageList.push({
                                 url: item,
diff --git a/src/pages/banquet/combo/dishes_combo.vue b/src/pages/banquet/combo/dishes_combo.vue
index c727227..7f656d4 100644
--- a/src/pages/banquet/combo/dishes_combo.vue
+++ b/src/pages/banquet/combo/dishes_combo.vue
@@ -16,7 +16,7 @@
                 <wd-text :text="matchedItems_sc.price" mode="price" type="error" prefix="￥" />
                 <wd-text size="24rpx" :text="matchedItems_sc.line_price" mode="price" decoration="line-through" prefix="￥" />
             </view>
-            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.dishesCategory.name}}</wd-tag></view>
+            <view class="pt-2 color-black "> {{matchedItems_sc.name}} <wd-tag custom-class="space" type="primary">{{matchedItems_sc.tag_name}}</wd-tag></view>
             <view class="pt-2 color-coolgray font-size-24">
                 销量：{{matchedItems_sc.sales}}
             </view>
@@ -91,14 +91,15 @@
                 CommonApi.commonGet('/api/banquet/dishes/detail', this.search).catch((res) => {
                     if (res.code === 1) {
                         this.matchedItems_sc = res.data;
-
-                        console.log(res.data.images)
+                        this.matchedItems_sc.tag_name = res.data.dishesCategory.name;
+                        // console.log(res.data.images)
                         res.data.images.forEach(item => {
                             this.imageList.push({
                                 url: item,
                                 title: '',
                                 poster: item
                             })
+
                         })
                         // console.log(this.imageList)
                     } else {

From 8ad7ee78ce968371d3a12fbef9860b8fb86d5cc4 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Thu, 14 Aug 2025 14:19:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                              |   8 ++++----
 src/pages/banquet/order/detail.vue          |  10 ++++++++--
 src/pages/tab/banquet/cook.vue              |   6 +++---
 src/router/index.ts                         |   2 +-
 src/static/images/tabbar/cook.png           | Bin 0 -> 4014 bytes
 src/static/images/tabbar/cook_selected.png  | Bin 0 -> 4516 bytes
 src/static/images/tabbar/hotel.png          | Bin 0 -> 2212 bytes
 src/static/images/tabbar/hotel_selected.png | Bin 0 -> 2248 bytes
 8 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 src/static/images/tabbar/cook.png
 create mode 100644 src/static/images/tabbar/cook_selected.png
 create mode 100644 src/static/images/tabbar/hotel.png
 create mode 100644 src/static/images/tabbar/hotel_selected.png

diff --git a/src/pages.json b/src/pages.json
index 0afd8d8..ee49d99 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -208,14 +208,14 @@
         "text": "首页"
       },
       {
-        "iconPath": "static/images/tabbar/shouye.png",
-        "selectedIconPath": "static/images/tabbar/shouye_selected.png",
+        "iconPath": "static/images/tabbar/cook.png",
+        "selectedIconPath": "static/images/tabbar/cook_selected.png",
         "pagePath": "pages/tab/banquet/cook",
         "text": "选厨师"
       },
       {
-        "iconPath": "static/images/tabbar/bofang.png",
-        "selectedIconPath": "static/images/tabbar/bofang_selected.png",
+        "iconPath": "static/images/tabbar/hotel.png",
+        "selectedIconPath": "static/images/tabbar/hotel_selected.png",
         "pagePath": "pages/tab/banquet/hotel",
         "text": "选酒店"
       },
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 2ceb5cb..0b64d99 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -158,7 +158,7 @@
       <view>厨师姓名：{{ server_user.public_name }}</view>
       <view>厨师联系方式：{{ server_user.phone }}</view>
       <template #footer>
-        <wd-button size="small" plain>查看详情</wd-button>
+        <wd-button size="small" plain @click="cookDetail( server_user.id)">查看详情</wd-button>
       </template>
     </wd-card>
 
@@ -385,7 +385,13 @@ export default defineComponent({
         }
       });
     },
-
+    //点击详情
+    cookDetail (id: number) {
+      // console.log(id);
+      uni.navigateTo({
+        url: `/pages/banquet/cook/detail?id=${id}`
+      });
+    },
 
   },
 
diff --git a/src/pages/tab/banquet/cook.vue b/src/pages/tab/banquet/cook.vue
index 847ab4f..99dbe1a 100644
--- a/src/pages/tab/banquet/cook.vue
+++ b/src/pages/tab/banquet/cook.vue
@@ -17,7 +17,7 @@
 
         <up-cell-group :border="false">
           <view class="detail-box" v-for="(item, index) in matchedItems_sp" :key="index">
-            <u-cell :border="false"  @click="goodsDetail(item.id)">
+            <u-cell :border="false"  @click="cookDetail(item.id)">
               <template #icon>
                 <wd-img :width="100" :height="100" :src="item.avatar" :enable-preview="false" :radius="8" :round=false
                   custom-class="margin-right-24" />
@@ -132,10 +132,10 @@ export default defineComponent({
 
     },
     //点击详情
-    goodsDetail (id: number) {
+    cookDetail (id: number) {
       // console.log(id);
       uni.navigateTo({
-        url: `/pages/banquet/cook/detail?id=${id}&is_add=1`
+        url: `/pages/banquet/cook/detail?id=${id}`
       });
     },
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 9029a64..c84f1f3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import pagesJson from '@/pages.json';
 
 // 路径常量
-export const HOME_PATH = '/pages/tab/home/index';
+export const HOME_PATH = '/pages/tab/banquet/index';
 export const LOGIN_PATH = '/pages/common/login/index';
 export const ERROR404_PATH = '/pages/common/404/index';
 
diff --git a/src/static/images/tabbar/cook.png b/src/static/images/tabbar/cook.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b3de55398c21ffd67a052d90a790486563b6f0a
GIT binary patch
literal 4014
zcmcgv=U3BBw+)a8p@v9Pia#VERg@kCNstmEy$L}PrB~@7JRk%S5FShdDowyhsG&)(
zqJ*aOE=Unkq(&*CC~)Jt_fNR*`{B&2wP*I;=bV`@C&}E@kc<5^I|u~gGQ#LtGWOoT
z!FGbNmfKb2GB&0lOG8~y#h}P42*l%Iq=&W+cig<8J?N?m54l>y^b#t>B$vUJG7d{K
zRpPCR>yz@)%&`HD$g|+&@B1ai5Mulba_PHT4Jk4UD=X^<)%2#(qRNjgI-$=rLrUL9
z(=T7u@?gT{d&augaw(uVY86oU;Y%K|EF1(Nm<JaFe$F$@>@1LvPkI0EwHq{MM6Z6#
z7nL4))c-4xs5pE^@R8#2jnuWhO`YvK3%oZsRuPF@i~iAnv|ed%jitk*#k5hRKRatb
z=x4;*phNTq5OnlTnc)yvyuFe4)_u;lp?CLxrQTmvwLiX#z`QDt80;_j*}URH2|{Ju
zvBH`QmA*5QNCVDsg<pM^&!>#Bm^xM7To5*%DX$o*xOn#!Lr-aoSHg=aLEpNEe*MZW
z-$JG|X5w-)5q?~$9`a7F&vW`GRWVc&x~;M3-!EupdgR(enOQZJf<8PJdqa>G&3{}(
z01i*A+i(umN<HFT*2WHL^-SOS4ss^}Q2^><s#l5!5!vwALReHrwEK`h`B(i(0?-4F
zeGwHzSg(X7MW*xIP=v)Bx-!8FHsOh_KteDTl@jq`KM{|N3iSpE(&~&?c_|koR6g#q
z=fOe#XQ9}_7SS%7X+&7a-j}A#$lQEYBvr;5>sjzV6L1wQ3M>Cu^uX03pWZkfYG!h|
zWP|9Nl@0nC)THB+<!sP2vIg#JI}ZF#1y|Mv8Ij=D8kYq=5JJa$OiM?$n<P|!DNuI3
zv8$b?3FUqG_&!QQ3l&3{cf5D5aCJe3a!<84fI_b0M?`E+Ybw&k>`3xuFc&qMt=QCJ
z*1+qV8rUYc>D$Pcdgs{4r!}$e>YLikTQ+?}-vSfTpB%~2sbX+b1M1q8fa})pLTQnA
zJ8x%}E6tkrbRd&ekvsQZblB>!*Yym^P+qC9@3#gh-IJ!eSDyBRWWV6v@GQ`Re=W=r
z{ukJvdE~l#>ahQcoUY>yq*sEbcTr#qM{mvYd=&<~I!6!w5r_I}J26W$;zrKbW0XdJ
zY?VlKDp(tcCob34;ri_o2pCMD$T<oBjfkkP#)rdck|{8MEY@a$mJRHC{hRrKG?M{p
zcI33WxVxn8`+mz<_>Y){?s!}-n0VIehlF0p#`$OVjcxond?3X(f-6Q#VXv*BZG{tR
zmfe#KOv+7-e(B6y3qG9)@f!|YwnrD*#5Hdz{QxlD!c9-a5lSz&gq#bkYln=j9PGO?
zv)p|O8_KBAQA=)<gvX~r#h2U)?-ZfzHg3yw3{VAe&y>qS5gyT3@wMbm<4==mk2~~y
z<J`A}8c?FaZiYW4NEvE2^3b#Tft#A3&Az}`tW`<(oNt>P#Yz3ra9#8Dn!J;`XsurH
zk{&8PQ2S}F&QkODiw^o1mTa9-m#W$up2Xul>R9P$$Fc;^<tFt;t|PzaXEPCdhWAx_
zrFF?Bu*xoEX#y9Ef;Cuq#IAVbB|#0nCY_45FF;bYn-_JWNRJ;n<y%UTbNM~sG`WXY
zN4oLpMQy$#!WdcdgeNJN(mYyW1gn%jU!LVX7-aD(SIx&rzm}Oqx!tBrc=9Q{g!PN{
z$+UH`vBu$6i#f`;PtjC61y|+GODl^*@TQf0IRF!LY~==&Y<Riw;iZPp97_ZP4%!=N
zC*{ZFg=oh5Dr`#>G2_aAnyicLvy$(+$tq<7^D?G~nLLHpLJLY}tCYijVQVfJt-GBp
zP$RiMlpqHE__OiBx9yzKX2<}@l{7gJ3Jh_>*LiMQW@`AT>hIP1siC#3M9cyYn%#1W
z$}ah+PG~x3&O7EB!RUNFX*mJc$HNe7+zuv{rt5`M+RD(S%q7hB<siRyzlOoF3DJ6`
z_z0Z(SkfAwp?3?~%<xLk(+<roFC9y7ywihH&pCN~xS{{hR%V-UcN957Pq45eYjWUh
zqT#Z%@8`_<u8?baM0<C59o<A>+?}`J{BRNXOO}-^AgioVw6kefW*(f0D`xa3FcvnC
z!P7pv+&Jk$FRU2TgzJ5Sc$+UZI=2$-oS);42Q3NB<}XbHsOY4XCjkZpGd5nvR=!+5
z0%%5N4z}KxCi3m-Gd?xCr4YwokG>J~!W(zq6U3*R;7gDmoOupje6H8}*g5LDJI;e+
zS;Ymrcy78c4xL*Bk?o?oynph&YdP^f44T?8#;l5VgB*F@oLOw+UV?JxZF)1U21$Qp
zBR6NQdf%%lS}{oIo~`Sb`uGi)Sky}PEKOGBHfV@;5p|-@E>G?}`_-BSSP7QYu`#ps
zH}4xe8?*_kJETgyXy&<7c(SZ+rrWon|1qLh!@4w?#^`o6Uej;V?ivaB6ke<VA2f}#
zPNoF>RtS)UDxF9>=xKGAP3%c<?e0HKmxa4<rfGU-;_`=VVILH|vf|J4rWTiN$nk<L
zgdH&3LmA#fO<2{oQ2;|zDGP32<#pp8ycdo%9uIiJG~B{pp6lodL)^}y)SJ1(k^b5I
ze25v`(})NP8YVNao%&!+Nh?-b4o3SO$%<9ZZqxU1Bj%oS`Z2NlEVb#)0Vi}6`em~g
zr#)Uj;SJM^XsFwJs*(Oh3N04YKKb5)kG6ZLd>R}ZJAkNS`OV*669$1KjmBJz+NTJh
z3vhZSC+Gy)?@t|~B93ItBh>9xo8hs`j&e*CBUs6c&m*U;=lUl<9g42#`L{=Q?mB)_
ziY&ACWHZ4pB1a?3zl%q|gS1GOye6_#pkQ=AClm8&s~w0o{oANiA}yi-SE_hVQ0w9W
z4ik(oj@}>FUWJExEW*=#^s<4B#PN`-3PZBs+6eUa;n8c7vgO>ZN&Y&3O=?}!NPI$B
z+21fYedAMGBaWwq`-0R+%Ltb$SA{LulSq5ZOTBsFeP8l^k-jagau@rCbNNE~Ed}UV
z1t9A)Nk+0#diu(fUT{gWGsoWJUZzW>^}*${t)n|AxRA)Jcb#Par=wbX=P^8&nD5x8
zk6-y+rYD(mz4z8gmlqK{(t24QbGG~qv%l8tPGTug*QT;_Z2RC=rt6>AtnyaW?T?07
zeDgAe)PNo7D_zveved)dRp1&dWv7iDs=03rBm+WxnC-4HoyGh;q7j+*{d)0NZru*P
zt6l@%D%Pq0bhHAG%;PZ59-nhAz}R(*`;5u8<L_$3k_rHUbz4JP%p*G$=4KL~8AOJa
zEvc(My*a!G39yo<!cHcQo~1m^F%-wNsY*Mmltl(V5~|oUu!i(~(v%%lvVhs6(oaP;
z;SlJz>S-z3#JAZ1o4L@Hqrl|Ae)m4&&G>H?63+&Q*ol@CPWl#v!0UwYaVfYR<>Ia3
zjougckytum=3~3^Sc`zY7IgF_Q@18ImCD!gjjc!N%CJ}eF1Yv$k{3#1oxPGyy6|F7
zQG+d4k`hL_?FsM70y5}3v#pXVLjQg-oGU&+B15>1QnaRf!7@qAtR#^}wF8fLKZ;Mh
z9U4X?L(ms`sQrfZT2{bROQFNEFqd1=xYP0yKO6q;=czKL#hfwh&Y>!0_jRJU-&8&(
zUP2TJJ9~ya-#?W+@$7{KxuNiUNMS)@v|HX7F~X%TT(u-xi|M=b(+XWegl#4wuPFV<
z@$kD(i<%%cGo7SAr1xGx_imJda~%%%TV`zR)cs=z>}ro!U`^6dMwppKqz!(#<Z5L6
zARMvqTUv4iV9QN*PgN61{eV7DarApO6p=esu>e)^Sipl<l@&z<^%bI5_^#G?(1mS|
z?fo6cks5AweUdhn`_tuHH`mTIZ6^3{7@I&&36F$SlJQ_#E;xyW9SUbn-j@(ZFU9EM
zX|M5Mdoaf&Fo?21=P*f&nL(1`Ap9=8^2PrL<>P5gsMAme=}e(rK$X+OIyM30>YP|I
zUW28BPmUX8Ts_%|XJ1M=#ZNm0lEsLCih=c8Xh=YJ3i}c#h#$cXvL@_R<>NJ+4Ilw0
zV%XuVAlcpsJ9Bi-#TN_>6eNiS#P6d0*D&L64u1_}*k6hXSi{`=86e0Uy#zu*?0Gn3
z6P4W<Aj2R4l#iz-Kp2k743J@<!MOF`OoN2~lVf>Mxzkwj^QR6a{W4X`6t5A9*MqHy
zfBzm2!NA<Z07fm1JK=EJsWXfK!4Ya8IQocac_8_tszGEf&kB2diwn--P=EK+;_Ij3
z-LIDpF&KhIJ^=`*0?-1l@%qim=6}m=B#E(tDhew9^Y!Mdk{Tw?TsD$vOV!!fH0a&j
zLW>{DP{97%-|exh3Hi=*ckS{D)7urL5`lQ9y4~u3QZp<|q1z$Y)z72FROC-Vv(5*b
zJF)+J$b$BAf;E9S$K)NRs8(|d%oE(;5{jr_HAJKSC~D0!gz#n{^jo>Mlz4$X=xbTg
z%<`;N)y|R_2ZqTjdDlz$$-={6zC_n*Q_0l;de91HxkI#J72ziyr=B92*^>tw$d{rT
z4HBQXo{s&ReQp*H>{UMwr0c;z6K9R2*qa>y_C6(pCyIHvrlGuzgoV*+eq<=N8e5f$
zAq~Zq5~QOLvA9J;%j9kDS)%hbyptp7qzvjt+HMngD1ye!rULXlNv>(3*r`?_&7>^E
z0)8C@jYxu#_1dB5FekV@1+68EIA)o>E?gumP1xYRUK7WxssrroCL##qYztQjmgDFk
ze#>;Jrn6{Hy!@H!WC(_EgRrb+&6qBWGajqYbuq@x^O!&}SpfiT-TyXw>oybIMG%4H
z;b+W2vTmPE!m2^gmmH*=golg|#b2{s*kTt0eh)DkyuzR+KD56(c7vg{fk&)7XHfOJ
zsI9B#8Cs!e(vCTUO1^D7A1uhwY61H07Bi?87v=6WCqs@{?^91eWU8xo7y~%SNZ(Yi
ILe~lZKP;U%v;Y7A

literal 0
HcmV?d00001

diff --git a/src/static/images/tabbar/cook_selected.png b/src/static/images/tabbar/cook_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c09f86502fc05d03d2445a07b7c978fd79e19eeb
GIT binary patch
literal 4516
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
CSW<}q

literal 0
HcmV?d00001

diff --git a/src/static/images/tabbar/hotel.png b/src/static/images/tabbar/hotel.png
new file mode 100644
index 0000000000000000000000000000000000000000..dad056fd7be3b012622b6fc1c154b73be25e2c4f
GIT binary patch
literal 2212
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-ahlfg{e-#WAEJ
z?(N*%yxVRJtk)Cx9^FxPc{<s|&U5l)6I;*FfbT2xl~xEolHkZX^;lIiDBs<oPNd>=
zf2DQorMB?$qx~!@23`;R%!DQ!uwY~@Ec1B41f;4w931B`3$0Loz!h}-Y+$cIzy!Ch
zZ)UGKG(2R@-A$bw9HlgG-Cm=-K%w-G%vBCX*32at`J4M1nywTUhbXg%ESb1y?^!D*
z8fxA!OQH6Dz24G4ab7#?|Am*c_pMU=5aLy7HP`Pqzr5X_t@q!b|Nr*6C{wujlgrEf
z>+jsXTf4FMt$@W`zj%?SU+vaudEEbAU-#esdgap(n{AnXuX`;Q>szP$EUU@JK4>oM
z$IXFE&!;{qu&BBF;_2F=$Z)}w?YHmB_aCnh-|6iCOOI*!<(Cf&EZ*EV)v%}$b*y>6
zW2NL4`L>4-m#wQf*uA$4=(_*0UN?0s<mIZ|m<}7nq{f}8IN2@xN=xC_K6~9VcDaf&
zrr7JXUsC_FUt7!ZY3-Cx=im5NA24Lf|GVKyp+sA;`q}zzN*%2+g<4IbckSl=4w#_r
zcV_JzFUJaDu0xSWRYY6DS1Qa2^$BvUm^yR>Ha6M3XRrBJG;j95lGyL1?_&8xTl_mC
z9D#xIUTwa@i8r?!v^ttZSS9DPa4k~cDoW(j=x73>0&YE(TK1W&kBitNAFbwyajb|3
zdV1}okO`q1_Rk4%y!Q0}vzww%d|kTPCb3q&_D&LGwZ49^J+WfW>j?Y)$I4>rQraBu
z7vg}S^_<esDq00eduu*+-&h`Ws;<*sNm@JHF=?6Y{)y6JPoDeQmBxNI_#Pj%&n>|5
z$DS@vHjW^_<(H=)e)ysEWspcp<{@dDx+aCCQ<f)6*y;6#J5E#EbMSFHM^Ia0M9n|F
zx~9*6W<;G}dw#<={?Zk@uo}<*t-G7<d@;H6?x;4$`(vUlo4Y)<IMy4537Gdu&u0l{
zz4^B6`|-zx$CpQje%k(C|IzdN+k5J2j;wn0D|y22Bwh6rEm0o=KFwRKAo2WvGcZ_%
zmz_U-;fA{oYoGw@P6r1^5f?|1C0TqvwVvy(URtyN<ol$(;dr9NzP*zl9^Ikcp?yN;
z^U3lFmKu5$Jz?g3#jKHatdWo3i>8Gyz1sU&Bqh-?ZT?C}_Ajz6(<Og*92ML$Jw)K%
z&ZdGeLr>O+p;{d2qLV`e;+E1yAa#vGo{YI2C(uiGEZ!ZG2@n8z@}XFa$1%I4ovS<h
zBZ?&!DHI39e2{pTWyE)VZ>74AO}Ie#1kTIPQ&#|eDk5&v2J-UE25arUGt8`k6PB_R
zKHf2L=hObmpOfSV+JEp+JjV6tSmEQzz{opNyHW29BgmV90(l2pQ{E^~yZ!G+hiSVa
zml69>*8Yd<)E*bywa7bkq?omkb*4dWT-&auGmeD^lXo=jXqv;hqwvlN8(=s^dV$i@
z%;<kJrtAOQ*dHO|SPhK7x!QD%Ke+$sn`}t1)=zB7``_o6PU*-messg<9!KNJ__xay
z%r9-39_i}fxN3vt3Q;DmOJ0}nrHeAMt~~T?K^U;s)b_2O9}27&xn?&<DK1c0Yx1@>
zOfVvT!ri>`dK<a&(CP0LICVT0yx#S<Zh!r(qOOzs*=H6N9rsFj%_5TWnzyocwNSu>
z(2v!h)(QtqSZn^|>sl`d$FQUCPj2^faNKrp!u9Q1jI5EO`_=DTF|yvQa*n&d3aByk
g&%7E64EV>KH`&QCVBW(@V6%h4)78&qol`;+0G73xumAu6

literal 0
HcmV?d00001

diff --git a/src/static/images/tabbar/hotel_selected.png b/src/static/images/tabbar/hotel_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..e646e0189db86ce0a50a92cd08c2015d01c162d9
GIT binary patch
literal 2248
zcmdT`i#JqT7(b(vdrYar2*q$FBB>M=*K-b|F>VG^9^Dv)ZV%H)3Xw;Lm`s{sQtK*Y
z(skt-<&{UNDLss<JSxvT@=EeZMVEW(uKO3<)m`1S_Wpi*t^M2kTi^HF-}?4xCnjB<
zxPk}(fIP#F#=^1g%Y<Zco9CXNh65pxMYjg>rRqZf0AUOox+8==n(DyPG6qhq5=Cza
z=4Ge2bi;5l@sjpk2BL5J8V+#Xfxg{PO$YXRY`2-a|2m<fjb#;H9Kp(|$y!<-CnhhL
zM}U)g;7Se-qaYm9K{!dqVU$1s_bjC%0zlVJ!+7gvYXDuLm(un`D+)Q@uG$O{zyq24
zxkds2>kIJNp#{R3iQ@8la~UY<L4tDvOcid8f4yZALcZN$>PA#~X_m^y*mUdoI7;l@
z%6_9Yd@6ASer9^AjObYGRq>(2)Gtj|cGOcS>3z|VzJ4ZyP$DXq+!$KmT>Y|@y>RE}
z@!n(GhP(~Uva(P8<`QaJ*0<?X@K6}3Z<2m3q@yYA;`4egGl^SWnex1d?)jDt?rb+$
z(i?1`Nv|U5XvR>9#UgHJp6strb|?J_)doI@DY5^#LpsLPxzX)>p+W_fYC1+PqG$+0
zb+=ino^1Pc#9-FDaG}7Ykxjj1l@>k|^0+1&wsR~FHqVXZ<`7ZV8RJ*|{U5S9m$M5d
z^XAtw^gM&;!N%Kb8YnGZafp&3?ZSk*f9fDKVQdd3mL@yG=+t@z+P=La8eC-$Htu|(
ztw1YKM31^|VStS}G&nWcK@pu=^IcP(x(e$*2xC;U<|XEl_j5A3j_?pjQK~7mG(8d6
ztXe>@g+WwE4g*jeVOr^K`qSy<F#`9tT?1fa2MVXUBx*MxwuLopCG^om<m50kp(A!)
z02!|7oD*r;MaG8zQn<`_GWl8f?Iy#L*}2xo8LhQOJZ6(COh&`-Jekq|b)FtpV{0{-
z2Ht08=WRK}kxl%Z4YityhxAoYPDxdSmS|bu<8@rx@wC*%e_lB6rNu*Ls*4y*wh*=^
zzOpg)VkdYKu`>>3wV%kKoL;WK;QZMA`+UTQlz%v45o!&UPWBJZ22U;GOw+rp*R=bH
z*sLzgc#F*WI8$s}s9MXd5U}yqtAF%=>I$>fOT$T1%6$<5s!P%Y?+=|%yi^~-)AM|@
z;vqeEalTjVJ6F*-IONPX-*H@u!pjHdqah5jC}|jRY7@BQOQ<Lsz%7Q@wP*~^3e%1?
z`m5hFs<Vo^dT#x#E4MEC`<59=<!a>&??v=1_l4rMq>aP;UK4byB^nZ-u3HCNm2w<~
zl<qR=9V1@nT5K?vlLU#~P9vuJ7qziLmz6x}Bc0PoXfh-&E@G_Yu~&U-N(uI^r)=~h
z{))8U84p2Xze0-xVP8Y6TO#u%Vhq_C7PSv1t7%?8>S~)*Ila#;h|TWs`DsFdFL3{w
z8>W!5`mD(hx{$7&YH#zEN|UoBUtapI5<K3+9s}JJPk-g_p!Rm*60}b{L?KWuzc=U&
z0k0Z-bYNr#u5D#AUOG0a7-Hk39<ZeIU=ex!m}L0+xCv^4hH}zdGcNtT!-Sba=T5%l
ztHurM+DI`f4=50}7`=Sw$Bz~~cEzZiSZlulF5$p`CgK0X(X_Jf_~B3mpUM^khN8?Y
zMaZgnbM`HF#zP*R`NN0PjJL|+P<M|5G7zhRkngpb0A^QcD7&Qq*g0<0h?@g|UdxY@
zB<n;WSJk>_Tu8s$2xldGOhPR4Q<V6AqT7>qu7!2w&9<Ky>x!N#H}Ro3nc-JdQCi&2
z0hp4cLE@(yh1@j0HxsW&6^cKWhu~d3b2`@D%Nh5mWTjG&3Sdp0@QA)WfX4R>^xPy-
zg)h~-!)@gdJLk_Hl|eWy%qF*BH38I%Pv^HX0ra3h@BOk>QHbq$;P^|NHY$I;S`5y~
X4AzZv(W3(l{A&U*Y?-ut>)qI2j4-?-

literal 0
HcmV?d00001