From 6f9d49f08812cfd94d8a017af1f8793789831269 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 7 Jan 2025 13:07:46 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=95=86=E5=BA=97=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 6 +- src/pages/humanFace/list.vue | 2 +- src/pages/shop/components/number-box.vue | 225 ---------- src/pages/shop/components/product-car.vue | 88 ++-- src/pages/shop/components/product-row.vue | 20 +- src/pages/shop/components/product-sku.vue | 186 ++++++++ src/pages/shop/components/product-spec.vue | 127 ------ src/pages/shop/components/product-total.vue | 88 ++-- src/pages/shop/components/select-sku.vue | 1 + src/pages/shop/detail.vue | 454 +++++++++----------- src/pages/shop/product-detail.vue | 1 - src/static/tabbar/shop-select.png | Bin 0 -> 1058 bytes src/static/tabbar/shop.png | Bin 0 -> 1059 bytes 13 files changed, 478 insertions(+), 720 deletions(-) delete mode 100644 src/pages/shop/components/number-box.vue create mode 100644 src/pages/shop/components/product-sku.vue delete mode 100644 src/pages/shop/components/product-spec.vue create mode 100644 src/static/tabbar/shop-select.png create mode 100644 src/static/tabbar/shop.png diff --git a/src/pages.json b/src/pages.json index c8c4dfd..0b9d6f6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -275,9 +275,9 @@ }, { "pagePath": "pages/tabbar/shop", - "text": "商店", - "iconPath": "static/tabbar/home.png", - "selectedIconPath": "static/tabbar/home-select.png" + "text": "超市", + "iconPath": "static/tabbar/shop.png", + "selectedIconPath": "static/tabbar/shop-select.png" }, { "pagePath": "pages/tabbar/order", diff --git a/src/pages/humanFace/list.vue b/src/pages/humanFace/list.vue index 5d0d08f..e9250da 100644 --- a/src/pages/humanFace/list.vue +++ b/src/pages/humanFace/list.vue @@ -17,7 +17,7 @@ - + {{ v.username }} 修改 diff --git a/src/pages/shop/components/number-box.vue b/src/pages/shop/components/number-box.vue deleted file mode 100644 index 0b57fe4..0000000 --- a/src/pages/shop/components/number-box.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - diff --git a/src/pages/shop/components/product-car.vue b/src/pages/shop/components/product-car.vue index 6235c7b..1f949eb 100644 --- a/src/pages/shop/components/product-car.vue +++ b/src/pages/shop/components/product-car.vue @@ -1,51 +1,3 @@ - - - + diff --git a/src/pages/shop/components/product-row.vue b/src/pages/shop/components/product-row.vue index af8b839..ca11654 100644 --- a/src/pages/shop/components/product-row.vue +++ b/src/pages/shop/components/product-row.vue @@ -17,7 +17,7 @@ 加入购物车 @@ -26,25 +26,24 @@ diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue new file mode 100644 index 0000000..c317f69 --- /dev/null +++ b/src/pages/shop/components/product-sku.vue @@ -0,0 +1,186 @@ + + + diff --git a/src/pages/shop/components/product-spec.vue b/src/pages/shop/components/product-spec.vue deleted file mode 100644 index aff3498..0000000 --- a/src/pages/shop/components/product-spec.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - - diff --git a/src/pages/shop/components/product-total.vue b/src/pages/shop/components/product-total.vue index 8a5aef4..76e4e26 100644 --- a/src/pages/shop/components/product-total.vue +++ b/src/pages/shop/components/product-total.vue @@ -1,59 +1,37 @@ - - - - \ No newline at end of file + diff --git a/src/pages/shop/components/select-sku.vue b/src/pages/shop/components/select-sku.vue index 79a66dc..304e7c1 100644 --- a/src/pages/shop/components/select-sku.vue +++ b/src/pages/shop/components/select-sku.vue @@ -70,6 +70,7 @@ + diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 8c6fbf3..9b5d871 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -1,204 +1,3 @@ - - + + diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 774930b..5f8f6b3 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -55,6 +55,8 @@ const getUserInfo = () => { const userStorage = uni.getStorageSync(userInfoKey); if (!isEmpty(userStorage)) { state.userInfo = userStorage; + console.log(state.userInfo,"state.userInfo"); + } }; @@ -97,7 +99,16 @@ const doLogin = async (loginType, token, accountId, sessionId) => { } }; +const toService = async (v:any)=>{ + const isLogin = await hooks.useCheckLogin(); + if(isLogin){ + router.jump(v.router) + } +} + const doLogout = async () => { + const isLogin = await hooks.useCheckLogin(); + if(!isLogin) return uni.showLoading({ title: "退出登录中...", mask: true, @@ -115,15 +126,15 @@ const doLogout = async () => {