Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-front

# Conflicts:
#	otherPages/binding/partner/index.vue
#	otherPages/binding/withdrawal/index.vue
#	otherPages/myOrdersManage/withdrawal/index.vue

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'

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(';'),

otherPages/binding/partner/index.vue

@@ -1,121 +1,77 @@
 <template>
-	<!-- <div>合伙人钱包明细</div> -->
+	<!-- <div>交易明细</div> -->
 	<view class="box">
 		<view class="top flex" :style="{ borderRadius: '31.5rpx' }">
-			<view class="income flex element" :style="{ borderRadius: '31.5rpx',backgroundColor: currentTab === 1 ? '#FFBF60' : '#F3F3F3', 
-					color: currentTab === 1 ? 'white' : 'black'  }" @click="tabClick(1)">
+			<view @click="changeTab(0)" :class="{ active : type == 0 }" class="income flex element"
+				:style="{ borderRadius: '31.5rpx' }">
 				收入明细
 			</view>
-			<view class="income flex element" :style="{ borderRadius: '31.5rpx',backgroundColor: currentTab === 2 ? '#FFBF60' : '#F3F3F3', 
-					color: currentTab === 2 ? 'white' : 'black'}" @click="tabClick(2)">
+			<view @click="changeTab(1)" :class="{ active : type == 1 }" class="income flex element"
+				:style="{ borderRadius: '31.5rpx' }">
 				支出明细
 			</view>
 		</view>
 
-		<view class="mt20" v-for="(item,index) in detaliList" :key="index">
-			<view class="Recharge flex mb28">
-				<view class="flex">
-					<!-- <image src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
-						mode=""></image> -->
-					<image :src="icon" mode=""></image>
-					<view class="text1">
-						<view class="text2">
-							{{item.title}}
-						</view>
-						<view>
-							{{item.time}}
-						</view>
+		<view v-for="(item,index) in list" :key="index" class="Recharge flex">
+			<view class="flex">
+				<image style="width: 80rpx;height: 80rpx" src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
+					mode="aspectFill"></image>
+				<view class="text1">
+					<view class="text2">
+						{{ item.title }}
+					</view>
+					<view>
+						{{ item.createTime }}
 					</view>
-				</view>
-				<view class="text3">
-					¥ {{item.amont}}
 				</view>
 			</view>
-			<up-line color="#C7C7C7"></up-line>
+			<view class="text3">
+				￥{{ item.amount }}
+			</view>
 		</view>
 	</view>
-
-
 </template>
 
 <script setup>
 	import {
-		ref,
-		reactive,
-	} from 'vue';
-
-    import {
-        onShow
-    } from "@dcloudio/uni-app"
+		ref
+	} from "vue"
+	import {
+		amountLogList
+	} from "@/api/amount/index.js"
 
 	import {
-		getTransactionDetailsList
-	} from "@/api/home.js"
-
-	const icon = ref('/static/images/levelImage/money.png')
-
-	const detaliList = reactive([
-        // {
-		// 	title: "合伙人推广佣金",
-		// 	time: "2020-12-29 12:54:54",
-		// 	amont: "168.00"
-		// },
-		// {
-		// 	title: "合伙人推广佣金",
-		// 	time: "2020-12-29 12:54:54",
-		// 	amont: "168.00"
-		// },
-	])
-
-	const state = reactive({
-		transactionType: 0
-	})
+		onShow
+	} from "@dcloudio/uni-app"
 
 	onShow(() => {
-		getList()
+		getRunningWater()
 	})
 
