diff --git a/index.html b/index.html index 2ef6934..2f148ee 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ + + diff --git a/src/pages/integrated/visitor/invitation-record.vue b/src/pages/integrated/visitor/invitation-record.vue index fe7e308..8ff27ff 100644 --- a/src/pages/integrated/visitor/invitation-record.vue +++ b/src/pages/integrated/visitor/invitation-record.vue @@ -113,7 +113,7 @@ - 邀约记录 + 访客记录 @@ -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) } 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/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/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/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 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 @@ + + + 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 @@