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 @@