fix:登录页和启动页

App.vue

@@ -1,590 +1,585 @@
 <script>
-	export default {
-		onLaunch: function() {
-			let that = this
-			// #ifdef APP || H5
-			uni.setStorageSync('isDial', false)
-			setInterval(() => {
-				// #ifdef H5 || APP
-				let userId = uni.getStorageSync('userId')
-				if (uni.getStorageSync('token')) {
-					that.$Request.get('/app/chat/selectUserChatVideo').then(res => {
-						if (res.code == 0 && res.data) {
-							// videoStatus 状态  1是发起 2是通话中 3是已取消 4是已拒绝 5是已结束  不过他只会返回1和2
-							if (res.data.videoStatus) {
-								console.log(res.data)
-								uni.setStorageSync('videoStatus', res.data.videoStatus)
-								uni.setStorageSync('messageType', res.data.messageType) //4视频通话 5语音通话
-								if (res.data.videoStatus == 1) {
-									console.log(uni.getStorageSync('isDial'))
-									if (!uni.getStorageSync('isDial')) {
-										uni.setStorageSync('isDial',
-											true) //跳转通话页面  做标识  true 已跳转 false 未跳转
-										uni.navigateTo({
-											url: '/my/videoVoice/videoVoice?byUserId=' +
-												res.data.userId +
-												'&chatContentId=' + res.data.chatContentId +
-												'&isRol=2&messageType=' + res.data
-												.messageType + '&chatConversationId=' + res
-												.data.chatConversationId + '&postPushId=' + res
-												.data
-												.postPushId + '&resumesId=' + res.data
-												.resumesId + '&userType=' + res.data.userType
-										})
-									}
-								}
-							}
+export default {
+  onLaunch: function () {
+    let that = this;
+    // #ifdef APP
+    // 检查是否首次启动 - 引导页逻辑
+    let firstUpload = uni.getStorageSync("firstUpload") || false;
+    if (!firstUpload) {
+      // 标记已经显示过引导页
+      uni.setStorageSync("firstUpload", true);
+      // 跳转到引导页
+      uni.navigateTo({
+        url: "/pages/my/jobApplicant/startPage",
+        success: () => {
+          // 跳转成功后，不再执行后面的逻辑
+          return;
+        },
+      });
+      // 这里需要return，避免执行后面的代码
+      return;
+    }
+    // #endif
 
-						} else {
-							uni.setStorageSync('videoStatus', 4)
-						}
-					})
-				}
-				// #endif
+    // #ifdef APP || H5
+    uni.setStorageSync("isDial", false);
+    setInterval(() => {
+      // #ifdef H5 || APP
+      let userId = uni.getStorageSync("userId");
+      if (uni.getStorageSync("token")) {
+        that.$Request.get("/app/chat/selectUserChatVideo").then((res) => {
+          if (res.code == 0 && res.data) {
+            // videoStatus 状态  1是发起 2是通话中 3是已取消 4是已拒绝 5是已结束  不过他只会返回1和2
+            if (res.data.videoStatus) {
+              console.log(res.data);
+              uni.setStorageSync("videoStatus", res.data.videoStatus);
+              uni.setStorageSync("messageType", res.data.messageType); //4视频通话 5语音通话
+              if (res.data.videoStatus == 1) {
+                console.log(uni.getStorageSync("isDial"));
+                if (!uni.getStorageSync("isDial")) {
+                  uni.setStorageSync("isDial", true); //跳转通话页面  做标识  true 已跳转 false 未跳转
+                  uni.navigateTo({
+                    url:
+                      "/my/videoVoice/videoVoice?byUserId=" +
+                      res.data.userId +
+                      "&chatContentId=" +
+                      res.data.chatContentId +
+                      "&isRol=2&messageType=" +
+                      res.data.messageType +
+                      "&chatConversationId=" +
+                      res.data.chatConversationId +
+                      "&postPushId=" +
+                      res.data.postPushId +
+                      "&resumesId=" +
+                      res.data.resumesId +
+                      "&userType=" +
+                      res.data.userType,
+                  });
+                }
+              }
+            }
+          } else {
+            uni.setStorageSync("videoStatus", 4);
+          }
+        });
+      }
+      // #endif
+    }, 5000);
+    // #endif
+    // #ifdef MP-WEIXIN
+    if (!uni.getStorageSync("token")) {
+      uni.login({
+        provider: "weixin",
+        success: function (loginRes) {
+          console.log(loginRes, "************");
+          let data = {
+            code: loginRes.code,
+          };
+          that.$Request.get("/app/Login/wxLogin", data).then((res) => {
+            if (res.code == 0) {
+              uni.setStorageSync("openId", res.data.open_id);
+              uni.setStorageSync("unionId", res.data.unionId);
+              uni.setStorageSync("sessionkey", res.data.session_key);
+              let inviterCode = "";
+              if (uni.getStorageSync("inviterCode")) {
+                inviterCode = uni.getStorageSync("inviterCode");
+              }
+              let sendData = {
+                openId: uni.getStorageSync("openId"),
+                unionId: uni.getStorageSync("unionId"),
+                userName: "游客",
+                avatar: "",
+                sex: "1", //性别
+                inviterCode: inviterCode, //别人登录进来携带你的邀请码
+              };
+              let phoneNum = false;
+              uni.setStorageSync("sendDataList", sendData);
+              that.$Request.getT("/app/common/type/188").then((ret) => {
+                if (ret.code == 0) {
+                  if (ret.data && ret.data.value && ret.data.value == "是") {
+                    phoneNum = true;
+                    let flag = res.data.flag;
+                    if (flag == "2" && phoneNum) {
+                      //需要授权手机号则走手机号授权
+                      uni.setStorageSync("weixinPhone", true);
+                    } else {
+                      //不需要手机号则则直接走授权登录
+                      uni.setStorageSync("weixinPhone", false);
+                    }
+                  } else {
+                    uni.setStorageSync("weixinPhone", false);
+                  }
+                }
+              });
+            }
+          });
+        },
+      });
+    }
+    // #endif
 
+    setInterval((d) => {
+      //定时器，定时去调取聊天未读消息
+      let userId = uni.getStorageSync("userId");
+      if (userId) {
+        this.$Request.get("/app/chat/selectChatCount").then((res) => {
+          if (res.code === 0) {
+            let chatCount = res.data.chatCount;
+            let messageCount = res.data.messageCount;
 
-			}, 5000)
-			// #endif
-			// #ifdef MP-WEIXIN
-			if (!uni.getStorageSync('token')) {
-				uni.login({
-					provider: 'weixin',
-					success: function(loginRes) {
-						console.log(loginRes, '************')
-						let data = {
-							code: loginRes.code,
-						}
-						that.$Request.get('/app/Login/wxLogin', data).then(res => {
-							if (res.code == 0) {
-								uni.setStorageSync('openId', res.data.open_id)
-								uni.setStorageSync('unionId', res.data.unionId)
-								uni.setStorageSync('sessionkey', res.data.session_key)
-								let inviterCode = '';
-								if (uni.getStorageSync('inviterCode')) {
-									inviterCode = uni.getStorageSync('inviterCode')
-								}
-								let sendData = {
-									openId: uni.getStorageSync('openId'),
-									unionId: uni.getStorageSync('unionId'),
-									userName: '游客',
-									avatar: '',
-									sex: '1', //性别
-									inviterCode: inviterCode //别人登录进来携带你的邀请码
-								};
-								let phoneNum = false
-								uni.setStorageSync('sendDataList', sendData)
-								that.$Request.getT('/app/common/type/188').then(ret => {
-									if (ret.code == 0) {
-										if (ret.data && ret.data.value && ret.data.value ==
-											'是') {
-											phoneNum = true;
-											let flag = res.data.flag;
-											if (flag == '2' && phoneNum) { //需要授权手机号则走手机号授权
-												uni.setStorageSync('weixinPhone', true)
-											} else { //不需要手机号则则直接走授权登录
-												uni.setStorageSync('weixinPhone', false)
-											}
-										} else {
-											uni.setStorageSync('weixinPhone', false)
-										}
-									}
-								});
+            uni.setStorageSync("messageCount", messageCount);
 
-							}
-						})
+            let num = chatCount + messageCount;
+            if (num == 0) {
+              uni.removeTabBarBadge({
+                index: 1,
+              });
+              return;
+            }
+            uni.setTabBarBadge({
+              index: 1,
+              text: num + "",
+            });
+          }
+        });
+      }
+    }, 6000);
 
-					}
-				});
-			}
-			// #endif
+    //#ifdef APP-PLUS
+    // APP检测更新 具体打包流程可以参考：https://ask.dcloud.net.cn/article/35667
+    plus.screen.lockOrientation("portrait-primary"); //竖屏正方向锁定
+    //获取是否热更新过
+    const updated = uni.getStorageSync("updated"); // 尝试读取storage
 
-			setInterval(d => { //定时器，定时去调取聊天未读消息
-				let userId = uni.getStorageSync('userId')
-				if (userId) {
-					this.$Request.get('/app/chat/selectChatCount').then(res => {
-						if (res.code === 0) {
-							let chatCount = res.data.chatCount
-							let messageCount = res.data.messageCount
+    if (updated.completed === true) {
+      // 如果上次刚更新过
+      // 删除安装包及安装记录
+      console.log("安装记录被删除，更新成功");
+      uni.removeSavedFile({
+        filePath: updated.packgePath,
+        success: (res) => {
+          uni.removeStorageSync("updated");
+        },
+      });
+    } else if (updated.completed === false) {
+      uni.removeStorageSync("updated");
+      plus.runtime.install(updated.packgePath, {
+        force: true,
+      });
+      uni.setStorage({
+        key: "updated",
+        data: {
+          completed: true,
+          packgePath: updated.packgePath,
+        },
+        success: (res) => {
+          console.log("成功安装上次的更新，应用需要重启才能继续完成");
+        },
+      });
+      uni.showModal({
+        title: "温馨提示",
+        content: "应用将重启以完成更新",
+        showCancel: false,
+        complete: () => {
+          plus.runtime.restart();
+        },
+      });
+    } else {
+      //获取当前系统版本信息
+      plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+        //请求后台接口 解析数据 对比版本
+        that.$Request.getT("/app/user/selectNewApp").then((res) => {
+          res = res.data[0];
+          if (res.wgtUrl && widgetInfo.version < res.version) {
+            let downloadLink = "";
+            let androidLink = res.androidWgtUrl;
+            let iosLink = res.iosWgtUrl;
+            let ready = false;
+            //校验是是不是热更新
+            if (res.wgtUrl.match(RegExp(/.wgt/))) {
+              // 判断系统类型
+              if (plus.os.name.toLowerCase() === "android") {
+                console.log("安卓系统");
+                if (androidLink && androidLink !== "#") {
+                  // 我这里默认#也是没有地址，请根据业务自行修改
+                  console.log("发现下载地址");
+                  // 安卓：创建下载任务
+                  if (androidLink.match(RegExp(/.wgt/))) {
+                    console.log("确认wgt热更新包");
+                    downloadLink = androidLink;
+                    ready = true;
+                  } else {
+                    console.log("安卓推荐.wgt强制更新，.apk的强制更新请您自行修改程序");
+                  }
+                } else {
+                  console.log("下载地址是空的，无法继续");
+                }
+              } else {
+                console.log("苹果系统");
+                if (iosLink && iosLink !== "#") {
+                  // 我这里默认#也是没有地址，请根据业务自行修改
+                  console.log("发现下载地址");
+                  // 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
+                  if (iosLink.match(RegExp(/.wgt/))) {
+                    console.log("确认wgt热更新包");
+                    downloadLink = iosLink;
+                    ready = true;
+                  } else {
+                    console.log("苹果只支持.wgt强制更新");
+                  }
+                } else {
+                  console.log("下载地址是空的，无法继续");
+                }
+              }
+              if (ready) {
+                console.log("任务开始");
+                let downloadTask = uni.downloadFile({
+                  url: downloadLink,
+                  success: (res) => {
+                    if (res.statusCode === 200) {
+                      // 保存下载的安装包
+                      console.log("保存安装包");
+                      uni.saveFile({
+                        tempFilePath: res.tempFilePath,
+                        success: (res) => {
+                          const packgePath = res.savedFilePath;
+                          // 保存更新记录到stroage，下次启动app时安装更新
+                          uni.setStorage({
+                            key: "updated",
+                            data: {
+                              completed: false,
+                              packgePath: packgePath,
+                            },
+                            success: () => {
+                              console.log("成功保存记录");
+                            },
+                          });
+                          // 任务完成，关闭下载任务
+                          console.log(
+                            "任务完成，关闭下载任务，下一次启动应用时将安装更新"
+                          );
+                          downloadTask.abort();
+                          downloadTask = null;
+                        },
+                      });
+                    }
+                  },
+                });
+              } else {
+                console.log("下载地址未准备，无法开启下载任务");
+              }
+            } else {
+              //不是热更新是在线更新 校验是否强制升级
+              if (res.method == "true") {
+                uni.showModal({
+                  showCancel: false,
+                  confirmText: "立即更新",
+                  title: "发现新版本",
+                  content: res.des,
+                  success: (res) => {
+                    if (res.confirm) {
+                      that.$queue.showLoading("下载中...");
+                      if (uni.getSystemInfoSync().platform == "android") {
+                        uni.downloadFile({
+                          url: androidLink,
+                          success: (downloadResult) => {
+                            if (downloadResult.statusCode === 200) {
+                              plus.runtime.install(
+                                downloadResult.tempFilePath,
+                                {
+                                  force: false,
+                                },
+                                (d) => {
+                                  console.log("install success...");
+                                  plus.runtime.restart();
+                                },
+                                (e) => {
+                                  console.error("install fail...");
+                                }
+                              );
+                            }
+                          },
+                        });
+                      }
+                      if (uni.getSystemInfoSync().platform == "ios") {
+                        plus.runtime.openURL(iosLink, function (res) {});
+                      }
+                    } else if (res.cancel) {
+                      console.log("取消");
+                    }
+                  },
+                });
+              } else {
+                uni.showModal({
+                  title: "发现新版本",
+                  confirmText: "立即更新",
+                  cancelText: "下次更新",
+                  content: res.des,
+                  success: (res) => {
+                    if (res.confirm) {
+                      that.$queue.showLoading("下载中...");
+                      if (uni.getSystemInfoSync().platform == "android") {
+                        uni.downloadFile({
+                          url: androidLink,
+                          success: (downloadResult) => {
+                            if (downloadResult.statusCode === 200) {
+                              plus.runtime.install(
+                                downloadResult.tempFilePath,
+                                {
+                                  force: false,
+                                },
+                                (d) => {
+                                  console.log("install success...");
+                                  plus.runtime.restart();
+                                },
+                                (e) => {
+                                  console.error("install fail...");
+                                }
+                              );
+                            }
+                          },
+                        });
+                      }
+                      if (uni.getSystemInfoSync().platform == "ios") {
+                        plus.runtime.openURL(iosLink, function (res) {});
+                      }
+                    } else if (res.cancel) {
+                      console.log("取消");
+                    }
+                  },
+                });
+              }
+            }
+          }
+        });
+      });
+    }
 
-							uni.setStorageSync('messageCount', messageCount)
+    //#endif
+  },
+  onShow: function () {
+    // uni.removeStorageSync('firstLogin');
+    // uni.removeStorageSync('firstUpload');
+    //关键词过滤  602
+    this.$Request.getT("/app/common/type/602").then((res) => {
+      if (res.code == 0) {
+        if (res.data && res.data.value) {
+          this.$queue.setData("chatSearchKeys", res.data.value);
+        }
+      }
+    });
+    // 小程序是否上线
+    // this.$Request.get('/app/common/type/238').then(res => {
+    // 	if (res.code == 0) {
+    // 		// #ifdef MP-WEIXIN
+    // 		this.$queue.setData('XCXIsSelect', res.data.value);
+    // 		// #endif
+    // 		// #ifndef MP-WEIXIN
+    // 		this.$queue.setData('XCXIsSelect', '是');
+    // 		// #endif
+    // 	}
+    // });
+    this.$Request.get("/app/common/type/257").then((res) => {
+      if (res.code == 0) {
+        // #ifdef MP-WEIXIN
+        this.$queue.setData("XCXIsSelect", res.data.value);
+        // #endif
+        // #ifndef MP-WEIXIN
+        this.$queue.setData("XCXIsSelect", "是");
+        // #endif
+      }
+    });
+    //用户客服
+    // 企业微信链接 274
+    this.$Request.get("/app/common/type/322").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("kefu", res.data.value);
+      }
+    });
+    // 企业微信客服APPID 275
+    this.$Request.get("/app/common/type/324").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("kefuAppid", res.data.value);
+      }
+    });
+    //企业端客服
+    this.$Request.get("/app/common/type/321").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("kefuq", res.data.value);
+      }
+    });
+    // 企业微信客服APPID 275
+    this.$Request.get("/app/common/type/323").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("kefuAppidq", res.data.value);
+      }
+    });
+    // 企业会员每天免费联系次数 421
+    this.$Request.get("/app/common/type/421").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("vipMsgNum", res.data.value);
+      }
+    });
+    // 企业非会员每天免费联系次数 422
+    this.$Request.get("/app/common/type/422").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("msgNum", res.data.value);
+      }
+    });
+    // 企业会员每次联系价格 419
+    this.$Request.get("/app/common/type/419").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("vipMsgPrice", res.data.value);
+      }
+    });
+    // 企业非会员每次联系价格 420
+    this.$Request.get("/app/common/type/420").then((res) => {
+      if (res.code == 0) {
+        this.$queue.setData("msgPrice", res.data.value);
+      }
+    });
+    //腾讯云实时语音SDKAppID
+    this.$Request.get("/app/common/type/814").then((res) => {
+      if (res.code == 0) {
+        uni.setStorageSync("sdkAppId", res.data.value);
+      }
+    });
+    console.log("App Show");
+    // #ifdef H5
+    // let sysTem = uni.getSystemInfoSync()
+    // if (sysTem.model == 'PC') { //如果是pc访问移动端域名
+    // 	this.$Request.get('/app/common/type/432').then(res => {
+    // 		if (res.code == 0) {
+    // 			if (res.data.value == '是') {
+    // 				this.$Request.get('/app/common/type/433').then(ree => {
+    // 					if (ree.code == 0) {
+    // 						if (ree.data.value) {
+    // 							window.location.href = ree.data.value;
+    // 						}
+    // 					}
+    // 				})
+    // 			}
+    // 		}
+    // 	})
+    // }
+    // #endif
+    // #ifdef APP-PLUS
 
