From 6c5b3beb20ecc0c428569c79cc7dcc0ebe91a352 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Wed, 21 Jun 2023 18:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/template/tabBar.vue                |   6 +-
 pages/mainPages/Settled/Settled.vue           | 123 +++++++++++-
 pages/mainPages/payment/payment.vue           |  27 +++
 pages/mainPages/userCenter/userCenter.vue     |  12 +-
 pages/mainPages/userset/userset.vue           |   3 +-
 pages/subPages/Equity/Equity.vue              |  51 ++---
 pages/subPages/Equity/Topping/Topping.vue     | 126 +++++++-----
 pages/subPages/Equity/chat/chat.vue           |  51 ++++-
 pages/subPages/Equity/person/person.vue       | 184 +++++++++++++-----
 pages/subPages/Equity/recruit/recruit.vue     |  51 ++++-
 pages/subPages/goods/index.vue                |   2 +-
 pages/subPages/homepage/homepage/homepage.vue |  20 +-
 .../hirePlatform/addResume/addResume.vue      |  38 ++--
 .../recruitmentEnter/recruitmentEnter.vue     |   4 +-
 .../subPages2/hirePlatform/resume/resume.vue  |  25 ++-
 pagesA/businessCooperation/index.vue          |  30 +--
 pagesA/identityList/bloggerCertification.vue  |  33 +++-
 pagesA/identityList/teacherCertification.vue  |  33 +++-
 pagesA/instantMessenger/instantMessenger.vue  |   4 +-
 .../studentIdentification.vue                 | 108 +++++++---
 20 files changed, 692 insertions(+), 239 deletions(-)

diff --git a/components/template/tabBar.vue b/components/template/tabBar.vue
index cca1e65..6790ae3 100644
--- a/components/template/tabBar.vue
+++ b/components/template/tabBar.vue
@@ -11,13 +11,14 @@
 					</view>
 					<view  v-else>
 						<view class="iconfont tabbar-item-icon" :class="item.iconclass" :style="current===index?'color:'+TabBarsData.style.iconcoloron:'color:'+TabBarsData.style.iconcolor"></view>
-						<view class="f-24" :style="current===index?'color:'+TabBarsData.style.textcoloron:'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
+						<view class="f-24" :style="current===index?'color:'+'#509DFD':'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
 					</view>
 					
 				</view>
 				<view class="navstyle-3-item" v-if="TabBarsData.params.navstyle==='2'" :class="(isTip && index=='2')?'msg_tip':''">
 					<view class="navstyle-image" :style="{'background-image':current===index?'url('+item.select_img+')':'url('+item.default_img+')'}"></view>
-					<view class="f-24 t-c" :style="current===index?'color:'+TabBarsData.style.textcoloron:'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
+					<!-- <view class="f-24 t-c" :style="current===index?'color:'+TabBarsData.style.textcoloron:'color:'+TabBarsData.style.textcolor">{{item.text}}</view> -->
+					<view class="f-24 t-c" :style="current===index?'color:'+'#509DFD':'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
 				</view>
 			</view>
 		</view>
@@ -297,6 +298,7 @@
 
 	.tabbar-item.item-on {
 		/* color: #fd4a5f; */
+		
 	}
 
 	.tabbar-item .image {
diff --git a/pages/mainPages/Settled/Settled.vue b/pages/mainPages/Settled/Settled.vue
index 8b3a508..5f424ec 100644
--- a/pages/mainPages/Settled/Settled.vue
+++ b/pages/mainPages/Settled/Settled.vue
@@ -82,7 +82,7 @@
 														<span>{{languageStatus!=1?'定位':'위치설정'}}</span>
 													</view>
 												</view>
-												<view class="userInfoInputMain">
+												<view class="userInfoInputMain" v-if="0">
 													<span style="color:red;width:6rpx;">*</span>
 													<span>{{languageStatus!=1?'行业分类':'항업분류'}}</span>
 													<view class="timePickerView" @click="showThePic">
@@ -96,7 +96,7 @@
 													</view>
 													<image :src="imgfixUrls + 'merchant/right.svg'" />
 												</view>
-												<view class="userInfoInputMain">
+												<view class="userInfoInputMain" v-if="0">
 													<span>{{languageStatus!=1?'上班时间':'영업시간'}}</span>
 													<view class="timePickerView">
 														
@@ -214,7 +214,7 @@
 										</view>
 										<view class="userInfoInput" >
 											<view class="userInfoInputPackage">
-												<view class="userInfoInputMain">
+												<view class="userInfoInputMain" v-if="0">
 													<span>招聘状态</span>
 													<view class="timePickerView">
 														<picker @change="switchChange" class="dataPicker" :value="switchIndex" :disabled="true" range-key="title" :range="switchList">
@@ -263,7 +263,7 @@
 													<span>{{languageStatus!=1?'企业亮点':''}}</span>
 													<input :placeholder="languageStatus!=1?'请输入企业亮点':''" v-model="userInfo.recruit_brighten" />
 												</view>
-												<view class="twiceTitle" v-if="switchIndex == 1">
+												<view class="twiceTitle" v-if="switchIndex == 1 && 0">
 													<span>企业幻灯片(750X560)</span>
 													<view>
 														<!-- 图片预览循环模板 -->
@@ -350,7 +350,7 @@
 								<!-- 家政信息区域 -->
 								
 								<!-- 店铺图片区域 -->
-								<view class="userImg">
+								<view class="userImg" v-if="0">
 									<view class="userInfoPackage">
 										<view class="firstTitle">
 											<view class="firstTitleName">
@@ -417,8 +417,8 @@
 								</view>
 								<!-- 店铺图片区域 -->
 
-								<!-- 店铺图片区域 -->
-								<view class="userIntroduce">
+								<!-- 企业介绍区域 -->
+								<view class="userIntroduce" v-if="0">
 									<view class="userInfoPackage">
 										<view class="firstTitle">
 											<view class="firstTitleName">
@@ -444,7 +444,7 @@
 										</view>
 									</view>
 								</view>
-								<!-- 店铺图片区域 -->
+								<!-- 企业介绍区域 -->
 
 								<view class="agreement1">
 									<label class="radio">
@@ -463,7 +463,7 @@
 
 								<!-- 表单提交按钮 -->
 								<view class="submitButtom" @click="saveUserInfo" v-if="userInfo.chargestatus == 0"><span>{{languageStatus!=1?'提交申请':'올리기'}}</span></view>
-								<view class="submitButtom" @click="saveUserInfo" v-else><span>{{languageStatus!=1?'下一步':'올리기'}}</span></view>
+								<view class="submitButtom" @click="newSaveUserInfo" v-else><span>{{languageStatus!=1?'下一步':'올리기'}}</span></view>
 								<!-- 表单提交按钮 -->
 
 								<!-- 填充 -->
@@ -1430,7 +1430,110 @@
 				_this.isWxaudit = !_this.isWxaudit;
 				_this.isWxaudit = !_this.isWxaudit;
 			},
-			// 提交商户信息
+			newSaveUserInfo(){
+				let _this = this;
+				if(_this.btnOff == true) return
+				_this.btnOff = true;
+				setTimeout(()=>{
+					_this.btnOff = false;
+				},2000)
+				// 判断
+				if (_this.userInfo.storename == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业名称不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.name == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '姓名不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.position == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '职务不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				let phone_reg = new RegExp(/^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/);
+				let myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(17[0-9]{1})|(19[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
+				if (!myreg.test(_this.userInfo.mobile) && !phone_reg.test(_this.userInfo.mobile)) {
+					App.showError("电话号码格式不正确");
+					return
+				}
+				
+				if (_this.userInfo.address == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '详细地址不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (_this.userInfo.business_license == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传营业执照',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业亮点不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (!_this.storeChecked) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先阅读《企业入驻相关条款》',
+						duration: 2000
+					});
+					return
+				}
+				if (_this.switchIndex == 1) {
+					this.userInfo.recruit_switch = this.switchList[this.switchIndex].id;
+					this.userInfo.recruit_nature_id = this.userInfo.nature[this.natureIndex].id;
+					this.userInfo.recruit_scale_id = this.userInfo.scale[this.scaleIndex].id;
+					this.userInfo.recruit_industry_id = this.userInfo.industry[this.industryIndex].id;
+				}
+				// let store_housekeep = [];
+				
+				// let housekeep_cate = JSON.stringify(store_housekeep);
+				let jsonString = JSON.stringify(this.userInfo.cateidArray);
+				let storehours = JSON.stringify(this.storehours);
+				let base64 = new this.$util.Base64();
+				this.userInfo.cateidArray = base64.encode(jsonString);
+				let data = this.userInfo;
+				data.storehours = base64.encode(storehours);
+				// data.store_housekeep_cate = base64.encode(housekeep_cate);
+				this.userInfo.sale_id = this.e.sale_id;
+				App._post_form('&p=store&do=createStore', data, res => {
+					uni.setStorageSync('userId', res.data);
+					_this.userInfo.storeid = res.data.storeid;
+					_this.page = 2;
+					_this.getChargeList();
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
+				}, err=>{
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
+				});
+			},
+			// 提交商户信息(旧版下一步触发)
 			saveUserInfo() {
 				let _this = this;
 				if(_this.btnOff == true) return
diff --git a/pages/mainPages/payment/payment.vue b/pages/mainPages/payment/payment.vue
index 83726fc..ddd1a43 100644
--- a/pages/mainPages/payment/payment.vue
+++ b/pages/mainPages/payment/payment.vue
@@ -353,6 +353,12 @@ export default {
 												});
 											});
 											
