From 059b2814b8bfd0bf7876fa68ed531b00c685e0e2 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 14 Nov 2023 17:22:23 +0800
Subject: [PATCH] 1

---
 pages/mainPages/Settled/Settled.vue           | 706 +++++++++---------
 .../recruitmentDetails/recruitmentDetails.vue |  20 +
 2 files changed, 381 insertions(+), 345 deletions(-)

diff --git a/pages/mainPages/Settled/Settled.vue b/pages/mainPages/Settled/Settled.vue
index d3b3e14..2add617 100644
--- a/pages/mainPages/Settled/Settled.vue
+++ b/pages/mainPages/Settled/Settled.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<!-- 商铺入驻 -->
 	<view id="app">
 		<loadlogo v-if="!isWxaudit" />
@@ -26,7 +26,7 @@
 							</view>
 							<view class="mainPackage">
 								<!-- 用户信息区域 -->
-								<view class="userInfo">
+								<view class="userInfo">
 									<view class="userInfoPackage" style="color: #f00;font-size: 12px;padding-bottom: 4rpx;line-height: 40rpx;" v-if="userInfo.reject">驳回原因：{{userInfo.reject}}</view>
 									<view class="userInfoPackage">
 										<view class="firstTitle">
@@ -172,33 +172,33 @@
 										</view>
 									</view>
 								</view>
-								<!-- 用户信息区域 -->
-								<!-- 营业执照 -->
-								<view class="userImg">
-									<view class="userInfoPackage">
-										<view class="firstTitle">
-											<view class="firstTitleName">
-												<view class="line"></view>
-												<span style="color:red;width:6rpx;">*</span>
-												<span>企业营业执照</span>
-											</view>
-											<view class="firstTitleTips"></view>
-										</view>
-										<view class="twiceTitle1">
-											<view>
-												<!-- 图片预览循环模板 -->
-												<view class="imgPreview" v-if="userInfo.business_license !== null">
-													<image :src="imageRootNew2 + userInfo.business_license" />
-													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" />
-												</view>
-												<!-- 图片预览循环模板 -->
-												<view class="userImgUpdata" @click="uploadFiles(7, 1)" v-if="userInfo.business_license == null">
-													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
+								<!-- 用户信息区域 -->
+								<!-- 营业执照 -->
+								<view class="userImg">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span style="color:red;width:6rpx;">*</span>
+												<span>企业营业执照</span>
+											</view>
+											<view class="firstTitleTips"></view>
+										</view>
+										<view class="twiceTitle1">
+											<view>
+												<!-- 图片预览循环模板 -->
+												<view class="imgPreview" v-if="userInfo.business_license !== null">
+													<image :src="imageRootNew2 + userInfo.business_license" />
+													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" />
+												</view>
+												<!-- 图片预览循环模板 -->
+												<view class="userImgUpdata" @click="uploadFiles(7, 1)" v-if="userInfo.business_license == null">
+													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
 								<!-- 营业执照 -->
 								
 								<!-- 企业信息区域 -->
@@ -259,24 +259,24 @@
 														<span></span>
 													</view>
 													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'企业亮点':''}}</span>
+													<input :placeholder="languageStatus!=1?'请输入企业亮点':''" v-model="userInfo.recruit_brighten" />
 												</view>
