修复求职端bug

manifest.json

@@ -63,7 +63,7 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "android" ],
-                        "appid" : "wxeaffcaea958472d3",
+                        "appid" : "wx6b884c8431f096c4",
                         "UniversalLinks" : "https://maxiong.xianmxkj.com/"
                     },
                     "alipay" : {
@@ -72,14 +72,14 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wxeaffcaea958472d3",
+                        "appid" : "wx6b884c8431f096c4",
                         "UniversalLinks" : "https://maxiong.xianmxkj.com/"
                     }
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wxeaffcaea958472d3",
-                        "appsecret" : "32f6f3ce599abff2fa0191a36780c66c",
+                        "appid" : "wx6b884c8431f096c4",
+                        "appsecret" : "30d3fd06ab473f07b0a4b45e1048b5cb",
                         "UniversalLinks" : "https://maxiong.xianmxkj.com/"
                     }
                 },

package/jobIntention/tagManage.vue

@@ -121,6 +121,7 @@ export default {
 	},
 	methods: {
 		goBack() {
+			uni.$emit('updatePosition')
 			uni.navigateBack()
 		},
 		getData(){

pages/index/game/gameList.vue

@@ -317,21 +317,34 @@ export default {
     let systemInfo = uni.getSystemInfoSync();
     this.statusBarHeight = systemInfo.statusBarHeight || 0;
 	let that = this;
-			uni.$on('city', data => {
-				that.city = data.city
-				uni.setStorageSync('city', that.city)
-			})
+	// 更换城市调用getJobSearchList
+	uni.$on('city', data => {
+		that.city = data.city
+		uni.setStorageSync('city', that.city);
+		this.searchPage = 1
+		this.getJobSearchList();
+	})
+	// 监听筛选条件触发getJobSearchList
+	uni.$on('updateRecord', () => {
+	    this.getFilterData();
+	})
+	// 监听工作性质变化
+	uni.$on('updatePosition', () => {
+		this.searchPage = 1;
+		this.page = 1;
+	    this.getTypeList();
+	})
 	if (uni.getStorageSync('city')) {
 		this.city = uni.getStorageSync('city')
 	} else {
 		this.city = ''
 	}
-    this.getTypeList();
     this.getLocation();
-    //this.getJobSearchList();
   },
   onUnload(){
-	uni.$off('city') 
+	uni.$off('city');
+	uni.$off('updateRecord');
+	uni.$off('updatePosition')
   },
   watch: {
   	current(newData, oldData) {
@@ -339,37 +352,37 @@ export default {
   		uni.showLoading({
   			title: '加载中'
   		})
-  		this.page = 1
+  		this.searchPage = 1
   		this.getJobSearchList();
   	},
   	currentSx(newData, oldData) {
   		uni.showLoading({
   			title: '加载中'
   		})
-  		this.page = 1
-  		this.getJobSearchList();
-  	},
-  	currentjob(newData, oldData) {
-  		uni.showLoading({
-  			title: '加载中'
-  		})
-  		this.page = 1
-  		this.getJobSearchList();
-  	},
-  	currentJobSx(newData, oldData) {
-  		uni.showLoading({
-  			title: '加载中'
-  		})
-  		this.page = 1
-  		this.getJobSearchList();
-  	},
-  	currentJobSxs(newData, oldData) {
-  		uni.showLoading({
-  			title: '加载中'
-  		})
-  		this.page = 1
+  		this.searchPage = 1
   		this.getJobSearchList();
   	},
+  	// currentjob(newData, oldData) {
+  	// 	uni.showLoading({
+  	// 		title: '加载中'
+  	// 	})
+  	// 	this.page = 1
+  	// 	this.getJobSearchList();
+  	// },
+  	// currentJobSx(newData, oldData) {
+  	// 	uni.showLoading({
+  	// 		title: '加载中'
+  	// 	})
+  	// 	this.page = 1
+  	// 	this.getJobSearchList();
+  	// },
+  	// currentJobSxs(newData, oldData) {
+  	// 	uni.showLoading({
+  	// 		title: '加载中'
+  	// 	})
+  	// 	this.page = 1
+  	// 	this.getJobSearchList();
+  	// },
   },
   onPageScroll(e) {
     // 监听页面滚动
@@ -380,107 +393,57 @@ export default {
       this.isFixed = false;
     }
   },
-  onShow(){
-	//获取选中的筛选条件
-	if (uni.getStorageSync('filter') && (uni.getStorageSync('filter')).length > 0) {
-		let filter = uni.getStorageSync('filter')
-		this.education = '' //学历
-		this.experience = '' //经验
-		this.industry = '' //行业
-		this.salaryRange = '' //薪资
-		this.companyPeople = '' //公司规模
-		filter.map(item => {
-			let arr = []
-			item.list.map(ite => {
-				if (ite.value != '不限') {
-					arr.push(ite.value)
-				}
-			})
-			switch (item.name) {
-				case '学历要求':
-					this.education = arr.join(',')
-					break;
-				case '薪资范围（单选）':
-					this.salaryRange = arr.join(',')
-					break;
-				case '经验要求':
-					this.experience = arr.join(',')
-					break;
-				case '公司规模':
-					this.companyPeople = arr.join(',')
-					break;
-				case '行业':
-					this.industry = arr.join(',')
-					break;
-			}
-	
-		})
-		// console.log(filter)
-	} else {
-		this.education = '' //学历
-		this.experience = '' //经验
-		this.industry = '' //行业
-		this.salaryRange = '' //薪资
-		this.companyPeople = '' //公司规模
-	} 
-	this.getJobSearchList();
-  },
   methods: {
     // 获取工作性质列表
     getTypeList() {
-	var that=this
-	//行业期望
-	this.$Request.get('/app/intention/getIntentionList', {
-		
-	}).then(res => {
-		if (res.code == 0) {
-			let arr = res.data
-		let classRule=[]
-		let industry=[{id:'不限',name:'不限'}]
-		var industryArr=this.industry==''?[]:this.industry.split(',')
-		industryArr.forEach(function(item){
-			if(that.$queue.array_column(that.directionList,'name').indexOf(item)<0)
-				industry.push({id:item,name:item})
-		})
-		
-		arr.forEach(function(item){
-			var tmp={}
-			tmp.id=item.ruleClassifyId
-			tmp.name=item.ruleClassifyName
-			tmp.label=item.ruleClassifyName
-			classRule.push(tmp)
-			var indus=!item.industry?[]:item.industry.split('/')
-			indus.forEach(function(ind){
-				var tm={}
-				tm.name=ind
-				tm.id=ind
-				if(that.$queue.array_column(industry,'name').indexOf(tm.name)<0)
-					industry.push(tm)
+		var that=this
+		//行业期望
+		this.$Request.get('/app/intention/getIntentionList', {}).then(res => {
+			if (res.code == 0) {
+				let arr = res.data
+			let classRule=[]
+			let industry=[{id:'不限',name:'不限'}]
+			var industryArr=this.industry==''?[]:this.industry.split(',')
+			industryArr.forEach(function(item){
+				if(that.$queue.array_column(that.directionList,'name').indexOf(item)<0)
+					industry.push({id:item,name:item})
+			})
+			
+			arr.forEach(function(item){
+				var tmp={}
+				tmp.id=item.ruleClassifyId
+				tmp.name=item.ruleClassifyName
+				tmp.label=item.ruleClassifyName
+				classRule.push(tmp)
+				var indus=!item.industry?[]:item.industry.split('/')
+				indus.forEach(function(ind){
+					var tm={}
+					tm.name=ind
+					tm.id=ind
+					if(that.$queue.array_column(industry,'name').indexOf(tm.name)<0)
+						industry.push(tm)
+				})
 			})
+				this.typeList = classRule
+				this.directionList=industry
+				that.getJobSearchList();
+				that.getJobList();
+			}
 		})
-			this.typeList = classRule
-			this.directionList=industry
-			console.log(44444)
-			that.getJobList();
-			// console.log(this.typeList, '1111')
-		}
-	})
-	return;
-      this.$Request
-        .getT("/app/dict/list", {
-          type: "工作性质",
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.typeList = res.data.map((item) => ({
-              label: item.value,
-              value: item.code,
-            }));
-            // 获取到tabs数据后调用职位列表
-			console.log(3333333)
-            this.getJobList();
-          }
-        });
+		// this.$Request
+		// 	.getT("/app/dict/list", {
+		// 	  type: "工作性质",
+		// 	})
+		// 	.then((res) => {
+		// 	  if (res.code == 0) {
+		// 		this.typeList = res.data.map((item) => ({
+		// 		  label: item.value,
+		// 		  value: item.code,
+		// 		}));
+		// 		// 获取到tabs数据后调用职位列表
+		// 		this.getJobList();
+		// 	  }
+		// });
     },
     // 跳转到搜索页面
     goNavs(url) {
@@ -518,8 +481,7 @@ export default {
           that.getSelectCity(res.longitude,res.latitude)
         },
         fail: function () {
-			console.log('1111')
-          that.getJobList();
+			this.getTypeList();
         },
       });
     },
@@ -530,8 +492,7 @@ export default {
 				// console.log(res, '获取地址信息')
 				this.city = res.data.city ? res.data.city : '区域'
 				uni.setStorageSync('city', res.data.city)
-				console.log('2222')
-				that.getJobList();
+				that.getTypeList();
 			}
 		});
 	},
@@ -540,8 +501,8 @@ export default {
       let data = {
         page: this.page,
         limit: this.limit,
-        /* postType: this.typeList.length > 0 ? this.typeList[this.current].name : "", */
-		ruleClassifyName: this.typeList[this.current].name, //岗位名称
+        postType: this.typeList.length > 0 ? this.typeList[this.current].name : "",
+		ruleClassifyName: this.typeList.length > 0 ? this.typeList[this.current].name : "", //岗位名称
         screen: +this.currentSx + 1, //1推荐 2最新
         city: this.city == "全国" ? "" : this.city,
         lng: this.longitude,
@@ -593,9 +554,55 @@ export default {
     // 刷新职位列表
     refreshJobList() {
       this.page = 1;
-	  console.log(55555)
       this.getJobList();
     },
+	// 筛选求职列表
+	getFilterData(){
+		//获取选中的筛选条件
+		if (uni.getStorageSync('filter') && (uni.getStorageSync('filter')).length > 0) {
+			let filter = uni.getStorageSync('filter')
+			this.education = '' //学历
+			this.experience = '' //经验
+			this.industry = '' //行业
+			this.salaryRange = '' //薪资
+			this.companyPeople = '' //公司规模
+			filter.map(item => {
+				let arr = []
+				item.list.map(ite => {
+					if (ite.value != '不限') {
+						arr.push(ite.value)
+					}
+				})
+				switch (item.name) {
+					case '学历要求':
+						this.education = arr.join(',')
+						break;
+					case '薪资范围（单选）':
+						this.salaryRange = arr.join(',')
+						break;
+					case '经验要求':
+						this.experience = arr.join(',')
+						break;
+					case '公司规模':
+						this.companyPeople = arr.join(',')
+						break;
+					case '行业':
+						this.industry = arr.join(',')
+						break;
+				}
+		
+			})
+			// console.log(filter)
+		} else {
+			this.education = '' //学历
+			this.experience = '' //经验
+			this.industry = '' //行业
+			this.salaryRange = '' //薪资
+			this.companyPeople = '' //公司规模
+		}
+		this.searchPage = 1
+		this.getJobSearchList();
+	},
     // 获取求职列表
     getJobSearchList() {
       let data = {
@@ -608,6 +615,11 @@ export default {
         lat: this.latitude,
 		isDue:1,
         userId: uni.getStorageSync("userId") ? uni.getStorageSync("userId") : "",
+		education:this.education || '',//学历
+		experience:this.experience || '',//经验
+		industry:this.industry || '',//行业
+		salaryRange:this.salaryRange || '',//薪资
+		companyPeople:this.companyPeople || ''//公司规模
       };
       this.$Request.get("/app/postPush/userGetPostPushList", data).then((res) => {
 		  uni.hideLoading()

pages/msg/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="msg-box">
+	<view class="msg-box" :style="{ paddingTop: BarHeight + 'px' }">
 		<!-- 顶部导航栏 -->
 		<view class="nav-header">
 			<view class="nav-left" @click="goSearch">
@@ -37,7 +37,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="margin-topW">
+		<!-- <view class="margin-topW">
 			<view class="flex padding-tb radius padding-lr-sm bg" @click="goChat">
 				<view>
 					<image style="width: 80rpx;height: 80rpx;border-radius: 80rpx;"
@@ -56,7 +56,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 
 		<view v-if="chatList.length" class="margin-top-sm  content ">
 			<view class="radius padding-lr-sm bg" style="margin-top: 4rpx;" @click="goIM(item)"
@@ -183,6 +183,7 @@
 		},
 		data() {
 			return {
+				BarHeight:'',
 				page: 1,
 				limit: 100,
 				chatList: [],
@@ -217,6 +218,10 @@
 			}
 		},
 		onShow() {
+			// #ifdef APP-PLUS
+			let systemInfo = uni.getSystemInfoSync();
+			this.BarHeight = systemInfo.statusBarHeight;
+			// #endif
 			let that = this
 			that.userId = uni.getStorageSync('userId')
 			if (that.userId) {
@@ -521,7 +526,7 @@
 
 <style lang="scss">
 	.msg-box {
-		padding-top: 80rpx;
+		// padding-top: 80rpx;
 
 		.chat-title {
 			background: linear-gradient(180deg, rgba(13, 39, 247, 1) 0%, rgb(191, 194, 201) 100%);

pages/public/login.vue

@@ -62,13 +62,15 @@
      <!-- <button class="confirm-btn" style="margin-top: 100rpx" @click="register">
         手机号登录
       </button> -->
+	   <!-- #ifdef APP -->
 	  <view class="login-btn wechat" :class="{ disabled: !checked }"
-		:disabled="checked"
+		:disabled="checked" @click="login"
 	    ><image
 	      src="@/static/images/jobApplicant/wx.svg"
 	      mode="scaleToFill"
 	    />微信登录</view
 	  >
+	  <!-- #endif -->
 	  <view class="login-btn password" :class="{ disabled: !checked }"
 		:disabled="checked" @click="register(1)"
 	    ><image
@@ -541,18 +543,63 @@ export default {
                   url: "/pages/public/selectIdentity/selectIdentity",
                 });
               } else {
-                uni.navigateBack();
+                if (res.user.userType == 2) {
+                  // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+                  let firstLogin = uni.getStorageSync("firstLogin") || false;
+                  if (!firstLogin) {
+                    uni.navigateTo({
+                      url: "/pages/my/jobApplicant/guidePage",
+                    });
+                  } else {
+                    uni.reLaunch({
+                      url: "/pages/my/index",
+                    });
+                  }
+                } else {
+                  // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+                  let firstLogin = uni.getStorageSync("firstLogin") || false;
+                  if (!firstLogin) {
+                    uni.navigateTo({
+                      url: "/pages/my/jobApplicant/guidePage",
+                    });
+                  } else {
+                    uni.reLaunch({
+                      url: "/pages/my/index",
+                    });
+                  }
+                }
               }
             } else {
-              uni.navigateBack();
+              if (res.user.userType == 2) {
+                // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+                let firstLogin = uni.getStorageSync("firstLogin") || false;
+                if (!firstLogin) {
+                  uni.navigateTo({
+                    url: "/pages/my/jobApplicant/guidePage",
+                  });
+                } else {
+                  uni.reLaunch({
+                    url: "/pages/my/index",
+                  });
+                }
+              } else {
+                // 这里判断一下看是否是第一次登录如果是就跳到引导页，如果不是就正常跳
+                let firstLogin = uni.getStorageSync("firstLogin") || false;
+                if (!firstLogin) {
+                  uni.navigateTo({
+                    url: "/pages/my/jobApplicant/guidePage",
+                  });
+                } else {
+                  uni.reLaunch({
+                    url: "/pages/my/index",
+                  });
+                }
+              }
             }
           });
         } else {
-          uni.showModal({
-            showCancel: false,
-            title: "登录失败",
-            content: res.msg,
-          });
+          uni.hideLoading();
+          this.$queue.showToast(res.msg);
         }
       });
     },

pages/public/loginphone.vue

@@ -137,10 +137,27 @@ export default {
 	    });
 	  }
 	},