-							let num = chatCount + messageCount
-							if (num == 0) {
-								uni.removeTabBarBadge({
-									index: 1
-								})
-								return;
-							}
-							uni.setTabBarBadge({
-								index: 1,
-								text: num + ""
-							})
+    if (uni.getSystemInfoSync().platform == "android") {
+      let clientid = plus.push.getClientInfo().clientid;
 
-						}
-					});
-				}
-			}, 6000);
+      let userId = this.$queue.getData("userId");
+      if (userId) {
+        this.$Request
+          .postT("/app/user/updateClientId?clientId=" + clientid + "&userId=" + userId)
+          .then((res) => {});
+      }
+    }
 
-			//#ifdef APP-PLUS
-			// APP检测更新 具体打包流程可以参考：https://ask.dcloud.net.cn/article/35667
-			plus.screen.lockOrientation('portrait-primary'); //竖屏正方向锁定
-			//获取是否热更新过
-			const updated = uni.getStorageSync('updated'); // 尝试读取storage
+    //#endif
+    //#ifdef H5
+    let isopen = false;
+    this.$Request.get("/app/common/type/237").then((res) => {
+      if (res.data.value == "是") {
+        isopen = true;
+      }
+    });
+    if (isopen) {
+      let ua = navigator.userAgent.toLowerCase();
+      if (ua.indexOf("micromessenger") !== -1) {
+        let openid = uni.getStorageSync("openid");
+        let userId = uni.getStorageSync("userId");
+        let that = this;
+        if (!openid) {
+          if (
+            window.location.href.indexOf("?code=") !== -1 ||
+            window.location.href.indexOf("&code=") !== -1
+          ) {
+            let code;
+            if (window.location.href.indexOf("?code=") !== -1) {
+              code = window.location.href.split("?code=")[1].split("&")[0];
+            } else {
+              code = window.location.href.split("&code=")[1].split("&")[0];
+            }
+            this.$Request.get("/app/Login/getOpenId?code=" + code).then((ret) => {
+              uni.setStorageSync("openId", ret.data);
 
-			if (updated.completed === true) {
-				// 如果上次刚更新过
-				// 删除安装包及安装记录
-				console.log('安装记录被删除，更新成功');
-				uni.removeSavedFile({
-					filePath: updated.packgePath,
-					success: res => {
-						uni.removeStorageSync('updated');
-					}
-				});
-			} else if (updated.completed === false) {
-				uni.removeStorageSync('updated');
-				plus.runtime.install(updated.packgePath, {
-					force: true
-				});
-				uni.setStorage({
-					key: 'updated',
-					data: {
-						completed: true,
-						packgePath: updated.packgePath
-					},
-					success: res => {
-						console.log('成功安装上次的更新，应用需要重启才能继续完成');
-					}
-				});
-				uni.showModal({
-					title: '温馨提示',
-					content: '应用将重启以完成更新',
-					showCancel: false,
-					complete: () => {
-						plus.runtime.restart();
-					}
-				});
-			} else {
-				//获取当前系统版本信息
-				plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
-					//请求后台接口 解析数据 对比版本
-					that.$Request.getT('/app/user/selectNewApp').then(res => {
-						res = res.data[0];
-						if (res.wgtUrl && widgetInfo.version < res.version) {
-							let downloadLink = '';
-							let androidLink = res.androidWgtUrl;
-							let iosLink = res.iosWgtUrl;
-							let ready = false;
-							//校验是是不是热更新
-							if (res.wgtUrl.match(RegExp(/.wgt/))) {
-								// 判断系统类型
-								if (plus.os.name.toLowerCase() === 'android') {
-									console.log('安卓系统');
-									if (androidLink && androidLink !== '#') {
-										// 我这里默认#也是没有地址，请根据业务自行修改
-										console.log('发现下载地址');
-										// 安卓：创建下载任务
-										if (androidLink.match(RegExp(/.wgt/))) {
-											console.log('确认wgt热更新包');
-											downloadLink = androidLink;
-											ready = true;
-										} else {
-											console.log('安卓推荐.wgt强制更新，.apk的强制更新请您自行修改程序');
-										}
-									} else {
-										console.log('下载地址是空的，无法继续');
-									}
-								} else {
-									console.log('苹果系统');
-									if (iosLink && iosLink !== '#') {
-										// 我这里默认#也是没有地址，请根据业务自行修改
-										console.log('发现下载地址');
-										// 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
-										if (iosLink.match(RegExp(/.wgt/))) {
-											console.log('确认wgt热更新包');
-											downloadLink = iosLink;
-											ready = true;
-										} else {
-											console.log('苹果只支持.wgt强制更新');
-										}
-									} else {
-										console.log('下载地址是空的，无法继续');
-									}
-								}
-								if (ready) {
-									console.log('任务开始');
-									let downloadTask = uni.downloadFile({
-										url: downloadLink,
-										success: res => {
-											if (res.statusCode === 200) {
-												// 保存下载的安装包
-												console.log('保存安装包');
-												uni.saveFile({
-													tempFilePath: res.tempFilePath,
-													success: res => {
-														const packgePath = res
-															.savedFilePath;
-														// 保存更新记录到stroage，下次启动app时安装更新
-														uni.setStorage({
-															key: 'updated',
-															data: {
-																completed: false,
-																packgePath: packgePath
-															},
-															success: () => {
-																console
-																	.log(
-																		'成功保存记录'
-																	);
-															}
-														});
-														// 任务完成，关闭下载任务
-														console.log(
-															'任务完成，关闭下载任务，下一次启动应用时将安装更新'
-														);
-														downloadTask.abort();
-														downloadTask = null;
-													}
-												});
-											}
-										}
-									});
-								} else {
-									console.log('下载地址未准备，无法开启下载任务');
-								}
-							} else {
-								//不是热更新是在线更新 校验是否强制升级
-								if (res.method == 'true') {
-									uni.showModal({
-										showCancel: false,
-										confirmText: '立即更新',
-										title: '发现新版本',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												that.$queue.showLoading('下载中...');
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								} else {
-									uni.showModal({
-										title: '发现新版本',
-										confirmText: '立即更新',
-										cancelText: '下次更新',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												that.$queue.showLoading('下载中...');
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								}
-							}
-						}
-					});
-				});
-			}
+              this.$Request
+                .get("/app/Login/openid/login?openId=" + ret.data)
+                .then((res) => {
+                  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);
+                });
+            });
+          } else {
+            this.$Request.get("/app/common/type/108").then((res) => {
+              if (res.data.value == "是") {
+                window.location.href =
+                  "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
+                  that.$queue.getWxAppid() +
+                  "&redirect_uri=" +
+                  window.location.href.split("#")[0] +
+                  "&response_type=code&scope=snsapi_userinfo#wechat_redirect";
+              }
+            });
+          }
+        }
+        if (userId && openid) {
+          this.$Request
+            .get("/app/Login/bindOpenId?userId=" + userId + "&openId=" + openid)
+            .then((res) => {
+              // 省钱兄陪玩 https://pw.xianmxkj.com
+            });
+        }
+      }
+    }
 
-			//#endif
-		},
-		onShow: function() {
-			//关键词过滤  602
-			this.$Request.getT('/app/common/type/602').then(res => {
-				if (res.code == 0) {
-					if (res.data && res.data.value) {
-						this.$queue.setData('chatSearchKeys', res.data.value)
-					}
-				}
-			});
-			// 小程序是否上线
-			// this.$Request.get('/app/common/type/238').then(res => {
-			// 	if (res.code == 0) {
-			// 		// #ifdef MP-WEIXIN
-			// 		this.$queue.setData('XCXIsSelect', res.data.value);
-			// 		// #endif
-			// 		// #ifndef MP-WEIXIN
-			// 		this.$queue.setData('XCXIsSelect', '是');
-			// 		// #endif
-			// 	}
-			// });
-			this.$Request.get('/app/common/type/257').then(res => {
-				if (res.code == 0) {
-					// #ifdef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', res.data.value);
-					// #endif
-					// #ifndef MP-WEIXIN
-					this.$queue.setData('XCXIsSelect', '是');
-					// #endif
-				}
-			});
-			//用户客服
-			// 企业微信链接 274
-			this.$Request.get('/app/common/type/322').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('kefu', res.data.value);
-				}
-			});
-			// 企业微信客服APPID 275
-			this.$Request.get('/app/common/type/324').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('kefuAppid', res.data.value);
-				}
-			});
-			//企业端客服
-			this.$Request.get('/app/common/type/321').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('kefuq', res.data.value);
-				}
-			});
-			// 企业微信客服APPID 275
-			this.$Request.get('/app/common/type/323').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('kefuAppidq', res.data.value);
-				}
-			});
-			// 企业会员每天免费联系次数 421
-			this.$Request.get('/app/common/type/421').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('vipMsgNum', res.data.value);
-				}
-			});
-			// 企业非会员每天免费联系次数 422
-			this.$Request.get('/app/common/type/422').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('msgNum', res.data.value);
-				}
-			});
-			// 企业会员每次联系价格 419
-			this.$Request.get('/app/common/type/419').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('vipMsgPrice', res.data.value);
-				}
-			});
-			// 企业非会员每次联系价格 420
-			this.$Request.get('/app/common/type/420').then(res => {
-				if (res.code == 0) {
-					this.$queue.setData('msgPrice', res.data.value);
-				}
-			});
-			//腾讯云实时语音SDKAppID 
-			this.$Request.get('/app/common/type/814').then(res => {
-				if (res.code == 0) {
-					uni.setStorageSync('sdkAppId', res.data.value)
-				}
-			});
-			console.log('App Show')
-			// #ifdef H5
-			// let sysTem = uni.getSystemInfoSync()
-			// if (sysTem.model == 'PC') { //如果是pc访问移动端域名
-			// 	this.$Request.get('/app/common/type/432').then(res => {
-			// 		if (res.code == 0) {
-			// 			if (res.data.value == '是') {
-			// 				this.$Request.get('/app/common/type/433').then(ree => {
-			// 					if (ree.code == 0) {
-			// 						if (ree.data.value) {
-			// 							window.location.href = ree.data.value;
-			// 						}
-			// 					}
-			// 				})
-			// 			}
-			// 		}
-			// 	})
-			// }
-			// #endif
-			// #ifdef APP-PLUS
-
-			if (uni.getSystemInfoSync().platform == 'android') {
-				let clientid = plus.push.getClientInfo().clientid;
-
-				let userId = this.$queue.getData('userId');
-				if (userId) {
-					this.$Request.postT('/app/user/updateClientId?clientId=' + clientid + '&userId=' + userId).then(
-						res => {});
-				}
-			}
-
-			//#endif
-			//#ifdef H5
-			let isopen = false
-			this.$Request.get('/app/common/type/237').then(res => {
-				if (res.data.value == '是') {
-					isopen = true
-				}
-			});
-			if (isopen) {
-				let ua = navigator.userAgent.toLowerCase();
-				if (ua.indexOf('micromessenger') !== -1) {
-					let openid = uni.getStorageSync('openid');
-					let userId = uni.getStorageSync('userId');
-					let that = this;
-					if (!openid) {
-						if (window.location.href.indexOf('?code=') !== -1 || window.location.href.indexOf('&code=') !==
-							-1) {
-							let code;
-							if (window.location.href.indexOf('?code=') !== -1) {
-								code = window.location.href.split('?code=')[1].split('&')[0];
-							} else {
-								code = window.location.href.split('&code=')[1].split('&')[0];
-							}
-							this.$Request.get('/app/Login/getOpenId?code=' + code).then(ret => {
-								uni.setStorageSync('openId', ret.data)
-
-								this.$Request.get('/app/Login/openid/login?openId=' + ret.data).then(res => {
-
-									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);
-								});
-							});
-						} else {
-							this.$Request.get('/app/common/type/108').then(res => {
-								if (res.data.value == '是') {
-									window.location.href =
-										'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
-										that.$queue.getWxAppid() +
-										'&redirect_uri=' +
-										window.location.href.split('#')[0] +
-										'&response_type=code&scope=snsapi_userinfo#wechat_redirect';
-								}
-							});
-						}
-					}
-					if (userId && openid) {
-						this.$Request.get('/app/Login/bindOpenId?userId=' + userId + '&openId=' + openid).then(res => {
-							// 省钱兄陪玩 https://pw.xianmxkj.com
-						});
-					}
-				}
-			}
-
-
-			//#endif
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
+    //#endif
+  },
+  onHide: function () {
+    console.log("App Hide");
+  },
+};
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	@import "uview-ui/index.scss";
-	@import 'components/colorui/main.css';
-	@import 'components/colorui/icon.css';
-
+/*每个页面公共css */
+@import "uview-ui/index.scss";
+@import "components/colorui/main.css";
+@import "components/colorui/icon.css";
 