-	const getList = async () => {
-		let response = await getTransactionDetailsList({
-			transactionType: state.transactionType
-		})
-		console.log(response)
+	const list = ref([]);
+	const type = ref(0);
+
+	// 获取流水
+	const getRunningWater = async () => {
+		let response = await amountLogList({
+			type: type.value,
+			moneyType:0
+		});
+		if (response.code == 200) {
+			list.value = response.data
+		}
 	}
 
-
-	const currentTab = ref(1);
-
-	const tabClick = (val) => {
-		detaliList.splice(0, detaliList.length)
-		switch (val) {
-			case 1:
-				detaliList.push({
-					title: "合伙人推广佣金",
-					time: "2020-12-29 12:54:54",
-					amont: "168.00"
-				}, {
-					title: "合伙人推广佣金",
-					time: "2020-12-29 12:54:54",
-					amont: "168.00"
-				}, )
-				currentTab.value = val;
-				break;
-			case 2:
-				detaliList.push({
-					title: "提现",
-					time: "2020-12-29 12:54:54",
-					amont: "168.00"
-				}, )
-				currentTab.value = val;
-				break;
-		}
+	const changeTab = (index) => {
+		type.value = index;
+		getRunningWater();
 	}
 </script>
 
 <style scoped lang="scss">
 	.box {
 		width: 750rpx;
-		height: 100vh;
+		height: 1452rpx;
 		background-color: #FFFFFF;
 		padding: 2% 2% 0 2%;
 		box-sizing: border-box;
@@ -127,10 +83,10 @@
 		background-color: #F3F3F3;
 	}
 
-	// .element:hover {
-	// 	background-color: #FFBF60;
-	// 	color: white;
-	// }
+	.active {
+		background-color: #FFBF60;
+		color: white;
+	}
 
 	.income {
 		width: 361rpx;
@@ -146,8 +102,6 @@
 		padding: 3% 3% 0 2%;
 		box-sizing: border-box;
 		justify-content: space-between;
-		// background-color: red;
-
 	}
 
 	.flex {

otherPages/binding/withdrawal/index.vue

@@ -9,8 +9,7 @@
 				<view class="money level">
 					<text>¥</text>
 					<up-input class="amount" placeholderClass="placeInput" placeholder="请输入提现金额" clearable fontSize="34rpx"
-						border="bottom" type="number" color="#FF2742" 
-                        v-model="form.amount"></up-input>
+						border="bottom" type="number" color="#FF2742" v-model="num"></up-input>
 				</view>
 				<!-- <DForm :list="state. " @submit="handleSubmit" /> -->
 			</view>
@@ -32,7 +31,7 @@
 	</view>
 
 	<uni-popup ref="inputDialogRef" type="dialog">
-		<uni-popup-dialog ref="inputClose" mode="input" title="提现" v-model="form.name" placeholder="请输入姓名"
+		<uni-popup-dialog ref="inputClose" mode="input" title="提现" v-model="fullName" placeholder="请输入姓名"
 			@confirm="dialogInputConfirm" @close="close" :before-close="true"></uni-popup-dialog>
 	</uni-popup>
 </template>
@@ -52,21 +51,21 @@
 	const configList = computed(() => {
 		return store.getters.configList
 	})
-	const userInfo = computed(() => {
-		return store.getters.userInfo
-	})
 
-	const form = ref({
-		amount: '',
-        name : '',
-	})
+	const num = ref('');;
+	const fullName = ref('')
 	const inputDialogRef = ref(null)
 	const inputClose =  ref(null)
 	const cashClick = () => {
 		
-		if (form.value.amount) {
-			form.value.name = ''
+		if (num.value) {
+			fullName.value = ''
 			inputDialogRef.value.open()
+			
+			
+			
+			
+			
 		} else {
 			uni.showToast({
 				icon: 'error',
@@ -76,23 +75,37 @@
 		}
 	}
 
-	const dialogInputConfirm = async (val) => {
+	const dialogInputConfirm = (val) => {
 		if (val) {
 			
-            let response = await cashOut({
-                ...form.value,
-                type: 0,
-                userId: userInfo.value.userId
-            })
-            if (response.code == 200) {
-                uni.showToast({
-                    title: response.msg,
-                    icon: "none"
-                })
-            }
-			form.value.name = val
+			
+			//提现接口
+			
+			cashOut({
+				userId: store.state.user.userInfo.userId,
+				amount:num.value,
+				nameValue:val,
+				moneyType:0,
+			}).then(res => {
+				if (res.code == 200) {
+					store.dispatch("getUserInfo")
+					uni.showToast({
+						icon: 'success',
+						title: '提现成功',
+						duration: 2000
+					})
+					uni.navigateTo({
+						url: "/otherPages/workbenchManage/myWallet/index"
+					})
+				}
+			})
+			
+			
+			
+			
+			fullName.value = val
 			inputClose.value.close()
-			form.value.name = ''
+			fullName.value = ''
 		} else {
 			uni.showToast({
 				icon: 'error',
@@ -104,7 +117,7 @@
 
 	const close = () => {
 		inputDialogRef.value.close()	
-		form.value.name = ''
+		fullName.value = ''
 	}
 </script>
 

otherPages/myOrdersManage/bond/detail.vue

@@ -1,86 +1,74 @@
 <template>
-	<!-- <div>保证金明细</div> -->
+	<!-- <div>交易明细</div> -->
 	<view class="box">
 		<view class="top flex" :style="{ borderRadius: '31.5rpx' }">
-			<view 
-				class="income flex element" 
-				v-for="(tab, tIdx) in tabs"
-				:key="`tab-${tIdx}`"
-				:class="[queryParams.status === tab.value ? 'is-active' : '']" 
-			>
-				{{ tab.title }}
+			<view @click="changeTab(0)" :class="{ active : type == 0 }" class="income flex element"
+				:style="{ borderRadius: '31.5rpx' }">
+				收入明细
+			</view>
+			<view @click="changeTab(1)" :class="{ active : type == 1 }" class="income flex element"
+				:style="{ borderRadius: '31.5rpx' }">
+				支出明细
 			</view>
 		</view>
-		<view>
-			<view class="Recharge flex"
-				v-for="(item, index) in list"
-				:key="`record-${index}`"
-			>
-				<view class="flex">
-					<image src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
-						mode=""></image>
-					<view class="text1">
-						<view class="text2">
-							{{ item.title }}
-						</view>
-						<view>
-							{{ item.createTime }}
-						</view>
+
+		<view v-for="(item,index) in list" :key="index" class="Recharge flex">
+			<view class="flex">
+				<image style="width: 80rpx;height: 80rpx" src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
+					mode="aspectFill"></image>
+				<view class="text1">
+					<view class="text2">
+						{{ item.title }}
+					</view>
+					<view>
+						{{ item.createTime }}
 					</view>
 				</view>
-				<view class="text3">
-					{{ `¥${item.price}` }}
-				</view>
+			</view>
+			<view class="text3">
+				￥{{ item.amount }}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-import { reactive } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
-import { usePageList } from "@/utils/pageList";
-
-const tabs = reactive([
-	{
-		title: '收入明细',
-		value: '0',
-	},
-	{
-		title: '支出明细',
-		value: '1',
-	},
-])
-
-// todo
-const { queryParams, list, total, getData } = usePageList()
-
-onShow(() => {
-	list.value = [
-		{
-			title: '提现',
-			price: 168,
-			status: '1',
-			createTime: '2020-12-29 12:54:54'
-		},
-		{
-			title: '提现',
-			price: 168,
-			status: '1',
-			createTime: '2020-12-29 12:54:54'
-		},
-		{
-			title: '提现',
-			price: 168,
-			status: '1',
-			createTime: '2020-12-29 12:54:54'
-		},
-	]
-})
+	import {
+		ref
+	} from "vue"
+	import {
+		amountLogList
+	} from "@/api/amount/index.js"
+
+	import {
+		onShow
+	} from "@dcloudio/uni-app"
+
+	onShow(() => {
+		getRunningWater()
+	})
+
+	const list = ref([]);
+	const type = ref(0);
+
+	// 获取流水
+	const getRunningWater = async () => {
+		let response = await amountLogList({
+			type: type.value,
+			moneyType:2
+		});
+		if (response.code == 200) {
+			list.value = response.data
+		}
+	}
 
+	const changeTab = (index) => {
+		type.value = index;
+		getRunningWater();
+	}
 </script>
 
-<style lang="scss" scoped>
+<style scoped lang="scss">
 	.box {
 		width: 750rpx;
 		height: 1452rpx;
@@ -95,13 +83,9 @@ onShow(() => {
 		background-color: #F3F3F3;
 	}
 
-	.element {
-		border-radius: 32rpx;
-
-		&.is-active {
-			background-color: #FFBF60;
-			color: white;
-		}
+	.active {
+		background-color: #FFBF60;
+		color: white;
 	}
 
 	.income {
@@ -115,10 +99,9 @@ onShow(() => {
 
 
 	.Recharge {
-		padding: 20rpx 0;
+		padding: 3% 3% 0 2%;
 		box-sizing: border-box;
 		justify-content: space-between;
-		border-bottom: 1rpx solid #E0E0E0;
 	}
 
 	.flex {

otherPages/myOrdersManage/transaction/index.vue

@@ -21,7 +21,7 @@
 						{{ item.title }}
 					</view>
 					<view>
-						2020-12-29 12:54:54
+						{{ item.createTime }}
 					</view>
 				</view>
 			</view>
@@ -54,7 +54,8 @@
 	// 获取流水
 	const getRunningWater = async () => {
 		let response = await amountLogList({
-			type: type.value
+			type: type.value,
+			moneyType:1
 		});
 		if (response.code == 200) {
 			list.value = response.data

otherPages/myOrdersManage/withdrawal/index.vue

@@ -0,0 +1,168 @@
+<template>
+	<!-- <div>提现</div> -->
+	<view class="box">
+		<view class="top" :style="{ borderRadius: '16rpx' }">
+			<view >
+				提现金额
+			</view>
+			<view class="level">
+				<view class="money level">
+					<text>¥</text>
+					<input v-model="form.amount" type="digit" />
+				</view>
+				<!-- <DForm :list="state. " @submit="handleSubmit" /> -->
+			</view>
+		</view>
+	</view>
+	<view class="center">
+		<view class="text">
+			提现说明
+		</view>
+		<view>
+			<up-parse :content="configList.withdrawal_statement.paramValueArea" containerStyle="{
+          color: '#707070',
+          fontSize: '30rpx',
+          lineHeight: '45rpx',
+        }"></up-parse>
+		</view>
+		<view @click="handleSubmit" class="buttom level" :style="{ borderRadius: '41rpx' }">
+			提现
+		</view>
+	</view>
+	<view >
+		<!-- <u-popup :show="show" mode="center" @close="close" @open="open"> -->
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		computed
+	} from "vue";
+	import DForm from "@/components/dForm/index.vue"
+	import {
+		cashOut
+	} from "@/api/amount/index.js"
+	import {
+		useStore
+	} from "vuex"
+
+	const state = reactive({
+		list: [{
+			type: "input",
+			key: "提现金额",
+			placeholder: "请输入提现金额",
+		}, ]
+	})
+	const store = useStore();
+	const configList = computed(() => {
+		return store.getters.configList
+	})
+	const userInfo = computed(() => {
+		return store.getters.userInfo
+	})
+	const form = ref({
+		amount: ''
+	})
+
+	const handleSubmit = async (val) => {
+		if (!form.value.amount) {
+			return uni.showToast({
+				title: '请填写提现金额',
+				icon: "none"
+			})
+		}
+		let response = await cashOut({
+			amount:form.value.amount,
+			type: 0,
+			userId: userInfo.value.userId,
+			moneyType:1
+		})
+		if (response.code == 200) {
+			uni.showToast({
+				title: response.msg,
+				icon: "none"
+			})
+			store.dispatch("getUserInfo")
+			uni.showToast({
+				icon: 'success',
+				title: '提现成功',
+				duration: 2000
+			})
+			uni.switchTab({
+				url: "/pages/userManage/index"
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.box {
+		width: 750rpx;
+		height: 180rpx;
+		background-image: linear-gradient(to bottom, #FFBF60, #FFFFFF);
+		padding: 60rpx 24rpx 0 24rpx;
+		box-sizing: border-box;
+	}
+
+	.top {
+		width: 702rpx;
+		height: 227rpx;
+		background-color: #FFFFFF;
+		padding: 24rpx 34rpx 0 34rpx;
+		box-sizing: border-box;
+	}
+
+	.money {
+		width: 550rpx;
+		height: 71rpx;
+		/* background-color: #FFBF60; */
+		color: #FFBF60 !important;
+		font-size: 54rpx !important;
+		;
+		height: 71rpx;
+		/* background-color: #FFBF60; */
+		color: #FFBF60 !important;
+		font-size: 54rpx !important;
+		margin: 3% 0 0 5%;
+	}
+
+	.money input {
+		margin-left: 5%;
+		font-size: 61rpx;
+		height: 71rpx;
+	}
+
+	.center {
+		width: 100%;
+		height: 1265rpx;
+		background-color: #FFFFFF;
+		font-size: 30rpx;
+		color: #707070;
+		padding: 84rpx 0 0 54rpx;
+		box-sizing: border-box;
+		line-height: 45rpx;
+	}
+
+	.text {
+		color: #000000;
+		font-weight: 700;
+		margin-bottom: 30rpx;
+	}
+
+	.buttom {
+		width: 544rpx;
+		height: 89rpx;
+		background-color: #FFBF60;
+		color: #FFFFFF;
+		font-size: 28rpx;
+		line-height: 89rpx;
+		margin: 800rpx 0 0 50rpx;
+		justify-content: center;
+	}
+
+	.level {
+		display: flex;
+	}
+</style>

otherPages/userManage/pet/index.vue

@@ -160,12 +160,12 @@
 		show.value = false;
 		if (petType.value === '猫咪') {
 			uni.navigateTo({
-				url: "/otherPages/userManage/pet/petInfo?petType=0&optionType=add"
+				url: "/otherPages/userManage/pet/petInfo?petType=0&optionType=add&userId="+userInfo.value.userId
 			})
 		}
 		if (petType.value === '狗狗') {
 			uni.navigateTo({
-				url: "/otherPages/userManage/pet/petInfo?petType=1&optionType=add"
+				url: "/otherPages/userManage/pet/petInfo?petType=1&optionType=add&userId="+userInfo.value.userId
 			})
 		}
 	};

otherPages/userManage/pet/petInfo.vue

@@ -68,6 +68,7 @@
 	const loading = ref(false);
 	const fileList = ref([]);
 	const petId = ref('');
+	const userId = ref('');
 	const petType = ref('dog');
 	const optionType = ref('add');
 	const isNewOrder = ref(false);
@@ -94,6 +95,7 @@
 
 	onLoad((option) => {
 		petType.value = option.petType;
+		userId.value = option.userId
 		optionType.value = option.optionType;
 		if (optionType.value === 'edit') {
 			petId.value = option.petId;
@@ -223,6 +225,7 @@
 				petType: petType.value,
 				headImage: headImage.value
 			},
+			userId:userId.value,
 			...petBaseInfo.value,
 			...petHealthInfo.value
 		};

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>

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}}

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">

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">

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>
@@ -137,17 +146,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

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;">当前分成比例：