Merge remote-tracking branch 'origin/master'

src/components/index/PageTop.vue

@@ -228,9 +228,9 @@
                }
                 this.currentIndex = index;
                 window.sessionStorage.setItem("currentNav",index);
-                if((index==1||index==2)&&!this.userInfo) {
-                    this.$router.push('/login');
-                }
+                // if((index==1||index==2)&&!this.userInfo) {
+                //     this.$router.push('/login');
+                // }
                 if(index==5) this.$router.push("/knowledge");
                 if(index==4) this.$router.push("/useHelp");
                 if(index==0) this.$router.push("/");

src/main.js

@@ -160,7 +160,7 @@ router.beforeEach((to, from, next) => {
     if(window.sessionStorage.getItem("userInfo") ==null){
         if(to.name == 'dashboard'||to.name=='indexView'|| to.name == 'login' || to.name == 'mobileLoginCmpt'|| to.name == 'emailLoginCmpt'|| to.name == 'mobileRegisterCmpt'|| to.name == 'emailRegisterCmpt'||to.name=='completeInfoCmpt'|| to.name == 'successCmpt'||to.name=='findPasswordCmpt'||to.name=='modifyPasswordCmpt'||to.name=='passSuccessCmpt'||to.name=='indexView'||to.name=="mobileIndex"||to.name=="mobileLogin"||to.name=="loginByPhone"||to.name=="loginByEmail"||to.name=="mobileRegister"||to.name=="registerComplete"||to.name=="shareRequire"||to.name=="shareProject"||to.name=="knowledgeList"||to.name=="knowledgeDetail"||to.name=='vip'||to.name=='vipList'||to.name=='loadEmail'||to.name=='openEmail'||to.name=="viewRequire"||to.name=="phoneBusinessList"||to.name=="phoneBusinessDetail"||to.name=="phoneRequireDetail"||to.name=="bigBusinessList"||to.name=="bigBusinessDetail"||to.name=="requireDetail"||to.name=="mixSearch"){
         } else{
-            if(to.path == '/projectdetails'||to.path == '/seeprojectlist'||to.path == '/projectlist'||to.path == '/viewproject'||to.path == '/templateMobile1'||to.path == '/knowledge'||to.path == '/knowledgedetails'||to.path == '/termserviceed'||to.path == '/privacypolicyed'||to.path == '/contactused'||to.path == '/aboutused'||to.path == '/casedetailsed'||to.path == '/lndustryfocused'||to.path == '/successfulcaseed'||to.path == '/usehelped'||to.path == '/useHelp'||to.path == '/reminder'||to.path == '/contactus' ||to.path == '/privacypolicy' ||to.path == '/termservice' ||to.path == '/casedetails' ||to.path == '/successfulcase' ||to.path == '/lndustryfocus' ||to.path == '/aboutus' ){
+            if(to.path == '/casedetailschild'||to.path == '/lndustryfocuschild'||to.path == '/successfulcasechild'||to.path == '/projectdetails'||to.path == '/seeprojectlist'||to.path == '/projectlist'||to.path == '/viewproject'||to.path == '/templateMobile1'||to.path == '/knowledge'||to.path == '/knowledgedetails'||to.path == '/termserviceed'||to.path == '/privacypolicyed'||to.path == '/contactused'||to.path == '/aboutused'||to.path == '/casedetailsed'||to.path == '/lndustryfocused'||to.path == '/successfulcaseed'||to.path == '/usehelped'||to.path == '/useHelp'||to.path == '/reminder'||to.path == '/contactus' ||to.path == '/privacypolicy' ||to.path == '/termservice' ||to.path == '/casedetails' ||to.path == '/successfulcase' ||to.path == '/lndustryfocus' ||to.path == '/aboutus' ){
 
             }else{
                 if(to.path == '/projectlist' || to.path == '/phoneBusinessList'){

src/views/mobile/projectment/projectlist.vue

@@ -140,6 +140,7 @@
                             if(this.userInfo){
                                 if(this.userInfo.auditState=="AS01"){
                                     MessageBox({
+                                        title: this.$t('commonTips.remind'),
                                         message:this.userInfo.empType==1?this.$t("commonTips.hasLoginAndNotAuthBigBusiness"):this.$t("commonTips.hasLoginAndNotAuthSmallBusiness"),
                                         confirmButtonText:this.userInfo.empType==1?this.$t("topNav.postDemand"):this.$t("topNav.submitPro"),
                                         cancelButtonText:this.$t("commonTips.cancel"),
@@ -153,6 +154,7 @@
                                 }
                                 if(this.userInfo.auditState=="AS04"){
                                     MessageBox({
+                                        title: this.$t('commonTips.remind'),
                                         message:this.$t("commonTips.auditRejectBusiness"),
                                         confirmButtonText:this.$t("commonTitle.goEdit"),
                                         cancelButtonText:this.$t("commonTips.cancel"),
@@ -166,6 +168,7 @@
                                 }
                                 if(this.userInfo.auditState =="AS02"){
                                     MessageBox({
+                                        title: this.$t('commonTips.remind'),
                                         message:this.$t("commonTips.auditingAuthBusiness"),
                                         confirmButtonText:this.$t("commonTips.iKnowTitle"),
                                         showCancelButton:false
@@ -173,6 +176,7 @@
                                 }
                             }else{
                                 MessageBox({
+                                    title: this.$t('commonTips.remind'),
                                     message:this.$t("commonTips.loginMore"),
                                     confirmButtonText:this.$t("mobile.alreadyLogin"),
                                     cancelButtonText:this.$t("commonTips.cancel"),

src/views/mobile/projectment/projectreleasechild.vue

@@ -115,7 +115,7 @@
                             </el-upload>
                             <div style="position: absolute;left: 2.3rem;top: 0px;width: 4rem;line-height: 0.3rem;text-align: left">
                                 <p style="line-height: 0.4rem;font-size: 0.24rem;margin-bottom: 0.6rem">{{$t('personalAuth.businessCardTitle')}}</p>
-                                <span style="border: 1px solid #5D78FF;color: #5D78FF;padding: 6px 20px;border-radius: 3px" @click="iscard">名片示例</span>
+                                <span style="border: 1px solid #5D78FF;color: #5D78FF;padding: 6px 20px;border-radius: 3px" @click="iscard">{{$t('personalAuth.cardEg')}}</span>
                             </div>
                         </div>
                     </el-form-item>