From 69ae00ba9e9c31e71304caa09deb82cbd2c0a61f Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Mon, 4 Dec 2023 17:37:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mod(custom):=20=E5=9B=9E=E9=80=80=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8F=90=E7=8E=B0=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/admin/withdrawal/index.vue | 3 +-- src/pages/index/index.vue | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue index 1c8f499..b6bf3a6 100644 --- a/src/pages/admin/withdrawal/index.vue +++ b/src/pages/admin/withdrawal/index.vue @@ -107,8 +107,7 @@ const getData = async () => { }); data.value = res.data.data || []; pagination.value.totalItems = res.data.total; - row.value = res.data.data.integral || 0; - console.log(res); + row.value = res.data.integral || 0; } catch (e) { throw e; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b020915..42de51b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -62,19 +62,18 @@ interface SwiperList { const swiperList = ref>>([]); const userMenuList = ref([ - { - id: 1, - label: "活动游戏", - url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`, - icon: "//jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png", - }, - { - id: 2, - label: "活动商品", - // url: "/pages/hotGoods/index/index", - url: "", - icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png", - }, + // { + // id: 1, + // label: "活动游戏", + // url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`, + // icon: "//jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png", + // }, + // { + // id: 2, + // label: "活动商品", + // url: "/pages/hotGoods/index/index", + // icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png", + // }, { id: 3, label: "商户入驻", From 1499f25121dde976021f48bd5a82220e553f099c Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Mon, 4 Dec 2023 18:18:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(custom):=20=E4=BF=AE=E5=A4=8D=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/admin/withdrawal/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue index b6bf3a6..f885ff6 100644 --- a/src/pages/admin/withdrawal/index.vue +++ b/src/pages/admin/withdrawal/index.vue @@ -103,7 +103,7 @@ const getData = async () => { const res = await getWithdrawList({ PageNum: pagination.value.page, PageSize: pagination.value.showPageSize, - Bid: user_info.bid, + Bid: user_info.data.bid, }); data.value = res.data.data || []; pagination.value.totalItems = res.data.total; From 4bfc3539bcbe7c61f1a7bcf9be477e054e4eea99 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Mon, 4 Dec 2023 21:31:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(custom):=20=E4=BF=AE=E5=A4=8D=E8=8B=A5?= =?UTF-8?q?=E5=B9=B2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/pages/admin/withdrawal/index.vue | 2 +- src/pages/product/list/index.vue | 2 +- src/pages/users/user_setting/index.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4bb9387..16f27ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jdt-user", - "version": "3.0.1", + "version": "3.0.2", "private": true, "description": "", "templateInfo": { @@ -9,7 +9,7 @@ "css": "sass" }, "taroConfig": { - "version": "3.0.1" + "version": "3.0.2" }, "scripts": { "build:weapp": "taro build --type weapp", diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue index f885ff6..5241768 100644 --- a/src/pages/admin/withdrawal/index.vue +++ b/src/pages/admin/withdrawal/index.vue @@ -121,7 +121,7 @@ const add = async () => { icon: "none", }); const res = await addWithdraw({ - Bid: user_info.bid, + Bid: user_info.data.bid, Number: Number(basicData.value.num), }); Taro.showToast({ diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue index d5a57a7..d087d75 100644 --- a/src/pages/product/list/index.vue +++ b/src/pages/product/list/index.vue @@ -28,7 +28,7 @@ const getData = async () => { const mey_type = Taro.getStorageSync("mer_type"); const user_info = Taro.getStorageSync("userInfo"); const res = await productList({ - bid: user_info.bid, + bid: user_info.data.bid, BType: mey_type, }); console.log(res); diff --git a/src/pages/users/user_setting/index.vue b/src/pages/users/user_setting/index.vue index 3ef655f..1bdc0de 100644 --- a/src/pages/users/user_setting/index.vue +++ b/src/pages/users/user_setting/index.vue @@ -1,7 +1,7 @@