-												<view class="userInfoInputMain" v-if="switchIndex == 1">
-													<span style="color:red;width:10rpx;">*</span>
-													<span>{{languageStatus!=1?'企业亮点':''}}</span>
-													<input :placeholder="languageStatus!=1?'请输入企业亮点':''" v-model="userInfo.recruit_brighten" />
-												</view>
-												<view class="userInfoInputMain" v-if="switchIndex == 1">
-													<span style="color:red;width:10rpx;">*</span>
-													<span>企业类型</span>
-													<view class="timePickerView" style="width: 336rpx;">
-														<picker @change="newTypeChange" class="dataPicker" :value="newTypeIndex" range-key="name" :range="newTypeList">
-														    <view class="uni-input">{{newTypeList[newTypeIndex].name}}
-															</view>
-														</picker>
-														<span></span>
-													</view>
-													<image :src="imgfixUrls + 'merchant/right.svg'" />
-												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>企业类型</span>
+													<view class="timePickerView" style="width: 336rpx;">
+														<picker @change="newTypeChange" class="dataPicker" :value="newTypeIndex" range-key="name" :range="newTypeList">
+														    <view class="uni-input">{{newTypeList[newTypeIndex].name}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
 												<view class="twiceTitle" v-if="switchIndex == 1 && 0">
 													<span>企业幻灯片(750X560)</span>
 													<view>
@@ -294,42 +294,53 @@
 												<view class="twiceTitle" v-if="switchIndex == 1" style="display: flex;
 															align-items: center;
 															justify-content: space-between;">
-													<span>企业长图</span>
-													<button style="display: inline-block;margin:0px;font-size: 14px;color: #ff4444;background-color: transparent;" open-type="contact" hover-class="none" @click="asfd">个性定制</button>
-													<view v-if="0">
-														<!-- 图片预览循环模板 -->
-														<view class="imgPreview" v-for="(item,index) in userInfo.recruit_long_img" :key="index">
-															<image :src="item" />
-															<image :src="imgfixUrls + 'merchant/close.png'" class="close"
-															 @click="closePreview(6, item)" />
-														</view>
-														<!-- 图片预览循环模板 -->
-														<view class="userImgUpdata" @click="uploadFiles(6, 6)">
-															<image :src="imgfixUrls + 'merchant/addImg.svg'" />
-														</view>
-													</view>
-												</view>
-												<view class="twiceTitle" style="position: relative;">
-													<span style="color:red;width:10rpx;">*</span>
-													<span>企业简介</span>
-													<jinEdit placeholder="请输入内容" @editOk="editOk1" uploadFileUrl="/#" :html="userInfo.introduction" @editFocus="editFocus1"></jinEdit> 
-													<!-- <view style="margin-top: 10px;font-size: 11px;color: #999;padding-bottom: 10px;">
-														<text style="color: #f00;margin: 5px;">*</text>
-														请点击“✓”完成编辑
-													</view> -->
-												</view>
-												<view class="twiceTitle" style="position: relative;">
-													<span style="color:red;width:10rpx;">*</span>
-													<span>经营业务</span>
-													<jinEdit placeholder="请输入内容" @editOk="editOk2" uploadFileUrl="/#" :html="userInfo.business" @editFocus="editFocus2"></jinEdit> 
-												</view>
-												<view class="twiceTitle" style="position: relative;">
-													<span>企业优势</span>
-													<jinEdit placeholder="请输入内容" @editOk="editOk3" uploadFileUrl="/#" :html="userInfo.advantage" @editFocus="editFocus3"></jinEdit> 
+													<span>企业长图</span>
+													<button style="display: inline-block;margin:0px;font-size: 14px;color: #ff4444;background-color: transparent;" open-type="contact" hover-class="none" @click="asfd">个性定制</button>
+													
+												</view>
+												<view class="twiceTitle" v-if="switchIndex == 1" style="margin-top: 0px;">
+													<view>
+														<!-- 图片预览循环模板 -->
+														<view class="imgPreview" v-for="(item,index) in userInfo.recruit_long_img" :key="index">
+															<image :src="item" />
+															<image :src="imgfixUrls + 'merchant/close.png'" class="close"
+															 @click="closePreview(6, item)" />
+														</view>
+														<!-- 图片预览循环模板 -->
+														<view class="userImgUpdata" @click="uploadFiles(6, 6)">
+															<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+														</view>
+													</view>
+												</view>
+												<view class="twiceTitle">
+													<!-- <span style="color:red;width:10rpx;">*</span> -->
+													<span>企业简介</span>
+													<view class="userIntroduceInput">
+														<view class="userIntroduceInputPackage"><textarea placeholder="请输入企业简介" v-model="userInfo.introduction" :maxlength="-1"></textarea></view>
+													</view>
+													<!-- <jinEdit placeholder="请输入内容" @editOk="editOk1" uploadFileUrl="/#" :html="userInfo.introduction" @editFocus="editFocus1"></jinEdit> -->
+													<!-- <view style="margin-top: 10px;font-size: 11px;color: #999;padding-bottom: 10px;">
+														<text style="color: #f00;margin: 5px;">*</text>
+														请点击“✓”完成编辑
+													</view> -->
+												</view>
+												<view class="twiceTitle">
+													<!-- <span style="color:red;width:10rpx;">*</span> -->
+													<span>经营业务</span>
+													<view class="userIntroduceInput">
+														<view class="userIntroduceInputPackage"><textarea placeholder="请输入经营业务" v-model="userInfo.business" :maxlength="-1"></textarea></view>
+													</view>
+													<!-- <jinEdit placeholder="请输入内容" @editOk="editOk2" uploadFileUrl="/#" :html="userInfo.business" @editFocus="editFocus2"></jinEdit> -->
+												</view>
+												<view class="twiceTitle">
+													<span>企业优势</span>
+													<view class="userIntroduceInput">
+														<view class="userIntroduceInputPackage"><textarea placeholder="请输入企业优势" v-model="userInfo.advantage" :maxlength="-1"></textarea></view>
+													</view>
+													<!-- <jinEdit placeholder="请输入内容" @editOk="editOk3" uploadFileUrl="/#" :html="userInfo.advantage" @editFocus="editFocus3"></jinEdit> -->
 												</view>
 											</view>
 										</view>
-										
 									</view>
 								</view>
 								<!-- 企业信息区域 -->
@@ -621,7 +632,7 @@
 	import Loadlogo from '@/components/template/loadlogo.vue';
 	import wPickerb from '@/components/w-picker/w-picker.vue'
 	import PhoneMask from '@/components/template/PhoneMask';
-	import getvxphone from '@/components/template/getVXphone.vue'
+	import getvxphone from '@/components/template/getVXphone.vue'
 	import jinEdit from '@/components/jin-edit/jin-edit.vue';
 	// #ifdef H5
 	import wxApi from '@/common/js/wxApi.js';
@@ -636,7 +647,7 @@
 			Loadlogo,
 			PhoneMask,
 			wPickerb,
-			getvxphone,
+			getvxphone,
 			jinEdit
 		},
 		data() {
@@ -685,7 +696,7 @@
 				visiblec: false,
 				userInfo: {
 					storename: '',
-					name: '',
+					name: '',
 					position: '',
 					mobile: '',
 					lat: '',
@@ -704,11 +715,11 @@
 					album: [],
 					examine: [],
 					thumbimages: [],
-					cateidArray: [],
-					business_license: null,// 营业执照
-					recruit_brighten: '',// 企业亮点
-					recruit_adv: [],//企业幻灯片
-					recruit_long_img: [],
+					cateidArray: [],
+					business_license: null,// 营业执照
+					recruit_brighten: '',// 企业亮点
+					recruit_adv: [],//企业幻灯片
+					recruit_long_img: [],
 					introduction: '',//企业简介
 					business: '',//经营业务
 					advantage: '',//企业优势
@@ -753,12 +764,12 @@
 					startTime:'00:00'
 				}],
 				btnOff:false,
