Merge remote-tracking branch 'origin/master'

public/css/common.scss

@@ -1551,6 +1551,9 @@ body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, form, input, texta
     .el-form-item__content{
       width:calc(100% - 300px);
       word-wrap: break-word;
+      .el-form-item__error{
+        width: 500px;
+      }
     }
   }
   .contnetform {
@@ -1575,7 +1578,7 @@ body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, form, input, texta
     }
     .el-form-item__content{
       margin-left: 10px;
-      width:calc(100% - 140px);
+      width:calc(100% - 150px);
       word-wrap: break-word;
     }
   }
@@ -1584,6 +1587,9 @@ body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, form, input, texta
     .el-form-item__content{
       width:calc(100% - 200px);
       word-wrap: break-word;
+      .el-form-item__error{
+        width: 500px;
+      }
     }
   }
   .contnetformen {

src/common/lang/en.js

@@ -10,6 +10,9 @@ module.exports = {
         aboutUs:"About Us",
         useHelp:"Frequent Questions",
         serviceRecord:'Service Record',
+        irelease:'Published Product',
+        mymessage:'我的消息',
+        submitPro: "Publish Product",
         workPlace:"Console",
         logoTitle:"Instant Matchmaking Platform",
         login:"Login",
@@ -732,6 +735,7 @@ module.exports = {
 		plprovince:'Please select province',
 		plcity:'Please select city',
 		companyLogoUrl:'Company Logo：',
+        replaceLogoUrl:'replace Logo',
 		compantype:'PNG and JPG format only',
 		compansize:'Product pictures within 2MB maximum',
 		uploadtext:'Please upload picture',
@@ -743,9 +747,9 @@ module.exports = {
         projectModelNo: 'Form Factor',
         projectPhase:'Product Stage：',
 		projectInstroduction:'Product Description：',
-		plprojectModel:'Please select form factor：',
-		plprojectPhase:'Please select product stage：',
-		plprojectInstroduction:'Please enter product description within 500 words：',
+		plprojectModel:'Please select form factor',
+		plprojectPhase:'Please select product stage',
+		plprojectInstroduction:'Please enter product description within 2000 words',
 		projectPicUrlList:'Product Picture：',
 		uploadpicUrl:'Please upload picture',
 		projectLightspotList:'Product /Service Highlights：',
@@ -753,7 +757,7 @@ module.exports = {
 		uploadbp:'Startup Pitch Deck：',
 		projectlight:'Product Highlights',
 		addprojectlight:'Add product highlights',
-		patentnum:'Patent #/ Application #',
+		patentnum:'Patent  Application ',
 		patentname:'Patent Name',
 		addpatent:'Add patent',
 		addbp:'Upload Pitch Deck',
@@ -785,10 +789,10 @@ module.exports = {
 		companyValuation:'Cumulative valuation ($)：',
 		companyEmpList:'Team Core Member Introduction：',
 		companyEventList:'Company Event：',
-		plcompanyCreateDate:'Please select year of company establishment：',
-		plcompanyScale:'Please select company size：',
-		plcompanyFinancedAmount:'Please select cumulative financing amount：',
-		plcompanyValuation:'Please select valuation：',
+		plcompanyCreateDate:'Please select year of company establishment',
+		plcompanyScale:'Please select company size',
+		plcompanyFinancedAmount:'Please select cumulative financing amount',
+		plcompanyValuation:'Please select valuation',
 		empName:'Name',
 		empPosition:'Position',
 		empResume:'Resume',
@@ -991,7 +995,7 @@ module.exports = {
         ProjectPatent:'Product Patent：',
         not:'No',
         clickdownload:'Download',
-        reasonrejection:'Deny：',
+        reasonrejection:'Deny',
         plreasonrejection:'Reason for Denial：',
         determine:'Confirm',
         ofapproval:'Confirm to Deny？',
@@ -1135,7 +1139,7 @@ module.exports = {
         operatortime:'Operating hours',
         submittime:'Submission time',
         reminder:'Friendly Notice',
-        remindertext:'Dear Users, the current platform does not support mobile device, please log in with your computer. If you don\'t have an account, please',
+        remindertext:'Dear user, This function is not currently supported on mobile phone. Please log in to PC. Thank you for your support!',
         searchtext:'There are very few content related to your search, please try another keyword! We are currently addding more project, and you are welcome to upload your own projectds. Please send an email to tb@techcode.com',
         pltext:'Please Use the Computer to check',
         isIncubation:'Entered Techcode Incubator?：',

src/common/lang/zh.js

@@ -10,6 +10,9 @@ module.exports = {
         aboutUs: "关于我们",
         useHelp: "使用帮助",
         serviceRecord:'服务记录',
+        irelease: '已发布的项目',
+        mymessage:'我的消息',
+        submitPro: "发布项目",
         workPlace: "我的工作台",
         logoTitle: "太库即时对接平台",
         login: "登录",
@@ -727,6 +730,7 @@ module.exports = {
         plprovince: '请选择省份',
         plcity: '请选择市区',
         companyLogoUrl: '公司logo：',
+        replaceLogoUrl:'更换logo',
         compantype: '上传图片只能是 png，jpg 格式',
         compansize: '上传图片大小不能超过 2MB',
         uploadtext: '请上传图片',
@@ -738,9 +742,9 @@ module.exports = {
         projectModelNo: '产品形态',
         projectPhase: '产品阶段：',
         projectInstroduction: '产品概述：',
-        plprojectModel: '请选择产品形态：',
-        plprojectPhase: '请选择产品阶段：',
-        plprojectInstroduction: '请输入产品概述，最多输入500个字符：',
+        plprojectModel: '请选择产品形态',
+        plprojectPhase: '请选择产品阶段',
+        plprojectInstroduction: '请输入产品概述，最多输入2000个字符',
         projectPicUrlList: '产品图片：',
         uploadpicUrl: '请上传图片',
         projectLightspotList: '产品/服务亮点：',
@@ -780,10 +784,10 @@ module.exports = {
         companyValuation: '积累估值(人民币)：',
         companyEmpList: '团队核心成员介绍：',
         companyEventList: '公司大事件：',
-        plcompanyCreateDate: '请选择公司创建时间：',
+        plcompanyCreateDate: '请选择公司创建时间',
         plcompanyScale: '请选择公司规模：',
-        plcompanyFinancedAmount: '请选择积累融资额：',
-        plcompanyValuation: '请选择积累估值：',
+        plcompanyFinancedAmount: '请选择积累融资额',
+        plcompanyValuation: '请选择积累估值',
         empName: '姓名',
         empPosition: '职位',
         empResume: '主要履历',
@@ -1132,7 +1136,7 @@ module.exports = {
         operatortime: '操作时间',
         submittime: '提交时间',
         reminder: '温馨提示',
-        remindertext: '尊敬的用户您好，目前平台还不支持手机使用，请您用电脑登录使用。如果还没账号，请',
+        remindertext: '尊敬的用户您好！目前手机端暂不支持该功能，请您登录PC端使用，感谢您的支持！',
         searchtext: '相关的搜索结果较少，您可以换个搜索词试试！我们也正在收录更多科创项目，欢迎提供科创项目线索，发送邮件至tb@techcode.com',
         pltext: '请使用电脑查看',
         isIncubation: '是否入孵过太库空间：',

src/components/bigbusiness/searchCmpt.vue

@@ -70,6 +70,7 @@
             bigbusinessleveData(a,b){
                 if(b) this.searchData.targetIndustryList = b;
                 else this.searchData.targetIndustryList = a?[a]:[];
+                this.$store.dispatch('saveListPagePars',{path:this.$route.path,pars:this.searchData});
                 this.$emit('active',this.searchData);
             },
             //获取行业领域接口

src/components/common/qrcodeCmpt.vue

 <template>
     <el-dialog
             :visible.sync="visible"
-            width="30%" :show-close="false"
+            width="350px" :show-close="false"
             :close-on-click-moda="false"
             :before-close="handleClose"
             center>

src/components/index/PageTop.vue

@@ -37,10 +37,11 @@
                 <div id="redMsg" v-if="messageVisible"></div>
             </span>
             <span class="roleSpan" v-if="!isShow">
-                <span style="margin-right: 5px;" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState==2">
+                <img style="margin-right: 5px;height: 18px" src="../../assets/img/svip.png" alt="图片" v-if="userInfo&&userInfo.isPrivilegeVip==1">
+                <span style="margin-right: 5px;" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState==2&&userInfo.isPrivilegeVip!=1">
                     <img src="../../assets/img/vipIcon@2x.png" alt="">
                 </span>
-            <span style="margin-right: 5px;"  v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState!=2">
+            <span style="margin-right: 5px;"  v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState!=2&&userInfo.isPrivilegeVip!=1">
                 <img src="../../assets/img/vipGrayIcon@2x.png" alt="">
             </span>
             <i style="background: #FF5D5D;border-radius: 3px;" v-if="userInfo&&userInfo.roleList.length>0&&userInfo.roleList[0].roleType==5"><img
@@ -70,8 +71,11 @@
                     <img src="../../assets/img/index/headerDefault.png" alt="">
                     <p class="user-name" v-if="userInfo&&(userInfo.empName||userInfo.empAccount)">{{userInfo&&userInfo.empName?userInfo.empName : userInfo.empAccount}}</p>
                     <p class="auth-info authinfo">
-                        <img src="../../assets/img/vipIcon@2x.png" alt="图片" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState==2">
-                        <img src="../../assets/img/vipGrayIcon@2x.png" alt="图片" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState!=2">
+                        <img src="../../assets/img/svip.png" alt="" v-if="userInfo&&userInfo.isPrivilegeVip==1">
+                        <span v-else>
+                            <img src="../../assets/img/vipIcon@2x.png" alt="图片" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState==2">
+                            <img src="../../assets/img/vipGrayIcon@2x.png" alt="图片" v-if="userInfo&&userInfo.empType!=2&&userInfo.authenticationState!=2">
+                        </span>
                         <img :src="diven_zh?require('../../assets/img/PM@2x.png'):require('../../assets/img/xiaoshouIcon@2x.png')" alt="图片" v-if="userInfo&&userInfo.roleList.length>0&&userInfo.roleList[0].roleType==5">
                         <img :src="diven_zh?require('../../assets/img/OM@2x.png'):require('../../assets/img/yunyingIcon@2x.png')" alt="图片" v-if="userInfo&&userInfo.roleList.length>0&&userInfo.roleList[0].roleType==2">
                         <img :src="diven_zh?require('../../assets/img/corporate@2x.png'):require('../../assets/img/bigBusinessIcon@2x.png')" alt="图片" v-if="userInfo&&userInfo.roleList.length>0&&userInfo.roleList[0].roleType==7 || userInfo&&userInfo.roleList.length>0&&userInfo.roleList[0].roleType==6">
@@ -287,7 +291,7 @@
               }else if(type==6){
                   this.$router.push("/carddetails");
               }else if(type==7){
-                  this.$router.push("/editAuth");
+                  this.$router.push({path:"/editAuth",query:{state:true}})
               }
                 this.drawer = false;
             },

src/components/index/Pagescreen.vue

@@ -248,11 +248,17 @@
         watch:{
             screenlist(val){
                 if(this.checkboxGroupstate){
+                    let checkboxGroupstate = [];
+                    if(this.checkboxGroupstate[0] == undefined){
+                        checkboxGroupstate.push(this.checkboxGroupstate);
+                    }else{
+                        checkboxGroupstate.push(this.checkboxGroupstate[0]);
+                    }
                     for(let i in this.screenlist){
-                        if(this.screenlist[i].industryId == this.checkboxGroupstate[0]){
+                        if(this.screenlist[i].industryId == checkboxGroupstate[0]){
                             this.screenlist[i].checked = true;
                             this.wholecheck = [];
-                            this.checkboxGroup = this.checkboxGroupstate;
+                            this.checkboxGroup = checkboxGroupstate;
                             this.screenchildList = this.screenlist[i].screenchildList;
                             if(this.checkboxGroupchildstate){
                                 for ( let i in this.screenchildList ) {
@@ -266,9 +272,9 @@
                             }
                         }
                        var childrenListData = this.screenlist[i].childrenList;
-                        for(var k in this.checkboxGroupstate){
+                        for(var k in checkboxGroupstate){
                             for(var j in childrenListData){
-                                if(this.checkboxGroupstate[k]==childrenListData[j].industryId){
+                                if(checkboxGroupstate[k]==childrenListData[j].industryId){
                                     this.$set(childrenListData[j],"checked",true);
                                     this.checkboxGroupchild.push(childrenListData[j].industryId);
                                     this.wholechildck = [];
@@ -288,11 +294,18 @@
             },
             checkboxGroupstate(val){
                 if(this.checkboxGroupstate){
+                    let checkboxGroupstate = [];
+                    if(this.checkboxGroupstate[0] == undefined){
+                        checkboxGroupstate.push(this.checkboxGroupstate);
+                    }else{
+                        checkboxGroupstate.push(this.checkboxGroupstate[0]);
+                    }
                     for(let i in this.screenlist){
-                        if(this.screenlist[i].industryId == this.checkboxGroupstate[0]){
+                        console.log(checkboxGroupstate)
+                        if(this.screenlist[i].industryId == checkboxGroupstate[0]){
                             this.screenlist[i].checked = true;
                             this.wholecheck = [];
-                            this.checkboxGroup = this.checkboxGroupstate;
+                            this.checkboxGroup = checkboxGroupstate;
                             this.screenchildList = this.screenlist[i].screenchildList;
                             if(this.checkboxGroupchildstate){
                                 for ( let i in this.screenchildList ) {

src/components/mobile/mobileTop.vue

@@ -100,13 +100,16 @@
                     this.$router.push("/");
                 }else{
                     this.currentIndex = index;
-                    if(index==0) this.$router.replace("/projectlist");
+                    if(index==0) this.$router.replace({path:"/projectlist",query:{state:true}});
                     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");
                     if(index==5) this.$router.push("/knowledgeList");
-                    if(index==6) this.$router.push("/serviceenterprise");
+                    if(data.id==8) this.$router.push("/serviceenterprise");
+                    if(data.id==9) this.$router.push("/projectrelease");
+                    if(data.id==10) this.$router.replace({path:"/projectlist",query:{state:false}});
+                    if(data.id==11) this.$router.replace({path:"/mobileAddAuth"});
                 }
                 window.sessionStorage.setItem("mobileIndex",this.currentIndex);
                 this.drawer = false;
@@ -241,6 +244,20 @@
                     name: "serviceRecord"
                 });
             }
+            if(this.userInfo&&this.userInfo.empType == 0){
+                this.activeList.push({
+                    id: 9,
+                    name: "submitPro"
+                });
+                this.activeList.push({
+                    id: 10,
+                    name: "irelease"
+                });
+                this.activeList.push({
+                    id: 11,
+                    name: "mymessage"
+                });
+            }
             this.getUserInfoFunc();
             if(this.$route.name=="mobileLogin"||this.$route.name=="loginByPhone"||this.$route.name=="loginByEmail"||this.$route.name=="mobileSuccess"||this.$route.name=="mobileRegister"||this.$route.name=="registerComplete"){
                 window.sessionStorage.setItem("mobileIndex",-2)

src/router.js

@@ -675,6 +675,11 @@ export default new Router({
                     name: "phoneBusinessList",
                     component: phoneBusinessList
                 },
+                {
+                    path: '/projectrelease',
+                    component: resolve => require(['./views/mobile/projectment/projectrelease.vue'], resolve),
+                    meta: {title: '发布项目'}
+                },
                 {
                     path: '/projectlist',
                     component: resolve => require(['./views/mobile/projectment/projectlist.vue'], resolve),

src/store.js

@@ -7,6 +7,7 @@ export default new Vuex.Store({
     state: {
         stateData: {},
         bigBusinessSearch:new Map(),
+        projectSearch:new Map(),
     },
     mutations: {
         someMutation(state,data) {
@@ -15,6 +16,9 @@ export default new Vuex.Store({
 
         SAVE_LIST_PAGE_PARS:(state,{path,pars})=>{
             state.bigBusinessSearch.set(path,pars);
+        },
+        pro_PARS:(state,{path,pars})=>{
+            state.projectSearch.set(path,pars);
         }
     },
     actions: {
@@ -25,6 +29,9 @@ export default new Vuex.Store({
         saveListPagePars: ({ commit },{path,pars}) => {
             commit('SAVE_LIST_PAGE_PARS',{ path,pars });
         },
+        projectPagePars: ({ commit },{path,pars}) => {
+            commit('pro_PARS',{ path,pars });
+        },
     },
     getters:{
         getStateData(state){

src/views/accountmanage/pages/edit.vue

@@ -105,6 +105,9 @@ white-space:nowrap;"  v-if="detailInfo.auditState=='AS04'" :title="$t('commonTit
             },
         },
         mounted() {
+            if(this.$route.query.state){
+                this.activeName = 'second';
+            }
             this.getInitData();
             const empinfo = JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo")));
             //empType 0 小b    1  大b    2 内部用户

src/views/innovatecompany/acceptintention/contentdetarl.vue

@@ -18,7 +18,7 @@
                                             <img :src="scope.row.companyLogoUrl" alt="图片" style="border-radius: 3px; border:1px solid #DCDFF1;width: 40px;height: 40px;">
                                         </el-col>
                                         <el-col :span="22">
-                                            <p style="padding-left: 40px" @click="scope.row.requirementStatus=='RA03'?$router.push({path:'/viewproject',query:{projectId:scope.row.projectId}}):''"  :class="scope.row.requirementStatus!='RA03'?'unnamep':'namep'">{{scope.row.requirementName}}</p>
+                                            <p style="padding-left: 40px" @click="scope.row.requirementStatus=='RA03'?$router.push({path:'/require/detail',query:{id:scope.row.detailId,flag:1}}):''"  :class="scope.row.requirementStatus!='RA03'?'unnamep':'namep'">{{scope.row.requirementName}}</p>
                                             <p class="stateclass" style="padding-left: 40px;font-weight: bold;">{{scope.row.companyName}} <span v-if="scope.row.requirementStatus!='RA03'">{{scope.row.requirementStatus=='RA02'?$t('projectdynamics.requirementrejection'):scope.row.requirementStatus=='RA04'?$t('commonTitle.requireSaleOut'):scope.row.requirementStatus=='RA05'?$t('commonTitle.requireDue'):scope.row.requirementStatus=='RA01'?$t('commonTitle.requireAuditing'):''}}</span></p>
                                         </el-col>
                                     </el-row>

src/views/innovatecompany/demandaudit/demandinside.vue

@@ -131,7 +131,7 @@
                         <div style="margin-top: 20px">
                             <el-form :inline="true" :label-width="diven_zh?'160px':'300px'" :model="addData" :class="diven_zh?'contnetform':'contnetform300'">
                                 <el-form-item label="公司主体是否为关联" style="width: 100%;">
-                                    <span>{{addData.isRelevance==1?'是':'否'}}</span>
+                                    <span>{{addData.isRelevance==1?$t('saleRecordTitle.yes'):$t('saleRecordTitle.no')}}</span>
                                 </el-form-item>
                                 <el-form-item :label="$t('personalAuth.name')+'：'" style="width: 100%;">
                                     <span>{{addData.requirementContacts.empName}}</span>

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -63,7 +63,7 @@
                         <el-tab-pane v-if="addData.showCompanyInfoAndCooperation||!isbtntype&&!isempinfo" :label="$t('listproject.market')" name="second"></el-tab-pane>
                         <el-tab-pane v-if="addData.showCompanyInfoAndCooperation||!isbtntype&&!isempinfo" :label="$t('listproject.overview')" name="third"></el-tab-pane>
                         <el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
-                        <el-tab-pane v-if="addData.showProgress" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
+                        <el-tab-pane v-if="addData.showProgress||userInfo.isPrivilegeVip==1" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
                         <el-tab-pane v-if="addData.showProgress" :label="$t('listproject.service')" name="five"></el-tab-pane>
                         <el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('intentionlist.intention')" name="intention">
                             <intention-bar v-if="!intentionIf" :projectId="$route.query.projectId"></intention-bar>
@@ -76,7 +76,7 @@
                         <el-tab-pane v-if="addData.showCompanyInfoAndCooperation||!isbtntype&&!isempinfo" :label="$t('listproject.market')" name="second"></el-tab-pane>
                         <el-tab-pane v-if="addData.showCompanyInfoAndCooperation||!isbtntype&&!isempinfo" :label="$t('listproject.overview')" name="third"></el-tab-pane>
                         <el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
-                        <el-tab-pane v-if="addData.showProgress" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
+                        <el-tab-pane v-if="addData.showProgress||userInfo.isPrivilegeVip==1" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
                         <el-tab-pane v-if="addData.showProgress" :label="$t('listproject.service')" name="five"></el-tab-pane>
                         <el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('intentionlist.intention')" name="intention">
                             <intention-bar v-if="!intentionIf" :projectId="$route.query.projectId"></intention-bar>
@@ -426,8 +426,8 @@
                 </div>
             </div>
             <el-row v-if="intentionIf" id="anchor-3">
-                <div v-if="addData.showProgress">
-                    <div class="contentsy" v-if="addData.showProgress">
+                <div v-if="addData.showProgress||userInfo.isPrivilegeVip==1">
+                    <div class="contentsy" v-if="addData.showProgress||userInfo.isPrivilegeVip==1">
                         <div>
                             <p>{{$t("listproject.strategic")}}</p>
                         </div>
@@ -446,6 +446,19 @@
                                 <el-form-item :label="$t('listproject.projectProgressFocusList')" style="width: 45%;">
                                     <span style="margin-right: 10px" v-for="(item,index) in addData.projectProgressFocusList" :key="index">{{item}}</span>
                                 </el-form-item>
+                                <div v-if="addData.salesDTO">
+                                    <el-form-item :label="$t('releasejson.projecttitle')+':'" style="width: 45%;">
+                                        <span>{{addData.salesDTO.name}}</span>
+                                    </el-form-item>
+                                    <el-form-item :label="$t('projectdynamics.phonenumber')+':'" style="width: 45%;">
+                                        {{addData.salesDTO.phone}}
+                                    </el-form-item>
+                                </div>
+                                <div v-else>
+                                    <el-form-item :label="$t('bottomNav.kfWechat')+':'" style="width: 45%;">
+                                        <img src="../../../assets/img/index/Bitmap@2x(7).png" alt="">
+                                    </el-form-item>
+                                </div>
                             </el-form>
                         </div>
                     </div>

src/views/innovatecompany/projectprocess/projectinside.vue

@@ -120,14 +120,14 @@
             </el-row>
             <el-row style="padding: 10px;background: #ffffff">
                 <el-row v-if="dataobj.empInfo" style="margin-left: 13px;line-height: 55px">
-                    <el-form label-position="left" :inline="true" :label-width="diven_zh?'80px':'180px'" :model="dataobj" :class="diven_zh?'contnetform':'contnetform'">
-                        <el-form-item :label="$t('oneself.kf')" style="width: 25%;">
+                    <el-form label-position="left" :inline="true" :label-width="diven_zh?'75px':'140px'" :model="dataobj" class="contnetform120">
+                        <el-form-item :label="$t('oneself.kf')+':'" style="width: 25%;">
                             <span style="line-height: 55px">{{dataobj.empInfo.empName}}</span>
                         </el-form-item>
-                        <el-form-item :label="$t('oneself.phone')" style="width: 30%;">
+                        <el-form-item :label="$t('oneself.phone')+':'" style="width: 30%;">
                             <span style="line-height: 55px">{{dataobj.empInfo.empPhone}}</span>
                         </el-form-item>
-                        <el-form-item :label="$t('oneself.email')" style="width: 30%;">
+                        <el-form-item :label="$t('oneself.email')+':'" style="width: 30%;">
                             <span style="line-height: 55px">{{dataobj.empInfo.empEmail}}</span>
                         </el-form-item>
                         <el-form-item style="width: 15%;">

src/views/innovatecompany/registeruser/accountinfo.vue

@@ -5,7 +5,7 @@
                 <span>{{addData.empAccount}}</span>
             </el-form-item>
             <el-form-item :label="$t('operationjson.usertype')+'：'" style="width: 100%;">
-                <span>{{addData.empType == 0?$t('operationjson.minb'):$t('operationjson.maxb')}}</span>
+                <span>{{addData.empType == 0?$t('operationjson.minb'):addData.empType == 1?$t('operationjson.maxb'):''}}</span>
             </el-form-item>
             <el-form-item :label="$t('usermanagement.registrationtime')+'：'" style="width: 100%;">
                 <span>{{addData.createdTime}}</span>
@@ -14,7 +14,7 @@
                 <span>{{addData.accountLevel == 0?$t('usermanagement.generaluser'):'VIP'}}</span>
             </el-form-item>
             <el-form-item :label="$t('usermanagement.accountstatus')+'：'" style="width: 100%;">
-                <span>{{addData.frozenState == 0?$t('usermanagement.normal'):$t('usermanagement.Frozen')}}</span>
+                <span>{{addData.frozenState == 0?$t('usermanagement.normal'):addData.frozenState == 1?$t('usermanagement.Frozen'):'游客'}}</span>
             </el-form-item>
             <el-form-item :label="$t('saleResponsibleUser.originType')+'：'" style="width: 100%;" v-if="!$route.query.flag">
                 <span>{{addData.registerSource}}</span>

src/views/innovatecompany/submitprojects/submitone.vue

@@ -19,19 +19,19 @@
             <el-form-item :label="$t('releasejson.officialAccount')" prop="officialAccount" style="width: 100%;">
                 <el-input v-model="formData.officialAccount" maxlength="36" :placeholder="$t('releasejson.plofficialAccount')" style="width: 250px;height: 40px"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('releasejson.company')" prop="companyNation" style="width: 350px;">
+            <el-form-item :label="$t('releasejson.company')" prop="companyNation">
                 <el-select style="width:170px;" v-model="formData.companyNation" :placeholder="$t('releasejson.plnation')" @change="countryChang(formData.companyNation)">
                     <el-option v-for="item in countryData" :key="item.geoId" :label="item.name" :value="item.geoId">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="countryIf" prop="companyProvince" style="width: 170px;">
+            <el-form-item v-if="countryIf" prop="companyProvince">
                 <el-select style="width:170px;" v-model="formData.companyProvince" :placeholder="$t('releasejson.plprovince')" @change="provinceChang(formData.companyProvince)">
                     <el-option v-for="item in provinceData" :key="item.geoId" :label="item.name" :value="item.geoId">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="provinceIf" prop="companyCity" style="width: 170px;">
+            <el-form-item v-if="provinceIf" prop="companyCity">
                 <el-select style="width:170px;" v-model="formData.companyCity" :placeholder="$t('releasejson.plcity')">
                     <el-option v-for="item in cityData" :key="item.geoId" :label="item.name" :value="item.geoId">
                     </el-option>

src/views/innovatecompany/submitprojects/submittwo.vue

@@ -14,7 +14,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item :label="$t('releasejson.projectInstroduction')" prop="projectInstroduction">
-                <el-input show-word-limit maxlength="500" v-model="formData.projectInstroduction" :placeholder="$t('releasejson.plprojectInstroduction')" style="width: 600px;" type="textarea" :rows="4"></el-input>
+                <el-input show-word-limit maxlength="2000" v-model="formData.projectInstroduction" :placeholder="$t('releasejson.plprojectInstroduction')" style="width: 600px;" type="textarea" :rows="4"></el-input>
             </el-form-item>
             <el-form-item :label="$t('releasejson.projectPicUrlList')" prop="projectPicUrlList">
                 <p class="imgTitle"  style="color: #9197B4"><i style="color: #FF9E29;font-size: 12px;padding-right: 5px" class="iconfont icon-gantanhao-quan"></i>{{$t('Otherjson.message2')}} <span>（{{$t('releasejson.companyLogoUrltext')}}）</span></p>

src/views/mobile/projectment/projectdetails.vue

 <template>
     <div class="overfolowWrapper">
-        <breadTop :title="title" :isSearch="false" :isColor="true" :isReturn="true" :isTranslate="true"></breadTop>
+        <breadTop :title="title" :isSearch="false" :isColor="true" :isReturn="true" :isTranslate="!companyInfo.projectCreatedBy"></breadTop>
         <div style="margin-top: 1rem;background: #5d78ff;text-align: center;color: #FFFFFF;padding-bottom: 0.2rem">
             <div style="margin: 0 auto;width: 90%">
                 <p style="padding: 0.7rem 0 0.4rem;">
@@ -20,7 +20,7 @@
                 <p><span v-for="(itemed,index) in companyInfo.companyLabelList" :key="index" style="display: inline-block;"><i style="background:#4C65E3;padding: 4px 8px;margin-right: 5px;border-radius: 3px;font-size: 12px;line-height: 0.6rem">{{itemed}}</i></span></p>
             </div>
         </div>
-        <div class="contentclassed">
+        <div class="contentclassed" v-if="!companyInfo.projectCreatedBy">
             <div v-if="companyInfo.projectSource!=1">
                 <div><span>{{$t("listproject.projectbasic")}}</span></div>
                 <p v-if="companyInfo.companyWebsite&&companyInfo.companyWebsite!='****'">
@@ -112,35 +112,126 @@
             </div>
             <p @click="isbtntype?$router.push('/reminder'):$router.go(-1)" style="background: #5d78ff;width: 70%;margin: 0.7rem auto 0;color: #FFFFFF;text-align: center;padding: 0.2rem 0;border-radius: 1rem;">{{isbtntype?$t("mobile.communicateTitle"):$t("workPlace.goreturn")}}</p>
         </div>
+        <div class="contentclassed" v-if="companyInfo.projectCreatedBy">
+            <el-row>
+                <p v-if="companyInfo.authenticationState=='AS02'&&companyInfo.projectCreatedBy" style="margin: 0;padding: 0 20px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("listproject.statereview")}}</p>
+                <p v-if="companyInfo.authenticationState=='AS04'&&companyInfo.projectCreatedBy" style="margin: 0;padding: 0 20px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
+            </el-row>
+            <div>
+                <div><span>{{$t("listproject.projectbasic")}}</span></div>
+                <p>
+                    <span>{{$t("releasejson.projectName")}}</span>
+                    <span>{{companyInfo.projectName}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.companyName")}}</span>
+                    <span>{{companyInfo.companyName}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.projectIndustryList")}}</span>
+                    <span v-for="(item,index) in companyInfo.projectIndustryList" :key="index" style="margin-right: 15px">{{item}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.companyLogoUrl")}}</span>
+                    <span> <img :src="companyInfo.companyLogoUrl" style="width:1.8rem;height: 1.8rem" alt=""></span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.companyCreateDate")}}</span>
+                    <span>{{companyInfo.companyCreateDate}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.projectModel")}}</span>
+                    <span>{{companyInfo.projectModel}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.projectPhase")}}</span>
+                    <span>{{companyInfo.projectPhase}}</span>
+                </p>
+                <p>
+                    <span>{{$t("releasejson.projectInstroduction")}}</span>
+                    <span style="display: block;line-height: 0.5rem;margin-top: 0.2rem">{{companyInfo.projectInstroduction}}</span>
+                </p>
+                <!--<p>-->
+                    <!--<span>{{$t('projectdynamics.Contact')+$t('oneself.phone')+':'}}</span>-->
+                    <!--<span>{{companyInfo.baseEmpInfoAuthenticationVO.empAccount}}</span>-->
+                <!--</p>-->
+                <!--<p>-->
+                    <!--<span>{{$t('projectdynamics.Contact')+$t('personalAuth.name')+':'}}</span>-->
+                    <!--<span>{{companyInfo.baseEmpInfoAuthenticationVO.companyName}}</span>-->
+                <!--</p>-->
+                <!--<p>-->
+                    <!--<span>{{$t('projectdynamics.Contact')+$t('personalAuth.position')+':'}}</span>-->
+                    <!--<span>{{companyInfo.baseEmpInfoAuthenticationVO.empPosition}}</span>-->
+                <!--</p>-->
+                <!--<p>-->
+                    <!--<span>{{$t('projectdynamics.Contact')+$t('personalAuth.companyEmail')+':'}}</span>-->
+                    <!--<span>{{companyInfo.baseEmpInfoAuthenticationVO.companyEmail}}</span>-->
+                <!--</p>-->
+                <!--<p>-->
+                    <!--<span>{{$t('projectdynamics.Contact')+$t('personalAuth.card')+':'}}</span>-->
+                    <!--<span> <img :src="companyInfo.baseEmpInfoAuthenticationVO.empCardUrl" style="height: 2rem" alt=""></span>-->
+                <!--</p>-->
+                <p style="color: #FF5D5D">温馨提示：手机版只展示部分项目内容，详细内容请登录Web版查看</p>
+            </div>
+            <div>
+                <div class="service_bottom">
+                    <p><el-button @click="editproject" type="primary" style="border-radius: 1rem;width: 101%;height: 0.8rem;position: relative;top: -1px;left: -1px;" :disabled="companyInfo.authenticationState=='AS02'">{{$t('listproject.editproject')}}</el-button></p>
+                    <p><el-button @click="handleOpreation" type="primary" style="border-radius: 1rem;width: 101%;height: 0.8rem;position: relative;top: -2px;left: -1px;padding-left: 55px" plain :disabled="companyInfo.authenticationState=='AS02'"><i style="position:absolute;top: 10px;left: 45px;font-size: 20px" class="iconfont icon-wechat"></i>{{$t('listproject.shareit')}}</el-button></p>
+                </div>
+            </div>
+        </div>
+        <div v-if="vueQrVisible">
+            <qrCmpt :url="url" @sendVisible="isVueQrVisible"></qrCmpt>
+        </div>
     </div>
 </template>
 
 <script>
     import breadTop from '../../../components/mobile/breadTop';
     import api from '../../innovatecompany/lreleaseproject/api/api';
-
+    import qrCmpt from '../../../components/common/qrcodeCmpt';
     export default {
         name: "peojectdetails",
         components: {
-            breadTop,
+            breadTop,qrCmpt
         },
         data() {
             return {
                 title: this.$t("Otherjson.projectdetails"),
-                companyInfo: {},
+                companyInfo: {
+                    baseEmpInfoAuthenticationVO:{}
+                },
                 tableData:[],
                 isbtntype:true,
                 isshow:false,
                 translateNum:true,
+                vueQrVisible:false,
+                url:'',
+                userInfo:JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))),
             }
         },
         methods: {
+            //二维码
+            isVueQrVisible(data){
+                this.vueQrVisible = data;
+            },
+            handleOpreation(){
+                this.vueQrVisible = true;
+                var refereesId = this.userInfo.roleList[0].roleType==5?this.userInfo.empId:0;
+                this.url = document.location.origin+"/#/share/project?id="+this.$route.query.id+"&refereesId="+refereesId; //
+            },
+            editproject(){
+                this.$router.push({path:"/projectrelease",query:{projectId:this.$route.query.id}})
+            },
             //根据id获取企业信息
             getProjectById() {
                 let id = this.$route.query.id;
                 api.selectProjectById(id).then((res) => {
                     if (res.code == 0) {
                         this.companyInfo = res.result;
+                        if(!this.companyInfo.baseEmpInfoAuthenticationVO){
+                            this.companyInfo.baseEmpInfoAuthenticationVO = {};
+                        }
                         if(this.isshow){
                             if(this.translateNum){
                                 this.translateNum = false;
@@ -167,7 +258,7 @@
                     transType:'BaiDu',
                     cacheType:'projectDetails',
                     projectId:this.$route.query.id,
-                    to:this.$i18n.locale=="zh-CN"?'zh':'en',
+                    to:this.$i18n.locale&&this.$i18n.locale=="zh-CN"?'zh':'en',
                     pageType:'mobilePhone',
                     companyName:this.companyInfo.companyName,
                     companyIntroduction:this.companyInfo.companyIntroduction,
@@ -219,7 +310,7 @@
             globalMsg.$on("translateFunc",(data)=>{
                 this.handleTransSBusinessList(data);
             })
-            this.isshow = this.$i18n.locale=="zh-CN"?false:true;
+            this.isshow = this.$i18n.locale&&this.$i18n.locale=="zh-CN"?false:true;
         }
     }
 </script>

src/views/mobile/projectment/projectlist.vue

 <template>
     <div class="wrapper">
-        <breadTop :title="title" :isSearch="true" :isTranslate="true" @isShowScreen="isShowScreen"></breadTop>
+        <breadTop :title="title" :isSearch="state" :isTranslate="state" @isShowScreen="isShowScreen"></breadTop>
         <div v-if="tableData.length != 0" class="contentList" style="overflow: auto;-webkit-overflow-scrolling: touch;">
             <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
                 <ul>
@@ -28,9 +28,11 @@
                         </div>
                     </li>
                 </ul>
-                <div style="text-align: center;" v-if="tableData&&authStatus!=2">
-                    <p style="margin-bottom: .2rem;">{{$t("commonTitle.bBNoAuthTitle")}}</p>
-                    <el-button type="primary" style="width: 3.6rem;height: .8rem;" @click="handleToAuth">{{$t("register.auth")}}</el-button>
+                <div v-if="state">
+                    <div style="text-align: center;" v-if="tableData&&authStatus!=2">
+                        <!--<p style="margin-bottom: .2rem;">{{$t("commonTitle.bBNoAuthTitle")}}</p>-->
+                        <el-button type="primary" style="width: 3.6rem;height: .8rem;" @click="handleToAuth">{{$t("topNav.submitPro")}}</el-button>
+                    </div>
                 </div>
             </mt-loadmore>
         </div>
@@ -70,6 +72,8 @@
                 isTrans:false,
                 lang:this.$i18n.locale,
                 authStatus:JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))).authenticationState,
+                projecturl:'/business/search/project',
+                state:true,
             }
         },
         methods:{
@@ -90,7 +94,7 @@
                     search:this.stateData
                 };
                 this.fullscreenLoading = true;
-                api.selectProjects(params).then((res)=>{
+                api.selectProjected(this.projecturl,params).then((res)=>{
                     this.fullscreenLoading = false;
                     if(res.code==0){
                         this.authStatus=JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))).authenticationState;
@@ -172,7 +176,7 @@
             },
             //去认证
             handleToAuth(){
-                this.$router.push('/mobileAddAuth');
+                this.$router.push('/projectrelease');
             },
             //sBusinessList翻译
             handleTransSBusinessList(flag){
@@ -216,13 +220,63 @@
             }
         },
         mounted(){
-            this.getInitList();
+            if(this.$route.query.state == 'true'){
+                this.projecturl = '/business/search/project';
+                this.title = this.$t("topNav.findProject");
+                this.state = true;
+                this.getInitList();
+            }else{
+                this.projecturl = '/business/project/selectMyProjects';
+                this.title = this.$t("topNav.irelease");
+                this.state = false;
+                this.getInitList();
+            }
             globalMsg.$on("isVisible",(data)=>{
                 this.isShow = data;
             })
             globalMsg.$on("translateFunc",(data)=>{
                 this.handleTransSBusinessList(data);
             })
+        },
+        watch: {
+            $route(){
+                if(this.$route.query.state == true){
+                    this.state = true;
+                    this.projecturl = '/business/search/project';
+                    this.title = this.$t("topNav.findProject");
+                    this.getInitList();
+                }else{
+                    this.projecturl = '/business/project/selectMyProjects';
+                    this.title = this.$t("topNav.irelease");
+                    this.state = false;
+                    this.getInitList();
+                }
+                globalMsg.$on("isVisible",(data)=>{
+                    this.isShow = data;
+                })
+                globalMsg.$on("translateFunc",(data)=>{
+                    this.handleTransSBusinessList(data);
+                })
+            },
+            // state( val ) {
+            //     console.log(val)
+            //     if(val){
+            //         this.projecturl = '/business/search/project';
+            //         this.title = this.$t("topNav.findProject");
+            //         this.state = true;
+            //     }else{
+            //         this.projecturl = '/business/project/selectMyProjects';
+            //         this.title = this.$t("topNav.irelease");
+            //         this.state = false;
+            //     }
+            //     this.getInitList();
+            //     globalMsg.$on("isVisible",(data)=>{
+            //         this.isShow = data;
+            //     })
+            //     globalMsg.$on("translateFunc",(data)=>{
+            //         this.handleTransSBusinessList(data);
+            //     })
+            // }
         }
     }
 </script>

src/views/mobile/reminder.vue

@@ -6,8 +6,8 @@
         </div>
         <p style="font-size:0.32rem;color:rgba(63,63,83,1);margin: 0 0.7rem">
             {{$t('Otherjson.remindertext')}}
-            <el-button type="text" style="font-size:0.32rem;font-weight: normal" @click="$router.push({path:'/mobileRegister'})">{{$t('commonTips.alreadyRegister')}}</el-button>
-            。
+            <!--<el-button type="text" style="font-size:0.32rem;font-weight: normal" @click="$router.push({path:'/mobileRegister'})">{{$t('commonTips.alreadyRegister')}}</el-button>-->
+            <!--。-->
         </p>
     </div>
 </template>

src/views/mobile/servicerecord/api/api.js

@@ -86,5 +86,16 @@ export default {
     editRecordDetail( params ) {
         return api.fetchLoadingPost( '/business/service/editRecordDetail', params);
     },
-
+    addProjectByH5( params ) {
+        return api.fetchLoadingPost( '/business/project/addProjectByH5', params);
+    },
+    updateProjectByH5( params ) {
+        return api.fetchLoadingPost( '/business/project/updateProjectByH5', params);
+    },
+    selectCompanyOrContact( params ) {
+        return api.fetchLoadingPost( '/business/project/selectCompanyOrContact', Qs.stringify(params));
+    },
+    selectProjectEditById (params){
+        return api.fetchGet('/business/project/selectProjectEditById?projectId='+params);
+    },
 }
\ No newline at end of file

src/views/quiethomepage/aboutwechild.vue

@@ -2,13 +2,13 @@
     <div class="soutform loginedWrapper">
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item>首页</el-breadcrumb-item>
-                <el-breadcrumb-item>关于我们</el-breadcrumb-item>
+                <el-breadcrumb-item>{{$t("topNav.index")}}</el-breadcrumb-item>
+                <el-breadcrumb-item>{{$t("topNav.aboutUs")}}</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="projectTabadd" style="margin-top: 10px;text-align: center">
             <el-tabs v-model="activeName">
-                <el-tab-pane label="关于我们" name="first">
+                <el-tab-pane :label="$t('topNav.aboutUs')" name="first">
                     <about-see style="padding-top: 50px;" :shows="true"></about-see>
                 </el-tab-pane>
             </el-tabs>

src/views/seeprojects/api/api.js

@@ -26,6 +26,9 @@ export default {
     selectProjects (params){
         return api.fetchLoadingPost('/business/search/project',params);
     },
+    selectProjected (url,params){
+        return api.fetchLoadingPost(url,params);
+    },
     tipInfo (){
         return api.fetchPost('/business/tip/tipInfo');
     },

src/views/seeprojects/choicegroup.vue

 <template>
     <div>
-        <page-screen class="statebottm" :checkboxGroupstate="$route.query.checkboxGroupstate" :checkboxGroupchildstate="$route.query.checkboxGroupchildstate" :screenlist="screenlist" :screenchildListIf="true" ref="screenchild" :titleName="$t('listproject.screen')"  @changecheck="screenData"></page-screen>
-        <region-choice @changecheck="regionData" ref="regionchild"></region-choice>
-        <page-screen v-show="downIf" class="statebottm" :screenlist="projectphaselist" :screenchildListIf="false" ref="projectphasechild" :titleName="$t('listproject.projectphase')"  @changecheck="projectphaseData"></page-screen>
-        <page-screen v-show="downIf" class="statebottm" :screenlist="projectstatelist" :screenchildListIf="false" ref="projectstatechild" :titleName="$t('listproject.projectstate')"  @changecheck="projectstateData"></page-screen>
-        <page-screen v-show="downIf" class="statebottm" :screenlist="bigbusinesslevelist" :screenchildListIf="false" ref="bigbusinesslevechild" :titleName="$t('listproject.bigbusinessleve')"  @changecheck="bigbusinessleveData"></page-screen>
-        <page-screen v-show="downIf" class="statebottm" :screenlist="cooperationwaylist" :screenchildListIf="false" ref="cooperationwaychild" :titleName="$t('listproject.cooperationway')"  @changecheck="cooperationwayData"></page-screen>
+        <page-screen class="statebottm" :checkboxGroupstate="stateData.projectParent" :checkboxGroupchildstate="stateData.projectIndustryList" :screenlist="screenlist" :screenchildListIf="true" ref="screenchild" :titleName="$t('listproject.screen')"  @changecheck="screenData"></page-screen>
+        <region-choice @changecheck="regionData" ref="regionchild" :searchReturnData="stateData"></region-choice>
+        <page-screen v-show="downIf" :checkboxGroupstate="stateData.projectPhaseList" class="statebottm" :screenlist="projectphaselist" :screenchildListIf="false" ref="projectphasechild" :titleName="$t('listproject.projectphase')"  @changecheck="projectphaseData"></page-screen>
+        <page-screen v-show="downIf" :checkboxGroupstate="stateData.projectModelList" class="statebottm" :screenlist="projectstatelist" :screenchildListIf="false" ref="projectstatechild" :titleName="$t('listproject.projectstate')"  @changecheck="projectstateData"></page-screen>
+        <page-screen v-show="downIf" :checkboxGroupstate="stateData.companyIndustryList" class="statebottm" :screenlist="bigbusinesslevelist" :screenchildListIf="false" ref="bigbusinesslevechild" :titleName="$t('listproject.bigbusinessleve')"  @changecheck="bigbusinessleveData"></page-screen>
+        <page-screen v-show="downIf" :checkboxGroupstate="stateData.cooperationWayList" class="statebottm" :screenlist="cooperationwaylist" :screenchildListIf="false" ref="cooperationwaychild" :titleName="$t('listproject.cooperationway')"  @changecheck="cooperationwayData"></page-screen>
         <el-row style="text-align: center;position:relative;margin-top: 20px">
             <span @click="downIf=!downIf" v-if="downIf" style="cursor:pointer;text-align: center;color: #B7BDDE;"><i class="el-icon-arrow-up"></i> {{$t("listproject.collapse")}}</span>
             <span @click="downIf=!downIf" v-if="!downIf" style="cursor:pointer;text-align: center;color: #B7BDDE;"><i class="el-icon-arrow-down"></i> {{$t("listproject.expand")}}</span>
@@ -39,6 +39,7 @@
             screenData(a,b){
                 this.stateData.projectParent = a;
                 this.stateData.projectIndustryList = b;
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 this.$emit('active',this.stateData);
             },
             //公司总部所在地
@@ -47,11 +48,14 @@
                     this.stateData.companyNationIds = [1];
                     this.stateData.companyProvinceIds = b;
                     this.stateData.companyCityIds = c;
+                    this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 }else{
                     if(!b){
                         this.stateData.companyNationIds = [-1];
+                        this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                     }else{
                         this.stateData.companyNationIds = b;
+                        this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                     }
                     this.stateData.companyProvinceIds = [];
                     this.stateData.companyCityIds = [];
@@ -61,21 +65,25 @@
             //产品阶段
             projectphaseData(a){
                 this.stateData.projectPhaseList = a;
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 this.$emit('active',this.stateData);
             },
             //产品形态
             projectstateData(a){
                 this.stateData.projectModelList = a;
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 this.$emit('active',this.stateData);
             },
             //目标客户行业
             bigbusinessleveData(a){
                 this.stateData.companyIndustryList = a;
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 this.$emit('active',this.stateData);
             },
             //首选合作方式
             cooperationwayData(a){
                 this.stateData.cooperationWayList = a;
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:this.stateData});
                 this.$emit('active',this.stateData);
             },
             //获取行业领域接口
@@ -184,6 +192,16 @@
                 this.stateData = {};
                 this.$emit('active',this.stateData);
             },
+            getInitSearch(){
+                if(window.sessionStorage.getItem("isDetailInpro")==false){
+                    this.stateData = {};
+                }else{
+                    if(this.$store.state.projectSearch.has(this.$route.path)) {
+                        this.stateData=this.$store.state.projectSearch.get(this.$route.path);
+                    }
+                }
+                this.$emit('active',this.stateData);
+            },
 
         },
         mounted() {
@@ -192,6 +210,7 @@
             this.projectstateSet();
             this.cooperationwaySet();
             this.selectBigBusinessLevelOneSet();
+            this.getInitSearch();
         }
 
     }

src/views/seeprojects/seeprojectlist.vue

@@ -269,6 +269,16 @@
                         });
                 }
             }
+        },
+        beforeRouteLeave(to,from,next){
+            if(to.path!="/viewproject"||to.path==undefined) {
+                window.sessionStorage.setItem("isDetailInpro",false);
+                this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:{}});
+                next()
+            }else{
+                window.sessionStorage.setItem("isDetailInpro",true);
+                next()
+            }
         }
     }
 </script>

src/views/usehelpview/usehelpchild.vue

@@ -2,13 +2,13 @@
     <div class="soutform loginedWrapper">
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item>首页</el-breadcrumb-item>
-                <el-breadcrumb-item>使用帮助</el-breadcrumb-item>
+                <el-breadcrumb-item>{{$t("topNav.index")}}</el-breadcrumb-item>
+                <el-breadcrumb-item>{{$t("drawerInfo.questions")}}</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="projectTabadd" style="margin-top: 10px;text-align: center">
             <el-tabs v-model="activeName">
-                <el-tab-pane label="使用帮助" name="first">
+                <el-tab-pane :label="$t('drawerInfo.questions')" name="first">
                     <about-see style="padding-top: 50px;" :shows="true"></about-see>
                 </el-tab-pane>
             </el-tabs>