From bea52580f599aea256f6025562c2e07e7d508608 Mon Sep 17 00:00:00 2001
From: "1263428893@qq.com" <xiao19950303>
Date: Fri, 14 Feb 2025 23:34:22 +0800
Subject: [PATCH] 1

---
 pages/home/index.vue                          |  7 +++-
 pages_subpack/category/index.vue              |  6 ++-
 pages_subpack/enterprise/index.vue            | 58 +++++++++++++++++----------
 pages_subpack/order-detail/index.vue          |  2 +-
 pages_subpack/person/index.vue                | 56 +++++++++++++++++---------
 pages_subpack/wallet/component/recharge.vue   |  3 ++
 pages_subpack/wallet/component/withdrawal.vue |  5 ++-
 7 files changed, 93 insertions(+), 44 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5e2e35b..adba39b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -12,7 +12,7 @@
 				企业/个人端
 			</view> -->
 		</view>
-		<view class="se-px-20 se-pt-10 se-zi-s">
+		<view class="se-px-20 se-pt-10 se-zi-s" @click="onCategory()">
 			<u-search height="40" placeholder="搜索" :showAction="false" v-model="keyword"></u-search>
 		</view>
 		<view class="se-pb-20 se-pt-40 se-zi-s">
@@ -242,6 +242,11 @@
 					url:"/pages_subpack/release/index?status="+event
 				})
 			},
+			onCategory(){
+				uni.navigateTo({
+					url:"/pages_subpack/category/index"
+				})
+			}
 		}
 		
 	}
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
index a594275..9d63494 100644
--- a/pages_subpack/category/index.vue
+++ b/pages_subpack/category/index.vue
@@ -1,5 +1,8 @@
 <template>
-	<view class="se-mt-10">
+	<view class="se-m-10">
+		<view class="se-px-20 se-pt-10 se-zi-s">
+			<u-search height="40" placeholder="搜索" :showAction="true" v-model="keyword"></u-search>
+		</view>
 		<view class="se-m-20 se-br-20 se-bs-b se-bgc-white se-py-20 se-px-30" v-for="(items,indexs) in tList" :key="indexs" @click="onMasterDetail(items)">
 			<view class="se-flex se-flex-h-sb">
 				<view class="se-flex">
@@ -48,6 +51,7 @@
 				tpageSize:20,
 				tList:[],
 				id:null,