-				addressDisabled:true,
-				newTypeList: [],// 新企业类型
-				newTypeIndex: '',
-				
-				setcolor1: '',
-				setcolor2: '',
+				addressDisabled:true,
+				newTypeList: [],// 新企业类型
+				newTypeIndex: '',
+				
+				setcolor1: '',
+				setcolor2: '',
 				setcolor3: '#666',
 			};
 		},
@@ -806,8 +817,10 @@
 			_this.storeChecked = false;
 			_this.provinceidName = _this.languageStatus != 1?'请选择省市区':'성/시/구 선택 입력하세요'
 			// _this.getloctions();
-			//	_this.init();
+			//	_this.init();
 			this.getNewType();// 新企业类型
+			_this.init(999);//上传图片会经历一次onHide-onShow，所以数据初始不能放onShow
+			
 		},
 		onHide() {},
 		watch: {
@@ -862,7 +875,6 @@
 				this.onshowIshow = false;
 				return
 			}
-			_this.init(999);
 		},
 		methods: {
 			deletcheck(id) {
@@ -1009,23 +1021,23 @@
 						that.showP = !that.showP;
 					}
 				});
-				/** typelist = [
-					[
-						{
-							twotype:[
-								{checked: true, id: null}, 
-								itemT
-							]
-						},
-						{twotype:[]}, 
-						{twotype:[]}, 
-						itemI, 
-						itemI
-					],
-					1,
-					2
+				/** typelist = [
+					[
+						{
+							twotype:[
+								{checked: true, id: null}, 
+								itemT
+							]
+						},
+						{twotype:[]}, 
+						{twotype:[]}, 
+						itemI, 
+						itemI
+					],
+					1,
+					2
 				]
-				**/
+				**/
 				that.typelist[0].forEach((itemI, index) => {
 					// that.typelist[0][index].twotype.forEach(itemT => {
 					itemI.twotype.forEach(itemT => {
@@ -1077,7 +1089,7 @@
 					for (let i = 0; i < _this.type2Url.length; i++) {
 						if (url == _this.type2Url[i]) {
 							_this.type2Url.splice(i, 1);
-							_this.userInfo.adv.splice(i, 1);
+							_this.userInfo.adv.splice(i, 1);
 							console.log(_this.type2Url, _this.userInfo.adv)
 						}
 					}
@@ -1106,14 +1118,14 @@
 						}
 					}
 				}
-				if (type == 6) {
-					for (let i = 0; i < _this.userInfo.recruit_long_img.length; i++) {
-						if (url == _this.userInfo.recruit_long_img[i]) {
-							_this.userInfo.recruit_long_img.splice(i, 1);
-						}
+				if (type == 6) {
+					for (let i = 0; i < _this.userInfo.recruit_long_img.length; i++) {
+						if (url == _this.userInfo.recruit_long_img[i]) {
+							_this.userInfo.recruit_long_img.splice(i, 1);
+						}
 					}
 				}
-				if (type == 7) {
+				if (type == 7) {
 					_this.userInfo.business_license=null;
 				}
 			},
@@ -1328,9 +1340,9 @@
 					'&p=store&do=createChargeOrder',
 					data,
 					res => {
-						if (res.data.status == '0') {
-							uni.redirectTo({
-								url: '/pagesA/identityList/identityList'
+						if (res.data.status == '0') {
+							uni.redirectTo({
+								url: '/pagesA/identityList/identityList'
 							})
 							// App.navigationTo({
 							// 	url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
@@ -1366,28 +1378,28 @@
 				let cityListLeft = [];
 				let cityListCenter = [];
 				let cityListRight = [];
-				App._post_form('&p=store&do=storeSettled', data, res => {
-					// if(res.data.havestore){
-					// 	App.showError("您已经", function() {
-					// 		// uni.navigateBack({
-					// 		// 	delta: 1
-					// 		// })
-					// 		// return;
-					// 	})
+				App._post_form('&p=store&do=storeSettled', data, res => {
+					// if(res.data.havestore){
+					// 	App.showError("您已经", function() {
+					// 		// uni.navigateBack({
+					// 		// 	delta: 1
+					// 		// })
+					// 		// return;
+					// 	})
 					// }
 					_this.userInfo = { ..._this.userInfo,
 						...res.data.store, ...res.data
-					};
-					// if (_this.switchIndex == 1) {
-					// 	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;
-					// }
-					
-					// _this.userInfo.address;
-					// _this.provinceidName = _this.userInfo.provinceid;
-					// _this.areaidName = _this.userInfo.areaid;
-					// _this.distidName = _this.userInfo.distid;
+					};
+					// if (_this.switchIndex == 1) {
+					// 	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;
+					// }
+					
+					// _this.userInfo.address;
+					// _this.provinceidName = _this.userInfo.provinceid;
+					// _this.areaidName = _this.userInfo.areaid;
+					// _this.distidName = _this.userInfo.distid;
 					
 					if(!_this.userInfo.top_img){
 						_this.userInfo.top_img = _this.backImages;
@@ -1463,11 +1475,14 @@
 						_this.userInfo.havestore = 1;
 					};
 					
-					console.log(idis);
-				}, err=>{
-					uni.navigateBack({
-						delta: 1
-					})
+					console.log(idis);
+					
+					// 页面滚动到顶部（富文本置入内容自动滚动到所在位置无法避免）
+					// setTimeout(()=>{
					// 	uni.pageScrollTo({
					// 		scrollTop: 0,
					// 		success(res) {
					// 			console.log(res,'11111111');
					// 		}
					// 	})
					// }, 2000)
+				}, err=>{
+					uni.navigateBack({
+						delta: 1
+					})
 				});
 			},
 			checkRight(id) {
@@ -1502,141 +1517,141 @@
 				});
 				_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 == null) {
-					uni.showToast({
-						icon: 'none',
-						title: '请上传营业执照',
-						duration: 2000
-					});
-					return;
-				}
-				
-				if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
-					uni.showToast({
-						icon: 'none',
-						title: '企业亮点不能为空',
-						duration: 2000
-					});
-					return;
-				}
-				var text1=this.getText(this.userInfo.introduction);
-				if(this.isNull(text1) && this.userInfo.introduction.indexOf('<img ')==-1  || this.userInfo.introduction.replace(/(^\s*)|(\s*$)/g, "")==""){
-					uni.showToast({
-						icon:'none',
-						title: '企业简介不能为空',
-						duration: 2000
-					});
-					return ;
-				}
-				
-				var text2=this.getText(this.userInfo.business);
-				if(this.isNull(text2) && this.userInfo.business.indexOf('<img ')==-1  || this.userInfo.business.replace(/(^\s*)|(\s*$)/g, "")==""){
-					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;
-				data.cc_id = this.newTypeList[this.newTypeIndex].id;
-				App._post_form('&p=store&do=createStore', data, res => {
-					uni.setStorageSync('userId', res.data);
-					_this.userInfo.storeid = res.data.storeid;
-					if(res.data.jump_pay===1){
-						_this.page = 2;
-						_this.getChargeList();
-						_this.btnOff = false;
-						_this.userInfo.store_housekeep_cate = [];
-					}else{
-						uni.showToast({
-							title: '提交成功'
-						})
-						setTimeout(()=>{
-							uni.navigateBack({
-								delta: 1
-							})
-						}, 1000)
-					}
-					
-				}, err=>{
-					_this.btnOff = false;
-					_this.userInfo.store_housekeep_cate = [];
-				});
+			},
+			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 == null) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传营业执照',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业亮点不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				// var text1=this.getText(this.userInfo.introduction);
+				// if(this.isNull(text1) && this.userInfo.introduction.indexOf('<img ')==-1  || this.userInfo.introduction.replace(/(^\s*)|(\s*$)/g, "")==""){
+				// 	uni.showToast({
+				// 		icon:'none',
+				// 		title: '企业简介不能为空',
+				// 		duration: 2000
+				// 	});
+				// 	return ;
+				// }
+				
+				// var text2=this.getText(this.userInfo.business);
+				// if(this.isNull(text2) && this.userInfo.business.indexOf('<img ')==-1  || this.userInfo.business.replace(/(^\s*)|(\s*$)/g, "")==""){
+				// 	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;
+				data.cc_id = this.newTypeList[this.newTypeIndex].id;
+				App._post_form('&p=store&do=createStore', data, res => {
+					uni.setStorageSync('userId', res.data);
+					_this.userInfo.storeid = res.data.storeid;
+					if(res.data.jump_pay===1){
+						_this.page = 2;
+						_this.getChargeList();
+						_this.btnOff = false;
+						_this.userInfo.store_housekeep_cate = [];
+					}else{
+						uni.showToast({
+							title: '提交成功'
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 1000)
+					}
+					
+				}, err=>{
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
+				});
 			},
 			// 提交商户信息(旧版下一步触发)
 			saveUserInfo() {
@@ -1700,8 +1715,8 @@
 						duration: 2000
 					});
 					return;
-				}
-				// 页面展示：所属行业:industryIndex，行业分类：twoLevelList
+				}
+				// 页面展示：所属行业:industryIndex，行业分类：twoLevelList
 				
 				if (_this.userInfo.business_license == null) {
 					uni.showToast({
@@ -1710,7 +1725,7 @@
 						duration: 2000
 					});
 					return;
-				}
+				}
 				
 				if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
 					uni.showToast({
@@ -1780,11 +1795,11 @@
 					_this.userInfo.storeid = res.data.storeid;
 					_this.page = 2;
 					_this.getChargeList();
-					_this.btnOff = false;
-					_this.userInfo.store_housekeep_cate = [];
-				}, err=>{
-					_this.btnOff = false;
+					_this.btnOff = false;
 					_this.userInfo.store_housekeep_cate = [];
+				}, err=>{
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
 				});
 			},
 			// 通过地区id获取商户分类
