From a9b9b6df9bebb9c6bb4107a514a8d7a362d7db1a Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Sun, 20 Apr 2025 23:23:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- otherPages/workbenchManage/bindUser/index.vue | 14 ++++++--- otherPages/workbenchManage/myLevel/index.vue | 12 +++++++- .../myUser/components/haveOrder.vue | 8 ++--- .../workbenchManage/myUser/components/noOrder.vue | 4 +-- otherPages/workbenchManage/myUser/index.vue | 34 +++++++++++++--------- otherPages/workbenchManage/myWallet/index.vue | 13 +++++++-- 6 files changed, 58 insertions(+), 27 deletions(-) diff --git a/otherPages/workbenchManage/bindUser/index.vue b/otherPages/workbenchManage/bindUser/index.vue index 3467072..b57a332 100644 --- a/otherPages/workbenchManage/bindUser/index.vue +++ b/otherPages/workbenchManage/bindUser/index.vue @@ -5,15 +5,21 @@ {{ userInfo?.userName}} - - {{ baseInfo.partner_level }} + + 初级伴宠师 + + + 中级伴宠师 + + + 高级伴宠师 当前分成比例： - 25% + {{baseInfo.partner_new_num}} 晋级后分成比例： - 30% + {{baseInfo.partner_upgrade_num}} diff --git a/otherPages/workbenchManage/myLevel/index.vue b/otherPages/workbenchManage/myLevel/index.vue index d36be07..9eb89bc 100644 --- a/otherPages/workbenchManage/myLevel/index.vue +++ b/otherPages/workbenchManage/myLevel/index.vue @@ -10,8 +10,18 @@ {{state.baseInfo.info.userName}} - + + + 初级伴宠师 + + + 中级伴宠师 + + + 高级伴宠师 已加入合伙人:{{state.baseInfo.partner_day}} diff --git a/otherPages/workbenchManage/myUser/components/haveOrder.vue b/otherPages/workbenchManage/myUser/components/haveOrder.vue index 6f9e842..68c7a43 100644 --- a/otherPages/workbenchManage/myUser/components/haveOrder.vue +++ b/otherPages/workbenchManage/myUser/components/haveOrder.vue @@ -3,8 +3,8 @@ - - {{ item.name }} + + {{ item.nickname }} {{ item.isShow == true ? '收起' : '展开' }} @@ -26,7 +26,7 @@ 最近一次下单 - {{ item.recentlyPayTime }} + {{ item.createTime }} @@ -34,7 +34,7 @@ 累计消费金额 - ￥ {{ item.reward_money }} + ￥ {{ item.orderAmount.toFixed(2) }} diff --git a/otherPages/workbenchManage/myUser/components/noOrder.vue b/otherPages/workbenchManage/myUser/components/noOrder.vue index 9dfbc68..6493121 100644 --- a/otherPages/workbenchManage/myUser/components/noOrder.vue +++ b/otherPages/workbenchManage/myUser/components/noOrder.vue @@ -2,8 +2,8 @@ - - {{ item.userName }} + + {{ item.nickname }} diff --git a/otherPages/workbenchManage/myUser/index.vue b/otherPages/workbenchManage/myUser/index.vue index 50d14ff..d0f2561 100644 --- a/otherPages/workbenchManage/myUser/index.vue +++ b/otherPages/workbenchManage/myUser/index.vue @@ -5,17 +5,26 @@ {{ state.baseInfo.info.userName }} - + + + 初级伴宠师 + + + 中级伴宠师 + + + 高级伴宠师 - + @@ -134,17 +143,14 @@ const getBaseInfo = () => { }) } const getList = async () => { - const { - code, - data - } = await hhrMyUserList({ + const {content} = await hhrMyUserList({ ...state.page, state: state.state, appUserId: state.info.userId }) - if (code === 200) { - state.list = [...data] - } + // if (code === 200) { + state.list = [...content] + // } } const tabClick = (item) => { state.state = item.index diff --git a/otherPages/workbenchManage/myWallet/index.vue b/otherPages/workbenchManage/myWallet/index.vue index c449c8d..de5ff8f 100644 --- a/otherPages/workbenchManage/myWallet/index.vue +++ b/otherPages/workbenchManage/myWallet/index.vue @@ -5,8 +5,17 @@ {{ state?.baseInfo?.info?.userName }} - - {{ state.baseInfo.partner_level }} + + 初级伴宠师 + + + 中级伴宠师 + + + 高级伴宠师 + + + 已加入合伙人:{{state.baseInfo.partner_day}} 当前分成比例： From e877b7d9bde64a24756bd5ac9f421c46b928209f Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 21 Apr 2025 07:17:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- otherPages/authentication/connectAddress/index.vue | 17 ++- otherPages/authentication/serve/index.vue | 2 +- otherPages/binding/partner/index.vue | 135 +++++++-------------- otherPages/binding/withdrawal/index.vue | 37 +++++- otherPages/myOrdersManage/bond/detail.vue | 135 +++++++++------------ otherPages/myOrdersManage/transaction/index.vue | 5 +- otherPages/myOrdersManage/withdrawal/index.vue | 14 ++- otherPages/userManage/pet/index.vue | 4 +- otherPages/userManage/pet/petInfo.vue | 3 + 9 files changed, 174 insertions(+), 178 deletions(-) diff --git a/otherPages/authentication/connectAddress/index.vue b/otherPages/authentication/connectAddress/index.vue index 1f2af55..0262595 100644 --- a/otherPages/authentication/connectAddress/index.vue +++ b/otherPages/authentication/connectAddress/index.vue @@ -153,10 +153,21 @@ } const toAdd = (item) => { + console.log("item") + console.log(item) if (item) { - uni.navigateTo({ - url: `/otherPages/authentication/connectAddress/detail?addressId=${item.id}` - }) + console.log("item") + console.log(item) + if(item !== undefined){ + uni.navigateTo({ + url: `/otherPages/authentication/connectAddress/detail?addressId=${item.id}` + }) + }else{ + uni.navigateTo({ + url: '/otherPages/authentication/connectAddress/detail' + }) + } + } else { uni.navigateTo({ url: '/otherPages/authentication/connectAddress/detail' diff --git a/otherPages/authentication/serve/index.vue b/otherPages/authentication/serve/index.vue index f113e97..7fa111a 100644 --- a/otherPages/authentication/serve/index.vue +++ b/otherPages/authentication/serve/index.vue @@ -325,7 +325,7 @@ id : form.id, phone: baseFormData.userTelephone, sex: baseFormData.sex == '男' ? 0 : 1, - userBrief: formData.userBrief, + brief: formData.userBrief, experience: formData.experience, petType: form.type.length > 0 ? form.type.join(',') : null, license: serveFormData.serve.join(';'), diff --git a/otherPages/binding/partner/index.vue b/otherPages/binding/partner/index.vue index b0dea59..377b16c 100644 --- a/otherPages/binding/partner/index.vue +++ b/otherPages/binding/partner/index.vue @@ -1,116 +1,77 @@