From 767bebb0904529abc39e0694f8c71b57fe8e0df9 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Mon, 23 Dec 2024 18:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/index-lzx.js                    |  46 ++++++
 config.js                                 |  16 +-
 manifest.json                             |   2 +-
 pages/index/keepAccounts.vue              |   8 +-
 pages_order/kepp/AnnualExpenditure.vue    |   2 +-
 pages_order/kepp/MechanicProblem.vue      |  31 +++-
 pages_order/kepp/addPriceEntryRecords.vue |  37 ++++-
 pages_order/kepp/addWorkEntryRecords.vue  |  33 +++-
 pages_order/kepp/keepAccountsDetail.vue   |   2 +
 pages_order/mine/MemberRecharge.vue       |  84 ++++++----
 pages_order/mine/help.vue                 |   4 +-
 pages_order/mine/promotion.vue            |   4 +-
 pages_order/work/addResume.vue            |  25 ++-
 pages_order/work/jobPosting.vue           |   6 +-
 pages_order/work/userDetail.vue           | 265 ++++++++++++++++++------------
 pages_order/work/workDetail.vue           |   2 +-
 16 files changed, 385 insertions(+), 182 deletions(-)

diff --git a/api/model/index-lzx.js b/api/model/index-lzx.js
index 60d36fa..0b59ffe 100644
--- a/api/model/index-lzx.js
+++ b/api/model/index-lzx.js
@@ -75,6 +75,52 @@ const api = {
 		limit : 500,
 		showLoading : true,
 	},
+	//面对面分享
+	getInviteCode: {
+		url: '/employ/share/getInviteCode',
+		method: 'POST',
+		auth: true,
+		limit : 500,
+		showLoading : true,
+	},
+	//帮助反馈
+	addQuestion: {
+		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, 
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/config.js b/config.js
index 195406f..03ac722 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
@@ -19,7 +19,7 @@ const config = {
 		baseUrl : 'http://augcl.natapp1.cc/employ-api',
 	},
 	prod : {
-		baseUrl : 'https://employadmin.augcl.com/employ-api',
+		baseUrl : 'https://admin.teyizhao.com/employ-api',
 	}
 }
 
