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

pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -1,8 +1,12 @@
 <template>
-	<view class="upload-btn" @click="showActionSheet">
+	<view v-if="changjingType =='shenfenzheng'" class="upload-btn" @click="showActionSheet">
 		<text>+</text>
 
 	</view>
+	<view v-else class="upload-btn" @click="showActionSheet">
+		<text>+</text>
+	
+	</view>
 	<view v-if="bottomText" class="bottom-text">
 		{{bottomText}}
 	</view>
@@ -16,6 +20,10 @@
 		props: {
 			bottomText: { // 试题序号
 				type: String
+			},
+			changjingType:{
+					type: String,
+					default: ''
 			}
 		},
 		methods: {

pages/admin/Jiazheng/gerenZiliao.vue

@@ -2,6 +2,9 @@
 	<view class="container">
 
 		<view>
+			<view>
+					<jiazhengUpload changjingType="shenfenzheng"></jiazhengUpload>
+			</view>
 			<view class="form-label-input">
 				<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
 				<uni-easyinput type="number" v-model="formData.phone" placeholder="请输入手机号" maxlength="11" />
@@ -99,13 +102,15 @@
 
 <script>
 	import dataChecked from './common/dataChecked.vue';
+		import jiazhengUpload from "./common/jiazhengUpload.vue"
 	import {
 		getJiazhengXueli,
 		getJiazhengHunyin
 	} from "@/api/jiazheng.js";
 	export default {
 		components: {
-			dataChecked
+			dataChecked,
+			jiazhengUpload
 		},
 		data() {
 			return {

pages/admin/Jiazheng/index.vue

@@ -2,6 +2,7 @@
 	<view>
 		<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>
 				<text class="nav-bar-title">+</text>
 				<uni-icons type="search" size="16" color="#000" @click="toggle('top')"></uni-icons>
@@ -22,7 +23,7 @@
 				<view class="jiazheng-search-right">
 					<!--  当前点击 增加 saixuan-active-->
 					<view class="saixuan-item-box saixuan-active">
-						<text>更新时间</text>
+						<text @click="timeClick">更新时间</text>
 						<icon :class="updataJtClass" />
 					</view>
 					<view class="saixuan-item-box">
@@ -148,6 +149,14 @@
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo`
 		})
 	}
+	function goUpPage(){
+		uni.redirectTo({
+			url: `/pages/admin/ShouYe/shouye`
+		})
+	}
+	function timeClick(){
+		
+	}
 	function change(){
 		
 	}