Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

common/styles/global/pages.scss

@@ -434,6 +434,8 @@
 		.user-file-picker{
 			.file-picker-image{max-height: 200rpx;max-width: 160rpx;}
 		}
+		.head-icon-box{width: 160rpx;height: 200rpx;margin: 0 auto;
+		background-image: url("@/static/images/my/client-default-icon.png");@include ezy-no-repeat-cover();}
 	}
 	.info-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
 }

pages.json

@@ -25,12 +25,12 @@
 		}, {
 			"path": "pages/admin/Jiazheng/jiazhengUserInfo",
 			"style": {
-				"navigationBarTitleText": "个人信息"
+					"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/admin/Jiazheng/jiazhengUserManager",
 			"style": {
-				"navigationBarTitleText": "家政人员管理"
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="jiazheng-uni-list">
+		<view class="icon-title-navBar-box">
+			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">家政人员信息</text>
+		</view>
 		<view>
 			<img src="" alt="" />
 			<view>上户中</view>
@@ -65,6 +69,11 @@
 		ref
 	} from "vue";
 	
+	function goUpPage(){
+		uni.redirectTo({
+			url:"/pages/admin/ShouYe/shouye"
+		})
+	}
 	function goJiazhengManage(){
 		uni.redirectTo({
 			url:"/pages/admin/Jiazheng/jiazhengUserManager"

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="jiazheng-uni-list">
+		<view class="icon-title-navBar-box">
+			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">家政人员</text>
+		</view>
 		<v-tabs v-model="current" :tabs="tabs" :scroll="false" @change="changeTab"></v-tabs>
 		<view v-show="current ==0">
 			<gerenZiliao></gerenZiliao>
@@ -40,6 +44,11 @@
 		methods: {
 			changeTab(index) {
 				console.log('当前选中的项：' + index)
+			},
+			goUpPage(){
+				uni.redirectTo({
+					url: `/pages/admin/Jiazheng/jiazhengUserInfo`
+				})
 			}
 		}
 	}

pages/client/my/index.vue

@@ -128,7 +128,6 @@
 		getMineLogout().then(res => {
 			console.log(res,'res');
 			toast('退出登录成功')
-			console.log(6666,'666');
 			cacheManager.clearAll();
 			uni.reLaunch({
 				url: '/pages/Login/index'

pages/client/my/myInfo.vue

@@ -7,10 +7,11 @@
 		</view>
 		<!-- 头像 -->
 		<view class="user-img-box">
-			<uni-file-picker limit="1" :del-icon="false" disable-preview :auto-upload="false"
+			<uni-file-picker limit="1" :del-icon="false" disable-preview :auto-upload="false" v-if="data.icon"
 				@select="handleSelect" file-mediatype="image" class="phone-file-picker user-file-picker">
 				<image :src="data.icon" class="file-picker-image"></image>
 			</uni-file-picker>
+			<icon class="head-icon-box" v-else></icon>
 			<!-- <view>图片地址：{{data.icon}}</view> -->
 		</view>
 		<!-- 姓名 -->