2 Commits c910cef315 ... cdd2594e15

Autor SHA1 Mensaje Fecha
  川 cdd2594e15 Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5 hace 7 meses
  川 493d44ab06 1 hace 7 meses

+ 1 - 1
package/jobIntention/companyImg.vue

@@ -55,7 +55,7 @@ export default {
 		console.log(this.lists[0].response.data)
 		var url=this.lists[0].response.data
 		const data = {
-			companyLogo: url, //logo
+			companyCertification: url, //logo
 			companyId: this.companyId, //ID
 		};
 		// 调用接口提交

+ 2 - 2
pages/my/index.vue

@@ -734,14 +734,14 @@
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											帮助中心
 										</view>
-									</view>
+									</view>--> 
 									<view v-if="token" class="util-item" @click="goOut()">
 										<image src="../../static/images/my/icon/utils/utils8.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											退出登录
 										</view>
-									</view> --> 
+									</view> 
 								</view>
 							</view>
 						</view>

+ 12 - 0
pages/my/jobApplicant/loginInput.vue

@@ -107,6 +107,18 @@ export default {
           // uni.switchTab({
           //   url: "/pages/index/index",
           // });
+		  
+		  		if (!this.userType) {
+		  		  uni.navigateTo({
+		  		    url: "/pages/my/jobApplicant/guidePage",
+		  		  });
+		  		} else {
+		  		  uni.switchTab({
+		  		    url: "/pages/index/index",
+		  		  });
+		  		}
+		  
+		  
           uni.navigateTo({
             url:'/pages/my/jobApplicant/guidePage'
           })

+ 20 - 2
pages/my/jobApplicant/registerSuccess.vue

@@ -26,11 +26,29 @@
 <script>
 export default {
   data() {
-    return {};
+    return {userType:""};
+  },
+  onLoad(options) {
+  if (options.userType) {
+  		this.userType = options.userType;
+  		console.log('接收的userType:', this.userType);
+  	}
   },
   methods: {
     goLogin(){
-        uni.navigateTo({ url: '/pages/my/jobApplicant/loginInput' })
+		// 这里判断一下看是否是第一次登录如果是就跳到引导页,如果不是就正常跳
+		// let firstLogin = uni.getStorageSync("firstLogin") || false;
+		console.log("userType:",this.userType)
+		// if (!this.userType) {
+		//   uni.navigateTo({
+		//     url: "/pages/my/jobApplicant/guidePage",
+		//   });
+		// } else {
+		//   uni.switchTab({
+		//     url: "/pages/index/index",
+		//   });
+		// }
+        uni.navigateTo({ url: '/pages/my/jobApplicant/loginInput?type=1' })
     },
   },
 };

+ 1 - 1
pages/my/peopleNumber.vue

@@ -86,7 +86,7 @@ export default {
       // 准备提交的数据
       const data = {
         companyAllName: this.companyName,
-        companyPeople: selectedPeople, // 选中的公司规模
+        companyPeople: this.peopleList[selectedPeople], // 选中的公司规模
         // 可根据接口需求添加其他字段
       };
 

+ 6 - 5
pages/public/register.vue

@@ -415,11 +415,12 @@ 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/my/jobApplicant/registerSuccess?userType="+res.data.userType,//pages/my/jobApplicant/registerSuccess
+            });
+          }, 1000);
+		  return
         } else {
           uni.showModal({
             showCancel: false,