@@ -28,17 +28,17 @@ const config = {
 const defaultConfig = {
 	mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
 	aliOss : {
-		url : 'https://tennis-oss.xzaiyp.top/',
+		url : 'https://img.teyizhao.com/',
 		config : {
 			//桶的地址
-			region: 'oss-cn-guangzhou',
+			region: 'oss-cn-beijing',
 			//id
-			accessKeyId:'LTAI5tNycA46YTwm383dRvMV',
+			accessKeyId:'LTAI5t5nV2Pw67wVC9ZvtFSb',
 			//密钥
-			accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG',
+			accessKeySecret:'perarQgbRK9TPNNb2G97EojoJ6kb9H',
 			//桶的名字
-			bucket: 'zhuoqiu-image',
-			endpoint:'oss-cn-guangzhou.aliyuncs.com',
+			bucket: 'teyizhaoimg',
+			endpoint:'oss-cn-beijing.aliyuncs.com',
 		}
 	},
 }
diff --git a/manifest.json b/manifest.json
index d653c7c..7bbb9fc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "unapp模板",
+    "name" : "特易招",
     "appid" : "__UNI__FCE26BB",
     "description" : "",
     "versionName" : "1.0.0",
diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue
index 0a844f0..89ea30c 100644
--- a/pages/index/keepAccounts.vue
+++ b/pages/index/keepAccounts.vue
@@ -101,7 +101,7 @@
 						<!-- <view class="introduce">
 							项目金额：1314元
 						</view> -->
-						<view class="">
+						<!-- <view class="">
 							<uv-radio-group v-model="form.status">
 								<view style="display: flex;">
 									<uv-radio
@@ -116,7 +116,7 @@
 									</uv-radio>
 								</view>
 							</uv-radio-group>
-						</view>
+						</view> -->
 						<view class="button">
 							<view @click="show = false">取消</view>
 							<view @click="submit">确定</view>
@@ -203,7 +203,7 @@
 				
 				this.form.type = this.queryParams.type
 				
-				this.$api('commonAddBill', this.form, res => {
+				this.$api('addNoteBook', this.form, res => {
 					if(res.code == 200){
 						this.show = false
 						this.form = {
@@ -219,10 +219,10 @@
 					id : item.id,
 					title : item.title,
 					status : item.status,
-					status : item.status,
 				}
 				this.addOrUpdate = true
 				this.show = true
+				this.getData()
 			}
 		}
 	}
diff --git a/pages_order/kepp/AnnualExpenditure.vue b/pages_order/kepp/AnnualExpenditure.vue
index 01f8bf7..5a66c9c 100644
--- a/pages_order/kepp/AnnualExpenditure.vue
+++ b/pages_order/kepp/AnnualExpenditure.vue
@@ -50,7 +50,7 @@
 		mixins : [mixinList],
 		data() {
 			return {
-				mixinsListApi : 'commonQueryBill',
+				mixinsListApi : 'queryBill',
 				apiType : '',
 			}
 		},
diff --git a/pages_order/kepp/MechanicProblem.vue b/pages_order/kepp/MechanicProblem.vue
index e343d5e..a59acbc 100644
--- a/pages_order/kepp/MechanicProblem.vue
+++ b/pages_order/kepp/MechanicProblem.vue
@@ -5,7 +5,7 @@
 		<view class="page-two">
 			<view class="headline">反馈内容</view>
 			<view class="text-field">
-				<uv-textarea v-model="feedback" placeholder="请简要描述您的问题和意见，以使我们提供更好的帮助" height="400rpx" maxlength="600"
+				<uv-textarea v-model="form.question" placeholder="请简要描述您的问题和意见，以使我们提供更好的帮助" height="400rpx" maxlength="600"
 					count="true" />
 			</view>
 
@@ -15,7 +15,7 @@
 			</view>
 
 			<view class="bottom">
-				<view class="submit">
+				<view class="submit" @click="submit">
 					提交
 				</view>
 			</view>
@@ -27,11 +27,36 @@
 	export default {
 		data() {
 			return {
-				feedback: ""
+				form:{
+					question: "",
+				}
 			}
 		},
 		onShow() {},
 		methods: {
+			submit(){
+				let data = JSON.parse(JSON.stringify(this.form))
+				
+				if(this.$utils.verificationAll(this.form, {
+					question : '请输入你的问题和意见',//问题和意见
+				})){
+					return
+				}
+				
+		
+				
+				this.$api('addQuestion', data, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: "反馈成功",
+							icon:'none'
+						})
+						
+						setTimeout(uni.navigateBack, 800, -1)
+					}
+				})
+			}
+			
 
 		}
 	}
diff --git a/pages_order/kepp/addPriceEntryRecords.vue b/pages_order/kepp/addPriceEntryRecords.vue
index c37f205..7f60467 100644
--- a/pages_order/kepp/addPriceEntryRecords.vue
+++ b/pages_order/kepp/addPriceEntryRecords.vue
@@ -8,7 +8,7 @@
 		<uv-cell
 		title="选择日期"
 		rightIconStyle="fontSize: 30rpx;"
-		:value="form.date || '请选择选择日期'"
+		:value="form.billDate || '请选择选择日期'"
 		@click="$refs.datetimePicker.open()"
 		isLink
 		></uv-cell>
@@ -28,7 +28,7 @@
 						size="40rpx"
 						labelSize="26rpx"
 						:label="item.name" 
-						:name="item.name">
+						:name="item.index">
 					</uv-radio>
 				</view>
 			</uv-radio-group>
