Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

manifest.json

@@ -199,11 +199,11 @@
                         "^/TencentGet" : ""
                     }
                 },
-				"/sqx_fast": {
-				  "target": "http://192.168.0.10:7155",
-				  "changeOrigin": true,
-				  "secure" : false
-				}
+                "/sqx_fast" : {
+                    "target" : "http://192.168.0.10:7155",
+                    "changeOrigin" : true,
+                    "secure" : false
+                }
             }
         },
         "sdkConfigs" : {

package/jobIntention/addExpectation.vue

@@ -133,7 +133,8 @@ export default {
 			trackWidth: 0,
 			draggingThumb: null, // 'left' 或 'right' 或 null
 			startX: 0,
-			startValue: 0
+			startValue: 0,
+			isWork:false
 		}
 	},
 	computed: {
@@ -322,6 +323,9 @@ export default {
 		    uni.showToast({ title: "请选择从事方向", icon: "none" });
 		    return;
 		  }
+		  if(this.isWork)
+			return
+			this.isWork=true
 			let data={
 				intentionId:this.id,
 				ruleClassifyId:this.jobId,
@@ -339,6 +343,8 @@ export default {
 			}
 		  uni.showLoading({ title: "提交中..." });
 		  this.$Request.postJson("/app/intention/saveUpdate", data).then((res) => {
+			  this.isWork=false
+			  this.industry=''
 			  uni.hideLoading();
 		    if (res.code == 0) {
 		        uni.showToast({ title: "保存成功", icon: "none" });

pages/msg/im.vue

@@ -175,7 +175,7 @@
 							<!-- 时间和收藏 -->
 							<view class="time-favorite flex justify-between align-center">
 								<view class="time-text">
-									7月24日 14:34 向你发起的沟通
+									{{conversationInfo.createTime&&conversationInfo.createTime}} 向你发起的沟通
 								</view>
 								<view :class="['favorite-btn  flex align-center',postPushInfo.isCollection?'collectActived':'']" @click.stop="setCollection(postPushInfo.postPushId)">
 									<text class="favorite-icon"><u-icon :name="postPushInfo.isCollection?'star-fill':'star'"></u-icon></text>
@@ -217,18 +217,18 @@
 							<!-- 当前职位 -->
 							<view class="current-job">
 								<image src="../../static/images/aixin.svg" class="job-icon" mode="aspectFit"></image>
-								<text class="job-text">{{ resumesInfo.companyName }}·{{ resumesInfo.lastWorkPosition }}</text>
+								<text class="job-text">{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.companyName||'' }}·{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.lastWorkPosition||'' }}</text>
 							</view>
 				
 							<!-- 求职期望 -->
 							<view class="job-expectation">
 								<image src="../../static/images/xiangzi.svg" class="job-icon" mode="aspectFit"></image>
-								<text class="expectation-text">求职期望: {{ resumesInfo.expectedPosition }}</text>
+								<text class="expectation-text">{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.companyName||'' }}·{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.profession||'' }}</text>
 							</view>
 				
 							<!-- 技能标签 -->
 							<view class="skill-tags">
-								<view class="skill-tag" v-for="(skill, skillIndex) in resumesInfo.skills" :key="skillIndex">
+								<view class="skill-tag" v-for="(skill, skillIndex) in resumesInfo.resumesListDtoList.intentIndustry&&resumesInfo.resumesListDtoList.intentIndustry.split('/')||[]" :key="skillIndex">
 									{{ skill }}
 								</view>
 							</view>
@@ -240,7 +240,7 @@
 						</view>
 						<view class="time-favorite flex justify-between align-center">
 							<view class="time-text">
-								7月24日 14:34 沟通的职位-亚马逊
+								{{conversationInfo.createTime&&conversationInfo.createTime.substring(0,10)}} 沟通的职位-亚马逊{{resumesInfo.intentionRuleClassifyName}}
 							</view>
 						</view>
 					</view>
@@ -1023,7 +1023,8 @@
 				isVip: false, //是否是会员
 				isVideo: false, //是否打视频
 				ossUrl:configdata.ossUrl,
-				jobStatusList:[]
+				jobStatusList:[],
+				conversationInfo:{}
 			};
 		},
 		onUnload() {
@@ -1720,6 +1721,7 @@
 				}
 				this.$Request.getT("/app/chat/getConversationInfo", data).then(res => {
 					if (res.code == 0) {
+						this.conversationInfo=res.data
 						if (res.data.isSendWx) {
 							this.isSendWx = true
 						} else {

pages/my/educationExperience.vue

@@ -136,6 +136,7 @@ export default {
 						"博士",
 						"博士后"
 				],
+			isWork:false
 		}
 	},
 	onLoad(options) {
@@ -209,9 +210,14 @@ export default {
 				degree:this.departments[this.formData.departmentIndex],
 				detail:this.formData.workContent
 			}
+			if(this.isWork)
+				return
+				this.isWork=true
 		  uni.showLoading({ title: "提交中..." });
 		  this.$Request.postJson("/app/userFirst/addEdu", data).then((res) => {
 			  uni.hideLoading();
+			  this.isWork=false
+			  this.formData.companyName=''
 		    if (res.code == 0) {
 		        uni.showToast({ title: "保存成功", icon: "none" });
 		        // 实际开发中可以在这里添加跳转逻辑

pages/my/index.vue

@@ -224,7 +224,36 @@
 						</view>
 					</view>
 					<!-- 更多工具 -->
-					<view class="utils flex justify-center">
+					<!-- 更多功能区域 -->
+					<view class="more-functions">
+						<text class="section-title">更多功能</text>
+						<view class="function-grid">
+							<view class="function-item">
+								<image src="../../static/images/index/moreSkill1.svg" class="function-icon"></image>
+								<text class="function-text">猎头服务</text>
+							</view>
+							<view class="function-item">
+								<image src="../../static/images/index/moreSkill2.svg" class="function-icon"></image>
+								<text class="function-text">精选公司</text>
+							</view>
+							<view class="function-item" @click="goNav('/pages/my/ruleCenter')">
+								<image src="../../static/images/index/moreSkill3.svg" class="function-icon"></image>
+								<text class="function-text">规则中心</text>
+							</view>
+							<view class="function-item" @click="goChat">
+								<image src="../../static/images/index/moreSkill4.svg" class="function-icon"></image>
+								<text class="function-text">联系客服</text>
+							</view>
+							<!-- <view v-if="token" class="function-item" @click="goOut()">
+								<image src="../../static/images/my/icon/utils/utils8.png"
+									class="function-icon"></image>
+								<view class="function-text">
+									退出登录
+								</view>
+							</view> -->
+						</view>
+					</view>
+					<view v-if="false" class="utils flex justify-center">
 						<view class="utils-box">
 							<view class="utils-box-c">
 								<view class="util-list">
@@ -2136,4 +2165,65 @@
 			}
 		}
 	}
+	// 更多功能区域
+	.more-functions {
+		margin: 0 32rpx;
+		padding: 24rpx 48rpx 48rpx 48rpx;
+		/* background: #fff;
+		border-radius: 24rpx; */
+		
+		.section-title {
+			color: rgba(29, 33, 41, 1);
+			font-family: DM Sans;
+			font-size: 28rpx;
+			font-weight: 500;
+			line-height: 44rpx;
+			letter-spacing: 0%;
+			text-align: left;
+		}
+		
+		.function-grid {
+			margin-top: 24rpx;
+			display: flex;
+			justify-content: space-between;
+			border-top: 0.5px solid rgba(238, 238, 238, 1);
+			padding-top: 16rpx;
+			
+			.function-item {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				gap: 16rpx;
+				
+				.function-icon {
+					width: 48rpx;
+					height: 48rpx;
+				}
+				
+				.function-text {
+					color: #333;
+					font-size: 24rpx;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+	
+	// 联系信息
+	.contact-info {
+		margin: 0 40rpx 120rpx 40rpx;
+		padding: 40rpx;
+		
+		.contact-text, .legal-text, .icp-text {
+			display: block;
+			color: rgba(153, 153, 153, 1);
+			font-family: DM Sans;
+			font-size: 18rpx;
+			font-weight: 400;
+			line-height: 1.6;
+			letter-spacing: 0%;
+			text-align: center;
+			margin-bottom: 8rpx;
+		}
+	}
 </style>

pages/my/jobApplicant/workRecord.vue

@@ -336,8 +336,8 @@ export default {
 	  eduList:[{
 			  school: "学校时间",
 			  profession: "专业",
-			  startTime: "在校时间",
-			  endTime: "离校时间",
+			  startTime: "2012-09-1",
+			  endTime: "2016-6-10",
 			  detail: "请填写您的教育经历",
 			  degree: "学历",
 			  }

pages/my/onlineResume.vue

@@ -261,7 +261,7 @@
 				this.$Request.getT("/app/userFirst/getUserResumes", {}).then((res) => {
 				  if (res.code == 0) {
 				     that.detail=res.data
-					  that.hasEcommerceExperience=res.data.resumeList.ifExp?true:false
+					  that.hasEcommerceExperience=res.data.resumeList&&res.data.resumeList.ifExp?true:false
 					  that.detail.degree=that.$queue.getHighestEducation(res.data.eduList)
 					  
 					  res.data.workExps.forEach(function(item) {

pages/my/workExperience.vue

@@ -223,7 +223,8 @@ export default {
 			departments:[],
 			departmentsIds:[],
 			positionLevels:['初级','资深'],
-			operateKey:0
+			operateKey:0,
+			isWork:false
 		}
 	},
 	onLoad(options) {
@@ -468,9 +469,14 @@ export default {
 				},
 				workExpDetails:postData
 			}
+			if(this.isWork)
+				return
+				this.isWork=true
 		  uni.showLoading({ title: "提交中..." });
 		  this.$Request.postJson("/app/userFirst/addWorkExp", data).then((res) => {
 			  uni.hideLoading();
+			  this.isWork=false
+			  this.formData.companyName==''
 		    if (res.code == 0) {
 		        uni.showToast({ title: "保存成功", icon: "none" });
 		        // 实际开发中可以在这里添加跳转逻辑

pages/public/loginphone.vue

@@ -1,410 +1,397 @@
 <template>
-  <view class="container">
-    <view class="wrapper">
-      <nav-bar title="登录" color="#000"></nav-bar>
+	<view class="container">
+		<view class="wrapper">
+			<nav-bar title="登录" color="#000"></nav-bar>
 
-      <!-- <view style="text-align: center;">
+			<!-- <view style="text-align: center;">
 				<image src="../../static/logo.png" style="border-radius: 64upx;"></image>
 			</view>
  -->
-      <view class="input-content">
-        <view class="item-label">手机号码</view>
-        <view class="cu-form-group">
-          <view class="input-box">
-            <input
-              type="number"
-              :value="phone"
-              placeholder="请输入登录的手机号码"
-              maxlength="11"
-              data-key="phone"
-              @input="inputChange"
-            />
-          </view>
-        </view>
-        <view class="item-label">{{type == 1?'登录密码':'验证码'}}</view>
-        <view class="cu-form-group" v-if="type == 1">
-          <view class="input-box">
-            <input
-              placeholder="请输入密码"
-              maxlength="20"
-			  :value="password"
-              :password="showPassword"
-              data-key="password"
-              @input="inputChange"
-              @confirm="toLogin"
-            />
-			<u-icon @click="changePassword" class="eye" :class="{ 'eye-active': !showPassword }" name="eye-fill"></u-icon>
-          </view>
-        </view>
-		<view class="cu-form-group" v-if="type == 2">
-		  <input
-		    type="number"
-		    :value="code"
-		    placeholder="请输入验证码"
-		    maxlength="6"
-		    data-key="code"
-		    @input="inputChange"
-		    @confirm="toLogin"
-		  />
-		  <text class="send-msg" @click="sendMsg" :disabled="sending">
-		    {{ sendTime }}
-		  </text>
-		</view>
+			<view class="input-content">
+				<view class="item-label">手机号码</view>
+				<view class="cu-form-group">
+					<view class="input-box">
+						<input type="number" :value="phone" placeholder="请输入登录的手机号码" maxlength="11" data-key="phone"
+							@input="inputChange" />
+					</view>
+				</view>
+				<view class="item-label">{{type == 1?'登录密码':'验证码'}}</view>
+				<view class="cu-form-group" v-if="type == 1">
+					<view class="input-box">
+						<input placeholder="请输入密码" maxlength="20" :value="password" :password="showPassword"
+							data-key="password" @input="inputChange" @confirm="toLogin" />
+						<u-icon @click="changePassword" class="eye" :class="{ 'eye-active': !showPassword }"
+							name="eye-fill"></u-icon>
+					</view>
+				</view>
+				<view class="cu-form-group" v-if="type == 2">
+					<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code"
+						@input="inputChange" @confirm="toLogin" />
+					<text class="send-msg" @click="sendMsg" :disabled="sending">
+						{{ sendTime }}
+					</text>
+				</view>
 
-        <view class="forgot-password" v-if="type ==1">
-          <view @click="forget">忘记密码</view>
-        </view>
-        <button class="confirm-btn" @click="toLogin">登录</button>
+				<view class="forgot-password" v-if="type ==1">
+					<view @click="forget">忘记密码</view>
+				</view>
+				<button class="confirm-btn" @click="toLogin">登录</button>
 
-        <view style="margin-top: 32rpx; text-align: center">
-          <view>
-            <text class="register-section" @click="register()">注册</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+				<view style="margin-top: 32rpx; text-align: center">
+					<view>
+						<text class="register-section" @click="register()">注册</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import navBar from "@/components/nav-bar/index.vue";
-export default {
-  data() {
-    return {
-		code: "",
-      phone: "",
-      password: "",
-	  showPassword:true,
-      banners: [],
-      invitation: "",
-      loginName: "",
-      sending: false,
-      sendTime: "获取验证码",
-      count: 60,
-	  type:0
-    };
-  },
-  components: {
-    navBar,
-  },
-  onLoad(options) {
-	  console.log(options);
-	  this.type = options.type;
-  },
-  methods: {
-    forget() {
-      uni.navigateTo({
-        url: "/pages/public/forgetPwd",
-      });
-    },
-    register() {
-      uni.navigateTo({
-        url: "/pages/public/register",
-      });
-    },
-    inputChange(e) {
-      const key = e.currentTarget.dataset.key;
-      this[key] = e.detail.value;
-    },
-    navBack() {
-      uni.navigateBack();
-    },
-	changePassword(){
-		this.showPassword = !this.showPassword;
-	},
-	sendMsg() {
-	  const { phone } = this;
-	  if (!phone) {
-	    this.$queue.showToast("请输入手机号");
-	  } else if (phone.length !== 11) {
-	    this.$queue.showToast("请输入正确的手机号");
-	  } else {
-	    this.$queue.showLoading("正在发送验证码...");
-	    this.$Request.getT("/app/Login/sendMsg/" + phone + "/forget").then((res) => {
-	      if (res.code === 0) {
-	        this.sending = true;
-	        this.$queue.showToast("验证码发送成功请注意查收");
-	        this.countDown();
-	        uni.hideLoading();
-	      } else {
-	        uni.hideLoading();
-	        uni.showModal({
-	          showCancel: false,
-	          title: "短信发送失败",
-	          content: res.msg ? res.msg : "请一分钟后再获取验证码",
-	        });
-	      }
-	    });
-	  }
-	},
-	countDown() {
-	  const { count } = this;
-	  if (count === 1) {
-	    this.count = 60;
-	    this.sending = false;
-	    this.sendTime = "获取验证码";
-	  } else {
-	    this.count = count - 1;
-	    this.sending = true;
-	    this.sendTime = count - 1 + "秒后重新获取";
-	    setTimeout(this.countDown.bind(this), 1000);
-	  }
-	},
-    toLogin() {
-      this.$queue.loginClear();
-      let openid = this.$queue.getData("openid");
-      const { phone, password,code } = this;
-	  if(!phone && phone.length != 11){
-		  this.$queue.showToast("请输入正确的手机号");
-		  return;
-	  }
-	  if(!password && this.type == 1){
-		  this.$queue.showToast("请输入密码");
-		  return;
-	  }
-	  if(!code && this.type == 2){
-	  		this.$queue.showToast("请输入验证码");
-	  		return;
-	  }
-        this.$queue.showLoading("正在登录中...");
-		let params = {
-			phone: phone,
-			openId: this.$queue.getData("openid"),
-		}
-		let url = ''
-		if(this.type == 1){
-			params = {
-				...params,
-				password: password,
-			}
-			url = '/app/Login/loginApp'
-		}
-		if(this.type == 2){
-			params = {
-				...params,
-				msg: code
-			}
-			url = '/app/Login/registerCode'
-		}
-        this.$Request
-          .post(url,params)
-          .then((res) => {
-            if (res.code == 0) {
-              this.$queue.setData("userId", res.user.userId);
-              this.$queue.setData("token", res.token);
-              this.$queue.setData("phone", res.user.phone);
-              this.$queue.setData("userName", res.user.userName);
-              this.$queue.setData("avatar", res.user.avatar);
-              this.$queue.setData("invitationCode", res.user.invitationCode);
-              this.$queue.setData("inviterCode", res.user.inviterCode);
-              this.getIsVip();
-              uni.hideLoading();
-              this.$queue.setData("userType", res.user.userType);
-              //判断是否开启身份选择 是/否
-              this.$Request.get("/app/common/type/339").then((rest) => {
-                if (rest.code == 0) {
-                  if (rest.data.value == "是") {
-                    // 这里是跳转到选择职场身份的界面
-                    uni.reLaunch({
-                      url: "/pages/public/selectIdentity/selectIdentity",
-                    });
-                  } else {
-                    if (res.user.userType == 2) {//企业
-                      // 原有的
-                      // uni.reLaunch({
-                      //   url: "/pages/my/index",
-                      // });
-                      // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
-                      let firstLogin = uni.getStorageSync("firstLogin") || false;
-                      if (!firstLogin) {
-                        uni.navigateTo({
-                          url: "/pages/my/jobApplicant/guidePage",
-                        });
-                      } else {
-                        uni.reLaunch({
-                          url: "/pages/my/index",
-                        });
-                      }
-                    } else {
-                      // uni.reLaunch({
-                      //   url: "/pages/my/index",
-                      // });
-                      // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
-                      let firstLogin = uni.getStorageSync("firstLogin") || false;
-                      if (!firstLogin) {
-                        uni.navigateTo({
-                          url: "/pages/my/jobApplicant/guidePage",
-                        });
-                      } else {
-                        uni.reLaunch({
-                          url: "/pages/my/index",
-                        });
-                      }
-                    }
-                  }
-                } else {
-                  if (res.user.userType == 2) {
-                    // uni.reLaunch({
-                    //   url: "/pages/my/index",
-                    // });
-                    // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
-                    let firstLogin = uni.getStorageSync("firstLogin") || false;
-                    if (!firstLogin) {
-                      uni.navigateTo({
-                        url: "/pages/my/jobApplicant/guidePage",
-                      });
-                    } else {
-                      uni.reLaunch({
-                        url: "/pages/my/index",
-                      });
-                    }
-                  } else {
-                    // uni.reLaunch({
-                    //   url: "/pages/my/index",
-                    // });
-                    // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
-                    let firstLogin = uni.getStorageSync("firstLogin") || false;
-                    if (!firstLogin) {
-                      uni.navigateTo({
-                        url: "/pages/my/jobApplicant/guidePage",
-                      });
-                    } else {
-                      uni.reLaunch({
-                        url: "/pages/my/index",
-                      });
-                    }
-                  }
-                }
-              });
-              // uni.switchTab({
-              // 	url: '/pages/my/index'
-              // })
-            } else {
-              uni.hideLoading();
-              this.$queue.showToast(res.msg);
-            }
-        });
-    },
-    getIsVip() {
-      this.$Request.get("/app/UserVip/isUserVip").then((res) => {
-        if (res.code == 0) {
-          // this.isVip = res.data
-          console.log(res.data);
-          this.$queue.setData("isVip", res.data);
-        }
-      });
-    },
-  },
-};
+	import navBar from "@/components/nav-bar/index.vue";
+	export default {
+		data() {
+			return {
+				code: "",
+				phone: "",
+				password: "",
+				showPassword: true,
+				banners: [],
+				invitation: "",
+				loginName: "",
+				sending: false,
+				sendTime: "获取验证码",
+				count: 60,
+				type: 0
+			};
+		},
+		components: {
+			navBar,
+		},
+		onLoad(options) {
+			console.log(options);
+			this.type = options.type;
+		},
+		methods: {
+			forget() {
+				uni.navigateTo({
+					url: "/pages/public/forgetPwd",
+				});
+			},
+			register() {
+				uni.navigateTo({
+					url: "/pages/public/register",
+				});
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			changePassword() {
+				this.showPassword = !this.showPassword;
+			},
+			sendMsg() {
+				const {
+					phone
+				} = this;
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (phone.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在发送验证码...");
+					this.$Request.getT("/app/Login/sendMsg/" + phone + "/forget").then((res) => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast("验证码发送成功请注意查收");
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: "短信发送失败",
+								content: res.msg ? res.msg : "请一分钟后再获取验证码",
+							});
+						}
+					});
+				}
+			},
+			toLogin() {
+				this.$queue.loginClear();
+				let openid = this.$queue.getData("openid");
+				const {
+					phone,
+					password,
+					code
+				} = this;
+				if (!password && this.type == 1) {
+					this.$queue.showToast("请输入密码");
+					return;
+				}
+				if (!code && this.type == 2) {
+					this.$queue.showToast("请输入验证码");
+					return;
+				}
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (phone.length != 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在登录中...");
+					let params = {
+						phone: phone,
+						openId: this.$queue.getData("openid"),
+					}
+					if (this.type == 1) {
+						params = {
+							...params,
+							password: password,
+						}
+					}
+					if (this.type == 2) {
+						params = {
+							...params,
+							msg: code
+						}
+					}
+					this.$Request
+						.post("/app/Login/loginApp", params)
+						.then((res) => {
+							if (res.code == 0) {
+								this.$queue.setData("userId", res.user.userId);
+								this.$queue.setData("token", res.token);
+								this.$queue.setData("phone", res.user.phone);
+								this.$queue.setData("userName", res.user.userName);
+								this.$queue.setData("avatar", res.user.avatar);
+								this.$queue.setData("invitationCode", res.user.invitationCode);
+								this.$queue.setData("inviterCode", res.user.inviterCode);
+								this.getIsVip();
+								uni.hideLoading();
+								this.$queue.setData("userType", res.user.userType);
+								//判断是否开启身份选择 是/否
+								this.$Request.get("/app/common/type/339").then((rest) => {
+									if (rest.code == 0) {
+										if (rest.data.value == "是") {
+											// 这里是跳转到选择职场身份的界面
+											uni.reLaunch({
+												url: "/pages/public/selectIdentity/selectIdentity",
+											});
+										} else {
+											if (res.user.userType == 2) { //企业
+												// 原有的。判断第一次根据userType  ==null
+												uni.reLaunch({
+													url: "/pages/my/index",
+												});
+												// 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+												// let firstLogin = uni.getStorageSync("firstLogin") || false;
+												// if (!firstLogin) {
+												//   uni.navigateTo({
+												//     url: "/pages/my/jobApplicant/guidePage",
+												//   });
+												// } else {
+												//   uni.reLaunch({
+												//     url: "/pages/my/index",
+												//   });
+												// }
+											} else if (res.user.userType == 1) {
+												uni.reLaunch({
+													url: "/pages/my/index",
+												});
+												// 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+												// let firstLogin = uni.getStorageSync("firstLogin") || false;
+												// if (!firstLogin) {
+												//   uni.navigateTo({
+												//     url: "/pages/my/jobApplicant/guidePage",
+												//   });
+												// } else {
+												//   uni.reLaunch({
+												//     url: "/pages/my/index",
+												//   });
+												// }
+											} else {
+												//表示是第一次进来，走引导页
+												uni.navigateTo({
+													url: "/pages/my/jobApplicant/guidePage",
+												});
+											}
+										}
+									} else {
+
+										if (res.user.userType == 2) { //企业
+											// 原有的。判断第一次根据userType  ==null
+											uni.reLaunch({
+												url: "/pages/my/index",
+											});
+
+										} else if (res.user.userType == 1) {
+											uni.reLaunch({
+												url: "/pages/my/index",
+											});
+
+										} else {
+											//表示是第一次进来，走引导页
+											uni.navigateTo({
+												url: "/pages/my/jobApplicant/guidePage",
+											});
+										}
+
+									}
+								});
+
+								// uni.switchTab({
+								// 	url: '/pages/my/index'
+								// })
+							} else {
+								uni.hideLoading();
+								this.$queue.showToast(res.msg);
+							}
+						});
+				}
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then((res) => {
+					if (res.code == 0) {
+						// this.isVip = res.data
+						console.log(res.data);
+						this.$queue.setData("isVip", res.data);
+					}
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-::v-deep .input-placeholder {
-  color: #9ea1a8;
-  font-family: DM Sans;
-  font-size: 28rpx;
-  font-weight: 400;
-  text-align: left;
-}
-page {
-  height: 100%;
-  background: #fff;
-}
-.forgot-password {
-  text-align: left;
-  margin-top: 8rpx;
-  color: rgba(102, 112, 133, 1);
-  font-family: Inter;
-  font-size: 24rpx;
-  font-weight: 400;
-  line-height: 40rpx;
-}
-.item-label {
-  color: rgba(18, 26, 44, 1);
-  font-family: Roboto;
-  font-size: 32rpx;
-  font-weight: 400;
-  line-height: 51.2rpx;
-  letter-spacing: 0px;
-  text-align: left;
-  padding-bottom: 8rpx;
-  margin-top: 32rpx;
-}
-.cu-form-group {
-	position: relative;
-  box-sizing: border-box;
-  border: 2rpx solid rgba(158, 161, 168, 1);
-  border-radius: 24rpx;
-  background: rgba(255, 255, 255, 1);
-  padding: 8rpx 24rpx !important;
-  height: 96rpx;
-}
-.eye{
-	position: absolute;
-	top: 50%;
-	right: 24rpx;
-	font-size: 48rpx;
-	transform: translateY(-50%);
-}
-.eye-active{
-	color: #016bf6;
-}
-.bg {
-  background-color: #ffffff;
-}
+	::v-deep .input-placeholder {
+		color: #9ea1a8;
+		font-family: DM Sans;
+		font-size: 28rpx;
+		font-weight: 400;
+		text-align: left;
+	}
+
 
-.send-msg {
-  color: rgba(1, 107, 246, 1);
-  font-size: 28rpx;
-  font-weight: 400;
-}
+	page {
+		height: 100%;
+		background: #fff;
+	}
 
-.container {
-  top: 0;
-  padding-top: 32upx;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  background: #ffffff !important;
-}
 
-.wrapper {
-  position: relative;
-  z-index: 90;
-  background: #ffffff;
-  padding-bottom: 32upx;
-}
+	.send-msg {
+		color: rgba(1, 107, 246, 1);
+		font-size: 28rpx;
+		font-weight: 400;
+	}
 
-.input-content {
-  padding: 32rpx;
-  box-sizing: border-box;
-}
 
-.confirm-btn {
-   border-radius: 60rpx;
-  margin-top: 32rpx;
-  background: #016bf6;
-  color: rgba(255, 255, 255, 1);
-  font-family: DM Sans;
-  font-size: 32rpx;
-  font-weight: 400;
+	.forgot-password {
+		text-align: left;
+		margin-top: 8rpx;
+		color: rgba(102, 112, 133, 1);
+		font-family: Inter;
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+	}
+
+	.item-label {
+		color: rgba(18, 26, 44, 1);
+		font-family: Roboto;
+		font-size: 32rpx;
+		font-weight: 400;
+		line-height: 51.2rpx;
+		letter-spacing: 0px;
+		text-align: left;
+		padding-bottom: 8rpx;
+		margin-top: 32rpx;
+	}
+
+	.cu-form-group {
+		position: relative;
+		box-sizing: border-box;
+		border: 2rpx solid rgba(158, 161, 168, 1);
+		border-radius: 24rpx;
+		background: rgba(255, 255, 255, 1);
+		padding: 8rpx 24rpx !important;
+		height: 96rpx;
+	}
+
+	.eye {
+		position: absolute;
+		top: 50%;
+		right: 24rpx;
+		font-size: 48rpx;
+		transform: translateY(-50%);
+	}
+
+	.eye-active {
+		color: #016bf6;
+	}
+
+	.bg {
+		background-color: #ffffff;
+	}
+
+	.send-msg {
+		border-radius: 30px;
+		color: black;
+		background: white;
+		height: 30px;
+		font-size: 14px;
+		line-height: 30px;
+	}
+
+	.container {
+		top: 0;
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #ffffff !important;
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #ffffff;
+		padding-bottom: 32upx;
+	}
+
+	.input-content {
+		padding: 32rpx;
+		box-sizing: border-box;
+	}
+
+	.confirm-btn {
+		border-radius: 60rpx;
+		margin-top: 32rpx;
+		background: #016bf6;
+		color: rgba(255, 255, 255, 1);
+		font-family: DM Sans;
+		font-size: 32rpx;
+		font-weight: 400;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
 
-  &:after {
-    border-radius: 60px;
-  }
-}
-.register-section {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: #016bf6;
-  font-family: Inter;
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 20px;
-  letter-spacing: 0%;
-  text-align: right;
-  text-decoration-line: underline;
-}
-</style>
+	.register-section {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #016bf6;
+		font-family: Inter;
+		font-size: 12px;
+		font-weight: 400;
+		line-height: 20px;
+		letter-spacing: 0%;
+		text-align: right;
+		text-decoration-line: underline;
+	}
+</style>

pages/public/register.vue

@@ -334,8 +334,9 @@ export default {
               this.getUserInfo();
               setTimeout(function () {
                 // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
-                let firstLogin = uni.getStorageSync("firstLogin") || false;
-                if (!firstLogin) {
+                // let firstLogin = uni.getStorageSync("firstLogin") || false;
+				console.log("userType：",res.user.userType)
+                if (!res.user.userType) {
                   uni.navigateTo({
                     url: "/pages/my/jobApplicant/guidePage",
                   });
@@ -414,11 +415,11 @@ export default {
           this.userName = res.data.userName;
           this.invitationCode = res.data.invitationCode;
           uni.setStorageSync("invitationCode", res.data.invitationCode);
-          setTimeout(function () {
-            uni.switchTab({
-              url: "/pages/index/index",
-            });
-          }, 1000);
+          // setTimeout(function () {
+          //   uni.switchTab({
+          //     url: "/pages/index/index",
+          //   });
+          // }, 1000);
         } else {
           uni.showModal({
             showCancel: false,