From 62e4f07cb033a595bc09ba736c0f769cf5937220 Mon Sep 17 00:00:00 2001
From: longjieli <11918793+longjieli@user.noreply.gitee.com>
Date: Wed, 2 Apr 2025 08:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/date/index.js                                  |  4 +-
 otherPages/authentication/connectAddress/index.vue | 45 ++++++++++++++++++----
 otherPages/authentication/examination/base.vue     |  2 +-
 .../authentication/examination/errorDetail.vue     |  2 +-
 otherPages/authentication/examination/train.vue    |  2 +-
 otherPages/binding/grade/detail.vue                |  4 +-
 otherPages/binding/grade/index.vue                 | 12 +++---
 otherPages/binding/wallet/index.vue                | 14 +++----
 otherPages/binding/withdrawal/index.vue            |  2 +-
 otherPages/myOrdersManage/bond/index.vue           |  2 +-
 otherPages/myOrdersManage/bond/refund.vue          |  2 +-
 otherPages/myOrdersManage/clock/detail.vue         |  2 +-
 otherPages/myOrdersManage/date/detail.vue          | 36 ++++++++++-------
 otherPages/myOrdersManage/service/base.vue         |  2 +-
 otherPages/myOrdersManage/service/dog.vue          |  2 +-
 otherPages/myOrdersManage/transaction/index.vue    |  6 +--
 otherPages/myOrdersManage/withdrawal/index.vue     |  4 +-
 otherPages/orderTakingManage/create/index.vue      |  2 +-
 otherPages/orderTakingManage/detail/index.vue      | 10 ++---
 otherPages/orderTakingManage/evaluate/index.vue    |  4 +-
 otherPages/orderTakingManage/pet/detail.vue        |  2 +-
 otherPages/orderTakingManage/pet/index.vue         |  6 +--
 .../userManage/pet/components/petBaseInfo.vue      |  5 ++-
 .../userManage/pet/components/petHealthInfo.vue    |  2 +-
 otherPages/userManage/pet/index.vue                |  6 +--
 otherPages/userManage/pet/petInfo.vue              |  1 +
 otherPages/userManage/record/index.vue             |  4 +-
 .../myLevel/commponents/levelInfo.vue              |  2 +-
 .../myUser/components/haveOrder.vue                | 16 ++++----
 .../workbenchManage/myUser/components/noOrder.vue  |  4 +-
 otherPages/workbenchManage/myUser/index.vue        |  2 +-
 otherPages/workbenchManage/myWallet/index.vue      | 12 +++---
 pages/login/wxUserInfo.vue                         | 41 ++++++++++----------
 pages/myOrdersManage/index.vue                     | 10 +----
 pages/orderTakingManage/index.vue                  | 10 +----
 pages/userManage/index.vue                         | 17 ++++----
 pages/workbenchManage/index.vue                    |  2 +-
 utils/useMixin.js                                  |  4 +-
 38 files changed, 165 insertions(+), 140 deletions(-)

diff --git a/api/date/index.js b/api/date/index.js
index fcc0cd3..b4e5ae3 100644
--- a/api/date/index.js
+++ b/api/date/index.js
@@ -22,8 +22,8 @@ export function insertOutDate(data) {
 // 接单地址-不接单日期列表数据查询
 export function outDateList() {
   return request({
-    'url': '​/applet/outDate/outDateList',
-    'method': 'get'
+    'url': '/applet/outDate/outDateList',
+    'method': 'get',
   })
 }
 
diff --git a/otherPages/authentication/connectAddress/index.vue b/otherPages/authentication/connectAddress/index.vue
index bf5bbd8..e869ce1 100644
--- a/otherPages/authentication/connectAddress/index.vue
+++ b/otherPages/authentication/connectAddress/index.vue
@@ -43,7 +43,7 @@
 							<image src="@/static/images/ydd/edit.png" mode="widthFix" style="width: 20rpx;"></image>
 							<text class="size-22 color-777 ml10">编辑</text>
 						</view>
-						<view @click="fetchDeleteAddress(item.id)" class="flex-rowl" style="margin-left: 50rpx;">
+						<view @click="clickDelHandle(item.id)" class="flex-rowl" style="margin-left: 50rpx;">
 							<image src="@/static/images/ydd/cancel.png" mode="widthFix" style="width: 20rpx;"></image>
 							<text class="size-22 color-777 ml10">删除</text>
 						</view>
@@ -61,6 +61,14 @@
 			</view>
 		</view>
 	</view>
+
+	<Modal @confirm="confirmDel" @cancel="cancel" ref="modal">
+		<template>
+			<view class="tip">
+				确认要删除此地址?
+			</view>
+		</template>
+	</Modal>
 </template>
 
 <script setup>
@@ -75,8 +83,11 @@
 		getAddressList,
 		deleteAddress
 	} from "@/api/address/address.js"
+	import Modal from "@/components/Modal/index.vue"
 
 	const list = ref([])