+				keyword:""
 			}
 		},
 		onLoad(options) {
diff --git a/pages_subpack/enterprise/index.vue b/pages_subpack/enterprise/index.vue
index 87a31e1..baed9b8 100644
--- a/pages_subpack/enterprise/index.vue
+++ b/pages_subpack/enterprise/index.vue
@@ -67,21 +67,17 @@
 				show:false,
 				indList: [],
 				form: {
+					id:"",
 					role:1,
-					name: 'jerryxiao',
+					name: '',
 					password: '',
-					mobile: '13189698114',
-					company:'小小公司',
+					mobile: '',
+					company:'',
 					idCard:'',
-					address:'湖南长沙岳麓区',
-					industryId:'1865294357074157570',
-					industryName:'建筑',
-					businessLicense: '',
-					businessLicenseFile:[
-						{
-							url:"https://tennis-oss.xzaiyp.top/2024-12-22/cf84422d-dcf7-4efa-82e7-371454eafbee.png"
-						}
-					]
+					address:'',
+					industryId:'',
+					industryName:'',
+					businessLicenseFile:[]
 				},
 				rules: {
 					name: [{
@@ -146,24 +142,44 @@
 		},
 		watch: {
 			
-			fileList(newValue, oldValue) {
-				if (newValue.length > 0) {
-					this.form.file = '有'
-				} else {
-					this.form.file = ''
-				}
-			}
 		},
 		onReady() {
 			this.onIndustryList()
 			this.$refs.uForm.setRules(this.rules)
 		},
+		mounted() {
+			let company = uni.getStorageSync("company")
+			if(company){
+				this.form.id = company.id
+				this.form.name = company.userName
+				this.form.mobile = company.phone
+				this.form.company = company.companyName
+				this.form.address = company.companyAddress
+				this.form.industryId = company.industryId
+				this.form.industryName = company.industryName
+				this.form.businessLicenseFile = this.stringToKeyValueArray(company.businessLicense)
+			}
+		},
 		methods: {
+			stringToKeyValueArray(str, delimiter1 = ',') {
+				if(str){
+					let arro = str.split(delimiter1);
+					let arr = [];
+					arro.forEach(items=>{
+						let obj = {};
+						obj["url"] = items
+						arr.push(obj)
+					})
+					console.info(arr)
+					return arr
+				}else{
+					return []
+				}
+			},
 			handleIndChange(){
 					this.show = true
 			},
 			selectIndClick(event){
-				console.info("selectIndClick",event)
 				this.form.industryId = event.id
 				this.form.industryName = event.name
 				this.show = false
@@ -183,7 +199,7 @@
 					role:that.form.role,
 					phone:that.form.mobile,
 					companyName:that.form.company,
-					companyAddress:that.form.companyAddress,
+					companyAddress:that.form.address,
 					industryId:that.form.industryId,
 					industryName:that.form.industryName,
 					businessLicense:that.form.businessLicenseFile.map(item => item.url).join(','),
diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue
index a6969c2..0d7a50b 100644
--- a/pages_subpack/order-detail/index.vue
+++ b/pages_subpack/order-detail/index.vue
@@ -142,7 +142,7 @@
 				</view>
 				<view class="se-flex se-pt-30 se-flex-h-sb">
 					<view class="se-fs-24 se-display-ib">支付方式</view>
-					<view class="se-fs-24 se-display-ib">试用以后支付</view>
+					<view class="se-fs-24 se-display-ib"></view>
 				</view>
 				<view class="se-flex se-pt-30 se-flex-h-sb">
 					<view class="se-fs-24 se-display-ib">工作时间</view>
diff --git a/pages_subpack/person/index.vue b/pages_subpack/person/index.vue
index 3341bb7..8fab0af 100644
--- a/pages_subpack/person/index.vue
+++ b/pages_subpack/person/index.vue
@@ -64,19 +64,15 @@
 				indList: [],
 				fileList: [],
 				form: {
+					id:'',
 					role:0,
-					name: 'jerryxiao',
+					name: '',
 					password: '',
-					mobile: '13189698114',
-					address:'湖南长沙岳麓区',
-					industryId:'1865294357074157570',
-					industryName:'建筑',
-					idCard:'',
-					idCardFile:[
-						{
-							url:"https://tennis-oss.xzaiyp.top/2024-12-22/cf84422d-dcf7-4efa-82e7-371454eafbee.png"
-						}
-					]
+					mobile: '',
+					address:'',
+					industryId:'',
+					industryName:'',
+					idCardFile:[]
 				},
 				rules: {
 					name: [{
@@ -108,7 +104,7 @@
 					address: [{
 						type: 'string',
 						required: true,
-						message: '请输入公司地址',
+						message: '请输入居住地址',
 						trigger: ['blur', 'change']
 					}],
 					industryId: [{
@@ -133,19 +129,40 @@
 			}
 		},
 		watch: {
-			fileList(newValue, oldValue) {
-				if (newValue.length > 0) {
-					this.form.file = '有'
-				} else {
-					this.form.file = ''
-				}
-			}
+
 		},
 		onReady() {
 			this.onIndustryList()
 			this.$refs.uForm.setRules(this.rules)
 		},
+		
+		mounted() {
+			let worker = uni.getStorageSync("worker")
+			if(worker){
+				this.form.id = worker.id
+				this.form.name = worker.userName
+				this.form.mobile = worker.phone
+				this.form.industryId = worker.industryId
+				this.form.industryName = worker.industryName
+				this.form.idCardFile = this.stringToKeyValueArray(worker.idCard)
+			}
+		},
 		methods: {
+			stringToKeyValueArray(str, delimiter1 = ',') {
+				if(str){
+					let arro = str.split(delimiter1);
+					let arr = [];
+					arro.forEach(items=>{
+						let obj = {};
+						obj["url"] = items
+						arr.push(obj)
+					})
+					console.info(arr)
+					return arr
+				}else{
+					return []
+				}
+			},
 			handleIndChange(){
 				this.show = true
 			},
@@ -168,6 +185,7 @@
 				that.$refs.uForm.validate().then(res => {
 					that.onRoleBoss()
 				}).catch(errors => {
+					console.info(errors)
 					uni.$u.toast('校验失败')
 				})
 			},
diff --git a/pages_subpack/wallet/component/recharge.vue b/pages_subpack/wallet/component/recharge.vue
index 88a3827..34123c2 100644
--- a/pages_subpack/wallet/component/recharge.vue
+++ b/pages_subpack/wallet/component/recharge.vue
@@ -53,6 +53,9 @@
 					id:that.userId,
 					price:that.money
 				}
+				if(!that.money){
+					return that.$u.toast("请填写金额！")
+				}
 				payRecharge(params).then(response=>{
 					uni.requestPayment({
 					    provider: "wxpay",
diff --git a/pages_subpack/wallet/component/withdrawal.vue b/pages_subpack/wallet/component/withdrawal.vue
index 174fe48..5b900ed 100644
--- a/pages_subpack/wallet/component/withdrawal.vue
+++ b/pages_subpack/wallet/component/withdrawal.vue
@@ -49,7 +49,10 @@
 			onWithdrawal(){
 				let that = this
 				let params = {
-					money:this.money
+					money:that.money
+				}
+				if(!that.money){
+					return that.$u.toast("请填写金额！")
 				}
 				withdrawal(params).then(response=>{
 					console.info("response",response)