上传修改

api/api.js

@@ -11,6 +11,7 @@ const models = [
 	'examination',
 	'collect',
 	'contact',
+	'workEntryInfo',
 ]
 
 const config = {
@@ -32,14 +33,6 @@ const config = {
 		url: '/api/common/aboutUs',
 		method: 'GET',
 	},
-	//新建账本
-	commonAddBill: {
-		url: '/api/common/addBill',
-		method: 'POST',
-		auth: true, 
-		limit : 500,
-		showLoading : true,
-	},
 	// 我的服务-兑换码
 	commonAddExchange: {
 		url: '/api/common/addExchange',
@@ -48,14 +41,6 @@ const config = {
 		limit : 500,
 		showLoading : true,
 	},
-	// 技工问题
-	commonAddQuestion: {
-		url: '/api/common/addQuestion',
-		method: 'POST',
-		auth: true, 
-		limit : 500,
-		showLoading : true,
-	},
 	// 我的服务-会员充值(开通VIP)
 	commonAddRecharge: {
 		url: '/api/common/addRecharge',
@@ -92,16 +77,6 @@ const config = {
 		url: '/api/common/queryAddressList',
 		method: 'GET',
 	},
-	//全年收支
-	commonQueryBill: {
-		url: '/api/common/queryBill',
-		method: 'GET',
-	},
-	//记工记账项目列表
-	commonQueryNotebookList: {
-		url: '/api/common/queryNotebookList',
-		method: 'GET',
-	},
 	//会员中心-正式积分||临时积分
 	commonQueryScore: {
 		url: '/api/common/queryScore',
@@ -224,7 +199,8 @@ function addApiModel(model, key){
 		if(config[`${k}`]){
 			console.error(`重名api------model=${key},key=${k}`);
 			uni.showModal({
-				title: `重名api------model=${key},key=${k}`
+				title: `重名api`,
+				content: `model=${key},key=${k}`
 			})
 			continue
 		}

api/model/index-lzx.js

@@ -75,36 +75,6 @@ const api = {
 		limit : 500,
 		showLoading : true,
 	},
-	//新建账本
-	addNoteBook: {
-		url: '/employ/notebook/addNoteBook',
-		method: 'POST',
-		auth: true,
-		limit : 500,
-		showLoading : true,
-	},
-	//记工记账-项目记工
-	addWorkInfo: {
-		url: '/employ/notebook/addWorkInfo',
-		method: 'POST',
-		auth: true,
-		limit : 500,
-		showLoading : true,
-	},
-	//记工记账-项目记账
-	addBillInfo: {
-		url: '/employ/notebook/addBillInfo',
-		method: 'POST',
-		auth: true,
-		limit : 500,
-		showLoading : true,
-	},
-	//记工记账-全年收支
-	queryBill: {
-		url: '/employ/notebook/queryBill',
-		method: 'GET',
-		auth: true, 
-	},
 }
 
 export default api

api/model/workEntryInfo.js

@@ -0,0 +1,57 @@
+
+// 记工记账相关接口
+
+const api = {
+	//记工记账项目列表
+	commonQueryNotebookList: {
+		url: '/api/common/queryNotebookList',
+		method: 'GET',
+	},
+	// 技工问题
+	commonAddQuestion: {
+		url: '/employ/notebook/addQuestion',
+		method: 'POST',
+		auth: true, 
+		limit : 500,
+		showLoading : true,
+	},
+	
+	//新建账本
+	addNoteBook: {
+		url: '/employ/notebook/addNoteBook',
+		method: 'POST',
+		auth: true,
+		limit : 500,
+		showLoading : true,
+	},
+	//记工记账-项目记工
+	addWorkInfo: {
+		url: '/employ/notebook/addWorkInfo',
+		method: 'POST',
+		auth: true,
+		limit : 500,
+		showLoading : true,
+	},
+	//记工记账-项目记账
+	addBillInfo: {
+		url: '/employ/notebook/addBillInfo',
+		method: 'POST',
+		auth: true,
+		limit : 500,
+		showLoading : true,
+	},
+	//记工记账-全年收支
+	queryBill: {
+		url: '/employ/notebook/queryBill',
+		method: 'GET',
+		auth: true, 
+	},
+	//记工记账-全年收支
+	notebookQueryWork: {
+		url: '/employ/notebook/queryWork',
+		method: 'GET',
+		auth: true, 
+	},
+}
+
+export default api

components/list/userList/index.vue

@@ -48,12 +48,29 @@
 			}
 		},
 		methods: {
-			getData(){
+			getData(params, query){
 				if(uni.getStorageSync('token')){
 					this.queryParams.token = uni.getStorageSync('token')
 				}
 				
-				this.$api(this.api, this.queryParams, res => {
+				let queryParams = {
+					pageNo: this.queryParams.pageNo,
+					pageSize: this.queryParams.pageSize,
+				}
+				
+				if(params && params.length > 0){
+					params.forEach(n => {
+						queryParams[n.name] = n.value
+					})
+				}
+				
+				if(query){
+					for(let key in query){
+						queryParams[key] = query[key]
+					}
+				}
+				
+				this.$api(this.api, queryParams, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){
 						this.list = res.result.records || res.result

components/list/workList/index.vue

@@ -42,7 +42,7 @@
 			}
 		},
 		methods: {
-			getData(params){
+			getData(params, query){
 				if(uni.getStorageSync('token')){
 					this.queryParams.token = uni.getStorageSync('token')
 				}
@@ -58,6 +58,12 @@
 					})
 				}
 				
+				if(query){
+					for(let key in query){
+						queryParams[key] = query[key]
+					}
+				}
+				
 				this.$api(this.api, queryParams, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){

components/screen/screenWork.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<uv-drop-down ref="dropDown" 
-		sign="dropDown_1" 
+		:sign="sign" 
 		text-active-color="#3796F8"
 			:extra-icon="{name:'arrow-down-fill',color:'#666',size:'26rpx'}"
 			:extra-active-icon="{name:'arrow-up-fill',color:'#3796F8',size:'26rpx'}" 
@@ -35,7 +35,7 @@
 		</uv-drop-down>
 		
 		<uv-drop-down-popup 
-		sign="dropDown_1" 
+		:sign="sign" 
 		:click-overlay-on-close="true" 
 		:currentDropItem="currentDropItem"
 		@clickItem="clickItem" 
@@ -77,6 +77,11 @@
 		mapState,
 	} from 'vuex'
 	export default {
+		props : {
+			sign : {
+				default : 'dropDown_1'
+			},
+		},
 		data() {
 			return {
 				// 表示value等于这些值，就属于默认值
@@ -164,41 +169,45 @@
 			...mapState(['jobTypeList', 'natureList', 'addressList']),
 		},
 		mounted() {
-			// 工种
-			this.jobTypeList.forEach(n => {
-				this.typeId.child.push({
-					label: n.name,
-					value: n.id,
+			setTimeout(this.initData, 300)
+		},
+		methods: {
+			initData(){
+				// 工种
+				this.jobTypeList.forEach(n => {
+					this.typeId.child.push({
+						label: n.name,
+						value: n.id,
+					})
 				})
-			})
-			this.list[0].tag = this.typeId.child
-			
-			// 工作性质
-			this.natureList.forEach(n => {
-				this.natureId.child.push({
-					label: n.name,
-					value: n.id,
+				this.list[0].tag = this.typeId.child
+				
+				// 工作性质
+				this.natureList.forEach(n => {
+					this.natureId.child.push({
+						label: n.name,
+						value: n.id,
+					})
 				})
-			})
-			this.list[1].tag = this.natureId.child
-			
-			// if(this.addressList[0]){
-			// 	this.areaId.value = this.addressList[0].id
-			// 	this.areaId.label = this.addressList[0].name
+				this.list[1].tag = this.natureId.child
 				
-			// 	this.defaultValue[0] = this.addressList[0].id
-			// 	this.$forceUpdate()
-			// }
-			
-			// 地址
-			this.addressList.forEach(n => {
-				this.areaId.child.push({
-					label: n.adress,
-					value: n.id,
+				// if(this.addressList[0]){
+				// 	this.areaId.value = this.addressList[0].id
+				// 	this.areaId.label = this.addressList[0].name
+					
+				// 	this.defaultValue[0] = this.addressList[0].id
+				// 	this.$forceUpdate()
+				// }
+				
+				// 地址
+				this.addressList.forEach(n => {
+					this.areaId.child.push({
+						label: n.adress,
+						value: n.id,
+					})
 				})
-			})
-		},
-		methods: {
+				
+			},
 			clickTag(item, i){
 				console.log(i);
 				item.index = i

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__FCE26BB",
+    "appid" : "__UNI__197A38F",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages.json

@@ -177,6 +177,12 @@
 			},
 			{
 				"path": "kepp/addWorkEntryRecords"
+			},
+			{
+				"path": "mine/enterpriseInfo"
+			},
+			{
+				"path": "auth/certificationEnterprise"
 			}
 		]
 	}],

pages/index/center.vue

@@ -19,12 +19,10 @@
 					手机号：{{phone}}
 				</view>
 				<view>
-					{{numInfo.vipType}}
+					{{UserExtensionInfo.vipType}}
 				</view>
 			</view>
-			<!-- <view class="headBtn" @click="headBtn">
-				角色切换
-			</view> -->
+			
 			<!-- <view class="setting">
 				<uv-icon name="setting" size="40rpx"></uv-icon>
 			</view> -->
@@ -34,7 +32,7 @@
 		<view class="user">
 			
 			<!-- 实名认证 -->
-			<view class="auth" v-if="numInfo.status != '1'" @click="$utils.navigateTo('/pages_order/auth/certification')">
+			<view class="auth" v-if="UserExtensionInfo.status != '1'" @click="$utils.navigateTo('/pages_order/auth/certification')">
 				<uv-cell  
 				icon="setting-fill" 
 				title="完成实名认证，信息优先推荐！" 
@@ -65,7 +63,7 @@
 				<view class="item"
 				@click="$utils.navigateTo('/pages_order/mine/IntegralRecord')">
 					<view class="">
-						{{numInfo.integerNum}}
+						{{UserExtensionInfo.integerNum || 0}}
 					</view>
 					<view class="">
 						我的积分
@@ -84,7 +82,7 @@
 				<view class="item"
 				@click="$utils.navigateTo('/pages_order/mine/collect')">
 					<view class="">
-						{{numInfo.scNum}}
+						{{UserExtensionInfo.scNum || 0}}
 					</view>
 					<view class="">
 						我的收藏
@@ -94,7 +92,7 @@
 				<view class="item"
 				@click="$utils.navigateTo('/pages_order/mine/contactRecord')">
 					<view class="">
-						{{numInfo.lxNum}}
+						{{UserExtensionInfo.lxNum || 0}}
 					</view>
 					<view class="">
 						联系记录
@@ -109,7 +107,7 @@
 				<uv-grid :col="4" :border="false">
 					<uv-grid-item 
 					v-if="!role"
-					@click="$utils.navigateTo('/pages_order/work/addResume')">
+					@click="toAddResume">
 						<image class="image" src="/static/image/center/a1.png" mode=""></image>
 						<text class="grid-text">在线简历</text>
 					</uv-grid-item>
@@ -146,19 +144,34 @@
 						<text class="grid-text">积分记录</text>
 					</uv-grid-item>
 
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/auth/certification')">
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/auth/certificationEnterprise')"
+					v-if="role">
+						<image class="image" src="/static/image/center/6.png" mode=""></image>
+						<text class="grid-text">企业认证</text>
+					</uv-grid-item>
+					
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/auth/certification')"
+					v-else>
 						<image class="image" src="/static/image/center/6.png" mode=""></image>
 						<text class="grid-text">实名认证</text>
 					</uv-grid-item>
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/redeemCode')">
-						<image class="image" src="/static/image/center/5.png" mode=""></image>
-						<text class="grid-text">兑换码</text>
+
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/enterpriseInfo')"
+					v-if="role">
+						<image class="image" src="/static/image/center/6.png" mode=""></image>
+						<text class="grid-text">企业信息</text>
 					</uv-grid-item>
 
-					<uv-grid-item @click="$utils.redirectTo('/index/consult')">
+					<uv-grid-item @click="$utils.redirectTo('/index/consult')"
+					v-else>
 						<image class="image" src="/static/image/center/6.png" mode=""></image>
 						<text class="grid-text">考证咨询</text>
 					</uv-grid-item>
+					
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/redeemCode')">
+						<image class="image" src="/static/image/center/5.png" mode=""></image>
+						<text class="grid-text">兑换码</text>
+					</uv-grid-item>
 
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/contract')">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
@@ -208,7 +221,7 @@
 			tabber,
 		},
 		computed: {
-			...mapState(['userInfo', 'role','banner',]),
+			...mapState(['userInfo', 'role','banner', 'UserExtensionInfo']),
 			headImage(){
 				return this.userInfo.headImage
 			},
@@ -236,22 +249,19 @@
 				// 		url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 				// 	},
 				// ],
-				numInfo : {},
 			}
 		},
 		onShow() {
 			this.$store.commit('getUserInfo')
 			this.$store.commit('getBanner')
 			//判断如果是登录状态则获取信息
-			this.getUserCenterData();
+			this.$store.commit('getUserExtensionInfo')
 		},
 		methods: {
-			//获取个人中心基础信息的接口
-			getUserCenterData(){
-				this.$api('getUserCenterData',{}, res =>{
-					if(res.code == 200){
-						this.numInfo = res.result
-					}
+			toAddResume(){
+				// 在完成实名认证的情况下执行
+				this.$store.commit('isAuthCertification', () => {
+					this.$utils.navigateTo('/pages_order/work/addResume')
 				})
 			},
 		}

pages/index/consult.vue

@@ -72,7 +72,10 @@
 		.list{
 			.item{
 				display: flex;
-				margin: 30rpx;
+				margin: 20rpx;
+				padding: 20rpx;
+				background-color: #fff;
+				border-radius: 20rpx;
 				.image{
 					width: 200rpx;
 					border-radius: 20rpx;

pages/index/index.vue

@@ -27,8 +27,8 @@
 			<view class="grid">
 				<uv-grid :border="false"
 				:col="5">
-				<!-- @click="$utils.navigateTo('/pages_order/work/workList?id=' + item.id)" -->
 					<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>
@@ -73,7 +73,7 @@
 		</view>
 		
 	
-		<checkinScore ref="checkinScore" v-if="numInfo.signFlag == false"/>
+		<checkinScore ref="checkinScore" v-if="UserExtensionInfo.signFlag == false"/>
 		
 		<PrivacyAgreementPoup/>
 		
@@ -103,7 +103,8 @@
 				'userInfo', 
 				'role', 
 				'banner',
-				'jobTypeList'
+				'jobTypeList',
+				'UserExtensionInfo',
 			]),
 			bannerList(){
 				return this.banner.filter(n => n.type == 0)
@@ -113,38 +114,30 @@
 			return {
 				productList: [],
 				keyword : '',
-				numInfo : {},
+				screenWorkList : [],
 			}
 		},
 		onPullDownRefresh(){
-			this.$refs.workList.getData()
+			this.$refs.workList.getData(this.screenWorkList)
 			this.$store.commit('getBanner')
 		},
 		// 页面显示的时候触发
 		onShow() {
-			this.$refs.workList.getData()
+			this.$refs.workList.getData(this.screenWorkList)
 			this.$store.commit('getBanner')
-			this.getUserCenterData();
+			if(uni.getStorageSync('token')){
+				this.$store.commit('getUserExtensionInfo')
+				this.$store.commit('getBanner')
+			}
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
 			this.$refs.workList.loadMoreData()
 		},
 		methods: {
-			//获取个人中心基础信息的接口
-			getUserCenterData(){
-				if(!uni.getStorageSync('token')){
-					return
-				}
-				this.$api('getUserCenterData',{}, res =>{
-					if(res.code == 200){
-						this.numInfo = res.result
-					}
-				})
-			},
 			clickItem(result){
-				console.log(result);
-				this.$refs.workList.getData(result)
+				this.screenWorkList = result
+				this.$refs.workList.getData(this.screenWorkList)
 			},
 			toAdd(){
 				if(this.role){
@@ -154,21 +147,30 @@
 				}
 			},
 			search(){
-				
+				this.$utils.navigateTo(`/pages_order/work/workList?keyword=${this.keyword}`)
 			},
 			// 切换身份
-			switchIdentity(){
-				uni.showModal({
-					title: `确认切换到${
-						this.role ? '师傅' : '雇主'
-					}身份吗？`,
-					success : e => {
-						this.$store.commit('setRole', !this.role)
-						this.$nextTick(() => {
-							this.$refs.workList.getData()
+			async switchIdentity(){
+				this.$store.commit('getUserExtensionInfo')
+				
+				// 在完成实名认证的情况下执行
+				this.$store.commit('isAuthCertification', () => {
+					// 在完成企业认证的情况下执行
+					this.$store.commit('isAuthCertificationEnterprise', state => {
+						uni.showModal({
+							title: `确认切换到${
+								this.role ? '师傅' : '雇主'
+							}身份吗？`,
+							success : e => {
+								this.$store.commit('setRole', !this.role)
+								this.$nextTick(() => {
+									this.$refs.workList.getData(this.screenWorkList)
+								})
+							}
 						})
-					}
+					})
 				})
+				
 			},
 		}
 	}

pages/index/keepAccounts.vue

@@ -14,7 +14,7 @@
 
 		<view class="page-picture">
 			<view class="page-picture-img">
-				<view class="page-picture-group" @click="show = true">
+				<view class="page-picture-group" @click="form = {};show = true">
 					<image src="../../static/image/keepAccounts/artisan.png" mode="aspectFit" />
 					<view>
 						新建账本
@@ -47,7 +47,7 @@
 		
 		<view class="list">
 			<view class="item"
-			v-for="(item,index) in list"
+			v-for="(item, index) in list"
 			@click="$utils.navigateTo('/pages_order/kepp/keepAccountsDetail?id=' + item.id)"
 			:key="index">
 				<view class="top">
@@ -68,17 +68,19 @@
 					</view>
 					<view class="right">
 						<view class="b1"
-						@click="$utils.navigateTo('/pages_order/kepp/addWorkEntryRecords?id=' + item.id)">
+						@click.stop="$utils.navigateTo('/pages_order/kepp/addWorkEntryRecords?id=' + item.id)">
 							记工
 						</view>
 						<view class="b2"
-						@click="$utils.navigateTo('/pages_order/kepp/addPriceEntryRecords?id=' + item.id)">
+						@click.stop="$utils.navigateTo('/pages_order/kepp/addPriceEntryRecords?id=' + item.id)">
 							记账
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		
+		<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
 
 		<uv-overlay :show="show">
 			<view class="warp">
@@ -101,7 +103,8 @@
 						<!-- <view class="introduce">
 							项目金额：1314元
 						</view> -->
-						<!-- <view class="">
+						<view class=""
+						v-if="form.id">
 							<uv-radio-group v-model="form.status">
 								<view style="display: flex;">
 									<uv-radio
@@ -116,7 +119,7 @@
 									</uv-radio>
 								</view>
 							</uv-radio-group>
-						</view> -->
+						</view>
 						<view class="button">
 							<view @click="show = false">取消</view>
 							<view @click="submit">确定</view>

pages_order/auth/certification.vue

@@ -6,7 +6,10 @@
 		@leftClick="$utils.navigateBack"/>
 		
 		<view class="info-tips">
-			完成实名认证，<text>您将获得《个人实名认证平台特权》</text>
+			
+			完成实名认证，<text
+			@click="$refs.configPopup.open('permission_authentic_person')">您将获得《个人实名认证平台特权》</text>
+			
 		</view>
 		<view style="color: red;" v-if="sub ==2">
 			已驳回，原因：{{form.remark}}
@@ -106,7 +109,7 @@
 							activeColor="#3796F8"
 							:name="1"
 						></uv-checkbox>
-						阅读并同意我们的<text @click="$refs.configPopup.open('getPrivacyPolicy')">《个人实名认证服务协议》</text>
+						阅读并同意我们的<text @click="$refs.configPopup.open('config_service_authentic')">《个人实名认证服务协议》</text>
 					</view>
 				</view>
 			</uv-checkbox-group>
@@ -202,6 +205,7 @@
 .page{
 	background-color: #fff;
 	min-height: 100vh;
+	padding-bottom: 100rpx;
 	.info-tips{
 		width: 100%;
 		padding: 30rpx 0;

pages_order/auth/certificationEnterprise.vue

@@ -0,0 +1,306 @@
+<template>
+	<!-- 实名认证 -->
+	<view class="page">
+		<navbar title="企业认证"
+		leftClick 
+		@leftClick="$utils.navigateBack"/>
+		
+		<view class="info-tips">
+			完成企业认证，<text
+			@click="$refs.configPopup.open('permission_authentic_company')">
+				您将获得《企业认证平台特权》
+			</text>
+		</view>
+		<view style="color: red;" v-if="sub ==2">
+			已驳回，原因：{{form.remark}}
+		</view>
+		
+		<view class="form">
+			<view class="form-item">
+				<view class="label">
+					企业名称
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入企业名称"
+				v-model="form.name"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="label">
+					企业地址
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入企业地址"
+				v-model="form.name"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="label">
+					法定代表人
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入法定代表人"
+				v-model="form.name"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="label">
+					社会统一新信用代码
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入社会统一新信用代码"
+				v-model="form.cerNo"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="label">
+					联系人姓名
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入联系人姓名"
+				v-model="form.phone"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="label">
+					联系电话
+				</view>
+				<input type="text" class="form-input" 
+				placeholder="请输入联系电话"
+				v-model="form.phone"/>
+			</view>
+			
+			<view class="form-item">
+				<view class="title">
+					请上传工商营业执照
+				</view>
+				<view class="tips">
+					（只能上传jpg、png,且不能超过1MB）
+				</view>
+			</view>
+			
+			<view class="form-item">
+				<uv-upload 
+				:fileList="fileList" 
+				:maxCount="1" 
+				width="690rpx"
+				height="280rpx" 
+				multiple 
+				@afterRead="afterRead" 
+				@delete="deleteImage">
+					<view class="upload">
+						<image src="../static/auth/cart.png"
+						mode="aspectFit"
+						style="width: 390rpx;height: 280rpx;" />
+						<view class="btn-add">
+							点击上传
+						</view>
+					</view>
+				</uv-upload>
+			</view>
+			<view class="form-item">
+				<view class="tips"
+				style="text-align: center;padding: 20rpx 0;">
+					(确保文字清晰、可辨、避免遮挡、不全、反光)
+				</view>
+			</view>
+		</view>
+		
+		
+		
+		<view v-if="sub==0"  class="uni-color-btn" @click="sumbit">
+			认证
+		</view>
+		
+		<view v-if="sub==1"  class="uni-uncolor-btn" @click="sumbit">
+			已审核通过
+		</view>
+		
+		<view v-if="sub==2"  class="uni-redcolor-btn" @click="sumbit">
+			已驳回,请重新提交
+		</view>
+		
+		
+		
+		
+		<view class="config">
+			<uv-checkbox-group
+				v-model="checkboxValue"
+				shape="circle">
+				<view class="content">
+					<view
+					style="display: flex;">
+						<uv-checkbox
+							size="40rpx"
+							icon-size="30rpx"
+							activeColor="#3796F8"
+							:name="1"
+						></uv-checkbox>
+						阅读并同意我们的<text 
+						@click="$refs.configPopup.open('service_authentic_company')">
+							《企业认证服务协议》
+						</text>
+					</view>
+				</view>
+			</uv-checkbox-group>
+		</view>
+		
+		<configPopup ref="configPopup"/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				checkboxValue : [],
+				form : {},
+				fileList: [],
+				sub:0
+			}
+		},
+		onLoad() {
+			this.getAuthenticationPerson();
+		},
+		methods: {
+			//获取个人实名信息
+			getAuthenticationPerson(){
+				this.$api('getAuthenticationPerson',{}, res =>{
+					if(res.code == 200){
+						
+						this.form = res.result || {};
+						
+						this.sub = this.form.status || 0;
+						
+						this.fileList = this.form.image ? this.form.image.split(',').map(url => {
+							return {
+								url
+							}
+						}) : []
+					}
+				})
+			},
+			deleteImage(e){
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e){
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+				
+			},
+			//提交实名认证信息 :lzx
+			sumbit(){
+				this.form.image = this.fileList.map((item) => item.url).join(",")
+				if(this.$utils.verificationAll(this.form,{
+					name:'请输入姓名',
+					cerNo:'请输入身份证号码',
+					phone:'请输入电话号码',
+					image:'身份证照片不能为空',
+				})) {
+					return
+				}
+				
+				// 清理不需要给后端的字段
+				delete this.form.createBy
+				delete this.form.createTime
+				delete this.form.updateBy
+				delete this.form.updateTime
+				delete this.form.userId
+				
+				this.$api('addAuthenticationPerson',this.form, res =>{
+					if(res.code == 200){
+						uni.showToast({
+							title:'提交成功!等待审核',
+							icon: 'none'
+						})	
+						setTimeout(uni.navigateBack,1000,-1)
+					}
+				})
+			}
+			
+			
+			
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	background-color: #fff;
+	min-height: 100vh;
+	padding-bottom: 100rpx;
+	.info-tips{
+		width: 100%;
+		padding: 30rpx 0;
+		background-color: #f3f3f3;
+		text-align: center;
+		text{
+			color: $uni-color;
+		}
+	}
+	
+	.form {
+		padding: 30rpx;
+		.form-item{
+			.label{
+				padding: 20rpx 0;
+			}
+			.form-input{
+				border: 1px solid $uni-color;
+				background: rgba($uni-color, 0.1);
+				padding: 10rpx 20rpx;
+				font-size: 28rpx;
+			}
+			.title{
+				font-weight: 900;
+				margin-top: 50rpx;
+				padding: 10rpx 0;
+			}
+			.tips{
+				font-size: 26rpx;
+				color: #777;
+				padding-bottom: 20rpx;
+			}
+		}
+		.upload{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 690rpx;
+			background-color: #f3f3f3;
+			border-radius: 10rpx;
+			.btn-add{
+				margin: auto;
+				padding: 10rpx 20rpx;
+				background-color: $uni-color;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+	}
+	
+	.config{
+		font-size: 26rpx;
+		line-height: 40rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		.content{
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		}
+		text{
+			color: $uni-color;
+		}
+	}
+}
+</style>

pages_order/auth/wxLogin.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="login">
 		<view class="logo">
-			<!-- <image src="/static/image/login/logo.png" mode=""></image> -->
+			<image :src="configList.config_logo" mode="aspectFill"></image>
 		</view>
 		<view class="title">
-			欢迎使用特易招
+			欢迎使用{{ configList.config_app_name }}
 		</view>
 		<view class="btn mt"
 			@click="wxLogin">
@@ -18,6 +18,10 @@
 		<!-- <view class="btn b2">
 			使用短信验证登录
 		</view> -->
+		<view class="btn b2"
+		@click="qux">
+			取消登录
+		</view>
 		
 		
 		
@@ -59,7 +63,6 @@
 			}
 		},
 		methods: {
-			
 			wxLogin(){
 				if(!this.checkboxValue.length){
 					return uni.showToast({
@@ -69,7 +72,11 @@
 				}
 				this.$store.commit('login')
 			},
-			
+			qux(){
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
 		}
 	}
 </script>
@@ -85,11 +92,11 @@
 	.logo{
 		height: 140rpx;
 		width: 140rpx;
-		background-color: #ddd;
 		border-radius: 30rpx;
 		image{
-			width: 80rpx;
-			height: 80rpx;
+			height: 140rpx;
+			width: 140rpx;
+			border-radius: 30rpx;
 		}
 		margin-bottom: 20rpx;
 	}

pages_order/auth/wxUserInfo.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="login">
 		<!-- <view class="logo">
-			<image :src="configList.logo_image" mode=""></image>
+			<image :src="configList.config_logo" mode=""></image>
 		</view> -->
 		<view class="title">
-			特易招
+			{{ configList.config_app_name }}
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
@@ -196,7 +196,7 @@
 			margin-top: 10vh;
 		}
 		.getPhoneNumber{
-			all: unset;
+			// all: unset;
 			display: flex;
 			justify-content: center;
 			align-items: center;

pages_order/kepp/AnnualExpenditure.vue

@@ -35,9 +35,10 @@
 			</view>
 			<view class="cell" style="margin-top: 40rpx;">
 				<uv-cell v-for="(item,index) in list" 
+				:key="index"
 				:label="item.billDate" 
 				title="佣金收入" 
-				:value="item.amount"></uv-cell>
+				:value="`${typeNo[item.type]}${item.amount}`"></uv-cell>
 			</view>
 		</view>
 
@@ -52,6 +53,7 @@
 			return {
 				mixinsListApi : 'queryBill',
 				apiType : '',
+				typeNo : ['+', '-'],
 			}
 		},
 		onLoad({apiType}) {

pages_order/kepp/addPriceEntryRecords.vue

@@ -77,7 +77,7 @@
 			return {
 				form : {
 					billDate : '',
-					amount : 0.5,
+					amount : '',
 					type : 0,
 					remarks:''
 				},
@@ -97,7 +97,7 @@
 		},
 		onLoad({id}) {
 			this.id = id
-			this.form.notebookId=id;
+			this.form.notebookId = id;
 		},
 		onShow() {},
 		methods: {
@@ -106,10 +106,8 @@
 			},
 			submit(){
 				if(this.$utils.verificationAll(this.form, {
-					remarks : '请输入项目备注',//
 					billDate : '请输入记工日期',//
 					amount:'请输入金额',
-					
 				})){
 					return
 				}

pages_order/kepp/addWorkEntryRecords.vue

@@ -21,12 +21,26 @@
 			type="number"
 			v-model="form.phone" /> -->
 			
-			<uv-number-box v-model="form.overtime"
+			<uv-number-box v-model="form.worktime"
 			:step="0.5"
 			:min="0.5"
 			></uv-number-box>
 		</view>
 		
+		<view class="form-sheet-cell">
+			<view class="label">
+				加班时间
+			</view>
+			<!-- <input placeholder="请输入上班时间" 
+			type="number"
+			v-model="form.phone" /> -->
+			
+			<uv-number-box v-model="form.overtime"
+			:step="0.5"
+			:min="0"
+			></uv-number-box>
+		</view>
+		
 		<view class="form-sheet-cell">
 			<view class="label">
 				备注
@@ -61,8 +75,9 @@
 			return {
 				form : {
 					workDate : '',
-					overtime : 0.5,
-					remarks:''
+					worktime : 0.5,
+					remarks : '',
+					overtime : 0,
 				},
 				id : 0,
 				dateValue : new Date().getTime()
@@ -70,7 +85,7 @@
 		},
 		onLoad({id}) {
 			this.id = id
-			this.form.notebookId=id;
+			this.form.notebookId = id;
 		},
 		onShow() {},
 		methods: {
@@ -78,17 +93,15 @@
 				this.form.workDate = this.$dayjs(e.value).format('YYYY-MM-DD')
 			},
 			submit(){
+				this.form.overtime = String(this.form.overtime)
 				if(this.$utils.verificationAll(this.form, {
-					overtime : '请输入项目时长',//
-					remarks : '请输入项目备注',//
-					workDate : '请输入记工日期',//
-					
+					workDate : '请选择记工日期',//
+					worktime : '请输入上班时长',//
+					overtime : '请输入加班时长',
 				})){
 					return
 				}
 				
-		
-				
 				this.$api('addWorkInfo', this.form, res => {
 					if(res.code == 200){
 						uni.showToast({

pages_order/kepp/keepAccountsDetail.vue

@@ -7,6 +7,7 @@
 			<uv-tabs :list="tabsSatus" lineWidth="0" 
 			lineHeight="0" 
 			:scrollable="false"
+			@click="clickTabsType"
 			activeStyle="color: #3796F8;"></uv-tabs>
 		</view>
 		<view class="page-two">
@@ -16,10 +17,11 @@
 				:key="index"
 				:label="item.billDate" 
 				title="佣金收入" 
-				:value="item.amount"></uv-cell>
+				:value="`${typeNo[item.type]}${item.amount}`"></uv-cell>
 			</view>
 		</view>
-
+			
+		<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
 	</view>
 </template>
 
@@ -29,27 +31,35 @@
 		mixins : [mixinList],
 		data() {
 			return {
-				mixinsListApi : 'commonQueryBill',
+				mixinsListApi : 'queryBill',
 				apiType : '',
 				tabsSatus : [
 					{
 						name: '记账',
-						index:0,
+						index: 0,
 					}, 
 					{
 						name: '记工',
-						index:1,
+						index: 1,
 					},
 				],
+				id : 0,
+				typeNo : ['+', '-'],
 			}
 		},
-		onLoad({apiType}) {
+		onLoad({apiType, id}) {
+			this.id = id
+			this.queryParams.employNoteBookId = id
 			this.apiType = apiType
-			this.mixinsListApi += apiType || ''
+			// this.mixinsListApi += apiType || ''
 		},
 		onShow() {},
 		methods: {
-
+			clickTabsType({index}){
+				console.log(index);
+				this.mixinsListApi = ['queryBill', 'notebookQueryWork'][index]
+				this.getData()
+			},
 		}
 	}
 </script>
@@ -57,7 +67,7 @@
 <style scoped lang="less">
 	.page {
 		background-color: #fff;
-
+		padding-bottom: 100rpx;
 		.page-two {
 			width: 90%;
 			margin-left: 5%;

pages_order/mine/about.vue

@@ -6,7 +6,9 @@
 		@leftClick="$utils.navigateBack"
 		/>
 		
-		
+		<view class="content">
+			<uv-parse :content="configList.config_aboutus"></uv-parse>
+		</view>
 		
 	</view>
 </template>
@@ -25,5 +27,10 @@
 </script>
 
 <style scoped lang="scss">
-
+.page{
+	.content{
+		padding: 20rpx;
+		background-color: #fff;
+	}
+}
 </style>

pages_order/mine/enterpriseInfo.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages_order/work/addResume.vue

@@ -150,6 +150,16 @@
 				form : {
 					sex : '男',
 					qulification : '',
+					title: '',
+					typeId : '',
+					areaId : '',
+					natureId : '',
+					age : '',
+					nation : '',
+					salaryLow : '',
+					salaryUp : '',
+					qualification : '',
+					brief: '',
 				},
 				sexList : [
 					{
@@ -227,6 +237,7 @@
 						areaId : '请选择工作的地区',
 						natureId : '请选择工作的性质',
 						age : '请输入您的年龄',
+						sex : '请选择性别',
 						nation : '请输入您的民族',
 						salaryLow : '请输入期望薪资下限',
 						salaryUp : '请输入期望薪资上限',
@@ -236,13 +247,6 @@
 					return
 				}
 				
-				// 清理不需要给后端的字段
-				delete this.form.createBy
-				delete this.form.createTime
-				delete this.form.updateBy
-				delete this.form.updateTime
-				delete this.form.userId
-				
 				let data = {
 					title: this.form.title,
 					typeId : this.form.typeId,
@@ -253,24 +257,12 @@
 					salaryLow : this.form.salaryLow,
 					salaryUp : this.form.salaryUp,
 					qualification : this.form.qualification,
-					brief: this.form.brief
+					brief: this.form.brief,
+					sex: this.form.sex,
 				}
 				
-				
-				if(this.form.id !=null){
-					data = {
-						id:this.form.id,
-						title: this.form.title,
-						typeId : this.form.typeId,
-						areaId : this.form.areaId,
-						natureId : this.form.natureId,
-						age : this.form.age,
-						nation : this.form.nation,
-						salaryLow : this.form.salaryLow,
-						salaryUp : this.form.salaryUp,
-						qualification : this.form.qualification,
-						brief: this.form.brief
-					}
+				if(this.form.id){
+					data.id = this.form.id
 				}
 				
 				this.$api('addResume', data, res => {

pages_order/work/jobPosting.vue

@@ -276,7 +276,7 @@
 				
 				if (this.$utils.verificationAll(this.form, {
 						title: '请输入招工标题',
-						address : '请选择工作地点',
+						// address : '请选择工作地点',
 						workAge : '请选择工龄要求',
 						// company : '请输入招聘公司',
 						salaryLow : '请输入薪资范围',

pages_order/work/workDetail.vue

@@ -35,7 +35,8 @@
 					:phoneCall="personInfo.phone" />
 			</view>
 
-			<view class="address">
+			<view class="address"
+			@click="openLocation(detail.latitude, detail.longitude)">
 				<view class="title2">
 					工作地址
 				</view>

pages_order/work/workList.vue

@@ -1,6 +1,8 @@
 <template>
 	<view>
-		<navbar leftClick @leftClick="$utils.navigateBack" />
+		<navbar 
+		:title="title"
+		leftClick @leftClick="$utils.navigateBack" />
 		
 		<view class="search">
 			<uv-search 
@@ -8,11 +10,11 @@
 			:showAction="false"
 			search-icon-size="40rpx"
 			@search="search"
-			v-model="keyword"></uv-search>
+			v-model="queryParams.title"></uv-search>
 		</view>
 		
 		<!-- 筛选器 -->
-		<screenWork @clickItem="clickItem"/>
+		<!-- <screenWork @clickItem="clickItem" ref="screenWork"/> -->
 		
 		<!-- 老板看到的 -->
 		<userList ref="workList" v-if="role"/>
@@ -42,17 +44,49 @@
 		data() {
 			return {
 				keyword : '',
+				title : '',
+				queryParams : {
+				},
+				screenWorkList : [],
+			}
+		},
+		onPullDownRefresh(){
+			this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+		},
+		// 页面显示的时候触发
+		onShow() {
+			this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+		},
+		onLoad({typeId, title, keyword}) {
+			if(title){
+				this.title = title
+			}
+			if(typeId){
+				this.queryParams.typeId = typeId
+			}
+			if(keyword){
+				this.queryParams.title = keyword
+				this.title = keyword
 			}
 		},
 		methods: {
-			
+			clickItem(result){
+				console.log(result);
+				this.screenWorkList = result
+				this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+			},
+			search(){
+				this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 .search{
-	width: 700rpx;
+	padding: 20rpx;
+	display: flex;
+	justify-content: center;
 	background-color: #fff;
 	/deep/ .uv-search__content__icon{
 		padding: 10rpx 0;

store/store.js

@@ -10,12 +10,13 @@ const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置列表
 		// 角色 true为老板 false为工人
-		role : true,
+		role : false,
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种
 		natureList : [],//工作性质
 		addressList : [],//开放地址 
+		UserExtensionInfo : {},//用户扩展信息，包含认证信息、统计信息
 	},
 	getters: {
 	},
@@ -82,12 +83,12 @@ const store = new Vuex.Store({
 				if(res.code == 200){
 					state.userInfo = res.result
 					
-					// if(!state.userInfo.nickName || !state.userInfo.headImage
-					// || !state.userInfo.phone){
-						// uni.navigateTo({
-						// 	url: '/pages_order/auth/wxUserInfo'
-						// })
-					// }
+					if(!state.userInfo.nickName || !state.userInfo.headImage
+					|| !state.userInfo.phone){
+						uni.navigateTo({
+							url: '/pages_order/auth/wxUserInfo'
+						})
+					}
 				}
 			})
 		},
@@ -157,6 +158,77 @@ const store = new Vuex.Store({
 		setRole(state, role){
 			state.role = role
 		},
+		// 在完成实名认证的情况下执行
+		isAuthCertification(state, fn){
+			this.commit('getUserExtensionInfo')
+			if(!state.UserExtensionInfo.personAuthenticationStatus) return
+			
+			if(['-1', '2'].includes(state.UserExtensionInfo.personAuthenticationStatus)){
+				uni.showModal({
+					title: `实名认证`,
+					content: '实名认证未完成 或 实名认证审核未通过，请先完成！',
+					confirmText: '去完成',
+					success : e => {
+						if(e.confirm){
+							uni.navigateTo({
+								url: '/pages_order/auth/certification'
+							})
+						}
+					}
+				})
+				return
+			}
+			
+			if(state.UserExtensionInfo.personAuthenticationStatus == '0'){
+				uni.showToast({
+					title: '实名认证审核中，请耐心等待！',
+					icon: 'none'
+				})
+				return
+			}
+			
+			
+			fn && fn(state)
+		},
+		// 在完成企业认证的情况下执行
+		isAuthCertificationEnterprise(state, fn){
+			this.commit('getUserExtensionInfo')
+			if(!state.UserExtensionInfo.companyAuthenticationStatus) return
+			
+			if(['-1', '2'].includes(state.UserExtensionInfo.companyAuthenticationStatus)){
+				uni.showModal({
+					title: `企业认证`,
+					content: '企业认证未完成 或 企业认证审核未通过，请先完成！',
+					confirmText: '去完成',
+					success : e => {
+						if(e.confirm){
+							uni.navigateTo({
+								url: '/pages_order/auth/certificationEnterprise'
+							})
+						}
+					}
+				})
+				return
+			}
+			
+			if(state.UserExtensionInfo.companyAuthenticationStatus == '0'){
+				uni.showToast({
+					title: '企业认证审核中，请耐心等待！',
+					icon: 'none'
+				})
+				return
+			}
+			
+			fn && fn(state)
+		},
+		//获取用户扩展信息的接口
+		getUserExtensionInfo(state){
+			api('getUserCenterData', res =>{
+				if(res.code == 200){
+					state.UserExtensionInfo = res.result
+				}
+			})
+		},
 	},
 	actions: {},
 })

utils/index.js

@@ -27,4 +27,14 @@ Vue.prototype.$dayjs = dayjs
 
 Vue.prototype.$timeUtils = time
 Vue.prototype.$utils = util
-Vue.prototype.$md5 = md5
+Vue.prototype.$md5 = md5
+
+Vue.prototype.openLocation = (latitude, longitude) => {
+	if(!latitude || !longitude){
+		return
+	}
+	uni.openLocation({
+		latitude : Number(latitude),
+		longitude : Number(longitude),
+	})
+}