+										}else if(_this.plugin == 'rights'){
+											App.showSuccess('支付成功', () => {
+												uni.navigateBack({
+													delta:1
+												})
+											});
 										}else{
 											App.navigationTo({
 												url: 'pages/mainPages/successRelease/successRelease?id=' + res.data.tieziid
@@ -452,6 +458,12 @@ export default {
 										});
 									});
 									
+								}else if(_this.plugin == 'rights'){
+									App.showSuccess('支付成功', () => {
+										uni.navigateBack({
+											delta:1
+										})
+									});
 								}else{
 									App.navigationTo({
 										url: 'pages/mainPages/successRelease/successRelease?id=' + res.data.tieziid
@@ -676,6 +688,14 @@ export default {
 								});
 							}
 						}else{
+							if(_this.plugin == 'rights'){
+								// 权益订单
+								App.showSuccess('支付成功', () => {
+									uni.navigateBack({
+										delta: 1
+									})
+								});
+							}
 							App.navigationTo({
 								url: 'pages/subPages/paySuccess/paySuccess?tid=' + _this.payInfo.tid,
 								navType: 'rediRect'
@@ -692,6 +712,13 @@ export default {
 									navType: 'rediRect'
 								});
 							});
+						}else if(_this.plugin == 'rights'){
+							// 权益订单
+							App.showError('支付失败', () => {
+								uni.navigateBack({
+									delta:1
+								})
+							});
 						}else{
 							App.showError('支付失败', () => {
 								App.navigationTo({
diff --git a/pages/mainPages/userCenter/userCenter.vue b/pages/mainPages/userCenter/userCenter.vue
index 5f87283..a2e01e6 100644
--- a/pages/mainPages/userCenter/userCenter.vue
+++ b/pages/mainPages/userCenter/userCenter.vue
@@ -183,19 +183,19 @@
 						<navigator class="content_box1" :url="'/pagesA/rule_center/rule_center'"
 						 v-if="memberInfo.identity==='企业' || memberInfo.identity==='商家'">
 							<view style="font-size: 14px!important;">规则中心</view>
-							<image :src="imageRootNew+'rule.png'" mode=""></image>
+							<image :src="imageRootNew+'rule-blue.png'" mode=""></image>
 						</navigator>
 						<!-- 普通用户 -->
 						<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'"
 						 v-else>
 							<view style="font-size: 14px!important;">我的简历</view>
-							<image :src="imageRootNew+'stLine-newspaper-l@2x.png'" mode=""></image>
+							<image :src="imageRootNew+'jianli.png'" mode=""></image>
 						</navigator>
 						<!-- 主页入口 -->
 						<navigator class="content_box1" :url="'/pages/subPages/homepage/homepage/homepage?mid='+memberInfo.mid+'&checkType=1'">
 							<view style="font-size: 14px!important;">我的主页</view>
-							<image :src="imageRootNew+'home_123.png'" mode="" v-if="memberInfo.identity!=='企业' && memberInfo.identity!=='商家'"></image>
-							<image :src="imageRootNew+'stLine-home-l@2x.png'" mode="" v-else></image>
+							<image :src="imageRootNew+'home_123.png'" mode="" ></image>
+							<!-- <image :src="imageRootNew+'stLine-home-l@2x.png'" mode=""></image> -->
 						</navigator>
 					</view>
 					
@@ -226,7 +226,7 @@
 					<!-- 工具区域 -->
 
 					<!-- 认证入口 -->
-					<view class="mineHomepage" v-if="memberInfo.identity=='游客'|| 1">
+					<view class="mineHomepage" v-if="memberInfo.identity=='游客'||memberInfo.identity=='达人'">
 						<navigator class="content_box2" :url="'/pagesA/identityList/identityList'">
 						<!-- <navigator class="content_box2" :url="'/pages/subPages/attestationCenter/index'"> -->
 							<image :src="imageRootNew+'icon_certificate.png'" mode=""></image>
@@ -1301,7 +1301,7 @@
 	.mineToolBodyPackage {
 		padding: 10upx 20upx;
 		flex-wrap: wrap;
-		margin-bottom: 70upx;
+		margin-bottom: 40upx;
 		display: flex;
 		justify-content: space-around;
 
diff --git a/pages/mainPages/userset/userset.vue b/pages/mainPages/userset/userset.vue
index e608417..e487714 100644
--- a/pages/mainPages/userset/userset.vue
+++ b/pages/mainPages/userset/userset.vue
@@ -36,7 +36,8 @@
 			
 			<view class="content-box b-f padding-box-all bor-radius-10upx f-28 t-c" @click="clearToken">{{languageStatus!=1?'退出登录':'로그아웃'}}</view>
 		</view>
-		<view style="color: gray;width: 300rpx;text-align: center;position: fixed;bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.11</view>
+		<view style="color: gray;width: 300rpx;text-align: center;position: fixed;
+			bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.15</view>
 		<!-- <bindPhone :phoneShow="phoneShow" @clickmask="closePop" @mobileBulr="mobileBulr"></bindPhone> -->
 			<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
 		<PopManager :show="show2" @clickmask="closeshow">
diff --git a/pages/subPages/Equity/Equity.vue b/pages/subPages/Equity/Equity.vue
index f94e46d..edd153b 100644
--- a/pages/subPages/Equity/Equity.vue
+++ b/pages/subPages/Equity/Equity.vue
@@ -48,7 +48,7 @@
 		   <!-- <view class="linkColor mr5" v-if="item.name=='广告曝光卡'">
 		    联系平台 <image class="rightArrow" :src="imageRootNew+'right.png'"></image>
 		   </view> -->
-			 <button v-if="item.name=='广告曝光卡'"
+			 <button v-if="item.link=='contact'"
 			 	class="linkColor mr5"
 			 	open-type="contact"
 			 	hover-class="none"
@@ -76,30 +76,32 @@
 				
 			}
 		},
-		mounted() {
-			let data = {};
-			App._post_form('&p=rights&do=getRightsList', data, res => {
-				this.list2 = res.data.table_list
-				this.list = res.data.member_rights_list
-				this.list3 = res.data.content_list;
-				this.rights_bag_data = res.data.rights_bag_data;
-				this.list.map(item => {
-					if(item.name == '置顶权益'){
-						item.link = 'pages/subPages/Equity/Topping/Topping?rights_id='+item.rights_id;
-					}
-					if(item.name == '畅聊卡'){
-						item.link = 'pages/subPages/Equity/chat/chat?rights_id='+item.rights_id
-					}
-					if(item.name == '招聘次数'){
-						item.link = 'pages/subPages/Equity/recruit/recruit?rights_id='+item.rights_id
-					}
-					if(item.name == '精准人才卡'){
-						item.link = 'pages/subPages/Equity/person/person?rights_id='+item.rights_id
-					}
-				})
-			})
+		onShow() {
+			this.getData();
 		},
 		methods: {
+			getData(){
+				let data = {};
+				App._post_form('&p=rights&do=getRightsList', data, res => {
+					this.list2 = res.data.table_list
+					this.list = res.data.member_rights_list
+					this.list3 = res.data.content_list;
+					this.rights_bag_data = res.data.rights_bag_data;
+					this.list.map(item => {
+						if(item.name == '置顶权益'){
+							item.link = 'pages/subPages/Equity/Topping/Topping?rights_id='+item.rights_id;
+						}else if(item.name == '畅聊卡'){
+							item.link = 'pages/subPages/Equity/chat/chat?rights_id='+item.rights_id
+						}else if(item.name == '招聘次数'){
+							item.link = 'pages/subPages/Equity/recruit/recruit?rights_id='+item.rights_id
+						}else if(item.name == '精准人才卡'){
+							item.link = 'pages/subPages/Equity/person/person?rights_id='+item.rights_id
+						}else{
+							item.link = 'contact'
+						}
+					})
+				})
+			},
 			go(url) {
 					uni.navigateTo({
 						url: '/' + url.link
@@ -111,8 +113,7 @@
 				let data = {
 					rights_id: this.rights_bag_data.id,
 					type: 2,
-					price: this.rights_bag_data.price,
-					num: 1,
+					// price: this.rights_bag_data.price,
 					contacts: user.nickname,
 					contact_phone: user.truemobile
 				};
diff --git a/pages/subPages/Equity/Topping/Topping.vue b/pages/subPages/Equity/Topping/Topping.vue
index df26d72..4d3a04e 100644
--- a/pages/subPages/Equity/Topping/Topping.vue
+++ b/pages/subPages/Equity/Topping/Topping.vue
@@ -20,17 +20,17 @@
 					选择职位
 				</view>
 				
-				<view class="selectItem" v-for="(item ,index) in jobList" :class="item.id == selectType ? 'sType' : 'dType'"
-				 :key="index" @click="clickItem(item.id)">
-					{{ item.content }}
+				<view class="selectItem" v-for="(item ,index) in jobList" :class="item.recruit_id == selectType ? 'sType' : 'dType'"
+				 :key="index" @click="clickItem(item.recruit_id)">
+					{{ item.recruit_title }}
 				</view>
 				
 				<view style="margin-bottom: 40upx;align-items: center;" class="flex">
 					<view style="margin-right: 20upx;font-size: 28upx;">使用天数:</view>
-					<input class="inputNum" type="number" placeholder-style="color: #CACACA"  placeholder="请输入使用天数" />
+					<input class="inputNum" type="number" v-model="useDay" placeholder-style="color: #CACACA"  placeholder="请输入使用天数" />
 				</view>
 				
-				<view style="font-size: 32upx;" class="selectBtn">确认使用</view>
+				<view style="font-size: 32upx;" class="selectBtn" @click="useEquity">确认使用</view>
 			</view>
 			
 			<view v-else style="text-align: center;font-size: 30upx;margin: 60upx; 0;color: #999;">暂无职位</view>
@@ -54,7 +54,7 @@
 			</view>
 		</view>
 		
-		<view class="submitBtn">
+		<view class="submitBtn" @click="buy">
 			立即支付   ¥{{selectOptPrice}}/{{selectOptTxt}}
 		</view>
 		
@@ -63,22 +63,14 @@
 </template>
 
 <script>
+	let _this;
 	import App from '@/common/js/app.js';
 	export default {
 		data() {
 			return {
-				jobList: [
-					{
-						id: 1,
-						content: '富力汤温泉-前台接待员'
-					},
-					{
-						id: 2,
-						content: '富力汤温泉-后勤接待人员'
-					}
-				],
+				jobList: [],
 				selectType: 1,
-				
+				useDay: '',
 				selectOption: 1,
 				selectOptTxt: '一天',
 				selectOptPrice: '100.00',
@@ -88,12 +80,35 @@
 				diyPrice: '',
 				dayNum: 0,
 				rights_id: null,
+				lock_1: false,
+				lock_2: false
 			};
 		},
 		onLoad(e){
+			_this = this;
 			this.rights_id = e.rights_id;
+		},
+		onShow() {
+			this.diySelect = '';
 			this.getData();
-			this.getJobList();
+		},
+		watch: {
+			useDay(nVal){
+				clearTimeout(this.lock_1);
+				this.lock_1 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					console.log(nVal);
+					this.useDay = nVal || '';
+				}, 500)
+			},
+			diySelect(nVal){
+				clearTimeout(this.lock_2);
+				this.lock_2 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					console.log(nVal, 1111);
+					this.diySelect = nVal || '';
+				}, 500)
+			},
 		},
 		methods: {
 			clickItem(val){
@@ -111,29 +126,6 @@
 					return;
 				}
 			},
-			getJobList(){
-				let data = {
-					industry_pid: '',
-					industry_id: '',
-					position_id: '',
-					sort: '',
-					recruitment_type: 2,
-					release_sid: 11,
-					release_mid: '',
-					is_total: 1,
-					page: 1,
-					page_index: 10,
-					is_private: 1
-				}
-				App._post_form(
-					`&p=recruit&do=homeList`,
-					data,
-					res => {
-						console.log(res);
-					},
-					() => {},() => {}
-				);
-			},
 			getData(){
 				App._post_form(
 					`&p=rights&do=getRightsTypeInfo`, { rights_id: this.rights_id },
@@ -142,6 +134,9 @@
 						this.dayNum = res.data.remaining_amount;
 						this.diyUnit = res.data.amount_unit;
 						this.diyPrice = res.data.price;
+						
+						this.jobList = res.data.filter_data.recruit;
+						
 						this.selectOptLs = res.data.num_data;
 						for(let key in this.selectOptLs){
 							this.selectOptPrice = key * res.data.price;
@@ -154,20 +149,57 @@
 				);
 			},
 			changeOrderPrice(e){
-				console.log(e.detail.value, this.diySelect,  Math.floor(this.diyPrice));
-				if(e.detail.value){
-					this.selectOptPrice = e.detail.value * Math.floor(this.diyPrice);
-					this.selectOptTxt = e.detail.value + '天';
+				// console.log(e.detail.value, this.diySelect,  +(this.diyPrice));
+				if(!!e.detail.value){
+					this.selectOptPrice = (Math.floor(e.detail.value) * +(this.diyPrice)).toFixed(2);
+					this.selectOptTxt = Math.floor(e.detail.value) + '天';
 					this.selectOption = '';
-					console.log(this.selectOptPrice);
 				}else{
 					for(let key in this.selectOptLs){
-						this.selectOptPrice = key * this.diyPrice;
+						this.selectOptPrice = (key * this.diyPrice).toFixed(2);
 						this.selectOption = this.selectOptLs[key];
 						this.selectOptTxt = this.selectOptLs[key];
 						return;
 					}
 				}
+			},
+			useEquity(){
+				let data = {
+					rights_id: this.rights_id,
+					position: JSON.stringify([{recruit_id: this.selectType,num:this.useDay}])
+				}
+				console.log(data);
+				App._post_form('&p=rights&do=memberUseRights', data, res => {
+					console.log(res);
+					uni.showToast({
+						title: res.message
+					})
+					this.getData();
+				},(err)=>{},(com)=>{})
+			},
+			buy(){
+				let user = uni.getStorageSync('userinfo');
+				let num;
+				for(let key in this.selectOptLs){
+					if(this.selectOptLs[key]==this.selectOption){
+						num = key;
+					}
+				}
+				
+				let data = {
+					rights_id: this.rights_id,
+					type: 1,
+					num: num || this.diySelect,
+					contacts: user.nickname,
+					contact_phone: user.truemobile
+				};
+				console.log(data)
+				App._post_form('&p=rights&do=createRightsPay', data, res => {
+					uni.navigateTo({
+						url: '/pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=' + res.data.type
+					})
+					console.log(res.data)
+				})
 			}
 		}
 	}
diff --git a/pages/subPages/Equity/chat/chat.vue b/pages/subPages/Equity/chat/chat.vue
index 996def4..bab17b4 100644
--- a/pages/subPages/Equity/chat/chat.vue
+++ b/pages/subPages/Equity/chat/chat.vue
@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		
-		<view class="submitBtn">
+		<view class="submitBtn" @click="buy">
 			立即支付   ¥{{selectOptPrice}}/{{selectOptTxt}}
 		</view>
 	</view>
@@ -52,12 +52,26 @@
 				diyPrice: '',
 				dayNum: 0,
 				rights_id: null,
+				lock_2: false
 			};
 		},
 		onLoad(e){
 			this.rights_id = e.rights_id;
+		},
+		onShow() {
+			this.diySelect = '';
 			this.getData();
 		},
+		watch: {
+			diySelect(nVal){
+				clearTimeout(this.lock_2);
+				this.lock_2 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					console.log(nVal, 1111);
+					this.diySelect = nVal || '';
+				}, 500)
+			},
+		},
 		methods: {
 			clickOption(val){
 				if(typeof val == 'string'){
@@ -91,20 +105,43 @@
 				);
 			},
 			changeOrderPrice(e){
-				console.log(e.detail.value, this.diySelect,  Math.floor(this.diyPrice));
-				if(e.detail.value){
-					this.selectOptPrice = e.detail.value * 30 * Math.floor(this.diyPrice);
-					this.selectOptTxt = e.detail.value + '个月';
+				// console.log(e.detail.value, this.diySelect,  +(this.diyPrice));
+				if(!!e.detail.value){
+					this.selectOptPrice = (Math.floor(e.detail.value) * 30 * +(this.diyPrice)).toFixed(2);
+					this.selectOptTxt = Math.floor(e.detail.value) + '个月';
 					this.selectOption = '';
-					console.log(this.selectOptPrice);
 				}else{
 					for(let key in this.selectOptLs){
-						this.selectOptPrice = key * this.diyPrice;
+						this.selectOptPrice = (key * this.diyPrice).toFixed(2);
 						this.selectOption = this.selectOptLs[key];
 						this.selectOptTxt = this.selectOptLs[key];
 						return;
 					}
 				}
+			},
+			buy(){
+				let user = uni.getStorageSync('userinfo');
+				let num;
+				for(let key in this.selectOptLs){
+					if(this.selectOptLs[key]==this.selectOption){
+						num = key;
+					}
+				}
+				
+				let data = {
+					rights_id: this.rights_id,
+					type: 1,
+					num: num || this.diySelect,
+					contacts: user.nickname,
+					contact_phone: user.truemobile
+				};
+				console.log(data)
+				App._post_form('&p=rights&do=createRightsPay', data, res => {
+					uni.navigateTo({
+						url: '/pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=' + res.data.type
+					})
+					console.log(res.data)
+				})
 			}
 		}
 	}
diff --git a/pages/subPages/Equity/person/person.vue b/pages/subPages/Equity/person/person.vue
index 42a9849..f816891 100644
--- a/pages/subPages/Equity/person/person.vue
+++ b/pages/subPages/Equity/person/person.vue
@@ -20,12 +20,15 @@
 					选择职位
 				</view>
 				
-				<view class="flex jcsb mb40" v-for="(item ,index) in perData.filter_data.recruit" :key="index">
+				<view class="flex jcsb mb40" v-for="(item ,index) in positionList" :key="index">
 					<view class="selectItem" :class="item.recruit_id == selectType0 ? 'sType' : 'dType'"
 					  @click="clickItem(item, 1)">
 						{{ item.recruit_title }}
 					</view>
-					<input class="inputSel" v-model="item.num" :disabled="item.recruit_id != selectType0" :style="item.recruit_id == selectType0 ? 'border: 1px solid #85BAFC' : 'border: 1px solid #ffffff'" type="number" placeholder-style="color: #CACACA"  placeholder="请输入使用份数" />
+					<input class="inputSel" v-model="useDay" v-if="item.recruit_id == selectType0" style="border: 1px solid #85BAFC"
+						type="number" placeholder-style="color: #CACACA"  placeholder="请输入使用份数" />
+					<input class="inputSel" value="" :disabled="true" v-else style="border: 1px solid #ffffff"
+						type="number" placeholder-style="color: #CACACA"  placeholder="请输入使用份数" />
 				</view>
 				
 				
@@ -37,7 +40,7 @@
 						毕业院校
 					</view>
 					<view style="flex-wrap: wrap;" class="flex">
-						<view class="gaojItem" :class="item == selectType2 ? 'sType' : 'dType'" v-for="(item, index) in perData.filter_data.school" :key="index" @click="clickItem(item, 3)">
+						<view class="gaojItem" :class="item == selectType2 ? 'sType' : 'dType'" v-for="(item, index) in perData.filter_data.graduated_school" :key="index" @click="clickItem(item, 3)">
 							{{ item }}
 						</view>
 					</view>
@@ -56,7 +59,7 @@
 				</view>
 				
 				
-				<view style="font-size: 32upx;" class="selectBtn">确认使用</view>
+				<view style="font-size: 32upx;" class="selectBtn" @click="useEquity">确认使用</view>
 			</view>
 			
 			<view v-else style="text-align: center;font-size: 30upx;margin: 60upx; 0;color: #999;">暂无职位</view>
@@ -70,12 +73,12 @@
 		<view class="buyBox">
 			<view class="flex jcsb mb40">
 				<view class="title">购买份数</view>
-				<view style="color: #BBBBBB;font-size: 30upx;">剩余: 0天</view>
+				<view style="color: #BBBBBB;font-size: 30upx;">剩余: {{dayNum}}{{diyUnit}}</view>
 			</view>
 			
 			<view style="margin-bottom: 40upx;align-items: center;" class="flex">
 				<view style="margin-right: 20upx;font-size: 28upx;">自定义份数:</view>
-				<input style="text-align: left;padding-left: 18upx;width: 72%;" class="inputNum" type="number" placeholder-style="color: #CACACA"  placeholder="请输入购买份数" />
+				<input style="text-align: left;padding-left: 18upx;width: 72%;" class="inputNum" @input="changeOrderPrice" v-model="diySelect" type="number" placeholder-style="color: #CACACA"  placeholder="请输入购买份数" />
 			</view>
 			
 			<view class="selectDay flex jcsb">
@@ -85,7 +88,7 @@
 			</view>
 		</view>
 		
-		<view class="submitBtn">
+		<view class="submitBtn" @click="buy">
 			立即支付   ¥{{selectOptPrice}}/{{selectOptTxt}}
 		</view>
 		
@@ -98,62 +101,89 @@
 	export default {
 		data() {
 			return {
-				list2: [
-					{
-						id: 1,
-						txt: '10份'
-					},
-					{
-						id: 2,
-						txt: '30份'
-					},
-					{
-						id: 3,
-						txt: '50份'
-					},
-					{
-						id: 4,
-						txt: '100份'
-					}
-				],
 				selectType0: 1,
-				selectOptPrice: '',
-				selectOptTxt: '',
-				selectType1: 1,
 				selectType2: 0,
 				selectType3: 0,
 				dayNum: 0,
-				perData: '',
+				perData: {},
+				positionList: [],
+				useDay: '',
 				show: true,
+				diySelect: '',
 				diyUnit: '',
 				diyPrice: '',
+				selectOptPrice: '',
+				selectOptTxt: '',
+				selectType1: 1,
 				rights_id: null,
+				lock_1: false,
+				lock_2: false
 			};
 		},
 		onLoad(e){
 			this.rights_id = e.rights_id;
+		},
+		onShow() {
+			this.diySelect = '';
 			this.getData();
 		},
-		mounted() {
-			
+		watch: {
+			useDay(nVal){
+				clearTimeout(this.lock_1);
+				this.lock_1 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					// console.log(nVal);
+					this.useDay = nVal || '';
+				}, 500)
+			},
+			// positionList: {
+			// 	deep:true,// vue2无深层侦听
+			// 	handler (nPVal) {
+			// 		console.log(nPVal,this.selectType0, 111);
+			// 		clearTimeout(this.lock_1);
+			// 		this.lock_1 = setTimeout(()=>{
+			// 			console.log(nPVal,this.selectType0);
+			// 			for(let i=0;i<this.positionList.length;i++){
+			// 				// this.positionList[i].num = '';// 数据层处理了，视图层未刷新
+			// 			}
+			// 		}, 500)
+			// 	}
+			// },
+			diySelect(nVal){
+				clearTimeout(this.lock_2);
+				this.lock_2 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					console.log(nVal, 1111);
+					this.diySelect = nVal || '';
+				}, 500)
+			},
 		},
 		methods: {
 			clickItem(val, type){
+				// console.log(val, type);
 				if(type == 1){
-					this.perData.filter_data.recruit.map(item => {
-						item.num = ''
-					})
-					this.selectType0 = val.recruit_id
+					// 点击职位选项
+					this.selectType0 = val.recruit_id;
+					this.useDay = '';
+					// console.log(val, this.positionList);
 				}
 				if(type == 2){
+					// 点击购买选项
 					this.selectType1 = val
-					this.selectOptTxt = val + '份'
-					this.selectOptPrice = val * this.diyPrice;
+					this.selectOptTxt = val
+					for(let key in this.perData.num_data){
+						if(this.perData.num_data[key]==val){
+							this.selectOptPrice = key * this.diyPrice;
+						}
+					}
+					return;
 				}
 				if(type == 3){
+					// 点击院校选项
 					this.selectType2 = val
 				}
 				if(type == 4){
+					// 点击优先选项
 					this.selectType3 = val
 				}
 			},
@@ -162,24 +192,90 @@
 					rights_id: 5
 				};
 				App._post_form('&p=rights&do=getRightsTypeInfo', data, res => {
-					res.data.filter_data.recruit.map(item =>{
-						item.num = ''
-					})
 					this.dayNum = res.data.remaining_amount;
 					this.diyUnit = res.data.amount_unit;
 					this.diyPrice = res.data.price;
-					this.perData = res.data
-					// this.perData.filter_data.recruit = []
-					this.show = this.perData.filter_data.recruit.length>0 ? true : false
-					
+					this.perData = res.data;
 					console.log(this.perData)
+					this.positionList = res.data.filter_data.recruit;
+					this.show = this.positionList.length>0 ? true : false;
 					
 					for(let key in this.perData.num_data){
+						// 初始化购买选项
 						this.selectOptPrice = key * res.data.price;
 						this.selectType1 = this.perData.num_data[key];
+						this.selectOptTxt = this.perData.num_data[key];
+						return;
+					}
+				})
+			},
+			changeOrderPrice(e){
+				// console.log(e.detail.value, +(this.diyPrice));
+				if(!!e.detail.value){
+					this.selectOptPrice = (Math.floor(e.detail.value) * +(this.diyPrice)).toFixed(2);
+					this.selectOptTxt = Math.floor(e.detail.value) + '份';
+					this.selectType1 = '';
+				}else{
+					for(let key in this.perData.num_data){
+						this.selectOptPrice = (key * this.diyPrice).toFixed(2);
 						this.selectType1 = this.perData.num_data[key];
+						this.selectOptTxt = this.perData.num_data[key];
 						return;
 					}
+				}
+			},
+			useEquity(){
+				let num,school,experience;
+				// num = this.positionList.filter(item => {
+				// 	return item.recruit_id == this.selectType0
+				// });
+				for(let key in this.perData.filter_data.graduated_school){
+					if(this.perData.filter_data.graduated_school[key]==this.selectType2){
+						school = key;
+					}
+				}
+				for(let key in this.perData.filter_data.experience){
+					if(this.perData.filter_data.experience[key]==this.selectType3){
+						experience = key;
+					}
+				}
+				let data = {
+					rights_id: this.rights_id,
+					position: JSON.stringify([{recruit_id: this.selectType0,num:this.useDay}]),
+					graduated_school: school,
+					experience: experience
+				}
+				console.log(data);
+				App._post_form('&p=rights&do=memberUseRights', data, res => {
+					console.log(res);
+					uni.showToast({
+						title: res.message
+					})
+					this.getData();
+				},(err)=>{},(com)=>{})
+			},
+			buy(){
+				let user = uni.getStorageSync('userinfo');
+				let num;
+				for(let key in this.perData.num_data){
+					if(this.perData.num_data[key]==this.selectType1){
+						num = key;
+					}
+				}
+				
+				let data = {
+					rights_id: this.rights_id,
+					type: 1,
+					num: num || this.diySelect,
+					contacts: user.nickname,
+					contact_phone: user.truemobile
+				};
+				console.log(data)
+				App._post_form('&p=rights&do=createRightsPay', data, res => {
+					uni.navigateTo({
+						url: '/pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=' + res.data.type
+					})
+					console.log(res.data)
 				})
 			}
 		}