@@ -1944,9 +1959,9 @@
 						_this.onkoc = 0;
 						_this.addressDisabled = false;
 						_this.getloctions(_this.lblis)
-					},
-					// fail(err){
-						// console.log('-----',err);
+					},
+					// fail(err){
+						// console.log('-----',err);
 					// }
 				});
 				// #endif
@@ -2022,60 +2037,60 @@
 				month = month > 9 ? month : '0' + month;
 				day = day > 9 ? day : '0' + day;
 				return `${year}-${month}-${day}`;
-			},
-			// 新企业类型-推荐、国有等等
-			getNewType(){
-				App._post_form('&p=cultivateClass&do=getCultivateClassChildList', {
-					cc_id: 8
-				}, res => {
-					this.newTypeList = res.data.map(item=>{
-						return {
-							...item, 
-							value: item.name
-						}
-					});
-					this.newTypeIndex = 0;
-				});
-			},
-			newTypeChange(e){
-				this.newTypeIndex = e.detail.value;
-			},
-			// 企业长图改富文本
-			editFocus1(){
-				this.setcolor1 = "#509DFD";
-			},
-			editFocus2(){
-				this.setcolor2 = "#509DFD";
-			},
-			editFocus3(){
-				this.setcolor3 = "#509DFD";
-			},
-			editOk1(res) {
-				this.userInfo.introduction = res.html;
-			},
-			editOk2(res) {
-				this.userInfo.business = res.html;
-			},
-			editOk3(res) {
-				this.userInfo.advantage = res.html;
-				
-			},
-			// 检查富文本框的内容
-			getText(str){return str.replace(/<[^<>]+>/g, "").replace(/&nbsp;/gi, "");},
-			isNull(str){if ( str == "" ) return true;var regu = "^[ ]+$";var re = new RegExp(regu);return re.test(str);},
-			
-			// 个性定制
-			asfd(){
-				//#ifdef MP-WEIXIN
-				this.CustomerService = uni.getStorageSync('CustomerService');
-				wx.openCustomerServiceChat({
-				  extInfo: {url: this.CustomerService.customerurl||''},
-				  corpId: this.CustomerService.enterpriseid,
-				  success(res) {
-					  
-				  }
-				})
-				//#endif
+			},
+			// 新企业类型-推荐、国有等等
+			getNewType(){
+				App._post_form('&p=cultivateClass&do=getCultivateClassChildList', {
+					cc_id: 8
+				}, res => {
+					this.newTypeList = res.data.map(item=>{
+						return {
+							...item, 
+							value: item.name
+						}
+					});
+					this.newTypeIndex = 0;
+				});
+			},
+			newTypeChange(e){
+				this.newTypeIndex = e.detail.value;
+			},
+			// 企业长图改富文本
+			editFocus1(){
+				this.setcolor1 = "#509DFD";
+			},
+			editFocus2(){
+				this.setcolor2 = "#509DFD";
+			},
+			editFocus3(){
+				this.setcolor3 = "#509DFD";
+			},
+			editOk1(res) {
+				this.userInfo.introduction = res.html;
+			},
+			editOk2(res) {
+				this.userInfo.business = res.html;
+			},
+			editOk3(res) {
+				this.userInfo.advantage = res.html;
+				
+			},
+			// 检查富文本框的内容
+			getText(str){return str.replace(/<[^<>]+>/g, "").replace(/&nbsp;/gi, "");},
+			isNull(str){if ( str == "" ) return true;var regu = "^[ ]+$";var re = new RegExp(regu);return re.test(str);},
+			
+			// 个性定制
+			asfd(){
+				//#ifdef MP-WEIXIN
+				this.CustomerService = uni.getStorageSync('CustomerService');
+				wx.openCustomerServiceChat({
+				  extInfo: {url: this.CustomerService.customerurl||''},
+				  corpId: this.CustomerService.enterpriseid,
+				  success(res) {
+					  
+				  }
+				})
+				//#endif
 			}
 		}
 	};
