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

common/queue.js

@@ -37,6 +37,16 @@ module.exports = {
 		this.remove("userType");
 		this.remove("member");
 		this.remove('companyId')
+		this.remove('avatar')
+		this.remove('age')
+		this.remove('companyName')
+		this.remove('companyStatus')
+		this.remove('isVip')
+		this.remove('vipMsgNum')
+		this.remove('vipMsgPrice')
+		this.remove('vipDueTimes')
+		this.remove('msgNum')
+		this.remove('msgPrice')
 	},
 	loginClear() {
 		this.remove("token");

manifest.json

@@ -2,8 +2,8 @@
     "name" : "亿职赞",
     "appid" : "__UNI__0B0096D",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/msg/addmsg.vue

@@ -6,7 +6,7 @@
 				<u-icon name="close" color="rgba(56, 58, 63, 1)" size="32"></u-icon>
 			</view>
 			<view class="nav-center">
-				<text class="nav-title">招呼语</text>
+				<text class="nav-title">常用语</text>
 			</view>
 			<view class="nav-right"></view>
 		</view>
@@ -32,7 +32,7 @@
 				</view>
 		-->
 
-		<view class="setting-item setting-item-first">
+		<view v-if="false" class="setting-item setting-item-first">
 			<view class="setting-left">
 				<view class="setting-title-row">
 					<view class="setting-label">自动发送招呼语</view>
@@ -51,7 +51,7 @@
 		<view class="main-content">
 			<!-- 左侧导航侧边栏 -->
 			<view class="sidebar">
-				<view class="sidebar-item" :class="{ 'active': tabCurrentIndex === 1 }" @click="tabClicks(1)">
+				<view hidden class="sidebar-item" :class="{ 'active': tabCurrentIndex === 1 }" @click="tabClicks(1)">
 					<text class="sidebar-text">常规</text>
 				</view>
 				<view class="sidebar-item" :class="{ 'active': tabCurrentIndex === 0 }" @click="tabClicks(0)">
@@ -85,7 +85,7 @@
 						<!-- 
 							<u-icon name="plus" color="#fff" size="30" style="margin-right: 10upx;"></u-icon>
 						-->
-						添加招呼语
+						添加常用语
 					</view>
 				</view>
 				
@@ -234,7 +234,15 @@
 				uni.navigateTo({
 					url: '/pages/msg/regular'
 				});
-			}
+			},
+			// 选择模板
+			selectTemplate(template) {
+				console.log('选择的模板:', template);
+				// 这里可以添加使用模板的逻辑，比如跳转到编辑页面
+				uni.navigateTo({
+					url: '/pages/msg/add?type=0&type1=0&template=' + encodeURIComponent(template)
+				});
+			},
 		},
 		onPageScroll: function(e) {
 			this.scrollTop = e.scrollTop > 200;
@@ -247,15 +255,7 @@
 		toggleNotification() {
 			console.log('自动发送招呼语开关状态:', this.notificationEnabled ? '开启' : '关闭');
 			// 这里可以添加保存到服务器的逻辑
-		},
-		// 选择模板
-		selectTemplate(template) {
-			console.log('选择的模板:', template);
-			// 这里可以添加使用模板的逻辑，比如跳转到编辑页面
-			uni.navigateTo({
-				url: '/pages/msg/add?type=0&type1=0&template=' + encodeURIComponent(template)
-			});
-		},
+		}
 	}
 </script>
 

pages/msg/im.vue

@@ -2123,7 +2123,7 @@
 				this.$Request.getT('/app/message/selectMessageByUserId?page=1&limit=100&state=20')
 					.then(res => {
 						if (res.code == 0) {
-							this.changYongList = [{label:'你好，很高兴认识您',value:0}];
+							this.changYongList = [{label:'你好啊，可以聊一聊~',value:0}];
 							res.data.list.forEach(d => {
 								let data = {
 									label: d.content,

pages/public/register.vue

@@ -323,6 +323,7 @@ export default {
           })
           .then((res) => {
             if (res.code === 0) {
+				return this.dealUserData(res)
               this.$queue.showToast("注册成功");
 
               this.$queue.setData("token", res.token);
@@ -417,11 +418,12 @@ export default {
           this.userName = res.data.userName;
           this.invitationCode = res.data.invitationCode;
           uni.setStorageSync("invitationCode", res.data.invitationCode);
-          setTimeout(function () {
+          /* setTimeout(function () {
             uni.reLaunch({
               url: "/pages/my/jobApplicant/registerSuccess",//pages/my/jobApplicant/registerSuccess
             });
-          }, 1000);
+          }, 1000); */
+		  
 		  return
         } else {
           uni.showModal({
@@ -433,6 +435,90 @@ export default {
         }
       });
     },
+	dealUserData(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);
+		if(res.user.invitationCode)
+		this.$queue.setData("invitationCode", res.user.invitationCode);
+		if(res.user.inviterCode)
+		this.$queue.setData("inviterCode", res.user.inviterCode);
+		this.$queue.setData("isVip", false);
+		uni.hideLoading();
+		if(res.user.userType)
+		this.$queue.setData("userType", res.user.userType);
+		this.$queue.connectSocket()
+		//判断是否开启身份选择 是/否
+		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",
+					});
+				}
+			}
+		});
+	}
   },
 };
 </script>