@@ -40,7 +40,7 @@
 			</view>
 			<input placeholder="请输入金额" 
 			type="number"
-			v-model="form.phone" />
+			v-model="form.amount" />
 		</view>
 		
 		<view class="form-sheet-cell">
@@ -48,7 +48,7 @@
 				备注
 			</view>
 			<uv-textarea
-			v-model="form.workDetail" 
+			v-model="form.remarks" 
 			count 
 			:maxlength="300" 
 			autoHeight
@@ -76,32 +76,53 @@
 		data() {
 			return {
 				form : {
-					date : '',
-					time : 0.5,
-					type : '收入',
+					billDate : '',
+					amount : 0.5,
+					type : 0,
+					remarks:''
 				},
 				id : 0,
 				dateValue : new Date().getTime(),
 				typeList : [
 					{
 						name : '收入',
+						index:0
 					},
 					{
 						name : '支出',
+						index:1
 					},
 				],
 			}
 		},
 		onLoad({id}) {
 			this.id = id
+			this.form.notebookId=id;
 		},
 		onShow() {},
 		methods: {
 			datetimePickerConfim(e){
-				this.form.date = this.$dayjs(e.value).format('YYYY-MM-DD')
+				this.form.billDate = this.$dayjs(e.value).format('YYYY-MM-DD')
 			},
 			submit(){
+				if(this.$utils.verificationAll(this.form, {
+					remarks : '请输入项目备注',//
+					billDate : '请输入记工日期',//
+					amount:'请输入金额',
+					
+				})){
+					return
+				}
 				
+				this.$api('addBillInfo', this.form, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						setTimeout(uni.navigateBack,1000,-1)
+					}
+				})
 			},
 		}
 	}
diff --git a/pages_order/kepp/addWorkEntryRecords.vue b/pages_order/kepp/addWorkEntryRecords.vue
index b762758..b44dc48 100644
--- a/pages_order/kepp/addWorkEntryRecords.vue
+++ b/pages_order/kepp/addWorkEntryRecords.vue
@@ -8,7 +8,7 @@
 		<uv-cell
 		title="选择日期"
 		rightIconStyle="fontSize: 30rpx;"
-		:value="form.date || '请选择选择日期'"
+		:value="form.workDate || '请选择选择日期'"
 		@click="$refs.datetimePicker.open()"
 		isLink
 		></uv-cell>
@@ -21,7 +21,7 @@
 			type="number"
 			v-model="form.phone" /> -->
 			
-			<uv-number-box v-model="form.time"
+			<uv-number-box v-model="form.overtime"
 			:step="0.5"
 			:min="0.5"
 			></uv-number-box>
@@ -32,7 +32,7 @@
 				备注
 			</view>
 			<uv-textarea
-			v-model="form.workDetail" 
+			v-model="form.remarks" 
 			count 
 			:maxlength="300" 
 			autoHeight
@@ -60,8 +60,9 @@
 		data() {
 			return {
 				form : {
-					date : '',
-					time : 0.5,
+					workDate : '',
+					overtime : 0.5,
+					remarks:''
 				},
 				id : 0,
 				dateValue : new Date().getTime()
@@ -69,14 +70,34 @@
 		},
 		onLoad({id}) {
 			this.id = id
+			this.form.notebookId=id;
 		},
 		onShow() {},
 		methods: {
 			datetimePickerConfim(e){
-				this.form.date = this.$dayjs(e.value).format('YYYY-MM-DD')
+				this.form.workDate = this.$dayjs(e.value).format('YYYY-MM-DD')
 			},
 			submit(){
+				if(this.$utils.verificationAll(this.form, {
+					overtime : '请输入项目时长',//
+					remarks : '请输入项目备注',//
+					workDate : '请输入记工日期',//
+					
+				})){
+					return
+				}
+				
+		
 				
+				this.$api('addWorkInfo', this.form, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						setTimeout(uni.navigateBack,1000,-1)
+					}
+				})
 			},
 		}
 	}