diff --git a/pages/subPages/Equity/recruit/recruit.vue b/pages/subPages/Equity/recruit/recruit.vue
index 0fc9599..da0091c 100644
--- a/pages/subPages/Equity/recruit/recruit.vue
+++ b/pages/subPages/Equity/recruit/recruit.vue
@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		
-		<view class="submitBtn">
+		<view class="submitBtn" @click="buy">
 			立即支付   ¥{{selectOptPrice}}/{{selectOptTxt}}
 		</view>
 	</view>
@@ -52,12 +52,26 @@
 				diyPrice: '',
 				dayNum: 0,
 				rights_id: null,
+				lock_2: false
 			};
 		},
 		onLoad(e){
 			this.rights_id = e.rights_id;
+		},
+		onShow() {
+			this.diySelect = '';
 			this.getData();
 		},
+		watch: {
+			diySelect(nVal){
+				clearTimeout(this.lock_2);
+				this.lock_2 = setTimeout(()=>{
+					nVal = Math.floor(nVal);
+					console.log(nVal, 1111);
+					this.diySelect = nVal || '';
+				}, 500)
+			},
+		},
 		methods: {
 			clickOption(val){
 				if(typeof val == 'string'){
@@ -91,20 +105,43 @@
 				);
 			},
 			changeOrderPrice(e){
-				console.log(e.detail.value, this.diySelect,  Math.floor(this.diyPrice));
-				if(e.detail.value){
-					this.selectOptPrice = e.detail.value * Math.floor(this.diyPrice);
-					this.selectOptTxt = e.detail.value + '次';
+				// console.log(e.detail.value, this.diySelect,  +(this.diyPrice));
+				if(!!e.detail.value){
+					this.selectOptPrice = (Math.floor(e.detail.value) * +(this.diyPrice)).toFixed(2);
+					this.selectOptTxt = Math.floor(e.detail.value) + '次';
 					this.selectOption = '';
-					console.log(this.selectOptPrice);
 				}else{
 					for(let key in this.selectOptLs){
-						this.selectOptPrice = key * this.diyPrice;
+						this.selectOptPrice = (key * this.diyPrice).toFixed(2);
 						this.selectOption = this.selectOptLs[key];
 						this.selectOptTxt = this.selectOptLs[key];
 						return;
 					}
 				}
+			},
+			buy(){
+				let user = uni.getStorageSync('userinfo');
+				let num;
+				for(let key in this.selectOptLs){
+					if(this.selectOptLs[key]==this.selectOption){
+						num = key;
+					}
+				}
+				
+				let data = {
+					rights_id: this.rights_id,
+					type: 1,
+					num: num || this.diySelect,
+					contacts: user.nickname,
+					contact_phone: user.truemobile
+				};
+				console.log(data)
+				App._post_form('&p=rights&do=createRightsPay', data, res => {
+					uni.navigateTo({
+						url: '/pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=' + res.data.type
+					})
+					console.log(res.data)
+				})
 			}
 			
 		}
diff --git a/pages/subPages/goods/index.vue b/pages/subPages/goods/index.vue
index 0163c6e..b13cea2 100644
--- a/pages/subPages/goods/index.vue
+++ b/pages/subPages/goods/index.vue
@@ -580,7 +580,7 @@
 						</view>
 					</view>
 					<!-- 商家信息 -->
-					<view class="store padding-box-all b-f m-btm20" v-if="!!dataInfo['shop']">
+					<view class="store padding-box-all b-f m-btm20" v-if="!!dataInfo['shop'] && 0">
 						<!-- 配置标题 -->
 						<goodsHeaderTitle :titleName="'商家信息'"></goodsHeaderTitle>
 						<view class="store-detail" @click="naviStore(dataInfo['shop'])">
diff --git a/pages/subPages/homepage/homepage/homepage.vue b/pages/subPages/homepage/homepage/homepage.vue
index 478996c..b21626d 100644
--- a/pages/subPages/homepage/homepage/homepage.vue
+++ b/pages/subPages/homepage/homepage/homepage.vue
@@ -356,13 +356,13 @@
 						// 	isOpen: true
 						// })
 						
-						if(res.data.is_store == 1){
-							_this.tabbar.unshift({
-								title: '店铺',
-								type: 'shop',
-								isOpen: true
-							})
-						}
+						// if(res.data.is_store == 1){
+						// 	_this.tabbar.unshift({
+						// 		title: '店铺',
+						// 		type: 'shop',
+						// 		isOpen: true
+						// 	})
+						// }
 						// if(res.data.is_pocket == 1){
 							_this.tabbar.unshift({
 								title: '发布',
@@ -374,9 +374,9 @@
 						if (res.data.is_pocket === 1 && checkType === "1") {
 							_this.getuserList(mid);
 						} else {
-							if(_this.isMe){
-								_this.getuserShopList(mid, location.lat, location.lng)
-							}
+							// if(_this.isMe){
+							// 	_this.getuserShopList(mid, location.lat, location.lng)
+							// }
 						}
 						// console.log(_this.tabbar.length, _this.tabbar[0].isOpen, 11111111)
 						// _this.tabbar[0].isOpen = res.data.is_pocket === 1;
diff --git a/pages/subPages2/hirePlatform/addResume/addResume.vue b/pages/subPages2/hirePlatform/addResume/addResume.vue
index 6e91d30..a411d54 100644
--- a/pages/subPages2/hirePlatform/addResume/addResume.vue
+++ b/pages/subPages2/hirePlatform/addResume/addResume.vue
@@ -403,7 +403,7 @@
 						</view>
 						<view class="dis-flex after-item-item">
 							<view style="flex: 0.3;" class="f-w">任职时间</view>
-							<view style="flex: 0.8;padding-left: 20upx;">{{ item.starttime }}-{{ item.endtime }}</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.start_time }}-{{ item.end_time }}</view>
 						</view>
 						<!-- <view class="dis-flex after-item-item">
 							<view style="flex: 0.3;" class="f-w">职务内容</view>
@@ -440,14 +440,14 @@
 							</view>
 							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
 								<view class="f-26" style="flex: 0.3;">开始时间</view>
-								<view :class="school_office.starttime ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="startTime = true">
-									{{ school_office.starttime || '请选择任职开始时间' }}
+								<view :class="school_office.start_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="startTime = true">
+									{{ school_office.start_time || '请选择任职开始时间' }}
 								</view>
 							</view>
 							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
 								<view class="f-26" style="flex: 0.3;">结束时间</view>
-								<view :class="school_office.endtime ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="endTime = true">
-									{{ school_office.endtime || '请选择任职结束时间' }}
+								<view :class="school_office.end_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="endTime = true">
+									{{ school_office.end_time || '请选择任职结束时间' }}
 								</view>
 							</view>
 							<!-- <view class="dis-flex" style="padding-bottom: 20upx;padding-top: 40upx;">
@@ -462,7 +462,7 @@
 									/>
 								</view>
 							</view> -->
-							<view class="dis-il-block t-c redbtn" style="bottom: -20%;" @click.stop="addschool_office">保存</view>
+							<view class="dis-il-block t-c redbtn" @click.stop="addschool_office">保存</view>
 						</view>
 					</view>
 				</PopManager>
@@ -630,7 +630,7 @@
 									<textarea  type="text"  style="font-size: 26upx;width: 100%;height: 400upx;" maxlength="9999" placeholder="请填写项目内容" v-model="work_experience.content" />
 								</view>
 							</view> -->
-							<view class="dis-il-block t-c redbtn" style="bottom: -20%;" @click.stop="addTeach_experience">保存</view>
+							<view class="dis-il-block t-c redbtn" @click.stop="addTeach_experience">保存</view>
 						</view>
 					</view>
 				</PopManager>
@@ -754,8 +754,8 @@ export default{
 			school_office:{
 				school_name:'',
 				position:'',
-				starttime:'',
-				endtime:''
+				start_time:'',
+				end_time:''
 			},
 			school_officeList:[],
 			work_experience:{
@@ -1078,8 +1078,8 @@ export default{
 			this.school_office = {
 				school_name:'',
 				position:'',
-				starttime:'',
-				endtime:'',
+				start_time:'',
+				end_time:'',
 			}
 		},
 		onConfirmage(e){
@@ -1088,13 +1088,13 @@ export default{
 		onConfirmendTime(e){
 			this.educational_experience.end_time = e.result;
 			this.work_experience.end_time = e.result;
-			this.school_office.endtime = e.result;
+			this.school_office.end_time = e.result;
 		},
 		onConfirmstartTime(e){
 			// console.log(e, '111111111111111111')
 			this.educational_experience.start_time = e.result;
 			this.work_experience.start_time = e.result;
-			this.school_office.starttime = e.result;
+			this.school_office.start_time = e.result;
 		},
 		onConfirmGra(e){
 			// console.log(e, '111111111111111111');
@@ -1106,8 +1106,8 @@ export default{
 				this.school_office ={
 					school_name:'',
 					position:'',
-					starttime:'',
-					endtime:''
+					start_time:'',
+					end_time:''
 				};
 			},500)
 		},
@@ -1223,6 +1223,10 @@ export default{
 						}
 					}
 			  }
+			  data.school_office.map(item=>{
+			  	item.start_time = item.start_time ? this.getDataTime(item.start_time):'';
+			  	item.end_time = item.end_time ? this.getDataTime(item.end_time):'';
+			  })
 			  data.work_experience.map(item=>{
 			  	item.start_time = item.start_time ? this.getDataTime(item.start_time):'';
 			  	item.end_time = item.end_time ? this.getDataTime(item.end_time):'';
@@ -1945,11 +1949,11 @@ page {
 			background-color: #ff4444;
 			color: #ffffff;
 			border-radius: 10upx;
-			position: absolute;
-			bottom: 10%;
+			position: relative;
 			left: 50%;
 			transform: translate(-50%);
 			z-index: 9;
+			margin-top: 20px;
 		}
 	}
 }
diff --git a/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue b/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue
index 694955a..d8adf97 100644
--- a/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue
+++ b/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue
@@ -38,7 +38,7 @@
 				</view>
 				<view class="button-set dis-flex">
 					<view class="flex-box set-data">{{ item.release_time }}</view>
-					<view class="flex-box set-compile t-c" @click="compile(item, index)" v-if="item.status == 3 || item.status == 5">
+					<view class="flex-box set-compile t-c" @click="compile(item, index)" v-if="0 && (item.status == 3 || item.status == 5)">
 						<!-- <text class="iconfont icon-bianji" style="font-size: 26upx;color: #333333;"></text> -->
 						<text>编辑</text>
 					</view>
@@ -55,7 +55,7 @@
 							<text>置顶中</text>
 						</view>
 					</view>
-					<view class="flex-box set-compile t-c" @click="over(item,index,4)" v-if="item.status == 5">
+					<view class="flex-box set-compile t-c" @click="over(item,index,4)" v-if="item.status == 5 && 0">
 						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
 						<text>重新打开</text>
 					</view>
diff --git a/pages/subPages2/hirePlatform/resume/resume.vue b/pages/subPages2/hirePlatform/resume/resume.vue
index c52b570..93461a8 100644
--- a/pages/subPages2/hirePlatform/resume/resume.vue
+++ b/pages/subPages2/hirePlatform/resume/resume.vue
@@ -43,7 +43,8 @@
 					<view class="rigth-text">发布于{{resumeData.create_time_text}}</view>
 				</view>
 				<view class="Self-content">
-					{{resumeData.self_evaluation}}
+					<text>{{resumeData.self_evaluation}}</text>
+					
 				</view>
 			</view>
 			<view class="job-intention">
@@ -68,7 +69,23 @@
 			</view>
 			<view class="work-experience" >
 				<view class="work-title">
-					工作经历
+					在校职务经验
+				</view>
+				<view class="experience-item" v-for="(item,index) in resumeData.school_office">
+					<view class="item-ball"></view>
+					<view class="item-title dis-flex">
+						<view class="item-post">
+							{{item.school_name}}•{{item.position}}
+						</view>
+						<view class="item-date">
+							{{item.start_time}}至{{item.end_time}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="work-experience" >
+				<view class="work-title">
+					实习经验
 				</view>
 				<view class="experience-item" v-for="(item,index) in resumeData.work_experience">
 					<!-- 小球 -->
@@ -85,7 +102,7 @@
 						{{item.corporate_name}}
 					</view>
 					<view class="working">
-						{{item.content}}
+						<text>{{item.content}}</text>
 					</view>
 <!-- 					<view class="working">
 						2、有较强的文字驾驭能力,有两年的事业单位文书经验,擅长各类公文写作;
@@ -101,7 +118,7 @@
 					<view class="item-ball"></view>
 					<view class="item-title dis-flex">
 						<view class="item-post">
-							{{item.school}}
+							{{item.school}}•{{item.graduated_school}}
 						</view>
 					</view>
 					<view class="company-name" style="padding: 10upx 0 30upx;">
diff --git a/pagesA/businessCooperation/index.vue b/pagesA/businessCooperation/index.vue
index 74e5dab..7611e00 100644
--- a/pagesA/businessCooperation/index.vue
+++ b/pagesA/businessCooperation/index.vue
@@ -98,6 +98,7 @@ export default {
 	methods: {
 		init(mid) {
 			let _this = this;
+			_this.getInfo(mid);
 		},
 		// 信息设置接口
 		getInfo(mid) {
@@ -105,11 +106,15 @@ export default {
 			let data = {
 				mid: mid
 			};
-			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+			App._post_form('&p=Certified&do=initApplyCertified', data, res => {
 				_this.setData({
-					studInfo: res.data
+					business: res.data
+				})
+			}, (err)=>{
+				console.log(err.data.message);
+				uni.navigateBack({
+					delta: 1
 				})
-				console.log(_this.studInfo)
 			});
 		},
 		setInfo() {
@@ -145,14 +150,14 @@ export default {
 				});
 				return ;
 			}
-			// if(data.code==''){
-			// 	uni.showToast({
-			// 		icon:'none',
-			// 	    title: '验证码不能为空',
-			// 	    duration: 2000
-			// 	});
-			// 	return ;
-			// }
+			if(data.code==''){
+				uni.showToast({
+					icon:'none',
+				    title: '验证码不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
 			setTimeout(()=>{
 				App._post_form('&p=certified&do=applyMerchantCertified',data, res => {
 					if(res.errno==0){
@@ -248,7 +253,8 @@ export default {
 			}
 			let data = {
 				phone: _this.business.mobile,
-				type: 2
+				type: 2,
+				is_verifycode: 1
 			};
 			App._post_form('&do=PIN', data, res => {
 				let timer_num = 60;
diff --git a/pagesA/identityList/bloggerCertification.vue b/pagesA/identityList/bloggerCertification.vue
index a18f87e..dc9721d 100644
--- a/pagesA/identityList/bloggerCertification.vue
+++ b/pagesA/identityList/bloggerCertification.vue
@@ -35,14 +35,16 @@
 					<view class="p30">
 						<view>
 							<view class="line inlineBlock verticalM"></view>
-							<text class="colorBlack font28 verticalM marginL10">其他平台粉丝截图</text>
+							<text style="color: #f00;font-size: 12px;vertical-align: bottom;margin-left: 15rpx;">*</text>
+							<text class="colorBlack font28 verticalM marginL15">其他平台粉丝截图</text>
 						</view>
 						<view class="marginT29 flex">
 							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="bloggerInfo.screenshot == '' || bloggerInfo.screenshot == undefined">
-								<image src="../../static/mb-plus.png" class="upLoadImg"></image>
+								<image :src="imageRootNew+'mb-plus.png'" class="upLoadImg"></image>
 							</view>
-							<view class="inlineBlock textC" v-else @click="uploadFiles()">
+							<view class="inlineBlock textC" v-else @click="uploadFiles()" style="position: relative;">
 								<image :src="bloggerInfo.screenshot" class="imageHave" mode="aspectFit"></image>
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click.stop="closePreview()" />
 							</view>
 						</view>
 					</view>
@@ -107,6 +109,7 @@ export default {
 	methods: {
 		init(mid) {
 			let _this = this;
+			_this.getInfo(mid);
 		},
 		// 信息设置接口
 		getInfo(mid) {
@@ -114,11 +117,15 @@ export default {
 			let data = {
 				mid: mid
 			};
-			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+			App._post_form('&p=Certified&do=initApplyCertified', data, res => {
 				_this.setData({
-					studInfo: res.data
+					bloggerInfo: res.data
+				})
+			}, (err)=>{
+				console.log(err.data.message);
+				uni.navigateBack({
+					delta: 1
 				})
-				console.log(_this.studInfo)
 			});
 		},
 		setInfo() {
@@ -265,6 +272,9 @@ export default {
 				}, 1000);
 				_this.getSmsCode = res.data.code;
 			});
+		},
+		closePreview(){
+			this.bloggerInfo.screenshot = '';
 		}
 	}
 };
@@ -323,6 +333,9 @@ export default {
 .marginL10 {
 	margin-left: 10upx;
 }
+.marginL15 {
+	margin-left: 15upx;
+}
 .p30 {
 	padding: 30upx;
 }
@@ -399,4 +412,12 @@ export default {
 .colorW {
 	color: rgba(255, 255, 255, 1);
 }
+.close {
+	width: 32upx !important;
+	height: 32upx !important;
+	position: absolute;
+	right: 10px;
+	top: 10px;
+	z-index: 30;
+}
 </style>
diff --git a/pagesA/identityList/teacherCertification.vue b/pagesA/identityList/teacherCertification.vue
index 273ea0b..6928289 100644
--- a/pagesA/identityList/teacherCertification.vue
+++ b/pagesA/identityList/teacherCertification.vue
@@ -43,14 +43,16 @@
 					<view class="p30">
 						<view>
 							<view class="line inlineBlock verticalM"></view>
-							<text class="colorBlack font28 verticalM marginL10">教师工作证件</text>
+							<text style="color: #f00;font-size: 12px;vertical-align: bottom;margin-left: 15rpx;">*</text>
+							<text class="colorBlack font28 verticalM marginL15">教师工作证件</text>
 						</view>
 						<view class="marginT29 flex">
 							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="teacherInfo.document_img == '' || teacherInfo.document_img == undefined">
-								<image src="../../static/mb-plus.png" class="upLoadImg"></image>
+								<image :src="imageRootNew+'mb-plus.png'" class="upLoadImg"></image>
 							</view>
-							<view class="inlineBlock textC" v-else @click="uploadFiles()">
+							<view class="inlineBlock textC" v-else @click="uploadFiles()" style="position: relative;">
 								<image :src="teacherInfo.document_img" class="imageHave" mode="aspectFit"></image>
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click.stop="closePreview()" />
 							</view>
 						</view>
 					</view>
@@ -116,6 +118,7 @@ export default {
 	methods: {
 		init(mid) {
 			let _this = this;
+			_this.getInfo(mid);
 		},
 		// 信息设置接口
 		getInfo(mid) {
@@ -123,11 +126,15 @@ export default {
 			let data = {
 				mid: mid
 			};
-			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+			App._post_form('&p=Certified&do=initApplyCertified', data, res => {
 				_this.setData({
-					studInfo: res.data
+					teacherInfo: res.data
+				})
+			}, (err)=>{
+				console.log(err.data.message);
+				uni.navigateBack({
+					delta: 1
 				})
-				console.log(_this.studInfo)
 			});
 		},
 		setInfo() {
@@ -291,6 +298,9 @@ export default {
 				}, 1000);
 				// _this.getSmsCode = res.data.code;
 			});
+		},
+		closePreview(){
+			this.teacherInfo.document_img = '';
 		}
 	}
 };
@@ -349,6 +359,9 @@ export default {
 .marginL10 {
 	margin-left: 10upx;
 }
+.marginL15 {
+	margin-left: 15upx;
+}
 .p30 {
 	padding: 30upx;
 }
@@ -425,4 +438,12 @@ export default {
 .colorW {
 	color: rgba(255, 255, 255, 1);
 }
+.close {
+	width: 32upx !important;
+	height: 32upx !important;
+	position: absolute;
+	right: 10px;
+	top: 10px;
+	z-index: 30;
+}
 </style>
diff --git a/pagesA/instantMessenger/instantMessenger.vue b/pagesA/instantMessenger/instantMessenger.vue
index 39e9523..f3ee032 100644
--- a/pagesA/instantMessenger/instantMessenger.vue
+++ b/pagesA/instantMessenger/instantMessenger.vue
@@ -12,11 +12,11 @@
 					<view class="f-24 t-c col-3 p-top-10">发视频</view>
 					<view ref="input" class="input" style="display: none;"></view>
 				</view>
-				<view class="p-top-bom-30 instantIten" @click="sendCard" v-if="getSetInfo.is_card == 1 && setFomeData.receive_type == 1">
+				<view class="p-top-bom-30 instantIten" @click="sendCard" v-if="0 && getSetInfo.is_card == 1 && setFomeData.receive_type == 1">
 					<view class="iconfont icon-news t-c f-44" style="font-size: 40upx;"></view>
 					<view class="f-24 t-c col-3 p-top-10">发名片</view>
 				</view>
-				<view class="p-top-bom-30 instantIten" @click="sendResume" v-if="getSetInfo.is_recruit == 1 && setFomeData.receive_type == 1">
+				<view class="p-top-bom-30 instantIten" @click="sendResume" v-if="0 && getSetInfo.is_recruit == 1 && setFomeData.receive_type == 1">
 					<view class="iconfont icon-copy t-c f-44" style="font-size: 40upx;"></view>
 					<view class="f-24 t-c col-3 p-top-10">发简历</view>
 				</view>
diff --git a/pagesA/studentIdentification/studentIdentification.vue b/pagesA/studentIdentification/studentIdentification.vue
index f07b506..a30838f 100644
--- a/pagesA/studentIdentification/studentIdentification.vue
+++ b/pagesA/studentIdentification/studentIdentification.vue
@@ -43,7 +43,7 @@
 								<view class="inputView">
 									<text class="colorBlack font24 verticalM">手机验证码</text>
 									<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
-									 v-model="studInfo.code" style="width:190upx;" />
+									 v-model="studInfo.sms_code" style="width:190upx;" />
 								</view>
 								<view class="colorBlack font24 verticalM marginL10"
 								 style="background: #fafafa;border-radius: 10rpx;line-height: 83rpx;padding: 0px 10px;flex-shrink: 0;"
@@ -58,13 +58,17 @@
 					<view class="p30">
 						<view>
 							<view class="line inlineBlock verticalM"></view>
-							<text class="colorBlack font28 verticalM marginL10">学生证件</text>
+							<text style="color: #f00;font-size: 12px;vertical-align: bottom;margin-left: 15rpx;">*</text>
+							<text class="colorBlack font28 verticalM marginL15">学生证件</text>
 						</view>
 						<view class="marginT29 flex">
 							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="studInfo.certificate_img == '' || studInfo.certificate_img == undefined">
-								<image :src="sfzZ" class="upLoadImg marginT30auto"></image>
+								<image :src="imageRootNew+'mb-plus.png'" class="upLoadImg"></image>
+							</view>
+							<view class="inlineBlock textC" v-else @click="uploadFiles(1)" style="position: relative;">
+								<image :src="studInfo.certificate_img" class="imageHave" mode="aspectFit"></image>
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click.stop="closePreview()" />
 							</view>
-							<view class="uploadButton inlineBlock textC" v-else @click="uploadFiles(1)"><image :src="studInfo.certificate_img" class="imageHave"></image></view>
 						</view>
 					</view>
 				</view>
@@ -111,12 +115,17 @@ export default {
 			buttonColor: 'rgba(255,68,68,1)',
 			userInfo: {},
 			studInfo: {
+				name: '',
+				school_name: '',
+				department_name: '',
+				code: '',
 				start_date: '',
-				mobile:'',
-				code:'',
+				mobile: '',
+				sms_code: '',
 				certificate_img: '',
-				id: null
+				id: '',
 			},
+			certificate_img: '',
 			id: null,
 			codeBtnText: '获取验证码',
 		};
@@ -170,28 +179,26 @@ export default {
 				_this.setData({
 					studInfo: res.data
 				})
+				_this.certificate_img = res.data.certificate_img;
 				console.log(_this.studInfo)
 			}, (err)=>{
-					// console.log(err.data.message);
-					uni.navigateBack({
-						delta: 1
-					})
-				});
+				// console.log(err.data.message);
+				uni.navigateBack({
+					delta: 1
+				})
+			});
 		},
 		setInfo() {
 			let _this = this;
 			let data = {
-				// type: 1,
-				// sid: _this.id,
-				// operation: 'set',
 				name: _this.studInfo.name,
 				school_name: _this.studInfo.school_name,
 				department_name: _this.studInfo.department_name,
 				code: _this.studInfo.code,
 				start_date: _this.studInfo.start_date,
 				mobile: _this.studInfo.mobile,
-				code: _this.studInfo.code,
-				certificate_img: _this.studInfo.img,
+				sms_code: _this.studInfo.sms_code,
+				certificate_img: _this.certificate_img,
 				id: _this.studInfo.id,
 			};
 			if(_this.studInfo.name==''){
@@ -234,7 +241,25 @@ export default {
 				});
 				return ;
 			}
-			if(_this.studInfo.img==''){
+			if(_this.studInfo.mobile==''){
+				uni.showToast({
+					icon:'none',
+				    title: '联系电话不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.sms_code==''){
+				uni.showToast({
+					icon:'none',
+				    title: '验证码不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			// console.log('img完整路径：'+_this.studInfo.certificate_img,  '----------')
+			// console.log('image不完整路径：'+_this.certificate_img, '----------')
+			if(data.certificate_img==''){
 				uni.showToast({
 					icon:'none',
 				    title: '请上传证件',
@@ -256,7 +281,8 @@ export default {
 					}
 				}, (err)=>{
 					// console.log(err.data.message);
-					if(err.data.message=='认证已成功，请勿重复申请认证'){
+					if(err.data.message=='认证已成功，请勿重复申请认证' 
+					|| err.data.message.indexOf('认证申请失败')!==-1){
 						uni.navigateBack({
 							delta: 1
 						})
@@ -328,9 +354,8 @@ export default {
 						let result = await App._MYupLoad(res.tempFilePaths[i]);
 						console.log(result)
 						_this.studInfo.certificate_img = result.data.img;
-						_this.studInfo.img = result.data.image;
-						console.log(_this.studInfo.certificate_img, _this.studInfo.img, '1222')
-						console.log(result.data.img, result.data.image, '12233');
+						_this.certificate_img = result.data.image;
+						console.log('img完整路径：'+result.data.img, 'image不完整路径：'+result.data.image, '12233');
 						uni.showToast({
 							title: result.message
 						})
@@ -386,6 +411,10 @@ export default {
 				}, 1000);
 				// _this.getSmsCode = res.data.code;
 			});
+		},
+		closePreview(){
+			this.studInfo.certificate_img = '';
+			this.certificate_img = '';
 		}
 	}
 };
@@ -455,6 +484,9 @@ export default {
 .marginL10 {
 	margin-left: 10upx;
 }
+.marginL15 {
+	margin-left: 15upx;
+}
 .p30 {
 	padding: 30upx;
 }
@@ -505,27 +537,28 @@ export default {
 }
 .uploadView {
 	width: 690upx;
-	height: 379upx;
+	// height: 379upx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 10upx;
 }
 .uploadButton {
-	width: 290upx;
-	height: 200upx;
+	width: 160upx;
+	height: 160upx;
 	background: rgba(248, 248, 248, 1);
 	border-radius: 10upx;
+	border: 1px solid #e0e0e0;
 }
 .imageHave {
-	width: 290upx;
-	height: 263upx;
+	width:630upx;
 }
 .flex {
 	display: flex;
 	justify-content: space-between;
 }
 .upLoadImg {
-	width: 212upx;
-	height: 141upx;
+	width: 48upx;
+	height: 48upx;
+	margin: 56upx auto;
 }
 .color999999 {
 	color: rgba(153, 153, 153, 1);
@@ -564,7 +597,22 @@ export default {
 /deep/ .uni-date__x-input{
 	line-height: 40px;
 }
-.icon-calendar:before {
+.inputView /deep/ text.uni-icons{
+	// vertical-align: bottom;
+	// vertical-align: -webkit-baseline-middle;
+}
+/deep/ .uni-date-x .icon-calendar {
+    padding-top: 5px;
+}
+.inputView /deep/ .icon-calendar:before{
 	content: none;
 }
+.close {
+	width: 32upx !important;
+	height: 32upx !important;
+	position: absolute;
+	right: 10px;
+	top: 10px;
+	z-index: 30;
+}
 </style>