+page {
+  background-color: #ffffff;
+  color: #343546;
+}
 
-	page {
-		background-color: #FFFFFF;
-		color: #343546;
-	}
+.bg {
+  background-color: #f7f7f7;
+}
+/*文本省略*/
+.m-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.m-ellipsis-l2,
+.m-ellipsis-l3 {
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  word-break: break-all;
+}
 
-	.bg {
-		background-color: #F7F7F7;
-	}
-	/*文本省略*/
-	.m-ellipsis {
-	    overflow: hidden;
-	    white-space: nowrap;
-	    text-overflow: ellipsis;
-	}
-	.m-ellipsis-l2,
-	.m-ellipsis-l3 {
-	    display: -webkit-box;
-	    overflow: hidden;
-	    text-overflow: ellipsis;
-	    -webkit-box-orient: vertical;
-	    word-break: break-all;
-	}
-	
-	.m-ellipsis-l2 {
-	    -webkit-line-clamp: 2;
-	}
-	.m-ellipsis-l3 {
-	    -webkit-line-clamp: 3;
-	}
-</style>
+.m-ellipsis-l2 {
+  -webkit-line-clamp: 2;
+}
+.m-ellipsis-l3 {
+  -webkit-line-clamp: 3;
+}
+</style>

pages/my/jobApplicant/startPage.vue

