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] =?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 @@
 				<up-image width="139rpx" height="139rpx" :src="userInfo?.userImage" shape="circle"></up-image>
 				<view class="header-name">
 					<view class="font32 mb20" :style="{color:'#000'}">{{ userInfo?.userName}}</view>
-					<view class="label1">
-						{{ baseInfo.partner_level }}
+					<view class="label1" v-if="userInfo.userHhRole == 1">
+						初级伴宠师
+					</view>
+					<view class="label1" v-if="userInfo.userHhRole == 2">
+						中级伴宠师
+					</view>
+					<view class="label1"v-if="userInfo.userHhRole == 3">
+						高级伴宠师
 					</view>
 					<view class="flex font24">
 						<view :style="{color:'#A55822'}">当前分成比例：
-							<text :style="{color:'#C12525'}">25%</text>
+							<text :style="{color:'#C12525'}">{{baseInfo.partner_new_num}}</text>
 						</view>
 						<view :style="{color:'#A55822'}">晋级后分成比例：
-							<text :style="{color:'#C12525'}">30%</text>
+							<text :style="{color:'#C12525'}">{{baseInfo.partner_upgrade_num}}</text>
 						</view>
 					</view>
 				</view>
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}}
 					</view>
 					<view class="flex-rowl">
-						<view class="label1 mr20">
+						<!-- <view class="label1 mr20">
 							{{ state.baseInfo.partner_level }}
+						</view>
+						 -->
+						<view class="label1" v-if="state.baseInfo.info.userHhRole == 1">
+							初级伴宠师
+						</view>
+						<view class="label1" v-if="state.baseInfo.info.userHhRole == 2">
+							中级伴宠师
+						</view>
+						<view class="label1"v-if="state.baseInfo.info.userHhRole == 3">
+							高级伴宠师
 						</view>
 						<view class="size-22" style="color: #B97132;">
 							已加入合伙人:{{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 @@
 		<view class="have-order-list mt20" v-for="(item,index) in listData" :key="item.id">
 			<view class="have-order-up">
 				<view class="have-order-image flex-rowl">
-					<up-image width="80rpx" height="80rpx" :src="item.userImage" shape="circle"></up-image>
-					<text class="ml20">{{ item.name }}</text>
+					<up-image width="80rpx" height="80rpx" src="https://image.hhlm1688.com/2025/03/287ecbed1d50a141759103f1d776ca063eGroup 213084@2x.png" shape="circle"></up-image>
+					<text class="ml20">{{ item.nickname }}</text>
 				</view>
 				<view class="have-order-image flex-rowr" @click="()=>arrowClick(index)">
 					<text class="mr10 size-22 color-999">{{ item.isShow == true ? '收起' : '展开' }}</text>
@@ -26,7 +26,7 @@
 					最近一次下单
 				</view>
 				<view >
-					{{ item.recentlyPayTime }}
+					{{ item.createTime }}
 				</view>
 			</view>
 			<view class="have-order-time flex-b size-26 color-999" v-show="item.isShow">
@@ -34,7 +34,7 @@
 					累计消费金额
 				</view>
 				<view >
-					￥ {{ item.reward_money }}
+					￥ {{ item.orderAmount.toFixed(2) }}
 				</view>
 			</view>
 			<view class="have-order-time flex-b size-26 color-999" v-show="item.isShow">
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 @@
 	<view class="no-order">
 		<view class="no-order-list mt20" v-for="item in list" :key="item.id">
 			<view class="no-order-image flex-rowl">
-				<up-image width="80rpx" height="80rpx" :src="item.userImage" shape="circle"></up-image>
-				<text class="ml20">{{ item.userName }}</text>
+				<up-image width="80rpx" height="80rpx" src="https://image.hhlm1688.com/2025/03/287ecbed1d50a141759103f1d776ca063eGroup 213084@2x.png" shape="circle"></up-image>
+				<text class="ml20">{{ item.nickname }}</text>
 			</view>
 			<up-line color="#C7C7C7"></up-line>
 			<view class="no-order-time flex-b size-26 color-999">
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 @@
 				<up-image width="120rpx" height="120rpx" :src="state.baseInfo.info.userImage" shape="circle"></up-image>
 				<view class="header-name">
 					<view class="font32 mb20 color-040">{{ state.baseInfo.info.userName }}</view>
-					<view class="label1">
+					<!-- <view class="label1">
 						{{ state.baseInfo.partner_level }}
+					</view> -->
+					<view class="label1" v-if="state.baseInfo.info.userHhRole == 1">
+						初级伴宠师
+					</view>
+					<view class="label1" v-if="state.baseInfo.info.userHhRole == 2">
+						中级伴宠师
+					</view>
+					<view class="label1"v-if="state.baseInfo.info.userHhRole == 3">
+						高级伴宠师
 					</view>
-					<!-- <view class="flex font24">
-						<view style="color: #B97132;">当前分成比例:
-							<text style="color: #CD4732;">25%</text>
+					<view class="flex font24">
+						<view :style="{color:'#A55822'}">当前分成比例：
+							<text :style="{color:'#C12525'}">{{state.baseInfo.partner_new_num}}</text>
 						</view>
-						<view class="ml28" style="color: #B97132;">晋级后分成比例:
-							<text style="color: #CD4732;">30%</text>
+						<view :style="{color:'#A55822'}">晋级后分成比例：
+							<text :style="{color:'#C12525'}">{{state.baseInfo.partner_upgrade_num}}</text>
 						</view>
-					</view> -->
+					</view>
 					<view class="color-a55 size-24 mt16" v-html="state.baseInfo.level_details">
 					</view>
 				</view>
@@ -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 @@
 				<up-image width="140rpx" height="140rpx" :src="state?.baseInfo?.info?.userImage" shape="circle"></up-image>
 				<view class="header-name">
 					<view class="font32 mb20 color-040">{{ state?.baseInfo?.info?.userName }}</view>
-					<view class="label1">
-						{{ state.baseInfo.partner_level }}
+					<view class="label1" v-if="state.baseInfo.info.userHhRole == 1">
+						初级伴宠师
+					</view>
+					<view class="label1" v-if="state.baseInfo.info.userHhRole == 2">
+						中级伴宠师
+					</view>
+					<view class="label1"v-if="state.baseInfo.info.userHhRole == 3">
+						高级伴宠师
+					</view>
+					<view class="size-22" style="color: #B97132;">
+						已加入合伙人:{{state.baseInfo.partner_day}}
 					</view>
 					<view class="flex font24">
 						<view style="color: #B97132;">当前分成比例：