From aed85c92df71b55c18f965c4be8704c68297f747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F?= Date: Tue, 23 Sep 2025 22:27:41 +0800 Subject: [PATCH] . --- .env | 4 +- manifest.json | 6 +- pages.json | 19 +- pages/chat/components/messageInput.vue | 3 +- pages/index/chat.vue | 223 ------------------ pages/index/components/cover-view-tabbar.vue | 75 ++++++ pages/index/index.vue | 152 +++++------- pages/index/list.vue | 5 +- pages/index/user.vue | 50 +++- pages/login/index.vue | 4 +- sheep/api/product/category.js | 15 ++ .../s-custom-navbar/s-custom-navbar.vue | 3 +- sheep/components/s-live-card/s-live-card.vue | 4 +- sheep/router/utils/uni-read-pages-v3.js | 1 + sheep/store/app.js | 24 +- sheep/ui/su-tabbar-item/su-tabbar-item.vue | 21 +- sheep/ui/su-tabbar/su-tabbar.vue | 3 +- static/imgs/login-bg.jpg | Bin 469469 -> 0 bytes static/imgs/login-logo.png | Bin 6408 -> 0 bytes 19 files changed, 238 insertions(+), 374 deletions(-) delete mode 100644 pages/index/chat.vue create mode 100644 pages/index/components/cover-view-tabbar.vue delete mode 100644 static/imgs/login-bg.jpg delete mode 100644 static/imgs/login-logo.png diff --git a/.env b/.env index 62323b3..91212d1 100644 --- a/.env +++ b/.env @@ -2,10 +2,10 @@ SHOPRO_VERSION=v2.4.1 # 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development） -SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn +SHOPRO_BASE_URL=https://puton.huimeimeta.com # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development） -SHOPRO_DEV_BASE_URL=http://114.215.197.144:8080 +SHOPRO_DEV_BASE_URL=https://puton.huimeimeta.com # SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080 ### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48080 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc diff --git a/manifest.json b/manifest.json index c670544..7cc7200 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name": "商城", - "appid": "__UNI__460BC4C", + "name": "美搭", + "appid": "__UNI__085F6F7", "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。", "versionName": "2025.09", "versionCode": "183", @@ -182,7 +182,7 @@ "versionCode": 100 }, "mp-weixin": { - "appid": "wx66186af0759f47c9", + "appid": "wx736793c30c956243", "setting": { "urlCheck": false, "minified": true, diff --git a/pages.json b/pages.json index 7acd702..a10cd06 100644 --- a/pages.json +++ b/pages.json @@ -55,13 +55,13 @@ } }, { - "path": "pages/index/chat", + "path": "pages/index/cart", "style": { - "navigationBarTitleText": "聊天" + "navigationBarTitleText": "购物车" }, "meta": { "sync": true, - "title": "聊天", + "title": "购物车", "group": "商城" } }, @@ -76,17 +76,6 @@ "group": "商城" } }, - { - "path": "pages/index/cart", - "style": { - "navigationBarTitleText": "购物车" - }, - "meta": { - "sync": true, - "title": "购物车", - "group": "商城" - } - }, { "path": "pages/index/login", "style": { @@ -739,7 +728,7 @@ "pagePath": "pages/index/room" }, { - "pagePath": "pages/index/chat" + "pagePath": "pages/index/cart" }, { "pagePath": "pages/index/user" diff --git a/pages/chat/components/messageInput.vue b/pages/chat/components/messageInput.vue index 1c7be68..c538c06 100644 --- a/pages/chat/components/messageInput.vue +++ b/pages/chat/components/messageInput.vue @@ -54,10 +54,9 @@ }, set(newValue) { emits(`update:modelValue`, newValue); - } + }, }); - // 打开工具菜单 function onTools(mode) { emits('onTools', mode); diff --git a/pages/index/chat.vue b/pages/index/chat.vue deleted file mode 100644 index fbe2767..0000000 --- a/pages/index/chat.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - - - diff --git a/pages/index/components/cover-view-tabbar.vue b/pages/index/components/cover-view-tabbar.vue new file mode 100644 index 0000000..132941e --- /dev/null +++ b/pages/index/components/cover-view-tabbar.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 46eb676..200661a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,94 +1,58 @@ - - - - - - - + + + + + diff --git a/pages/index/list.vue b/pages/index/list.vue index ac26dfb..e6c5792 100644 --- a/pages/index/list.vue +++ b/pages/index/list.vue @@ -27,7 +27,7 @@ > {{ sortState.sortList[0].name }} @@ -130,6 +130,8 @@ onLoad(async (params) => { await getCategoryList(); getList(); + + // await CategoryApi.getCategoryTree(); }); const categoryState = reactive({ @@ -155,6 +157,7 @@ sort: 0, order: false, }); + console.log(categoryState.categoryList, 'categoryState.categoryList'); } const sortState = reactive({ diff --git a/pages/index/user.vue b/pages/index/user.vue index b3852ca..91c4a41 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -17,9 +17,14 @@ + + + + + - - + + @@ -30,6 +35,7 @@ import sheep from '@/sheep'; import userAvatarCard from './components/user-avatar-card.vue'; import userTryOn from './components/user-tryOn.vue'; + import AuthUtil from '@/sheep/api/member/auth'; // 隐藏原生tabBar uni.hideTabBar({ @@ -37,6 +43,7 @@ }); const template = computed(() => sheep.$store('app').template.user); + const isLogin = computed(() => sheep.$store('user').isLogin); onShow(() => { sheep.$store('user').updateUserData(); @@ -54,18 +61,51 @@ const pattern = reactive({ icon: 'uni-icons-heart', }); + + const handleLayout = () => { + uni.showModal({ + title: '提示', + content: '确认注销账号？', + success: async function (res) { + if (!res.confirm) { + return; + } + const { code } = await AuthUtil.logout(); + if (code !== 0) { + return; + } + sheep.$store('user').logout(); + sheep.$router.go('/pages/login/index'); + }, + }); + }; diff --git a/pages/login/index.vue b/pages/login/index.vue index 1034631..1a5580d 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -2,7 +2,7 @@