@@ -73,8 +73,11 @@ export default {
       }
     },
     goLogin() {
+      // uni.navigateTo({
+      //   url: "/pages/my/jobApplicant/login",
+      // });
       uni.navigateTo({
-        url: "/pages/my/jobApplicant/login",
+        url: "/pages/public/login",
       });
     },
     // 暂停自动播放

pages/my/jobApplicant/workRecord.vue

@@ -367,6 +367,7 @@ export default {
       setTimeout(() => {
         uni.hideLoading();
         uni.showToast({ title: "提交成功", icon: "success" });
+        uni.setStorageSync("firstLogin", true);
         // 实际开发中可以在这里添加跳转逻辑
         uni.switchTab({ url: '/pages/index/index' })
       }, 1500);

pages/public/login.vue

@@ -66,7 +66,7 @@
         ><image
           src="@/static/images/jobApplicant/phone.svg"
           mode="scaleToFill"
-        />手机验证码登录</view
+        />手机账号密码登录</view
       >
       <view
         class=""
@@ -813,7 +813,7 @@ page {
   line-height: 42px;
   border-radius: 30px;
   margin-top: 40px;
-  background: #016BF6;
+  background: #016bf6;
   color: #fff;
   // font-size: $font-lg;
 

pages/public/loginphone.vue

@@ -1,6 +1,8 @@
 <template>
   <view class="container">
     <view class="wrapper">
+      <nav-bar title="登录" color="#000"></nav-bar>
+
       <!-- <view style="text-align: center;">
 				<image src="../../static/logo.png" style="border-radius: 64upx;"></image>
 			</view>
@@ -50,6 +52,7 @@
 </template>
 
 <script>
+import navBar from "@/components/nav-bar/index.vue";
 export default {
   data() {
     return {
@@ -63,6 +66,9 @@ export default {
       count: 60,
     };
   },
+  components: {
+    navBar,
+  },
   onLoad() {},
   methods: {
     forget() {
@@ -117,30 +123,76 @@ export default {
               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",
                       });
                     }
                   }
-                } else {
-                  if (res.user.userType == 2) {
-                    uni.reLaunch({
-                      url: "/pages/my/index",
-                    });
-                  } else {
-                    uni.reLaunch({
-                      url: "/pages/my/index",
-                    });
-                  }
                 }
               });
 

