From b7ce6a681a7f3fab511fbeb7c16195ce85ca6128 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Sun, 17 Aug 2025 09:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B4=E5=B8=AD2.0=20=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                        |  8 ++++----
 src/pages.json                  | 16 ++++++---------
 src/pages/tab/banquet/cook.vue  |  2 +-
 src/pages/tab/banquet/hotel.vue |  2 +-
 src/pages/tab/banquet/index.vue | 36 +++++++++++++++++++--------------
 src/pages/tab/user/index.vue    |  5 ++++-
 6 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/env/.env b/env/.env
index 5391e26..3cb2619 100644
--- a/env/.env
+++ b/env/.env
@@ -5,8 +5,8 @@ VITE_APP_TITLE=uniapp-vue3模板项目
 VITE_APP_ENV=development
 
 # 接口地址
-VITE_API_BASE_URL=http://www.caipu.com:8545
-# VITE_API_BASE_URL=https://ceshi-recipeapi.lihaink.cn/
+# VITE_API_BASE_URL=http://www.caipu.com:8545
+VITE_API_BASE_URL=https://ceshi-recipeapi.lihaink.cn/
 
 # 端口号
 VITE_APP_PORT=9527
@@ -15,8 +15,8 @@ VITE_APP_PORT=9527
 VITE_APP_PROXY=true
 
 # API代理前缀 
-VITE_API_PREFIX= http://www.caipu.com:8545
-# VITE_API_PREFIX= https://ceshi-recipeapi.lihaink.cn/
+# VITE_API_PREFIX= http://www.caipu.com:8545
+VITE_API_PREFIX= https://ceshi-recipeapi.lihaink.cn/
 
 # 删除console
 VITE_DROP_CONSOLE=false
diff --git a/src/pages.json b/src/pages.json
index 4e07389..3612980 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,18 +10,17 @@
     }
   },
   "pages": [
-    {
-      "path": "pages/tab/user/index",
-      "style": {
-        "navigationStyle": "custom"
-      },
-      "needLogin": true
-    },
     {
       "path": "pages/tab/banquet/index",
       "style": {
         "navigationBarTitleText": "首页",
         "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tab/user/index",
+      "style": {
+        "navigationStyle": "custom"
       },
       "needLogin": true
     },
@@ -111,12 +110,9 @@
           },
           "needLogin": true
         }
-<<<<<<< HEAD
 
 
 
-=======
->>>>>>> 6e2f3666d3e85e49f3f8dd0aef942f01cb3f8e2b
       ]
     },
     {
diff --git a/src/pages/tab/banquet/cook.vue b/src/pages/tab/banquet/cook.vue
index d172d34..4ab6566 100644
--- a/src/pages/tab/banquet/cook.vue
+++ b/src/pages/tab/banquet/cook.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <up-navbar :autoBack="true" style="font-weight: bold;" leftIcon="arrow-left" :title="`厨师`" titleColor="#303133"
+    <up-navbar   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>
diff --git a/src/pages/tab/banquet/hotel.vue b/src/pages/tab/banquet/hotel.vue
index f479836..622bb03 100644
--- a/src/pages/tab/banquet/hotel.vue
+++ b/src/pages/tab/banquet/hotel.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <up-navbar :autoBack="true" style="font-weight: bold;" leftIcon="arrow-left" :title="`酒店`" titleColor="#303133"
+    <up-navbar  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>
diff --git a/src/pages/tab/banquet/index.vue b/src/pages/tab/banquet/index.vue
index 58d8766..fa1bffc 100644
--- a/src/pages/tab/banquet/index.vue
+++ b/src/pages/tab/banquet/index.vue
@@ -20,21 +20,27 @@
       :placeholder="true" :fixed="true"></up-navbar>
     <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 bg-color="#fbfbfb"  >
-      <wd-grid-item use-slot @click="goTabCook">
-        <image class="wd-grid-item-img"
-          src="https://lihaiim.oss-cn-chengdu.aliyuncs.com/public/uploads/images/20250813/20250813165502085532573.png" />
-        <!-- <view class="text font-bold" >找厨师</view> -->
-      </wd-grid-item>
-      <wd-grid-item use-slot @click="goTabHotel">
-        <image class="wd-grid-item-img"
-          src="https://lihaiim.oss-cn-chengdu.aliyuncs.com/public/uploads/images/20250813/202508131655082b6295503.png" />
-        <!-- <view class="text font-bold">找酒店</view> -->
-      </wd-grid-item>
-      <view   v-for="(item, index) in matchedItems_sp" :key="index" >
+    <wd-grid :gutter="10" :column="2" clickable bg-color="#fbfbfb">
+      <view @click="goTabCook">
+        <wd-grid-item use-slot>
+          <image class="wd-grid-item-img"
+            src="https://lihaiim.oss-cn-chengdu.aliyuncs.com/public/uploads/images/20250813/20250813165502085532573.png" />
+          <!-- <view class="text font-bold" >找厨师</view> -->
+        </wd-grid-item>
+      </view>
+      <view @click="goTabHotel">
+        <wd-grid-item use-slot>
+          <image class="wd-grid-item-img"
+            src="https://lihaiim.oss-cn-chengdu.aliyuncs.com/public/uploads/images/20250813/202508131655082b6295503.png" />
+          <!-- <view class="text font-bold">找酒店</view> -->
+        </wd-grid-item>
+      </view>
+
+      <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 p-2 font-size-28">{{item.certification.public_name}}</view>
+          <image class="wd-grid-item-img-cook"
+            :src="`${item.certification.public_image ? item.certification.public_image : item.avatar}`" />
+          <view class="text font-bold p-2 font-size-28">{{ item.certification.public_name }}</view>
         </wd-grid-item>
       </view>
     </wd-grid>
@@ -126,7 +132,7 @@ export default defineComponent({
       });
     },
 
- 
+
 
   },
 
diff --git a/src/pages/tab/user/index.vue b/src/pages/tab/user/index.vue
index 8ea9e32..654ec85 100644
--- a/src/pages/tab/user/index.vue
+++ b/src/pages/tab/user/index.vue
@@ -1,5 +1,8 @@
 <template>
   <view class="page-wrap p-2">
+    <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 class="detail-box flex bg-white p-4">
       <view class="mr-10rpx">
         <u-avatar :src="userStore.user.avatar" size="70" />
@@ -39,7 +42,7 @@
       <u-button class="p-2" size="large" text="退出登录" type="primary" color="#59CB56" shape="circle"
         custom-style="width:100%;" @click="loginOut" />
     </view>
- 
+
   </view>
 </template>