+	const modal = ref(null)
+	const deleteId = ref(null);
 
 	const fetchAddressList = async () => {
 		try {
@@ -96,20 +107,22 @@
 	}
 
 	const toAdd = (item) => {
-		if(item) {
+		if (item) {
 			uni.navigateTo({
 				url: `/otherPages/authentication/connectAddress/detail?item=${JSON.stringify(item)}`
 			})
-		}else {
+		} else {
 			uni.navigateTo({
 				url: '/otherPages/authentication/connectAddress/detail'
 			})
 		}
 	}
-	
-	const fetchDeleteAddress = async (id) => {
-		let response = await deleteAddress({ id });
-		if(response.code == 200) {
+
+	const fetchDeleteAddress = async () => {
+		let response = await deleteAddress({
+			id: deleteId.value
+		});
+		if (response.code == 200) {
 			uni.showToast({
 				title: '删除成功!',
 				icon: "none"
@@ -121,6 +134,19 @@
 	onShow(() => {
 		fetchAddressList()
 	})
+
+	const clickDelHandle = (delId) => {
+		modal.value.open();
+		deleteId.value = delId;
+	}
+
+	const cancelDel = () => {
+		// 取消删除回调
+	}
+
+	const confirmDel = () => {
+		fetchDeleteAddress();
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -159,4 +185,9 @@
 		text-overflow: ellipsis; //溢出用省略号显示
 		white-space: nowrap; //溢出不换行
 	}
+
+	.tip {
+		text-align: center;
+		padding: 25rpx 0rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/examination/base.vue b/otherPages/authentication/examination/base.vue
index 411c8fa..1749f77 100644
--- a/otherPages/authentication/examination/base.vue
+++ b/otherPages/authentication/examination/base.vue
@@ -15,7 +15,7 @@
 						选择题
 					</view>
 				</view>
-				<view class="">
+				<view >
 					<questionCard 
 						v-for="(item, qIdx) in list" 
 						:key="`question-${qIdx}`"
diff --git a/otherPages/authentication/examination/errorDetail.vue b/otherPages/authentication/examination/errorDetail.vue
index eb9cec8..ef9fe92 100644
--- a/otherPages/authentication/examination/errorDetail.vue
+++ b/otherPages/authentication/examination/errorDetail.vue
@@ -7,7 +7,7 @@
 					<view class="label size-22 level" :style="{borderRadius:'10rpx'}">
 						{{ group.title }}
 					</view>
-					<view class="">
+					<view >
 						<questionCard 
 							v-for="(item, qIdx) in group.children" 
 							:key="`${gIdx}-question-${qIdx}`"
diff --git a/otherPages/authentication/examination/train.vue b/otherPages/authentication/examination/train.vue
index 8f95ead..28d5593 100644
--- a/otherPages/authentication/examination/train.vue
+++ b/otherPages/authentication/examination/train.vue
@@ -16,7 +16,7 @@
 						主观题
 					</view>
 				</view>
-				<view class="">
+				<view >
 					<questionCard 
 						v-for="(item, qIdx) in list" 
 						:key="`question-${qIdx}`"
diff --git a/otherPages/binding/grade/detail.vue b/otherPages/binding/grade/detail.vue
index 30113c9..7881bba 100644
--- a/otherPages/binding/grade/detail.vue
+++ b/otherPages/binding/grade/detail.vue
@@ -29,12 +29,12 @@
 				<view class="text-item">
 					仍需至少注册
 				</view>
-				<view class="">
+				<view >
 					5人
 				</view>
 			</view>
 		</view>
-		<view class="">
+		<view >
 
 		</view>
 	</view>
diff --git a/otherPages/binding/grade/index.vue b/otherPages/binding/grade/index.vue
index d4e62fd..07cbb77 100644
--- a/otherPages/binding/grade/index.vue
+++ b/otherPages/binding/grade/index.vue
@@ -27,7 +27,7 @@
 			</view>
 			<view class="flex-b margin_top_3">
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						当月注册用户
 					</view>
 					<view class="margin_top_10">
@@ -35,7 +35,7 @@
 					</view>
 				</view>
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						当月下单用户
 					</view>
 					<view class="margin_top_10">
@@ -43,7 +43,7 @@
 					</view>
 				</view>
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						当月有效用户
 					</view>
 					<view class="margin_top_10">
@@ -61,7 +61,7 @@
 			</view>
 			<view class="flex-b margin_top_3">
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						累积注册用户
 					</view>
 					<view class="margin_top_10">
@@ -69,7 +69,7 @@
 					</view>
 				</view>
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						累积下单用户
 					</view>
 					<view class="margin_top_10">
@@ -77,7 +77,7 @@
 					</view>
 				</view>
 				<view class="justify col_999">
-					<view class="">
+					<view >
 						累积有效用户
 					</view>
 					<view class="margin_top_10">
diff --git a/otherPages/binding/wallet/index.vue b/otherPages/binding/wallet/index.vue
index 032f970..a511d74 100644
--- a/otherPages/binding/wallet/index.vue
+++ b/otherPages/binding/wallet/index.vue
@@ -13,10 +13,10 @@
 					初级合伙人
 				</view>
 				<view class="time level">
-					<view class="">
+					<view >
 						当前分成比例:25%
 					</view>
-					<view class="">
+					<view >
 						晋级后分成比例:30%
 					</view>
 				</view>
@@ -24,7 +24,7 @@
 		</view>
 		<view class="top box-size" :style="{borderRadius:'16rpx'}">
 			<view class="level account">
-				<view class="">
+				<view >
 					钱包余额
 				</view>
 				<view class="level text">
@@ -46,18 +46,18 @@
 			</view>
 			<view class="level flex--justify divide">
 				<view class="level">
-					<view class="">
+					<view >
 						本月订单分成:&nbsp;&nbsp;
 					</view>
-					¥<view class="">
+					¥<view >
 						0.00
 					</view>
 				</view>
 				<view class="level">
-					<view class="">
+					<view >
 						累积订单分成:&nbsp;&nbsp;
 					</view>
-					¥<view class="">
+					¥<view >
 						0.00
 					</view>
 				</view>
diff --git a/otherPages/binding/withdrawal/index.vue b/otherPages/binding/withdrawal/index.vue
index c644c68..886cfb9 100644
--- a/otherPages/binding/withdrawal/index.vue
+++ b/otherPages/binding/withdrawal/index.vue
@@ -2,7 +2,7 @@
 	<!-- <div>提现</div> -->
 	<view class="box">
 		<view class="top" :style="{ borderRadius: '16rpx' }">
-			<view class="">
+			<view >
 				提现金额
 			</view>
 			<view class="level">
diff --git a/otherPages/myOrdersManage/bond/index.vue b/otherPages/myOrdersManage/bond/index.vue
index 264ff4e..047637c 100644
--- a/otherPages/myOrdersManage/bond/index.vue
+++ b/otherPages/myOrdersManage/bond/index.vue
@@ -33,7 +33,7 @@
 				履约保证金用于处理轻度违约行为，以及交易纠纷;具体规则可在<text
 					:style="{color:'#FFBF60'}">《履约保证金协议》</text>中查看，如平台有任何私自克扣/乱扣费的情况，可向市场监督局投诉，平台会对违约做出公正的判罚，同时接受公正的处理。
 			</view>
-			<view class="">
+			<view >
 				若在服务过程中由于伴宠师自身原因发生用户的隐私或财产被侵犯等涉及法律相关问题，并不是保证金可以解决的;如若发生恶性事件，平台会坚决走法律程序判定责任并追责，请各位伴宠师严于律己。
 			</view>
 		</view>
diff --git a/otherPages/myOrdersManage/bond/refund.vue b/otherPages/myOrdersManage/bond/refund.vue
index 5a38269..d5bdc7c 100644
--- a/otherPages/myOrdersManage/bond/refund.vue
+++ b/otherPages/myOrdersManage/bond/refund.vue
@@ -3,7 +3,7 @@
 	<view class="container">
 		<view class="top" :style="{ borderRadius: '8rpx' }">
 			<view class="level account">
-				<view class="">
+				<view >
 					账户总览
 				</view>
 			</view>
diff --git a/otherPages/myOrdersManage/clock/detail.vue b/otherPages/myOrdersManage/clock/detail.vue
index 4628073..603c751 100644
--- a/otherPages/myOrdersManage/clock/detail.vue
+++ b/otherPages/myOrdersManage/clock/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- <view>打卡记录</view> -->
 	<view class="container level mt24 box-size">
-		<view class="">
+		<view >
 			<image src="" mode="" :style="{width:'60rpx',height:'52rpx',backgroundColor:'red'}"></image>
 		</view>
 		<view class="ml10">
diff --git a/otherPages/myOrdersManage/date/detail.vue b/otherPages/myOrdersManage/date/detail.vue
index 65b92de..5657cf5 100644
--- a/otherPages/myOrdersManage/date/detail.vue
+++ b/otherPages/myOrdersManage/date/detail.vue
@@ -14,18 +14,18 @@
 		</view>
 
 		<view v-if="selectDateList.length" class="level center">
-			<view class="">
+			<view >
 				<view class="text1" :style="{ textAlign: 'right' }">
 					{{ selectDateList.length }}天
 				</view>
 				共不接单时间
 			</view>
 			<view class="level center_item">
-				<!-- 		<view class="">
-					<up-icon name="edit-pen" color="#2979ff" size="22"></up-icon>
+				<view >
+					<!-- <up-icon name="edit-pen" color="#2979ff" size="22"></up-icon> -->
 					修改
-				</view> -->
-				<view @click="cleanDates" class="">
+				</view>
+				<view @click="cleanDates" >
 					<!-- <up-icon name="trash" color="#2979ff" size="22"></up-icon> -->
 					清空
 				</view>
@@ -67,10 +67,9 @@
 	onLoad((options) => {
 		addressId.value = options.addressId
 	});
-	
+
 	onShow(() => {
-		let response = outDateList();
-		console.log("返回数据",response)
+		getOutDateList();
 	})
 
 	const addressId = ref(0)
@@ -153,18 +152,15 @@
 		groupedDates.value = sortedGroupedDates;
 	}
 
+	// 清除全部
 	const cleanDates = () => {
 		selectDateList.value = [];
 		gruopDate(selectDateList.value);
 	}
 
+	// 提交
 	const submit = async () => {
-		if (!selectDateList.value.length) {
-			return uni.showToast({
-				title: '请选择日期',
-				icon: "none"
-			})
-		} else if (!addressId.value) {
+		if (!addressId.value) {
 			return uni.showToast({
 				title: '地址标识不能为空',
 				icon: "none"
@@ -182,6 +178,18 @@
 			uni.navigateBack(-1);
 		}
 	}
+
+	const getOutDateList = async () => {
+		let response = await outDateList();
+		if (response.code == 200 && response.data) {
+			let list = response.data.filter(item => item.date !== null && item.date !== undefined);
+			list = list.map(item => item.date);
+			// 去除重复日期
+			selectDateList.value = [...new Set(list)];
+			console.log(selectDateList)
+			gruopDate(selectDateList.value);
+		}
+	}
 </script>
 
 <style scoped lang="scss">
diff --git a/otherPages/myOrdersManage/service/base.vue b/otherPages/myOrdersManage/service/base.vue
index 39035a3..e16560a 100644
--- a/otherPages/myOrdersManage/service/base.vue
+++ b/otherPages/myOrdersManage/service/base.vue
@@ -48,7 +48,7 @@
 				</view>
 				<view class="size-30 mt24 flex-between">
 					<view :style="{color:'#999999'}">更换尿垫</view>
-					<view class="">是</view>
+					<view >是</view>
 				</view>
 				<view class="size-30 mt24 flex-between">
 					<view :style="{color:'#999999'}">尿垫更换频率</view>
diff --git a/otherPages/myOrdersManage/service/dog.vue b/otherPages/myOrdersManage/service/dog.vue
index 5ef55ce..d8ed606 100644
--- a/otherPages/myOrdersManage/service/dog.vue
+++ b/otherPages/myOrdersManage/service/dog.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="size-30 mt24 flex-between">
 					<view :style="{color:'#999999'}">下雨天是否遛狗</view>
-					<view class="">是</view>
+					<view >是</view>
 				</view>
 				<view class="size-30 mt32 fw400">
 					狗狗雨具摆放位置
diff --git a/otherPages/myOrdersManage/transaction/index.vue b/otherPages/myOrdersManage/transaction/index.vue
index 35e187c..38a3556 100644
--- a/otherPages/myOrdersManage/transaction/index.vue
+++ b/otherPages/myOrdersManage/transaction/index.vue
@@ -14,8 +14,8 @@
 
 		<view v-for="(item,index) in list" :key="index" class="Recharge flex">
 			<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 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 }}
@@ -26,7 +26,7 @@
 				</view>
 			</view>
 			<view class="text3">
-				{{ item.type == '收入' ? '+' : '-' }}{{ item.amount }}
+				￥{{ item.amount }}
 			</view>
 		</view>
 	</view>
diff --git a/otherPages/myOrdersManage/withdrawal/index.vue b/otherPages/myOrdersManage/withdrawal/index.vue
index ca9e250..0a870fb 100644
--- a/otherPages/myOrdersManage/withdrawal/index.vue
+++ b/otherPages/myOrdersManage/withdrawal/index.vue
@@ -2,7 +2,7 @@
 	<!-- <div>提现</div> -->
 	<view class="box">
 		<view class="top" :style="{ borderRadius: '16rpx' }">
-			<view class="">
+			<view >
 				提现金额
 			</view>
 			<view class="level">
@@ -28,7 +28,7 @@
 			提现
 		</view>
 	</view>
-	<view class="">
+	<view >
 		<!-- <u-popup :show="show" mode="center" @close="close" @open="open"> -->
 	</view>
 </template>
diff --git a/otherPages/orderTakingManage/create/index.vue b/otherPages/orderTakingManage/create/index.vue
index 65bba29..15ded51 100644
--- a/otherPages/orderTakingManage/create/index.vue
+++ b/otherPages/orderTakingManage/create/index.vue
@@ -8,7 +8,7 @@
 			<view class="img">
 				<image src="/static/images/ydd/profile.png" mode="" style="width: 157rpx;height: 157rpx;"
 					:style="{borderRadius:'100rpx'}"></image>
-				<view class="">
+				<view >
 					点击更换头像
 					<view class="top_item">
 						<image src="/static/images/ydd/photograph.png" mode="" style="width: 55rpx;height: 55rpx;"
diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue
index fdd445e..08d2668 100644
--- a/otherPages/orderTakingManage/detail/index.vue
+++ b/otherPages/orderTakingManage/detail/index.vue
@@ -41,7 +41,7 @@
 				<view>
 					服务日期
 				</view>
-				<view class="">
+				<view >
 					12-0，12-08
 				</view>
 			</view>
@@ -51,7 +51,7 @@
 				<view>
 					服务地址
 				</view>
-				<view class="">
+				<view >
 					{{ orderDetail.address }}
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 					<view class="img" :style="{borderRadius:'100rpx'}">
 						<image :src="pet.headImage" mode=""></image>
 					</view>
-					<view class="">
+					<view >
 						<view class="flex name">
 							<view class="name_text">
 								{{ pet.nickName }}
@@ -196,10 +196,10 @@
 							服务宠物
 						</view>
 						<view class="desc">
-							<view class="">
+							<view >
 								中华田园犬
 							</view>
-							<view class="">
+							<view >
 								中华田园犬2
 							</view>
 						</view>
diff --git a/otherPages/orderTakingManage/evaluate/index.vue b/otherPages/orderTakingManage/evaluate/index.vue
index b5d0c5b..822241e 100644
--- a/otherPages/orderTakingManage/evaluate/index.vue
+++ b/otherPages/orderTakingManage/evaluate/index.vue
@@ -19,14 +19,14 @@
 					<view class="name">
 						猫小姐
 					</view>
-					<view class="">
+					<view >
 						<up-rate :count="count" v-model="value" active-color="#FFBF60" gutter="6"></up-rate>
 					</view>
 				</view>
 				<view class="time">
 					{{ item.createTime }}
 				</view>
-				<view class="">
+				<view >
 					{{ item.comment }}
 				</view>
 			</view>
diff --git a/otherPages/orderTakingManage/pet/detail.vue b/otherPages/orderTakingManage/pet/detail.vue
index c9e358d..c4e3458 100644
--- a/otherPages/orderTakingManage/pet/detail.vue
+++ b/otherPages/orderTakingManage/pet/detail.vue
@@ -8,7 +8,7 @@
 			<view class="img">
 				<image :src="petInfo.headImage" mode="" style="width: 157rpx;height: 157rpx;"
 					:style="{borderRadius:'100rpx'}"></image>
-				<!-- <view class="">
+				<!-- <view >
 					点击更换头像
 					<view class="top_item">
 						<image src="/static/images/tabBar/Group 1000001460@2x.png" mode=""
diff --git a/otherPages/orderTakingManage/pet/index.vue b/otherPages/orderTakingManage/pet/index.vue
index f982e14..2eff3e0 100644
--- a/otherPages/orderTakingManage/pet/index.vue
+++ b/otherPages/orderTakingManage/pet/index.vue
@@ -14,18 +14,18 @@
 									{{ item.nickName }}
 								</view>
 								<view class="personal-pet-sex">
-									<img :src="item.sex === 0 ? '../static/images/sex/boy.svg' : '@/static/images/sex/girl.svg'"
+									<img :src="item.sex === 0 ? '../../../static/images/sex/boy.svg' : '../../../static/images/sex/girl.svg'"
 										alt="sex" style="width: 16px;height: 16px;" />
 								</view>
 							</view>
 							<view class="personal-pet-info-3" style="width: 100%;">
-								<view class="ellipsis" style="max-width: 25%;">
+								<view  style="max-width: 25%;">
 									{{ item.type || '未知' }}
 								</view>
 								<view class="personal-pet-info-age" style="max-width: 90px;">
 									{{ item.type || '未知' }}
 								</view>
-								<view class="ellipsis" style="max-width: 25%;">
+								<view  style="max-width: 25%;">
 									{{ item.weight + 'kg' }}
 								</view>
 							</view>
diff --git a/otherPages/userManage/pet/components/petBaseInfo.vue b/otherPages/userManage/pet/components/petBaseInfo.vue
index 90fc18f..2116a0a 100644
--- a/otherPages/userManage/pet/components/petBaseInfo.vue
+++ b/otherPages/userManage/pet/components/petBaseInfo.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view >
 		<view class="personal-pet-basic-info">
 			<view class="personal-pet-info-title border-bottom">
 				宠物基本信息
@@ -70,7 +70,7 @@
 				<view class="personal-pet-breed-btns">
 					<view class="personal-pet-breed-btn">
 						<u-button color="#FFF4E4" @click="breedSelectClose">
-							<view style="color: #FFF4E4;">
+							<view style="color: #A9A9A9;">
 								取消
 							</view>
 						</u-button>
@@ -287,6 +287,7 @@
 		box-sizing: border-box;
 		background-color: #FFFFFF;
 		padding: 20rpx 20rpx 40rpx 20rpx;
+		left: 0;
 		width: 100%;
 		height: 160rpx;
 		position: fixed;
diff --git a/otherPages/userManage/pet/components/petHealthInfo.vue b/otherPages/userManage/pet/components/petHealthInfo.vue
index 964f092..2dc5d5f 100644
--- a/otherPages/userManage/pet/components/petHealthInfo.vue
+++ b/otherPages/userManage/pet/components/petHealthInfo.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="">
+    <view >
         <view class="personal-pet-health-info">
             <view class="personal-pet-info-title border-bottom">
                 宠物健康情况
diff --git a/otherPages/userManage/pet/index.vue b/otherPages/userManage/pet/index.vue
index ca59071..5d04f2c 100644
--- a/otherPages/userManage/pet/index.vue
+++ b/otherPages/userManage/pet/index.vue
@@ -19,13 +19,13 @@
 								</view>
 							</view>
 							<view class="personal-pet-info-3" style="width: 100%;">
-								<view class="" style="max-width: 35%;">
+								<view  style="max-width: 35%;">
 									{{ item.type || '未知' }}
 								</view>
 								<view class="personal-pet-info-age" style="max-width: 90px;">
 									{{ item.age || '未知' }}
 								</view>
-								<view class="" style="max-width: 25%;">
+								<view  style="max-width: 25%;">
 									体重{{ item.weight }}kg
 								</view>
 							</view>
@@ -65,7 +65,7 @@
 			</button>
 		</view>
 
-		<!-- <view class="">
+		<!-- <view >
       <u-picker :showToolbar='false' :show="show" :columns="petTypes" @change="petTypeChange" @cancel="cancel"
         @confirm="confirm"></u-picker>
     </view> -->
diff --git a/otherPages/userManage/pet/petInfo.vue b/otherPages/userManage/pet/petInfo.vue
index bab81b6..e62fed3 100644
--- a/otherPages/userManage/pet/petInfo.vue
+++ b/otherPages/userManage/pet/petInfo.vue
@@ -371,6 +371,7 @@
 
 		.breed-select {
 			background-color: #fff;
+			box-sizing: border-box;
 			width: 100%;
 			padding: 20px;
 			border-radius: 8px 8px 0 0;
diff --git a/otherPages/userManage/record/index.vue b/otherPages/userManage/record/index.vue
index d13e520..52cc16e 100644
--- a/otherPages/userManage/record/index.vue
+++ b/otherPages/userManage/record/index.vue
@@ -31,11 +31,11 @@
 				</view>
 			</view>
 			<view class="flex-rowr">
-				<view class="">
+				<view >
 					<image src="" mode="" :style="{width:'17rpx',height:'19rpx'}"></image>
 				</view>
 				<view class="ml10 mr20" :style="{color:'#707070',fontSize:'22rpx'}">编辑</view>
-				<view class="">
+				<view >
 					<up-icon name="edit-pen" color="#2979ff" size="58"></up-icon>
 				</view>
 				<view class="ml10" :style="{color:'#707070',fontSize:'22rpx'}">删除</view>
diff --git a/otherPages/workbenchManage/myLevel/commponents/levelInfo.vue b/otherPages/workbenchManage/myLevel/commponents/levelInfo.vue
index 7f475f5..0d4b9c6 100644
--- a/otherPages/workbenchManage/myLevel/commponents/levelInfo.vue
+++ b/otherPages/workbenchManage/myLevel/commponents/levelInfo.vue
@@ -10,7 +10,7 @@
 			</view>
 		</view>
 	</view>
-	<view class="">
+	<view >
 		<up-swiper :list="list3" previousMargin="30" nextMargin="30" circular :autoplay="false" radius="10" height="300rpx"
 			@change="swiperChange"></up-swiper>
 	</view>
diff --git a/otherPages/workbenchManage/myUser/components/haveOrder.vue b/otherPages/workbenchManage/myUser/components/haveOrder.vue
index a67cec1..cc3b044 100644
--- a/otherPages/workbenchManage/myUser/components/haveOrder.vue
+++ b/otherPages/workbenchManage/myUser/components/haveOrder.vue
@@ -14,34 +14,34 @@
 			</view>
 			<up-line color="#C7C7C7"></up-line>
 			<view class="have-order-time flex-b size-26 color-999">
-				<view class="">
+				<view >
 					注册时间
 				</view>
-				<view class="">
+				<view >
 					{{ item.createTime }}
 				</view>
 			</view>
 			<view class="have-order-time flex-b size-26 color-999" v-show="item.isShow">
-				<view class="">
+				<view >
 					最近一次下单
 				</view>
-				<view class="">
+				<view >
 					{{ item.recentlyPayTime }}
 				</view>
 			</view>
 			<view class="have-order-time flex-b size-26 color-999" v-show="item.isShow">
-				<view class="">
+				<view >
 					累计消费金额
 				</view>
-				<view class="">
+				<view >
 					￥ {{ item.reward_money }}
 				</view>
 			</view>
 			<view class="have-order-time flex-b size-26 color-999" v-show="item.isShow">
-				<view class="">
+				<view >
 					累计消报酬
 				</view>
-				<view class="">
+				<view >
 					￥ {{ item.accumulate_money }}
 				</view>
 			</view>
diff --git a/otherPages/workbenchManage/myUser/components/noOrder.vue b/otherPages/workbenchManage/myUser/components/noOrder.vue
index 77c87b6..9dfbc68 100644
--- a/otherPages/workbenchManage/myUser/components/noOrder.vue
+++ b/otherPages/workbenchManage/myUser/components/noOrder.vue
@@ -7,10 +7,10 @@
 			</view>
 			<up-line color="#C7C7C7"></up-line>
 			<view class="no-order-time flex-b size-26 color-999">
-				<view class="">
+				<view >
 					注册时间
 				</view>
-				<view class="">
+				<view >
 					{{ item.createTime }}
 				</view>
 			</view>
diff --git a/otherPages/workbenchManage/myUser/index.vue b/otherPages/workbenchManage/myUser/index.vue
index d39ba20..cce2c81 100644
--- a/otherPages/workbenchManage/myUser/index.vue
+++ b/otherPages/workbenchManage/myUser/index.vue
@@ -42,7 +42,7 @@
 						</up-tabs>
 					</view>
 
-					<view class="">
+					<view >
 						<noOrder :list="state.list" v-if="state.state == 0" />
 						<haveOrder :list="state.list" v-if="state.state == 1" />
 					</view>
diff --git a/otherPages/workbenchManage/myWallet/index.vue b/otherPages/workbenchManage/myWallet/index.vue
index f13198b..c449c8d 100644
--- a/otherPages/workbenchManage/myWallet/index.vue
+++ b/otherPages/workbenchManage/myWallet/index.vue
@@ -2,9 +2,9 @@
 	<view class="bind-user">
 		<view class="bind-user-header">
 			<view class="flex mb28 ml20	">
-				<up-image width="140rpx" height="140rpx" :src="state.baseInfo.info.userImage" shape="circle"></up-image>
+				<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="font32 mb20 color-040">{{ state?.baseInfo?.info?.userName }}</view>
 					<view class="label1">
 						{{ state.baseInfo.partner_level }}
 					</view>
@@ -46,18 +46,18 @@
 					</view>
 					<view class="level divide">
 						<view class="level flex-rowl">
-							<view class="">
+							<view >
 								本月订单分成:&nbsp;&nbsp;
 							</view>
-							¥<view class="">
+							¥<view >
 								{{state.baseInfo.new_money}}
 							</view>
 						</view>
 						<view class="level flex-rowl">
-							<view class="">
+							<view >
 								累积订单分成:&nbsp;&nbsp;
 							</view>
-							¥<view class="">
+							¥<view >
 								{{state.baseInfo.old_money}}
 							</view>
 						</view>
diff --git a/pages/login/wxUserInfo.vue b/pages/login/wxUserInfo.vue
index 3670e4e..4c79121 100644
--- a/pages/login/wxUserInfo.vue
+++ b/pages/login/wxUserInfo.vue
@@ -10,36 +10,36 @@
 
 		<button class="chooseAvatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 			<view class="line">
-				<view class="">
+				<view >
 					头像
 				</view>
-				<view class="">
+				<view >
 					<image :src="userInfoForm.headImage" v-if="userInfoForm.headImage"
-						style="width: 60rpx;height: 60rpx;" mode=""></image>
+						style="width: 60rpx;height: 60rpx;border-radius: 50%;" mode=""></image>
 
 					<!-- <image src="../static/auth/headImage.png" v-else style="width: 50rpx;height: 50rpx;" mode=""></image> -->
 				</view>
 			</view>
 		</button>
 		<view class="line">
-			<view class="">
+			<view >
 				昵称
 			</view>
-			<view class="">
+			<view >
 				<input type="nickname" placeholder="请输入昵称" style="text-align: right;" id="nickName"
 					v-model="userInfoForm.nickName" />
 			</view>
 		</view>
 		<view class="line">
-			<view class="">
+			<view >
 				手机号
 			</view>
 
-			<view class="" v-if="userInfoForm.phone">
+			<view  v-if="userInfoForm.phone">
 				<input placeholder="请输入手机号" style="text-align: right;" disabled v-model="userInfoForm.phone" />
 			</view>
 
-			<view class="" v-else>
+			<view  v-else>
 				<button class="getPhoneNumber" open-type="getPhoneNumber" @getphonenumber="getPhone">
 					获取电话号码
 				</button>
@@ -56,7 +56,8 @@
 	import {
 		ref,
 		getCurrentInstance,
-		computed
+		computed,
+		onMounted
 	} from 'vue'
 	import {
 		ossUpload
@@ -78,12 +79,6 @@
 
 	const store = useStore()
 
-	const userInfo = ref({
-		phone: "",
-		nickName: "",
-		headImage: ""
-	})
-
 	const userInfoForm = ref({
 		headImage: '',
 		nickName: '',
@@ -93,15 +88,19 @@
 	const configList = computed(() => {
 		return store.getters.configList
 	})
+	
+	const userInfo = computed(() => {
+		return store.getters.userInfo
+	})
 
 	onShow(() => {
 		// 可以在这里添加 onShow 的逻辑
 	})
 
 	onLoad(() => {
-		userInfoForm.value.phone = userInfo.value.phone || ''
-		userInfoForm.value.nickName = userInfo.value.nickName || ''
-		userInfoForm.value.headImage = userInfo.value.headImage || ''
+		userInfoForm.value.phone = userInfo.value?.userTelephone || ''
+		userInfoForm.value.nickName = userInfo.value?.userName || ''
+		userInfoForm.value.headImage = configList.value?.applet_info?.paramValueImage || ''
 	})
 
 	const onChooseAvatar = (res) => {
@@ -126,6 +125,7 @@
 				properties: ["value"],
 			})
 			.exec((res) => {
+				console.log(res)
 				const nickName = res?.[0]?.value
 				userInfoForm.value.nickName = nickName
 
@@ -152,6 +152,7 @@
 					userTelephone: userInfoForm.value.phone
 				}).then(res => {
 					if (res.code == 200) {
+						store.dispatch("getUserInfo")
 						uni.switchTab({
 							url: "/pages/workbenchManage/index"
 						})
@@ -219,17 +220,15 @@
 		}
 
 		.getPhoneNumber {
-			// all: unset;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			// background: $uni-linear-gradient-btn-color;
-			// background: $uni-color;
 			color: #fff;
 			width: 200rpx;
 			height: 60rpx;
 			border-radius: 30rpx;
 			font-size: 24rpx;
+			background-color: #FFBF60;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/myOrdersManage/index.vue b/pages/myOrdersManage/index.vue
index 95ef21a..6686e8a 100644
--- a/pages/myOrdersManage/index.vue
+++ b/pages/myOrdersManage/index.vue
@@ -50,9 +50,7 @@
 	import {
 		onShow
 	} from "@dcloudio/uni-app"
-	import {
-		getIsLogin
-	} from "@/utils/auth.js"
+	import { getLoginStatus } from "@/utils/useMixin.js"
 	// import personOrder from "./components/personOrder.vue";
 	// import lossOrder from "./components/lossOrder.vue";
 
@@ -62,11 +60,7 @@
 	} from "@/api/order/order.js"
 
 	onShow(() => {
-		if (!getIsLogin()) {
-			uni.navigateTo({
-				url: "/pages/login/index"
-			})
-		}
+		if (!getLoginStatus())return;
 	})
 
 	const current = ref(0)
diff --git a/pages/orderTakingManage/index.vue b/pages/orderTakingManage/index.vue
index 15d2e64..77ce5d2 100644
--- a/pages/orderTakingManage/index.vue
+++ b/pages/orderTakingManage/index.vue
@@ -29,9 +29,7 @@
 	import {
 		onShow
 	} from "@dcloudio/uni-app"
-	import {
-		getIsLogin
-	} from "@/utils/auth.js"
+	import { getLoginStatus } from "@/utils/useMixin.js"
 	import {
 		orderList
 	} from "@/api/receivingHall/index.js"
@@ -67,11 +65,7 @@
 	const orderlist = ref([]);
 
 	onShow(() => {
-		if (!getIsLogin()) {
-			uni.navigateTo({
-				url: "/pages/login/index"
-			})
-		}
+		if (!getLoginStatus()) return;
 		getOrderList();
 	})
 
diff --git a/pages/userManage/index.vue b/pages/userManage/index.vue
index 96e52f5..60ead87 100644
--- a/pages/userManage/index.vue
+++ b/pages/userManage/index.vue
@@ -33,7 +33,7 @@
 									width="68rpx" height="68rpx"></up-image>
 								服务酬劳
 							</view>
-							<view class="mb20">{{ userInfo.price }}</view>
+							<view class="mb20">{{ userInfo.price }}元</view>
 							<view class="flex flex-between but">
 								<view @click="toWithdrawDeposit">提现</view>
 								<view>|</view>
@@ -46,7 +46,7 @@
 									width="68rpx" height="68rpx"></up-image>
 								保证金
 							</view>
-							<view class="mb20">{{ userInfo.baoPrice }}</view>
+							<view class="mb20">{{ userInfo.baoPrice }}元</view>
 							<view @click="toBail" class="but">保证金中心</view>
 						</view>
 					</view>
@@ -139,6 +139,7 @@
 		getToken,
 		removeIsLogin
 	} from "../../utils/auth";
+	import { getLoginStatus } from "@/utils/useMixin.js"
 	import tab from "../../plugins/tab";
 	import Modal from "@/components/Modal/index.vue"
 	import {
@@ -153,12 +154,8 @@
 	} from "@/api/pet/index.js"
 
 	onShow(() => {
-		if (!getIsLogin()) {
-			uni.navigateTo({
-				url: "/pages/login/index"
-			})
-		}
-		getPetList();
+		if (!getLoginStatus()) return;
+		getPet();
 	})
 
 	onMounted(() => {
@@ -221,7 +218,7 @@
 		})
 	}
 
-	const getPetList = async () => {
+	const getPet = async () => {
 		let response = await getpetList();
 		pet.value = response?.data[0] || {};
 	}
@@ -296,6 +293,6 @@
 
 	.tip {
 		text-align: center;
-		padding: 25rpx 0rpx;
+		padding-bottom: 20rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/workbenchManage/index.vue b/pages/workbenchManage/index.vue
index 96f7684..a1d91bb 100644
--- a/pages/workbenchManage/index.vue
+++ b/pages/workbenchManage/index.vue
@@ -46,7 +46,7 @@
 					</view>
 				</view>
 				<!--  申请之后      -->
-				<view class="flex-rowl flex-wrap" v-if="userInfo.userBcs===1">
+				<view class="flex-rowl flex-wrap" v-if="userInfo.userBcs == 1" >
 					<view class="icon-list" v-for="item in iconState.list2" :key="item.id" @click="handleGoto(item)">
 						<up-image class="mb20" :show-loading="true" :src="item.image" width="68rpx"
 							height="68rpx"></up-image>
diff --git a/utils/useMixin.js b/utils/useMixin.js
index 1634525..512da9f 100644
--- a/utils/useMixin.js
+++ b/utils/useMixin.js
@@ -67,8 +67,8 @@ export const getLoginStatus = () => {
     if (getIsLogin() && getToken()) {
         return true
     } else {
-        modal.confirm("请先登录").then(res=>{
-            tab.navigateTo('/pages/login/index')
+        uni.navigateTo({
+        	url: '/pages/login/index'
         })
         return false
     }