+	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;
@@ -149,30 +166,28 @@ export default {
 	  		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"),
 		}
+		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("/app/Login/loginApp",params)
+          .post(url,params)
           .then((res) => {
             if (res.code == 0) {
               this.$queue.setData("userId", res.user.userId);
@@ -261,7 +276,6 @@ export default {
                   }
                 }
               });
-
               // uni.switchTab({
               // 	url: '/pages/my/index'
               // })
@@ -269,8 +283,7 @@ export default {
               uni.hideLoading();
               this.$queue.showToast(res.msg);
             }
-          });
-      }
+        });
     },
     getIsVip() {
       this.$Request.get("/app/UserVip/isUserVip").then((res) => {
@@ -341,12 +354,9 @@ page {
 }
 
 .send-msg {
-  border-radius: 30px;
-  color: black;
-  background: white;
-  height: 30px;
-  font-size: 14px;
-  line-height: 30px;
+  color: rgba(1, 107, 246, 1);
+  font-size: 28rpx;
+  font-weight: 400;
 }
 
 .container {

pages/public/register.vue

@@ -408,8 +408,8 @@ export default {
           this.$queue.setData("userId", res.data.userId);
           this.$queue.setData("userName", res.data.userName);
           this.$queue.setData("phone", res.data.phone);
-          this.$queue.setData("invitationCode", res.user.invitationCode);
-          this.$queue.setData("inviterCode", res.user.inviterCode);
+          this.$queue.setData("invitationCode", res.data.invitationCode);
+          this.$queue.setData("inviterCode", res.data.inviterCode);
 
           this.userName = res.data.userName;
           this.invitationCode = res.data.invitationCode;