zhengkaixin 1 рік тому
батько
коміт
ccd66a53d7

+ 3 - 3
config/.env.dev.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
 	ProjectName :"荆州经开区共享用工平台",
-	//BASE_URL: 'http://192.168.77.162:8086/jk-temporary-workers-server/',
-	BASE_URL:"https://equipment.xiaoxinda.com/jk-temporary-workers-server/",
+	BASE_URL: 'http://192.168.77.162:8086/jk-temporary-workers-server/',
+	//BASE_URL:"https://equipment.xiaoxinda.com/jk-temporary-workers-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	
@@ -14,7 +14,7 @@ const UNI_APP = {
 	//openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
 	
 	openId:"o_5WO4qUozermjNRBqypzMZg56Qw",// 个人企业 未注册
-	//openId:"002",// 个人  注册 ,企业未
+	//openId:"006",// 个人  注册 ,企业未
 	//openId:"323",// 个人  未注册 ,企业 注册
 	 
 	//小鹏管家appid

+ 1 - 1
pages/main/index/index.vue

@@ -278,7 +278,7 @@
 					 	}
 					 }
 				 }).catch(error => {
-					
+					this.carhelp.logoff();
 				 })
 				
 			},

+ 5 - 4
pages/packages/mine/employmentService/receiveRegistration.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar back-text="我的报名" back-icon-size="28" back-icon-color="#ffffff"
+		<u-navbar back-text="人员管理" back-icon-size="28" back-icon-color="#ffffff"
 			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
 		<!-- 标签 -->
 		<view class="tabs">
@@ -16,13 +16,13 @@
 				<!-- 头像 -->
 				<view class="photo">
 					<u-avatar :src="item.jobInformationInfo.photo"></u-avatar>
-					
+					<span>{{item.workPersonInfo?item.workPersonInfo.realName:''}}</span>
 				</view>
 				<!-- 信息 -->
 				<view class="infos">
 					<view class="positon-salary">
 						<view class="positon">
-							{{item.workPersonInfo?item.workPersonInfo.realName:''}}-{{item.jobInformationInfo.intendedIndustriesN}}
+							{{item.jobInformationInfo.intendedIndustriesN}}
 						</view>
 						<view class="salary">
 							{{item.jobInformationInfo.hopeSalary}}元/天
@@ -189,7 +189,8 @@
 			width: 48px;
 			height: 48px;
 			border-radius: 50px;
-			overflow: hidden;
+			text-align: center;
+			//overflow: hidden;
 			margin-right: 16rpx;
 			img{
 				width: 100%;

+ 2 - 1
pages/packages/news/articleDetail.vue

@@ -57,7 +57,8 @@
 					uni.hideLoading()					
 					var newsDetail = res.data.newsInfo;
 					if(newsDetail.content){
-						newsDetail.content=newsDetail.content.replaceAll('alt','width="100%" height="100%" /> <p')
+						var reg=new RegExp('alt','gi');
+						newsDetail.content=newsDetail.content.replace(reg,'width="100%" height="100%" /> <p')						
 					}
 					this.newsDetail=newsDetail
 				}).catch(error => {

+ 2 - 1
pages/packages/shareEmployment/articleDetail.vue

@@ -68,7 +68,8 @@
 					
 					var newsDetail=res.data.shareWorksInfo;
 					if(newsDetail.content){
-						newsDetail.content=newsDetail.content.replaceAll('alt','width="100%" height="100%" /> <p')
+						var reg=new RegExp('alt','gi');
+						newsDetail.content=newsDetail.content.replace(reg,'width="100%" height="100%" /> <p')						
 					}
 					this.form=newsDetail
 										

+ 2 - 1
pages/packages/skillTraining/trainingRegistration.vue

@@ -212,7 +212,8 @@
 					this.isJoin = res.data.isJoin;
 					var newsDetail=res.data.trainingInfo;
 					if(newsDetail.content){
-						newsDetail.content=newsDetail.content.replaceAll('alt','width="100%" height="100%" /> <p')
+						var reg=new RegExp('alt','gi');
+						newsDetail.content=newsDetail.content.replace(reg,'width="100%" height="100%" /> <p')						
 					}
 					this.info=newsDetail
 					

+ 9 - 6
pages/tab/mine/mine.vue

@@ -209,7 +209,6 @@
 		onLoad() {
 			this.userInfo = this.carhelp.getPersonInfo()
 			this.findByOpenId();
-
 		},
 		onShow(){
 			if(this.isReady){
@@ -367,7 +366,8 @@
 					}
 
 				}).catch(error => {
-					//.log("11111")
+					//.log("11111")
+					this.carhelp.logoff();
 					this.userInfo = {};
 					uni.hideLoading();
 					this.show = true;
@@ -392,7 +392,7 @@
 				// #endif
 			},
 			createUser(phone) {
-				
+				console.log("createUser",phone)
 				API.createUser({
 					phone: phone,
 					openId: this.carhelp.getOpenId()
@@ -428,7 +428,8 @@
 				// #endif
 			},
 			decryptPhoneNumber(e) {
-				console.log(e, this.carhelp.getOpenId())
+				console.log(e, this.carhelp.getOpenId())
+				var _this=this;
 				if (!e.detail.code&&e.detail.errMsg == 'getPhoneNumber:ok') {
 					uni.login({
 						provider: 'weixin', //使用微信登录
@@ -438,9 +439,11 @@
 								code: loginRes.code,
 								encryptedData: e.detail.encryptedData,
 								iv: e.detail.iv
-							}).then((res) => {
+							}).then((res) => {
+								
+								console.log(res)
 								if (res.data) {
-									this.createUser(res.data)
+									_this.createUser(res.data)
 
 								} else {
 									uni.showToast({