From 293cb7ac20008022a0f851bb0ea3e03b95240c00 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 26 Sep 2025 17:19:58 +0800 Subject: [PATCH 1/7] --- src/pages/tabbar/flowStatistics.vue | 2 +- src/pages/tabbar/~canteen.vue | 99 ++++++ src/pages/tabbar/~individualOrder.vue | 435 ++++++++++++++++++++++++++ 3 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 src/pages/tabbar/~canteen.vue create mode 100644 src/pages/tabbar/~individualOrder.vue diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue index ed3bdfc..1eb7139 100644 --- a/src/pages/tabbar/flowStatistics.vue +++ b/src/pages/tabbar/flowStatistics.vue @@ -80,7 +80,7 @@ - + 每月流水合计 diff --git a/src/pages/tabbar/~canteen.vue b/src/pages/tabbar/~canteen.vue new file mode 100644 index 0000000..2a1a35b --- /dev/null +++ b/src/pages/tabbar/~canteen.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/pages/tabbar/~individualOrder.vue b/src/pages/tabbar/~individualOrder.vue new file mode 100644 index 0000000..8767494 --- /dev/null +++ b/src/pages/tabbar/~individualOrder.vue @@ -0,0 +1,435 @@ + + + From 71803eabe8bc4df726882a2474317021209209e6 Mon Sep 17 00:00:00 2001 From: weiwei Date: Sun, 28 Sep 2025 10:12:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:tree-node=E5=88=A4=E6=96=AD=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=88=86=E7=B1=BB=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0picUrl=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/prosperity-shop/categary-manage.vue | 18 ++++++------- src/sheep/components/node-tree.vue | 26 +++++++++++++------ src/sheep/components/shop-categary-picker.vue | 8 ++++-- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/pages/prosperity-shop/categary-manage.vue b/src/pages/prosperity-shop/categary-manage.vue index 5c3208a..bddec77 100644 --- a/src/pages/prosperity-shop/categary-manage.vue +++ b/src/pages/prosperity-shop/categary-manage.vue @@ -46,12 +46,12 @@ { label: '下架', value: '1' }, ]" :key="index" - > + /> 父级分类 - + 分类图 ({ picUrl: [], }) const categoryTree = ref([]) -const selectedNode = ref({}) +const selectedNodeId = ref("") const { categoryList, getGoodsCategory, delCategary } = useCategaryManage() @@ -113,28 +113,28 @@ const addCategary = () => { parentId: "", picUrl: [], }) - selectedNode.value = {} + selectedNodeId.value = "" categaryFormDrawer.value = true } // 编辑分类 const editCategary = (item) => { getCategaryTree() - const picUrl = [{ path: filePath(item.picUrl), response: JSON.stringify({ data: { url: item.picUrl } }) }] + const picUrl = item.picUrl ? [{ path: filePath(item.picUrl), response: JSON.stringify({ data: { url: item.picUrl } }) }] : [] Object.assign(form, { ...item, picUrl }) - selectedNode.value = { id: item.parentId } + selectedNodeId.value = item.parentId categaryFormDrawer.value = true } // 提交保存 const saveCategary = async () => { if (!form.name) return uni.showToast({ title: "请填写分类名称", icon: "none" }) - if (selectedNode.value.id === form.id) return uni.showToast({ title: "父级分类不能是自己", icon: "none" }) + if (selectedNodeId.value === form.id) return uni.showToast({ title: "父级分类不能是自己", icon: "none" }) try { const params = { ...form, - parentId: selectedNode.value.id, - picUrl: JSON.parse(form.picUrl[0].response).data.url, + parentId: selectedNodeId.value, + picUrl: form.picUrl?.length ? JSON.parse(form.picUrl[0].response).data.url : "", } uni.showLoading({ title: "保存中..." }) const { code, msg } = await (form.id ? prosperityShopApi.editCategary(params) : prosperityShopApi.addCategary(params)) diff --git a/src/sheep/components/node-tree.vue b/src/sheep/components/node-tree.vue index 4c9f844..8a698d1 100644 --- a/src/sheep/components/node-tree.vue +++ b/src/sheep/components/node-tree.vue @@ -3,7 +3,7 @@ @@ -11,10 +11,10 @@ @@ -22,19 +22,29 @@ @@ -44,7 +54,7 @@ const getLevel = (level) => { overflow: hidden; } .tree-item { - border: 4rpx solid #e4e7ed77; + border: 4rpx solid #e4e7ed; margin-bottom: 16rpx; display: flex; align-items: center; diff --git a/src/sheep/components/shop-categary-picker.vue b/src/sheep/components/shop-categary-picker.vue index 8c94128..bd271e4 100644 --- a/src/sheep/components/shop-categary-picker.vue +++ b/src/sheep/components/shop-categary-picker.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/integrated/visitor/invitation.vue b/src/pages/integrated/visitor/invitation.vue index 3d0b105..c36186e 100644 --- a/src/pages/integrated/visitor/invitation.vue +++ b/src/pages/integrated/visitor/invitation.vue @@ -69,7 +69,7 @@ - 提交 + 提 交 @@ -112,7 +112,7 @@ - 邀约记录 + 访客记录 diff --git a/src/sheep/components/time-range-picker.vue b/src/sheep/components/time-range-picker.vue index f50aa82..d0fd7ab 100644 --- a/src/sheep/components/time-range-picker.vue +++ b/src/sheep/components/time-range-picker.vue @@ -12,14 +12,16 @@ - + 取消 @@ -101,6 +103,7 @@ function onConfirm() { border-radius: 12rpx; text-align: center; white-space: nowrap; + transition: all 0.1s linear; } .date-time-range .active { background: #0779fd; @@ -113,17 +116,7 @@ function onConfirm() { gap: 10rpx; margin-bottom: 20rpx; } -.day-time-point-list button { - flex: 1 0 calc(100vw / 9); - padding: 6rpx; - border: none; - background: #eeeeee; - border-radius: 12rpx; - font-size: 26rpx; - cursor: pointer; -} -.day-time-point-list .active { - background-color: #0779fd; - color: white; +.day-time-button { + flex: 1 0 calc(100vw / 4); } From 83c8f2d18d817af7a5ba21d52de565faf8d68297 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 29 Sep 2025 09:16:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.html b/index.html index 2ef6934..e8746f8 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ + + From 7a246ef802f29e2612a12a7094ed4a7a34377560 Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 29 Sep 2025 09:49:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=82=80=E7=BA=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95tab=E5=88=87=E6=8D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/integrated/visitor/invitation-record.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/integrated/visitor/invitation-record.vue b/src/pages/integrated/visitor/invitation-record.vue index 698380f..8ff27ff 100644 --- a/src/pages/integrated/visitor/invitation-record.vue +++ b/src/pages/integrated/visitor/invitation-record.vue @@ -163,8 +163,8 @@ const query = (page: number, pagesize: number) => { pageHook.startPage(page, pagesize, false, state.params) } -const onTabChange = (e: number) => { - state.params.type = e +const onTabChange = (index: number, value: number) => { + state.params.type = value pageRef.value.reload(true) } From 0c619d29c0c936d13d2fa1ddd08fd4dd6dfd33d6 Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 29 Sep 2025 09:53:47 +0800 Subject: [PATCH 6/7] chore:debugger --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index e8746f8..2f148ee 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - + - --> From 7cdfe541bc50476467513ae040a086200cde6d5b Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 30 Sep 2025 17:54:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=B1=E5=AF=8C?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/tabbar/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue index da83688..762b7b0 100644 --- a/src/pages/tabbar/index.vue +++ b/src/pages/tabbar/index.vue @@ -86,6 +86,10 @@ const jumpByParam = async () => { uni.setStorageSync("launchParam", launchParam) uni.switchTab({ url: "/pages/tabbar/integrated" }) break + case "prosperityShop": // 共富商城 + uni.setStorageSync("launchParam", launchParam) + uni.switchTab({ url: "/pages/tabbar/prosperityShop" }) + break default: uni.hideTabBar() break