From d5280f26e92daac73562689e3bc2e52943a48ab3 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 1 Jan 2025 14:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/contact.js                  | 15 +++++++
 components/screen/screenWork.vue      | 22 +++++-----
 pages.json                            |  6 +++
 pages/index/center.vue                |  2 +-
 pages/index/index.vue                 |  8 ++++
 pages_order/mine/InvitationCredit.vue | 27 +++++++------
 pages_order/mine/contract.vue         | 10 ++---
 pages_order/mine/contractDetail.vue   | 44 ++++++++++++++++++++
 pages_order/work/workDetail.vue       |  9 ++++-
 pages_order/work/workTypeList.vue     | 75 +++++++++++++++++++++++++++++++++++
 store/store.js                        |  2 +-
 11 files changed, 187 insertions(+), 33 deletions(-)
 create mode 100644 pages_order/mine/contractDetail.vue
 create mode 100644 pages_order/work/workTypeList.vue

diff --git a/api/model/contact.js b/api/model/contact.js
index d034542..4c5b3b9 100644
--- a/api/model/contact.js
+++ b/api/model/contact.js
@@ -26,6 +26,21 @@ const api = {
 		method: 'GET',
 		auth: true, 
 	},
+	
+	//电子合同-获取电子合同列表
+	queryContractList: {
+		url: '/employ/contract/queryContractList',
+		method: 'GET',
+		auth: true, 
+	},
+	
+	//电子合同-根据id查询电子合同详情
+	queryContracById: {
+		url: '/employ/contract/queryContracById',
+		method: 'GET',
+		auth: true, 
+	},
+	
 }
 
 export default api
\ No newline at end of file
diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue
index db2fd45..2a65b3e 100644
--- a/components/screen/screenWork.vue
+++ b/components/screen/screenWork.vue
@@ -90,16 +90,16 @@
 				result: [],
 				activeName: 'areaId',
 				areaId: {
-					label: '全国',
+					label: '全部',
 					value: 0,
 					activeIndex: 0,
 					color: '#333',
 					activeColor: '#3796F8',
 					child: [
-						// {
-						// 	label: '全国',
-						// 	value: 0,
-						// },
+						{
+							label: '全部',
+							value: 0,
+						},
 					]
 				},
 				typeId: {
@@ -207,13 +207,13 @@
 				})
 				this.list[1].tag = this.natureId.child
 				