diff --git a/pages_order/kepp/keepAccountsDetail.vue b/pages_order/kepp/keepAccountsDetail.vue
index 9e28d10..8fb3528 100644
--- a/pages_order/kepp/keepAccountsDetail.vue
+++ b/pages_order/kepp/keepAccountsDetail.vue
@@ -34,9 +34,11 @@
 				tabsSatus : [
 					{
 						name: '记账',
+						index:0,
 					}, 
 					{
 						name: '记工',
+						index:1,
 					},
 				],
 			}
diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue
index 07ce642..8809f4f 100644
--- a/pages_order/mine/MemberRecharge.vue
+++ b/pages_order/mine/MemberRecharge.vue
@@ -26,10 +26,8 @@
 		<view class="openvip">{{numInfo.vipType}}</view>
 
 		<view class="options">
-			<view 
-			@click="vipId = item.id"
-			:class="{option : true, act : vipId == item.id}" 
-			v-for="(item,index) in list" :key="index">
+			<view @click="vipId = item.id" :class="{option : true, act : vipId == item.id}" v-for="(item,index) in list"
+				:key="index">
 				<view style="font-weight: 600;">{{ item.name }}</view>
 				<view style="color: #FF2E2E;">
 					<text style="font-size: 20rpx;">￥</text>
@@ -42,8 +40,7 @@
 		<view class="block" v-if="vip.id">
 			<view class="privilege">{{ vip.name }}</view>
 			<view class="cells">
-				<view class="cell" 
-				v-for="(item, index) in vip.keys">
+				<view class="cell" v-for="(item, index) in vip.keys">
 					<image src="../static/mine/characteristic.png" mode="aspectFill" />
 					<view class="text">
 						<view>{{ item[0] }}</view>
@@ -86,15 +83,17 @@
 
 <script>
 	import mixinList from '@/mixins/list.js'
