Merge remote-tracking branch 'origin/master'

src/common/lang/zh.js

@@ -706,7 +706,7 @@ module.exports = {
 		companyIntroduction:'一句话介绍：',
 		plcompanyIntroduction:'请输入一句话介绍',
 		projectIndustryList:'技术领域：',
-		plprojectIndustryList:'请选择最多三个所属行业',
+		plprojectIndustryList:'请选择最多三个技术领域',
 		companyWebsite:'公司网站：',
 		ercompanyWebsite:'公司网站填写错误',
 		plcompanyWebsite:'请输入公司网站',

src/components/index/PageTop.vue

@@ -357,13 +357,13 @@
                 // ROLE_ORDINARY_MEDIUM = 6;//6普通大B用户
                 // ROLE_VIP_MEDIUM = 7;//7vip大B用户
                 if(this.userInfo.roleList.length>0&&this.userInfo.roleList[0].roleType==2||this.userInfo.roleList.length>0&&this.userInfo.roleList[0].roleType==5){
-                    this.$router.push({path:"/seeprojectlist",query:{remind:true}})
+                    this.$router.push({path:"/seeprojectlist"})
                 }
                 if(this.userInfo.roleList.length>0&&this.userInfo.roleList[0].roleType==1) this.$router.push("/registeruserlist");
                 if(this.isCompleteInfo){
-                    if(this.userInfo.empType==0) this.$router.push({path:"/bigBusiness/list",query:{remind:true}});
+                    if(this.userInfo.empType==0) this.$router.push({path:"/bigBusiness/list"});
                     else{
-                        if(this.userInfo.empType==1) this.$router.push({path:"/seeprojectlist",query:{remind:true}})
+                        if(this.userInfo.empType==1) this.$router.push({path:"/seeprojectlist"})
                     }
                 }else this.$router.push("/completeInfoCmpt");
 

src/components/mobile/mobileTop.vue

@@ -97,8 +97,8 @@
                     this.$router.push("/");
                 }else{
                     this.currentIndex = index;
-                    if(index==0) this.$router.push("/projectlist");
-                    if(index==1) this.$router.push("/phoneBusinessList");
+                    if(index==0) this.$router.replace("/projectlist");
+                    if(index==1) this.$router.replace("/phoneBusinessList");
                     if(index==2) this.$router.push("/lndustryfocused");
                     if(index==3) this.$router.push("/successfulcaseed");
                     if(index==4) this.$router.push("/usehelped");

src/main.js

@@ -99,6 +99,7 @@ const i18n = new VueI18n({
 
     }
 })();
+ console.log(router)
 router.beforeEach((to, from, next) => {
     // console.log(window.__asxiosPromiseArr)
     if (window.__asxiosPromiseArr) {
@@ -154,7 +155,7 @@ router.beforeEach((to, from, next) => {
                 if(to.path == '/phoneBusinessList'){
                     router.replace('/mobileRegister');
                 }else{
-                    if(ismobile == 1) router.push('/mobileRegister');
+                    if(ismobile == 1) router.replace('/mobileRegister');
                     else router.push('/login');
                 }
             }

src/views/mobile/projectment/projectlist.vue

@@ -108,7 +108,7 @@
                                 this.tableData = res.result.records;
                             }
                             this.totalPage = res.result.total;
-                            this.flags = (this.page >= this.pages) ? false : true;
+                            this.flags = (this.page >= res.result.pages) ? false : true;
                             this.isHaveMore(this.flags);
                         }else{
                             this.tableData = res.result.records;