-				if(this.addressList[0]){
-					this.areaId.value = this.addressList[0].id
-					this.areaId.label = this.addressList[0].adress
+				// if(this.addressList[0]){
+				// 	this.areaId.value = this.addressList[0].id
+				// 	this.areaId.label = this.addressList[0].adress
 					
-					this.defaultValue.slice(0, 1, this.addressList[0].id)
-					this.$forceUpdate()
-				}
+				// 	this.defaultValue.slice(0, 1, this.addressList[0].id)
+				// 	this.$forceUpdate()
+				// }
 				
 				// 地址
 				this.addressList.forEach(n => {
diff --git a/pages.json b/pages.json
index acb7805..371555a 100644
--- a/pages.json
+++ b/pages.json
@@ -186,6 +186,12 @@
 			},
 			{
 				"path": "mine/updateUser"
+			},
+			{
+				"path": "work/workTypeList"
+			},
+			{
+				"path": "mine/contractDetail"
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 44c21c5..27d0963 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -64,7 +64,7 @@
 			
 			<view class="line">
 				<view class="item"
-				@click="$utils.navigateTo('/pages_order/mine/IntegralRecord')">
+				@click="$utils.navigateTo('/pages_order/mine/InvitationCredit')">
 					<view class="">
 						{{UserExtensionInfo.integerNum || 0}}
 					</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2f16c82..4101d4e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,10 +30,18 @@
 					<uv-grid-item 
 					@click="$utils.navigateTo(`/pages_order/work/workList?typeId=${item.id}&title=${item.name}`)"
 					v-for="(item,index) in jobTypeList"
+					v-if="index < 4"
 					:key="index">
 						<image class="grid-icon" :src="item.image" mode="aspectFill"></image>
 						<text class="grid-text">{{item.name}}</text>
 					</uv-grid-item>
+						<uv-grid-item 
+						v-if="jobTypeList.length > 4"
+						@click="$utils.navigateTo(`/pages_order/work/workTypeList`)"
+						>
+							<image class="grid-icon" src="/static/image/home/5.png" mode="aspectFill"></image>
+							<text class="grid-text">其他招工</text>
+						</uv-grid-item>
 				</uv-grid>
 			</view>
 		</view>
diff --git a/pages_order/mine/InvitationCredit.vue b/pages_order/mine/InvitationCredit.vue
index 2c27e7e..6853202 100644
--- a/pages_order/mine/InvitationCredit.vue
+++ b/pages_order/mine/InvitationCredit.vue
@@ -9,7 +9,7 @@
 					<image src="../static/mine/characteristic.png" mode="aspectFill" />
 					<view>您当前的正式积分</view>
 				</view>
-				<view class="TopBlock-balance">100</view>
+				<view class="TopBlock-balance">{{UserExtensionInfo.integerNum || 0}}</view>
 				<view class="TopBlock-button"
 				@click="$utils.navigateTo('/pages_order/mine/IntegralRecord')">
 					<view>积分明细</view>
@@ -17,18 +17,16 @@
 			</view>
 		</view>
 
-		<view class="card">
+		<!-- <view class="card">
 			<view class="card-box">
 				<view class="card-top">获取正式积分</view>
 				<view style="background-color: #EDEDED; height: 1rpx;" />
 				<view class="card-cell">
 					<uv-cell-group>
 						<uv-cell>
-							<!-- 自定义左侧标题 -->
 							<template #title>
 								<text style="font-size: 12px;">邀请好友赚积分</text>
 							</template>
-							<!-- 自定义左侧标题下面的内容 -->
 							<template #label>
 								<view style="font-size: 20rpx;color: #999999; padding: 10rpx 0;">
 									<view>成功邀请一名好友注册，可获得2正式积分！</view>
@@ -36,15 +34,12 @@
 								</view>
 
 							</template>
-							<!-- 自定义右侧值 -->
 							<template #value>
 								<text style="font-size: 24rpx; color: #4280FD;">去邀请</text>
 							</template>
-							<!-- 自定义左侧图标 -->
 							<template #icon>
 								<uv-icon size="50" name="../static/mine/notepad.png" />
 							</template>
-							<!-- 自定义右侧图标 -->
 							<template #right-icon>
 								<uv-icon color="#4280FD" size="30rpx" name="arrow-right"></uv-icon>
 							</template>
@@ -61,26 +56,21 @@
 				<view class="card-cell">
 					<uv-cell-group>
 						<uv-cell>
-							<!-- 自定义左侧标题 -->
 							<template #title>
 								<text style="font-size: 12px;">我要找工作</text>
 							</template>
-							<!-- 自定义左侧标题下面的内容 -->
 							<template #label>
 								<view style="font-size: 20rpx;color: #999999; padding: 10rpx 0;">
 									<view>查看招工信息</view>
 								</view>
 		
 							</template>
-							<!-- 自定义右侧值 -->
 							<template #value>
 								<text style="font-size: 24rpx; color: #4280FD;">去找活</text>
 							</template>
-							<!-- 自定义左侧图标 -->
 							<template #icon>
 								<uv-icon size="50" name="../static/mine/notepad.png" />
 							</template>
-							<!-- 自定义右侧图标 -->
 							<template #right-icon>
 								<uv-icon color="#4280FD" size="30rpx" name="arrow-right"></uv-icon>
 							</template>
@@ -88,9 +78,20 @@
 					</uv-cell-group>
 				</view>
 			</view>
+		</view> -->
+		
+		<view class=""
+		style="padding: 20rpx;">
+			<uv-parse :content="configList.config_score_rule"></uv-parse>
 		</view>
+		
 
-		<view class="service">如有疑问请联系客服：<text>4008-678-918</text></view>
+		<view class="service">如有疑问请联系客服：<text
+		style="color: #4280FD;"
+		@click="$refs.customerServicePopup.open()"
+		>{{ configList.config_service_phone }}</text></view>
+		
+		<customerServicePopup ref="customerServicePopup"/>
 	</view>
 </template>
 
diff --git a/pages_order/mine/contract.vue b/pages_order/mine/contract.vue
index b4b395e..eae3856 100644
--- a/pages_order/mine/contract.vue
+++ b/pages_order/mine/contract.vue
@@ -17,6 +17,7 @@
 		<view class="content">
 			<view class="projectContent"
 			v-for="(item, index) in list"
+			@click="$utils.navigateTo('/pages_order/mine/contractDetail?id=' + item.id)"
 			:key="index">
 				<image src="../static/contract/contract.png" alt="" />
 				<view class="itemList">
@@ -66,22 +67,19 @@
 					},
 				],
 				type : 0,
