Browse Source

Merge branches '2025北京诚祥' and '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

tanxue 2 months ago
parent
commit
12c1d9544a

+ 1 - 1
pages.json

@@ -20,7 +20,7 @@
 		}, {
 			"path": "pages/admin/Jiazheng/index",
 			"style": {
-				"navigationBarTitleText": "家政"
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/admin/Jiazheng/jiazhengUserInfo",

+ 6 - 2
pages/Login/components/loginBox.vue

@@ -32,8 +32,8 @@
 	import passwordLli from "@/components/password-lli/password-lli.vue";
 	import {ref} from "vue"
 	import {toast} from "@/utils/common";
-	const userName = ref('17600168661') // 用户名
-	const password = ref('121045') // 密码
+	const userName = ref('18640920672') // 用户名
+	const password = ref('123') // 密码
 	const lliPassword = ref('') // 加密后的密码
 	const passLLiRef = ref(null)
 	const showPassword= ref(true)
@@ -116,7 +116,11 @@
 		// 客户端
 		// #ifdef H5
 		uni.navigateTo({
+<<<<<<< Updated upstream
 			url: `/pages/client/ShowYe/shouye`
+=======
+			url: `/pages/admin/Jiazheng/index`
+>>>>>>> Stashed changes
 		})
 		// #endif
 		

+ 59 - 18
pages/admin/Jiazheng/index.vue

@@ -1,7 +1,11 @@
 <template>
 	<view>
 		<view class="jiazheng-uni-list">
-
+			<view class="icon-title-navBar-box">
+				<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>
+			</view>
 			<view class="jiazheng-search-box">
 
 				<view @click="clickAlltype" class="select-item-box">
@@ -26,12 +30,12 @@
 						<text>录入时间</text>
 						<icon :class="luruJtClass" />
 					</view>
-					<uni-icons type="search" size="16" color="#000" @click="toggle('top')"></uni-icons>
+
 				</view>
 
 			</view>
 
-			<view class="wgy" @click="lookUserInfo" >
+			<view class="wgy" @click="lookUserInfo">
 				<view>
 					<view>王一一123</view>
 					<view>分享阿斯蒂芬</view>
@@ -52,7 +56,20 @@
 				<!-- 普通弹窗 -->
 				<uni-popup ref="popup" background-color="#fff">
 					<view>
-						asdfdsfadsf阿萨德发生的发的顺丰
+						<view>
+							<uni-section title="全部" type="line">
+								<view class="uni-px-5 uni-pb-5">
+									<uni-data-select v-model="value" :localdata="range"
+										@change="change"></uni-data-select>
+								</view>
+								<view class="phone-search-box">
+									<input class="search-input" placeholder="请输入职业名称" v-model="zyName" />
+									<view class="search-icon" @click="handleSearch">
+										<uni-icons type="search" size="24" color="#fff"></uni-icons>
+									</view>
+								</view>
+							</uni-section>
+						</view>
 					</view>
 				</uni-popup>
 			</view>
@@ -67,7 +84,9 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
-	import{getJiazhengList} from "@/api/jiazheng.js"
+	import {
+		getJiazhengList
+	} from "@/api/jiazheng.js"
 	// import {
 	// 	DropdownList
 	// } from "./data.js";
@@ -90,6 +109,22 @@
 		},
 	]
 
+	let range = ref([{
+			"value": 0,
+			"text": "篮球",
+			"disable": true
+		},
+		{
+			"value": 1,
+			"text": "足球"
+		},
+		{
+			"value": 2,
+			"text": "游泳"
+		}
+	])
+	let zyName = ref('')
+	let value = ref(0)
 	let isOpen = ref(false)
 	let typeChecked = ref(1)
 	const popup = ref(null);
@@ -102,8 +137,8 @@
 	const onSelectCell = (data, index) => {
 		console.log('data', data);
 		console.log('index', index);
-	//	isOpen.value = false;
-	//	allJtClass = 'select-jt-click'
+		//	isOpen.value = false;
+		//	allJtClass = 'select-jt-click'
 	}
 	const toggle = (data, index) => {
 		popup.value.open('top')
@@ -113,18 +148,24 @@
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo`
 		})
 	}
-	function getDataList(){
-		let req  ={
-			 "leixing": "",
-			  "page": 1,
-			  "realName": "",
-			  "size": 10,
-			  "sortRule": 0,
-			  "sortType": 0,
-			  "userName": ""
+	function change(){
+		
+	}
+	function handleSearch(){
+		
+	}
+	function getDataList() {
+		let req = {
+			"leixing": "",
+			"page": 1,
+			"realName": "",
+			"size": 10,
+			"sortRule": 0,
+			"sortType": 0,
+			"userName": ""
 		}
-		getJiazhengList(req).then(res=>{
-			console.log('res',res);
+		getJiazhengList(req).then(res => {
+			console.log('res', res);
 		})
 	}
 	onLoad(() => {

+ 5 - 5
unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,13 +1,13 @@
 {
-  "hash": "93b9454e",
-  "configHash": "a15962cf",
-  "lockfileHash": "0e1b2b91",
-  "browserHash": "69f6d216",
+  "hash": "e4126def",
+  "configHash": "ee829940",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "3202c580",
   "optimized": {
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "003ad07b",
+      "fileHash": "850f551d",
       "needsInterop": true
     }
   },