From 3a5eae8646f21c6de7e3dcf981bba8af09d0be59 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 17 Apr 2025 11:04:42 +0800 Subject: [PATCH 1/3] 1 --- src/sheep/utils/request.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index 0b8c890..191d41b 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -79,8 +79,7 @@ async function handleShLogin(): Promise { try { uni.showLoading({ title: "登录中...", mask: true }) const userInfo = await (window as any).CP2.getUserInfo() - - if (userInfo.code == 0 || !userInfo.accountId || !userInfo.sessionId) { + if (userInfo.code == 0 || !userInfo.data.accountId || !userInfo.data.sessionId) { uni.showToast({ title: "获取诗画用户信息失败", icon: "none" }) return false } From 587858fc74f1db1fb4a8beceb38da11975bb85fe Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 17 Apr 2025 14:34:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9C=E5=BC=80?= =?UTF-8?q?=E9=97=A8=E6=8B=92=E7=BB=9D=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 + src/pages/cabinet/buy.vue | 13 +- .../tm-collapse-item/tm-collapse-item.vue | 2 +- .../components/tm-collapse/tm-collapse.vue | 151 +++++++++--------- 4 files changed, 92 insertions(+), 81 deletions(-) diff --git a/src/pages.json b/src/pages.json index be1859c..a2b99c1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -328,6 +328,13 @@ "navigationBarTitleText": "选择支付方式", "disableScroll": true } + }, + { + "path": "cabinetList", + "style": { + "navigationBarTitleText": "智能柜列表", + "disableScroll": true + } } ] }, diff --git a/src/pages/cabinet/buy.vue b/src/pages/cabinet/buy.vue index ca08653..0f7d6b4 100644 --- a/src/pages/cabinet/buy.vue +++ b/src/pages/cabinet/buy.vue @@ -82,7 +82,8 @@ height="800rpx" cancelText="拒绝" confirmText="同意" - @confirm="appAuthHardDoorConfirm" + @confirm="appAuthHardDoor(1)" + @cancel="appAuthHardDoor(0)" > {{ state.authDesc }} @@ -166,16 +167,16 @@ const openDoor = async () => { // 支付方式tab改变 const payMethodTabChange = (e: number) => {} -// 确认协议 -const appAuthHardDoorConfirm = async () => { +// 确认或拒绝协议 +const appAuthHardDoor = async (type: 1 | 0) => { try { - uni.showLoading({ title: "授权中", mask: true }) + uni.showLoading({ title: type ? "授权中" : "加载中", mask: true }) const res = await hardApi.appAuthHardDoor({ authId: state.authId, - authStatus: 1, + authStatus: type ? 1 : 0, }) if (res.code == 0) { - uni.showToast({ title: "授权成功", icon: "none" }) + if (type) uni.showToast({ title: "授权成功", icon: "none" }) state.show = false } } catch (error: any) { diff --git a/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue b/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue index 783ac51..c740aca 100644 --- a/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue +++ b/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue @@ -1,5 +1,5 @@ - \ No newline at end of file + From eb57fc50b0ebb793fa3c41b2475675ed9a9b20c3 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 17 Apr 2025 17:48:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9C=E8=A1=A5?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 14 + src/pages/cabinet/buy.vue | 46 +- src/pages/cabinet/cabinetList.vue | 55 ++ src/pages/cabinet/putaway.vue | 129 +++ src/pages/cabinet/replenishment.vue | 87 ++ src/pages/tabbar/my.vue | 1 + src/static/page/加号.svg | 1 + .../tm-ui/components/tm-badge/tm-badge.vue | 321 ++++---- .../components/tm-stepper/tm-stepper.vue | 556 +++++++------ .../tm-ui/components/tm-tabs/tm-tabs.vue | 750 +++++++++--------- 10 files changed, 1148 insertions(+), 812 deletions(-) create mode 100644 src/pages/cabinet/cabinetList.vue create mode 100644 src/pages/cabinet/putaway.vue create mode 100644 src/pages/cabinet/replenishment.vue create mode 100644 src/static/page/加号.svg diff --git a/src/pages.json b/src/pages.json index a2b99c1..a46dbbc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -335,6 +335,20 @@ "navigationBarTitleText": "智能柜列表", "disableScroll": true } + }, + { + "path": "replenishment", + "style": { + "navigationBarTitleText": "商品补货", + "disableScroll": true + } + }, + { + "path": "putaway", + "style": { + "navigationBarTitleText": "商品上架", + "disableScroll": true + } } ] }, diff --git a/src/pages/cabinet/buy.vue b/src/pages/cabinet/buy.vue index 0f7d6b4..e9ad12e 100644 --- a/src/pages/cabinet/buy.vue +++ b/src/pages/cabinet/buy.vue @@ -1,68 +1,50 @@