-				mixinsListApi : 'bossQueryContractList',
+				mixinsListApi : 'queryContractList',
 			}
 		},
 		computed : {
-			...mapState([
-				'role', 
-			]),
 		},
 		onLoad() {
-			this.mixinsListApi = (this.role ? 'boss' : 'employee') + 'QueryContractList'
+			this.queryParams.role = this.role ? 1 : 0
 		},
 		methods: {
 			clickTabs({index}) {
 				this.type = index
+				this.getData()
 			},
-			
 		}
 	}
 </script>
diff --git a/pages_order/mine/contractDetail.vue b/pages_order/mine/contractDetail.vue
new file mode 100644
index 0000000..01b3b5d
--- /dev/null
+++ b/pages_order/mine/contractDetail.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="page">
+		<navbar title="电子合同"
+		leftClick 
+		@leftClick="$utils.navigateBack"/>
+		
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id : 0,
+				detail : {},
+			}
+		},
+		onLoad({id}) {
+			this.id = id
+			this.getDetail()
+		},
+		methods: {
+			getDetail(){
+					let data = {
+						contractId: this.id
+					}
+					if (uni.getStorageSync('token')) {
+						// data.token = uni.getStorageSync('token')
+					}
+					this.$api('queryContracById', data, res => {
+						if (res.code == 200) {
+							this.detail = res.result
+						}
+					})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue
index 68246cc..bdf0b25 100644
--- a/pages_order/work/workDetail.vue
+++ b/pages_order/work/workDetail.vue
@@ -139,7 +139,7 @@
 				hanHaiMember: {},
 				total: 0,
 				collectionFlag: false,
-				mixinsListApi: 'employeeQueryJobList',
+				mixinsListApi: '',
 			}
 		},
 		onLoad({
@@ -166,6 +166,13 @@
 						this.personInfo = res.result.personInfo
 						this.companyInfo = res.result.companyInfo
 						this.hanHaiMember = res.result.hanHaiMember
+						
+						this.mixinsListApi = 'employeeQueryJobList'
+						
+						this.queryParams.typeId = this.detail.typeId
+						this.queryParams.areaId = this.detail.areaId
+						
+						this.getData()
 					}
 				})
 			},
diff --git a/pages_order/work/workTypeList.vue b/pages_order/work/workTypeList.vue
new file mode 100644
index 0000000..0bb941e
--- /dev/null
+++ b/pages_order/work/workTypeList.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="page">
+		<navbar 
+		title="工种"
+		leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="content"
+		>
+			<view class="grid">
+				<uv-grid :border="false"
+				:col="5">
+					<uv-grid-item 
+					@click="$utils.navigateTo(`/pages_order/work/workList?typeId=${item.id}&title=${item.name}`)"
+					v-for="(item,index) in jobTypeList"
+					:key="index">
+						<image class="grid-icon" :src="item.image" mode="aspectFill"></image>
+						<text class="grid-text">{{item.name}}</text>
+					</uv-grid-item>
+				</uv-grid>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import { mapState } from 'vuex'
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			...mapState([
+				'userInfo', 
+				'role', 
+				'banner',
+				'jobTypeList',
+				'UserExtensionInfo',
+			]),
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.content{
+		position: relative;
+		margin: 30rpx;
+		.grid{
+			padding-bottom: 30rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			// border-top-left-radius: 60rpx;
+			// border-top-right-radius: 60rpx;
+			// box-shadow: 0 -10rpx 10rpx 10rpx #00000013;
+			.grid-icon{
+				width: 80rpx;
+				height: 80rpx;
+				margin-bottom: 10rpx;
+				margin-top: 30rpx;
+			}
+			.grid-text{
+				font-size: 24rpx;
+				font-weight: 900;
+			}
+		}
+		
+	}
+}
+</style>
diff --git a/store/store.js b/store/store.js
index 90406b4..ee1a5b4 100644
--- a/store/store.js
+++ b/store/store.js
@@ -10,7 +10,7 @@ const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置列表
 		// 角色 true为老板 false为工人
-		role : false,
+		role : true,
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种