-	import { mapState } from 'vuex'
+	import {
+		mapState
+	} from 'vuex'
 	export default {
-		mixins : [mixinList],
+		mixins: [mixinList],
 		data() {
 			return {
 				radiovalue: false,
-				mixinsListApi : 'commonQueryVipType',
-				vipId : '',
-				numInfo:{}
+				mixinsListApi: 'commonQueryVipType',
+				vipId: '',
+				numInfo: {}
 			}
 		},
 		onShow() {
@@ -107,26 +106,26 @@
 				return '/static/image/center/headImage.png'
 			},
 			//获取个人中心基础信息的接口
-			getUserCenterData(){
-				this.$api('getUserCenterData',{}, res =>{
-					if(res.code == 200){
+			getUserCenterData() {
+				this.$api('getUserCenterData', {}, res => {
+					if (res.code == 200) {
 						this.numInfo = res.result
 					}
 				})
 			},
-			vip(){
+			vip() {
 				let vip = {}
 				this.list.forEach(n => {
-					if(n.id == this.vipId){
-						
+					if (n.id == this.vipId) {
+
 						let keys = n.perquisite.split('##')
-						
+
 						keys.forEach((s, i) => {
 							keys[i] = s.split('$$')
 						})
-						
+
 						n.keys = keys
-						
+
 						vip = n
 					}
 				})
@@ -134,13 +133,35 @@
 			},
 		},
 		methods: {
-			submit(id){
-				console.log("当前标识:"+id)
-				this.$api('addVIP',{id:id}, res =>{
-					console.log(res)
+			submit(id) {
+				console.log("当前标识:" + id)
+				this.$api('addVIP', {
+					id: id
+				}, res => {
+					uni.requestPayment({
+						provider: 'wxpay', // 服务提提供商
+						timeStamp: res.result.timeStamp, // 时间戳
+						nonceStr: res.result.nonceStr, // 随机字符串
+						package: res.result.packageValue,
+						signType: res.result.signType, // 签名算法
+						paySign: res.result.paySign, // 签名
+						success: function(res) {
+							console.log('支付成功', res);
+							self.$refs.confirmationPopupUpload.open()
+							// self.$refs.confirmationPopup.close()
+						},
+						fail: function(err) {
+							console.log('支付失败', err);
+							self.$refs.confirmationPopup.close()
+							uni.showToast({
+								icon: 'none',
+								title: "支付失败"
+							})
+						}
+					});
 				})
 			},
-			getDataThen(list){
+			getDataThen(list) {
 				this.vipId = list[0] && list[0].id
 			},
 		},
@@ -209,6 +230,7 @@
 		.options {
 			display: flex;
 			flex-wrap: wrap;
+
 			.option {
 				display: flex;
 				justify-content: center;
@@ -220,12 +242,14 @@
 				border-radius: 16rpx;
 				box-sizing: border-box;
 				margin: 12rpx;
+
 				view {
 					margin-top: 15rpx;
 					font-size: 28rpx;
 				}
 			}
-			.act{
+
+			.act {
 				border: 4rpx solid $uni-color;
 				box-shadow: 0 0 10rpx 10rpx rgba($uni-color, 0.2);
 			}
@@ -248,6 +272,7 @@
 					display: flex;
 					align-items: center;
 					margin: 20rpx 0;
+
 					.text {
 						margin-left: 20rpx;
 						color: #707070;
@@ -284,7 +309,7 @@
 			justify-content: center;
 			align-items: center;
 			padding: 8rpx 0;
-			box-shadow: 0 -2rpx 6rpx 0 #d9d9d9	;
+			box-shadow: 0 -2rpx 6rpx 0 #d9d9d9;
 
 			.box {
 				display: flex;
@@ -296,15 +321,16 @@
 				view:nth-child(1) {
 					color: #999999;
 				}
+
 				view:nth-child(2) {
 					padding: 25rpx 60rpx;
 					color: #FFFFFF;
 					background-color: #3796F8;
 					border-radius: 12rpx;
-					
+
 				}
 
-view:nth-child(1) {
+				view:nth-child(1) {
 					color: #999999;
 				}
 			}
diff --git a/pages_order/mine/help.vue b/pages_order/mine/help.vue
index 23dc94a..1da6668 100644
--- a/pages_order/mine/help.vue
+++ b/pages_order/mine/help.vue
@@ -99,10 +99,10 @@
 				
 				data.image = this.fileList.map((item) => item.url).join(",")
 				
-				this.$api('addAdvice', data, res => {
+				this.$api('addQuestion', data, res => {
 					if(res.code == 200){
 						uni.showToast({
-							title: res.message,
+							title: "反馈成功",
 							icon:'none'
 						})
 						
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
index cb3fec5..5d674ad 100644
--- a/pages_order/mine/promotion.vue
+++ b/pages_order/mine/promotion.vue
@@ -23,7 +23,7 @@
 			return {
 				url: '',
 				title: '123123',
-				baseUrl: 'https://dianpin-img.xzaiyp.top/',
+				baseUrl: 'https://img.teyizhao.com/',
 				canvas: {},
 				imagePath: '',
 			}
@@ -34,7 +34,7 @@
 		},
 		methods: {
 			getQrCode() {
-				this.$api('getQrCode', res => {
+				this.$api('getInviteCode', res => {
 					if (res.code == 200) {
 						this.url = res.result.url
 						this.title = res.result.name
diff --git a/pages_order/work/addResume.vue b/pages_order/work/addResume.vue
index 5ac02a1..de87459 100644
--- a/pages_order/work/addResume.vue
+++ b/pages_order/work/addResume.vue
@@ -29,8 +29,9 @@
 				<view class="label">
 					求职岗位
 				</view>
-				<input placeholder="请输入求职岗位" 
-				type="number"
+				
+				
+				<input placeholder="请输入求职岗位"
 				v-model="form.title" />
 			</view>
 			
@@ -83,15 +84,23 @@
 			</view>
 			
 			<view class="form-sheet-cell"
-			@click="openPicker('qulification')">
+			@click="openPicker('qualification')">
 				<view class="label">
 					您的学历
 				</view>
 				<input placeholder="请选择学历" 
 				disabled
-				v-model="form.qulification" />
+				v-model="form.qualification" />
 			</view>
 			
+			<!-- <view class="form-sheet-cell">
+							<view class="label">
+								您的学历
+							</view>
+							<input placeholder="请输入您的学历" 
+							v-model="form.qualification" />
+						</view> -->
+			
 			<uv-textarea
 			v-model="form.brief" 
 			count 
@@ -151,7 +160,7 @@
 					},
 				],
 				picker : {
-					qulification : [
+					qualification : [
 						'初中',
 						'高中',
 						'专科',
@@ -221,7 +230,7 @@
 						nation : '请输入您的民族',
 						salaryLow : '请输入期望薪资下限',
 						salaryUp : '请输入期望薪资上限',
-						// qulification : '请选择您的学历',
+						qualification : '请选择您的学历',
 						brief: '请输入个人介绍',
 					})) {
 					return
@@ -243,7 +252,7 @@
 					nation : this.form.nation,
 					salaryLow : this.form.salaryLow,
 					salaryUp : this.form.salaryUp,
-					qulification : this.form.qulification,
+					qualification : this.form.qualification,
 					brief: this.form.brief
 				}
 				
@@ -259,7 +268,7 @@
 						nation : this.form.nation,
 						salaryLow : this.form.salaryLow,
 						salaryUp : this.form.salaryUp,
-						qulification : this.form.qulification,
+						qualification : this.form.qualification,
 						brief: this.form.brief
 					}
 				}
diff --git a/pages_order/work/jobPosting.vue b/pages_order/work/jobPosting.vue
index 4692c83..607a199 100644
--- a/pages_order/work/jobPosting.vue
+++ b/pages_order/work/jobPosting.vue
@@ -24,7 +24,8 @@
 			<uv-cell
 			title="工作地点"
 			rightIconStyle="fontSize: 30rpx;"
-			value="请选择招工地点"
+			:value="form.address||'请选择招工地点'"
+			@click="selectAddr"
 			isLink
 			></uv-cell>
 			
@@ -197,6 +198,7 @@
 				form : {
 					// jobContext : '',
 					phone : '',
+					address:'',
 					title : '',
 					workAge : '',
 					natureId : 0,
@@ -274,7 +276,7 @@
 				
 				if (this.$utils.verificationAll(this.form, {
 						title: '请输入招工标题',
-						// address : '请选择工作地点',
+						address : '请选择工作地点',
 						workAge : '请选择工龄要求',
 						// company : '请输入招聘公司',
 						salaryLow : '请输入薪资范围',
diff --git a/pages_order/work/userDetail.vue b/pages_order/work/userDetail.vue
index 536543a..e6f2b17 100644
--- a/pages_order/work/userDetail.vue
+++ b/pages_order/work/userDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<navbar leftClick @leftClick="$utils.navigateBack" />
-		
+
 		<view class="head">
 			<view class="headImage">
 				<image :src="hanHaiMember.headImage" mode=""></image>
@@ -29,14 +29,40 @@
 					联系他
 				</view>
 			</view>
+
+
+
+
+
+
+
+
+
+
+
+
 		</view>
-		
+
 		<view style="background-color: #f3f3f3;height: 30rpx;"></view>
 		
 		<view class="box">
-			
+
 			<view class="userinfo">
-				
+
+				<view class="line">
+					<view v-if="collectionFlag == false" @click="addResumeCollection">
+						<uv-icon size="30rpx" color="666" name="star"></uv-icon>
+						收藏
+					</view>
+					
+					
+					
+					<view v-else @click="addResumeCollection" style="color: red;">
+						<uv-icon size="30rpx" color="666" name="star"></uv-icon>
+						已收藏
+					</view>
+				</view>
+
 				<view class="line">
 					<view class="left">
 						联系电话
@@ -45,7 +71,7 @@
 						{{ authenticationPerson.phone }}
 					</view>
 				</view>
-				
+
 				<view class="line">
 					<view class="left">
 						期望工作地
@@ -54,7 +80,7 @@
 						{{ detail.ipAddress }}
 					</view>
 				</view>
-				
+
 				<view class="line">
 					<view class="left">
 						民族
@@ -63,7 +89,7 @@
 						{{ detail.nation }}
 					</view>
 				</view>
-				
+
 				<view class="line">
 					<view class="left">
 						工龄
@@ -72,7 +98,7 @@
 						{{ detail.workTime ? `${detail.workTime}年` : '应届生' }}
 					</view>
 				</view>
-				
+
 				<view class="line">
 					<view class="left">
 						IP归属地
@@ -81,32 +107,29 @@
 						{{ detail.ipAddress }}
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 			<view class="info">
 				<view class="title2">
 					<text>个人介绍</text>
-					
+
 				</view>
-				
+
 				<!-- <view 
 				class="text" 
 				v-html="text">
 				</view> -->
-				<view 
-				class="text">
+				<view class="text">
 					<uv-parse :content="detail.brief"></uv-parse>
 				</view>
 				<view class="tag-list">
-					<view 
-					:key="i"
-					v-for="(t, i) in detail.tag && detail.tag.split('、')">
+					<view :key="i" v-for="(t, i) in detail.tag && detail.tag.split('、')">
 						{{ t }}
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
 	</view>
 </template>
@@ -121,20 +144,22 @@
 	`
 	import userHead from '../components/user/userHead.vue'
 	export default {
-		components : {
+		components: {
 			userHead,
 		},
 		data() {
 			return {
-				text : '',
-				id : 0,
-				detail : {},
-				hanHaiMember:{},
-				authenticationPerson:{},
-				collectionFlag : false,
+				text: '',
+				id: 0,
+				detail: {},
+				hanHaiMember: {},
+				authenticationPerson: {},
+				collectionFlag: false,
 			}
 		},
-		onLoad({id}) {
+		onLoad({
+			id
+		}) {
 			this.id = id
 		},
 		onShow() {
@@ -142,120 +167,146 @@
 			this.getData()
 		},
 		methods: {
-			getData(){
+			getData() {
 				let data = {
 					jobId: this.id
 				}
-				if(uni.getStorageSync('token')){
+				if (uni.getStorageSync('token')) {
 					data.token = uni.getStorageSync('token')
 				}
 				this.$api('bossQueryResumeById', data, res => {
-					if(res.code == 200){
+					if (res.code == 200) {
 						this.detail = res.result.resume
 						this.collectionFlag = res.result.collectionFlag
 						this.hanHaiMember = res.result.hanHaiMember
-						this.authenticationPerson= res.result.authenticationPerson
+						this.authenticationPerson = res.result.authenticationPerson
 					}
 				})
 			},
+			addResumeCollection(){
+				let data = {
+					resumeId : this.id
+				}
+				if(uni.getStorageSync('token')){
+					data.token = uni.getStorageSync('token')
+				}
+				this.$api('addResumeCollection', data, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				})
+				this.getData();
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.page{
-	background-color: #fff;
-	min-height: 100vh;
-	.head {
-		display: flex;
-		align-items: center;
-		position: relative;
-		padding: 20rpx;
-		image {
-			width: 140rpx;
-			height: 140rpx;
-			border-radius: 50%;
-		}
-	
-		.headImage {
-			width: 160rpx;
-			margin-right: 40rpx;
+	.page {
+		background-color: #fff;
+		min-height: 100vh;
+
+		.head {
 			display: flex;
-			flex-direction: column;
 			align-items: center;
-			justify-content: center;
-			view {
-				display: flex;
-				font-size: 24rpx;
-				align-items: center;
-				margin-left: 20rpx;
-				background: rgba($uni-color, 0.2);
-				color: $uni-color;
-				padding: 10rpx;
-				border-radius: 10rpx;
-				margin-top: 10rpx;
+			position: relative;
+			padding: 20rpx;
+
+			image {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 50%;
 			}
-		}
-	
-		.info {
-			font-size: 28rpx;
-	
-			.name {
-				font-size: 32rpx;
+
+			.headImage {
+				width: 160rpx;
+				margin-right: 40rpx;
 				display: flex;
-				padding-bottom: 10rpx;
-	
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
 				view {
 					display: flex;
-					font-size: 20rpx;
+					font-size: 24rpx;
 					align-items: center;
-					padding-left: 20rpx;
+					margin-left: 20rpx;
+					background: rgba($uni-color, 0.2);
+					color: $uni-color;
+					padding: 10rpx;
+					border-radius: 10rpx;
+					margin-top: 10rpx;
 				}
 			}
-	
-			.tips {
-				font-size: 26rpx;
-			}
-		}
-		.right{
-			margin-left: auto;
-			.phone{
-				background-color: rgba($uni-color, 0.2);
-				color: $uni-color;
-				padding: 8rpx 16rpx;
-				border-radius: 10rpx;
-				image{
-					width: 24rpx;
-					height: 24rpx;
+
+			.info {
+				font-size: 28rpx;
+
+				.name {
+					font-size: 32rpx;
+					display: flex;
+					padding-bottom: 10rpx;
+
+					view {
+						display: flex;
+						font-size: 20rpx;
+						align-items: center;
+						padding-left: 20rpx;
+					}
+				}
+
+				.tips {
+					font-size: 26rpx;
 				}
 			}
-		}
-	}
-	.box{
-		padding: 30rpx;
-		
-		.userinfo{
-			font-size: 28rpx;
-			color: #666666;
-			line-height: 44rpx;
-			margin-bottom: 40rpx;
-			.line{
-				margin-bottom: 20rpx;
-				display: flex;
-				.left{
-					width: 220rpx;
-					flex-shrink: 0;
+
+			.right {
+				margin-left: auto;
+
+				.phone {
+					background-color: rgba($uni-color, 0.2);
+					color: $uni-color;
+					padding: 8rpx 16rpx;
+					border-radius: 10rpx;
+
+					image {
+						width: 24rpx;
+						height: 24rpx;
+					}
 				}
 			}
 		}
-		
-		.info{
-			.text{
-				font-size: 24rpx;
+
+		.box {
+			padding: 30rpx;
+
+			.userinfo {
+				font-size: 28rpx;
 				color: #666666;
 				line-height: 44rpx;
+				margin-bottom: 40rpx;
+
+				.line {
+					margin-bottom: 20rpx;
+					display: flex;
+
+					.left {
+						width: 220rpx;
+						flex-shrink: 0;
+					}
+				}
+			}
+
+			.info {
+				.text {
+					font-size: 24rpx;
+					color: #666666;
+					line-height: 44rpx;
+				}
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue
index 7b8f34d..ad1d6cf 100644
--- a/pages_order/work/workDetail.vue
+++ b/pages_order/work/workDetail.vue
@@ -196,7 +196,7 @@
 				this.$api('employeeQueryJobById', data, res => {
 					if(res.code == 200){
 						this.detail = res.result.jobInfo
-						this.collectionFlag = res.result.CollectionFlage
+						this.collectionFlag = res.result.collectionFlag
 						this.personInfo = res.result.personInfo
 						this.companyInfo = res.result.companyInfo
 						this.hanHaiMember  = res.result.hanHaiMember