@@ -2389,7 +2404,8 @@
 				vertical-align: middle;
 				display: inline-block;
 			}
-		}
+		}
+		
 	}
 
 	.twiceTitle1 {
diff --git a/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue b/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
index 767a52b..14083d6 100644
--- a/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
+++ b/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
@@ -108,6 +108,26 @@
 					<view class="psition-tag" v-if="recruitmentDetails.recruit_long_img.length>0">
 						<image class="longpic" :src="item" mode="widthFix" v-for="(item, index) in recruitmentDetails.recruit_long_img" :key="index"></image>
 					</view>
+					<template v-else>
+						<view class="psition-title" v-if="recruitmentDetails.introduction">
+							<view class="title dis-il-block" style="display: inline-block;">企业简介</view>
+						</view>
+						<view class="psition-tag" v-if="recruitmentDetails.introduction">
+							<text v-html="recruitmentDetails.introduction"></text>
+						</view>
+						<view class="psition-title" v-if="recruitmentDetails.business">
+							<view class="title dis-il-block" style="display: inline-block;">经营业务</view>
+						</view>
+						<view class="psition-tag" v-if="recruitmentDetails.business">
+							<text v-html="recruitmentDetails.business"></text>
+						</view>
+						<view class="psition-title" v-if="recruitmentDetails.advantage">
+							<view class="title dis-il-block" style="display: inline-block;">企业优势</view>
+						</view>
+						<view class="psition-tag" v-if="recruitmentDetails.advantage">
+							<text v-html="recruitmentDetails.advantage"></text>
+						</view>
+					</template>
 				</view>
 				<view class="information">
 					<view class="dis-flex" @click="nvgeing">