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] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=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 @@
 <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,
-		onMounted
-	} from 'vue';
+		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"
 
-	onMounted(() => {
-		getList()
+	onShow(() => {
+		getRunningWater()
 	})
 
-	const getList = () => {
-		getTransactionDetailsList({
-			transactionType: state.transactionType
-		})
+	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;
@@ -122,10 +83,10 @@
 		background-color: #F3F3F3;
 	}
 
-	// .element:hover {
-	// 	background-color: #FFBF60;
-	// 	color: white;
-	// }
+	.active {
+		background-color: #FFBF60;
+		color: white;
+	}
 
 	.income {
 		width: 361rpx;
@@ -141,8 +102,6 @@
 		padding: 3% 3% 0 2%;
 		box-sizing: border-box;
 		justify-content: space-between;
-		// background-color: red;
-
 	}
 
 	.flex {
diff --git a/otherPages/binding/withdrawal/index.vue b/otherPages/binding/withdrawal/index.vue
index bf8aff0..de6d514 100644
--- a/otherPages/binding/withdrawal/index.vue
+++ b/otherPages/binding/withdrawal/index.vue
@@ -42,6 +42,9 @@
 		computed,
 	} from "vue"
 	import { useStore } from 'vuex'
+	import {
+		cashOut
+	} from "@/api/amount/index.js"
 	
 	const store = useStore()
 
@@ -58,6 +61,11 @@
 		if (num.value) {
 			fullName.value = ''
 			inputDialogRef.value.open()
+			
+			
+			
+			
+			
 		} else {
 			uni.showToast({
 				icon: 'error',
@@ -69,11 +77,32 @@
 
 	const dialogInputConfirm = (val) => {
 		if (val) {
-			uni.showToast({
-				icon: 'success',
-				title: '提现成功',
-				duration: 2000
+			
+			
+			//提现接口
+			
+			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()
 			fullName.value = ''
diff --git a/otherPages/myOrdersManage/bond/detail.vue b/otherPages/myOrdersManage/bond/detail.vue
index 1a6aa05..fb2309c 100644
--- a/otherPages/myOrdersManage/bond/detail.vue
+++ b/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 {
diff --git a/otherPages/myOrdersManage/transaction/index.vue b/otherPages/myOrdersManage/transaction/index.vue
index 38a3556..e14fe2b 100644
--- a/otherPages/myOrdersManage/transaction/index.vue
+++ b/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
diff --git a/otherPages/myOrdersManage/withdrawal/index.vue b/otherPages/myOrdersManage/withdrawal/index.vue
index 982d1fd..36fd5dc 100644
--- a/otherPages/myOrdersManage/withdrawal/index.vue
+++ b/otherPages/myOrdersManage/withdrawal/index.vue
@@ -74,15 +74,25 @@
 			})
 		}
 		let response = await cashOut({
-			...form.value,
+			amount:form.value.amount,
 			type: 0,
-			userId: userInfo.value.userId
+			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>
diff --git a/otherPages/userManage/pet/index.vue b/otherPages/userManage/pet/index.vue
index 72d1634..945fa33 100644
--- a/otherPages/userManage/pet/index.vue
+++ b/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
 			})
 		}
 	};
diff --git a/otherPages/userManage/pet/petInfo.vue b/otherPages/userManage/pet/petInfo.vue
index 3cb8aed..86899f0 100644
--- a/otherPages/userManage/pet/petInfo.vue
+++ b/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
 		};