pages/public/register.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="container">
+    <nav-bar title="注册" color="#000"></nav-bar>
     <view class="wrapper">
       <view class="input-content">
         <view class="item-label">用户名</view>
@@ -52,8 +53,8 @@
             @confirm="toLogin"
           />
         </view>
-        <view class="cu-form-group" style="margin-top: 32rpx;" v-if="required == '是'">
-        <view class="item-label-code">邀请码</view>
+        <view class="cu-form-group" style="margin-top: 32rpx" v-if="required == '是'">
+          <view class="item-label-code">邀请码</view>
           <input
             type=""
             maxlength="6"
@@ -64,8 +65,8 @@
             @confirm="toLogin"
           />
         </view>
-        <view class="cu-form-group"  style="margin-top: 32rpx;" v-if="required == '否'">
-        <view class="item-label-code">邀请码</view>
+        <view class="cu-form-group" style="margin-top: 32rpx" v-if="required == '否'">
+          <view class="item-label-code">邀请码</view>
           <input
             type=""
             maxlength="6"
@@ -97,6 +98,7 @@
 </template>
 
 <script>
+import navBar from "@/components/nav-bar/index.vue";
 export default {
   data() {
     return {
@@ -115,6 +117,9 @@ export default {
       platform: "",
     };
   },
+  components: {
+    navBar,
+  },
   onLoad() {
     // this.invitation = this.$queue.getData('inviterCode') ? this.$queue.getData('inviterCode') : '';
     this.invitation = this.$queue.getData("invitation")
@@ -251,9 +256,17 @@ export default {
               );
               this.getUserInfo();
               setTimeout(function () {
-                uni.switchTab({
-                  url: "/pages/index/index",
-                });
+                // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+                let firstLogin = uni.getStorageSync("firstLogin") || false;
+                if (!firstLogin) {
+                  uni.navigateTo({
+                    url: "/pages/my/jobApplicant/guidePage",
+                  });
+                } else {
+                  uni.switchTab({
+                    url: "/pages/index/index",
+                  });
+                }
               }, 1000);
             } else {
               uni.hideLoading();
@@ -379,7 +392,7 @@ page {
   height: 30px;
   font-size: 10px;
   line-height: 30px;
-  background: #016BF6;
+  background: #016bf6;
 }
 
 .container {
@@ -410,7 +423,7 @@ page {
   line-height: 80upx;
   border-radius: 60upx;
   margin-top: 32upx;
-  background: #016BF6;
+  background: #016bf6;
 
   color: #fff;
   font-size: 32upx;

pages/public/selectIdentity/selectIdentity.vue

@@ -1,259 +1,252 @@
 <template>
-	<view>
-		<!-- #ifdef H5 -->
-		<image class="bgImg1"
-			src="https://zhaopin.xianmaxiong.com/file/uploadPath/2022/09/16/7c9fd30d3d119c3a2381739f279285c5.png"
-			mode="widthFix"></image>
-		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN || APP -->
-		<image class="bgImg"
-			src="https://zhaopin.xianmaxiong.com/file/uploadPath/2022/09/16/7c9fd30d3d119c3a2381739f279285c5.png"
-			mode="widthFix"></image>
-		<!-- #endif -->
-
-		<view class="title1">
-			请选择您的登录状态
-		</view>
-		<view class="title2">
-			欢迎来到招聘平台选择你的状态开启使用吧
-		</view>
-		<!-- 选择按钮 -->
-		<view class="selectBtn flex justify-center">
-			<view class="selectBtn1 flex align-center justify-center" @click="gotoVers(2)">
-				我要招人
-			</view>
-			<view class="selectBtn2 flex align-center justify-center" @click="gotoVers(1)">
-				我要应聘
-			</view>
-		</view>
-
-	</view>
+  <view class="guide-page">
+    <view class="guide-item">
+      <view class="guide-img">
+        <image src="@/static/images/jobApplicant/woyaozhaogongzuo.svg" mode="aspectFix" />
+      </view>
+      <view class="guide-btn" @click="gotoVers(1)">我要找工作</view>
+    </view>
+    <view class="guide-item">
+      <view class="guide-img">
+        <image src="@/static/images/jobApplicant/woyaozhaoren.svg" mode="aspectFix" />
+      </view>
+      <view class="guide-btn" @click="gotoVers(2)">我要招人</view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				userType: '', //用户类型 1:求职者 2:招聘者
-				CompanyList: '', //企业数据
-			};
-		},
-		onShow() {
-			this.userType = uni.getStorageSync('userType')
-			console.log(uni.getStorageSync('token'))
-			// #ifdef MP-WEIXIN
-			uni.hideHomeButton()
-			// #endif
-		},
-		methods: {
-			/**
-			 * 获取用户企业实名数据
-			 */
-			getCompany() {
-				this.$Request.get("/app/company/selectCompanyByUserId").then(res => {
-					if (res.code == 0 && res.data) {
-						this.CompanyList = res.data
-						if (this.CompanyList.status == 1) {
-							uni.showModal({
-								title: '提示',
-								content: '您提交的企业认证正在审核，是否查看修改?',
-								confirmColor: '#016BF6',
-								success: function(res) {
-									if (res.confirm) {
-										console.log('用户点击确定');
-										uni.navigateTo({
-											url: '/my/renzheng/index'
-										})
-									} else if (res.cancel) {
-										console.log('用户点击取消');
-									}
-								}
-							})
-						} else if (this.CompanyList.status == 2) { //已进行企业认证并且已通过则修改用户类型为2并跳转至企业端首页
-							if (this.userType == 1) { //若用户类型为1则修改身份为2跳转至首页
-								this.$Request.postT("/app/user/updateUserEntity", {
-									userType: 2
-								}).then(res => {
-									if (res.code == 0) {
-										// return
-										uni.setStorageSync('companyId', this.CompanyList.companyId)
-										uni.setStorageSync('userType', 2)
-										// uni.reLaunch({
-										// 	url:'/pages/index/index'
-										// })
-										uni.switchTab({
-											url: '/pages/index/index'
-										})
-									} else {
-										uni.showToast({
-											title: '切换失败，请重试！',
-											icon: 'none'
-										})
-									}
-								})
-							} else { //否则直接跳转至首页即可
-								uni.setStorageSync('companyId', this.CompanyList.companyId)
-								uni.setStorageSync('userType', 2)
-								// uni.reLaunch({
-								// 	url:'/pages/index/index'
-								// })
-								uni.switchTab({
-									url: '/pages/index/index'
-								})
-							}
-						} else if (this.CompanyList.status == 3) {
-							uni.showModal({
-								title: '提示',
-								content: '您提交的企业认证已被拒绝，是否查看修改?',
-								confirmColor: '#016BF6',
-								success: function(res) {
-									if (res.confirm) {
-										console.log('用户点击确定');
-										uni.navigateTo({
-											url: '/my/renzheng/index'
-										})
-									} else if (res.cancel) {
-										console.log('用户点击取消');
-									}
-								}
-							})
-						}
-					} else {
-						uni.showModal({
-							title: '提示',
-							content: '您还未企业认证,请先进行认证',
-							confirmColor: '#016BF6',
-							success: function(res) {
-								if (res.confirm) {
-									console.log('用户点击确定');
-									uni.navigateTo({
-										url: '/my/renzheng/index'
-									})
-								} else if (res.cancel) {
-									console.log('用户点击取消');
-								}
-							}
-						})
-					}
-				})
-			},
-			//选择登录身份
-			gotoVers(type) {
-				//用户端直接修改用户类型为1然后跳转至用户端首页
-				if (type == 1) { //用户端
-					//判断登录用户的userType 
-					if (this.userType == 1) { //若为1则直接跳转至首页
-						uni.setStorageSync('userType', 1)
-						// uni.reLaunch({
-						// 	url: '/pages/index/index'
-						// })
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					} else { //若为2，则修改用户的userType=2再跳转至首页
-						let data = {
-							userType: 1
-						}
-						this.$Request.postT("/app/user/updateUserEntity", data).then(res => {
-							if (res.code == 0) {
-								uni.setStorageSync('userType', 1)
-								// uni.reLaunch({
-								// 	url: '/pages/index/index'
-								// })
-								uni.switchTab({
-									url: '/pages/index/index'
-								})
-							} else {
-								uni.showToast({
-									title: '切换失败，请重试!'
-								})
-							}
-						})
-					}
-				} else { //企业端
-					/**
-					 * 企业端则判断该用户是否进行企业认证，
-					 * 若认证成功则修改用户状态为2跳转至企业端首页，
-					 * 若没有进行企业认证或审核中或审核失败则提示是否进行企业认证，选择是则跳转至认证的页面（用户类型还是为1）
-					 */
-					this.getCompany()
-					// if (this.userType == 1) { //原本用户类型为1
-					// 	this.getCompany()
-					// } else { //用户类型本来就为2
-					// 	uni.setStorageSync('userType', 2)
-					// 	uni.reLaunch({
-					// 		url: '/pages/index/index'
-					// 	})
-					// 	// uni.switchTab({
-					// 	// 	url:'/pages/index/index'
-					// 	// })
-					// }
-				}
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      userType: "", //用户类型 1:求职者 2:招聘者
+      CompanyList: "", //企业数据
+    };
+  },
+  onShow() {
+    this.userType = uni.getStorageSync("userType");
+    console.log(uni.getStorageSync("token"));
+    // #ifdef MP-WEIXIN
+    uni.hideHomeButton();
+    // #endif
+  },
+  methods: {
+    /**
+     * 获取用户企业实名数据
+     */
+    getCompany() {
+      this.$Request.get("/app/company/selectCompanyByUserId").then((res) => {
+        if (res.code == 0 && res.data) {
+          this.CompanyList = res.data;
+          if (this.CompanyList.status == 1) {
+            uni.showModal({
+              title: "提示",
+              content: "您提交的企业认证正在审核，是否查看修改?",
+              confirmColor: "#016BF6",
+              success: function (res) {
+                if (res.confirm) {
+                  console.log("用户点击确定");
+                  uni.navigateTo({
+                    url: "/my/renzheng/index",
+                  });
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              },
+            });
+          } else if (this.CompanyList.status == 2) {
+            //已进行企业认证并且已通过则修改用户类型为2并跳转至企业端首页
+            if (this.userType == 1) {
+              //若用户类型为1则修改身份为2跳转至首页
+              this.$Request
+                .postT("/app/user/updateUserEntity", {
+                  userType: 2,
+                })
+                .then((res) => {
+                  if (res.code == 0) {
+                    // return
+                    uni.setStorageSync("companyId", this.CompanyList.companyId);
+                    uni.setStorageSync("userType", 2);
+                    // uni.reLaunch({
+                    // 	url:'/pages/index/index'
+                    // })
+                    uni.switchTab({
+                      url: "/pages/index/index",
+                    });
+                  } else {
+                    uni.showToast({
+                      title: "切换失败，请重试！",
+                      icon: "none",
+                    });
+                  }
+                });
+            } else {
+              //否则直接跳转至首页即可
+              uni.setStorageSync("companyId", this.CompanyList.companyId);
+              uni.setStorageSync("userType", 2);
+              // uni.reLaunch({
+              // 	url:'/pages/index/index'
+              // })
+              uni.switchTab({
+                url: "/pages/index/index",
+              });
+            }
+          } else if (this.CompanyList.status == 3) {
+            uni.showModal({
+              title: "提示",
+              content: "您提交的企业认证已被拒绝，是否查看修改?",
+              confirmColor: "#016BF6",
+              success: function (res) {
+                if (res.confirm) {
+                  console.log("用户点击确定");
+                  uni.navigateTo({
+                    url: "/my/renzheng/index",
+                  });
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              },
+            });
+          }
+        } else {
+          uni.showModal({
+            title: "提示",
+            content: "您还未企业认证,请先进行认证",
+            confirmColor: "#016BF6",
+            success: function (res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+                uni.navigateTo({
+                  url: "/my/renzheng/index",
+                });
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+        }
+      });
+    },
+    //选择登录身份
+    gotoVers(type) {
+      //用户端直接修改用户类型为1然后跳转至用户端首页
+      if (type == 1) {
+        //用户端
+        //判断登录用户的userType
+        if (this.userType == 1) {
+          //若为1则直接跳转至首页
+          uni.setStorageSync("userType", 1);
+          //   原有的代码，现在需要做判断是否是第一次登录
+          // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+          let firstLogin = uni.getStorageSync("firstLogin") || false;
+          if (!firstLogin) {
+            uni.navigateTo({
+              url: "/pages/my/jobApplicant/guidePage",
+            });
+          } else {
+            uni.switchTab({
+              url: "/pages/index/index",
+            });
+          }
+        } else {
+          //若为2，则修改用户的userType=2再跳转至首页
+          let data = {
+            userType: 1,
+          };
+          this.$Request.postT("/app/user/updateUserEntity", data).then((res) => {
+            if (res.code == 0) {
+              uni.setStorageSync("userType", 1);
+              // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+              let firstLogin = uni.getStorageSync("firstLogin") || false;
+              if (!firstLogin) {
+                uni.navigateTo({
+                  url: "/pages/my/jobApplicant/guidePage",
+                });
+              } else {
+                uni.switchTab({
+                  url: "/pages/index/index",
+                });
+              }
+            } else {
+              uni.showToast({
+                title: "切换失败，请重试!",
+              });
+            }
+          });
+        }
+      } else {
+        //企业端
+        /**
+         * 企业端则判断该用户是否进行企业认证，
+         * 若认证成功则修改用户状态为2跳转至企业端首页，
+         * 若没有进行企业认证或审核中或审核失败则提示是否进行企业认证，选择是则跳转至认证的页面（用户类型还是为1）
+         */
+        this.getCompany();
+        // if (this.userType == 1) { //原本用户类型为1
+        // 	this.getCompany()
+        // } else { //用户类型本来就为2
+        // 	uni.setStorageSync('userType', 2)
+        // 	uni.reLaunch({
+        // 		url: '/pages/index/index'
+        // 	})
+        // 	// uni.switchTab({
+        // 	// 	url:'/pages/index/index'
+        // 	// })
+        // }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.bgImg1 {
-		width: 100%;
-		position: fixed;
-		top: 86rpx;
-		left: 0%;
-		z-index: -1;
-	}
-
-	.bgImg {
-		width: 100%;
-		position: fixed;
-		top: 10%;
-		left: 0%;
-		z-index: -1;
-	}
-
-	.title1 {
-		width: 100%;
-		text-align: center;
-		margin-top: 48vh;
-		font-size: 38rpx;
-		color: #1A1A1A;
-		font-weight: 800;
-	}
-
-	.title2 {
-		width: 100%;
-		text-align: center;
-		margin-top: 20rpx;
-		color: #999999;
-		font-size: 26rpx;
-		font-weight: 400;
-	}
-
-	.selectBtn {
-		width: 100%;
-		height: 90rpx;
-		margin-top: 200rpx;
-	}
-
-	.selectBtn1 {
-		width: 260rpx;
-		height: 100%;
-		border-radius: 8rpx;
-		background-color: #ffffff;
-		color: #016BF6;
-		font-size: 28rpx;
-		font-weight: bold;
-		border: 2rpx solid #016BF6;
-	}
-
-	.selectBtn2 {
-		width: 260rpx;
-		height: 100%;
-		border-radius: 8rpx;
-		background-color: #016BF6;
-		color: #ffffff;
-		margin-left: 49rpx;
-		font-size: 28rpx;
-		font-weight: bold;
-	}
-</style>
+.guide-page {
+  background: linear-gradient(90deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%);
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  padding: 120rpx 76rpx;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  gap: 36rpx;
+  .guide-item {
+    width: 100%;
+    height: 100%;
+    border-radius: 28rpx;
+    background: rgba(255, 255, 255, 0.851);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0 56rpx;
+    box-sizing: border-box;
+    gap: 72rpx;
+    .guide-img {
+      width: 364rpx;
+      height: 364rpx;
+      overflow: hidden;
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .guide-btn {
+      border-radius: 100rpx;
+      background: rgba(255, 255, 255, 1);
+      color: #016bf6;
+      font-family: DM Sans;
+      font-size: 32rpx;
+      font-weight: 400;
+      line-height: 48rpx;
+      letter-spacing: 0%;
+      text-align: center;
+      width: 100%;
+      padding: 16rpx;
+      box-sizing: border-box;
+    }
+  }
+}
+</style>