静态页面相关科创企业部分bug修改

src/common/lang/en.js

@@ -710,7 +710,7 @@ module.exports = {
 		companyLogoUrl:'Company Logo：',
 		compantype:'PNG and JPG format only',
 		compansize:'Product pictures within 2MB maximum',
-		uploadtext:'Please upload business card',
+		uploadtext:'Please upload picture',
 		companyLabelList:'Industry Labels：',
 		newcompany:'Add new label',
 		plcompany:'Please enter label',

src/common/lang/zh.js

@@ -710,7 +710,7 @@ module.exports = {
 		companyLogoUrl:'公司logo：',
 		compantype:'上传图片只能是 png，jpg 格式',
 		compansize:'上传图片大小不能超过 2MB',
-		uploadtext:'请上传名片',
+		uploadtext:'请上传图片',
 		companyLabelList:'行业通俗标签：',
 		newcompany:'添加新标签',
 		plcompany:'请输入标签',
@@ -752,7 +752,7 @@ module.exports = {
 		plcooperationWay:'请选择首选合作方式',
 		plcustomerLabelList:'请输入客户通俗标签',
 		plcustomerCase:'请输入现有客户举例',
-		plcompanys:'请选择最多三个所属行业',
+		plcompanys:'请选择最多三个目标客户行业',
 		//第四步
 		companyCreateDate:'公司创建时间：',
 		companyScale:'公司规模：',

src/views/innovatecompany/acceptintention/intentionbar.vue

@@ -78,6 +78,7 @@
         components:{
             progressBar
         },
+        props:['projectId'],
         methods : {
             // 分页导航
             handleCurrentChange(val) {
@@ -181,7 +182,7 @@
             const empinfo = JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo")));
             if(empinfo.empType == 2){
                 this.isempinfo = true;
-                this.stateData.projectId = 6417;
+                this.stateData.projectId = this.projectId;
                 this.isempurl = '/business/purpose/getRequirementsBelongProject';
             }else{
                 this.isempinfo = false;

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -43,7 +43,7 @@
                     <el-tab-pane v-if="addData.showProgress" :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></intention-bar>
+                        <intention-bar v-if="!intentionIf" :projectId="$route.query.projectId"></intention-bar>
                     </el-tab-pane>
                 </el-tabs>
             </el-row>
@@ -56,7 +56,7 @@
                     <el-tab-pane v-if="addData.showProgress" :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></intention-bar>
+                        <intention-bar v-if="!intentionIf" :projectId="$route.query.projectId"></intention-bar>
                     </el-tab-pane>
                 </el-tabs>
             </el-row>
@@ -570,6 +570,8 @@
                     vm.pathfrom = '/litemlist';
                 }else if(vm.pathfrom == '/projectinside' || vm.pathfrom == '/require/detail'|| vm.pathfrom == '/sale/selflist' || vm.pathfrom == '/bigBusiness/intentiondetail' || vm.pathfrom == '/bigBusiness/selfdetail' ||vm.pathfrom == '/contentdetarl' || vm.pathfrom == '/aggregatetab' || vm.pathfrom == '/saleproject/active'){
                     vm.pathfrom =from.fullPath;
+                }else if(vm.pathfrom == '/totceldataed'){
+                    vm.pathfrom = '/litemlisted';
                 }
             })
         },
@@ -762,6 +764,7 @@
 
                         });
                     }else if(response.code == 4042){
+                        console.log(123)
                         this.$message.error(this.$t('listproject.underreview'));
                     }else if(response.code == 2003){
                         this.$router.push('/bigBusiness/intentionlist');
@@ -861,11 +864,14 @@
                                 this.activeName = 'five';
                             }
                         }
-                        if(this.$el.querySelector("#anchor-13").offsetTop){
-                            if( scroll > this.$el.querySelector("#anchor-13").offsetTop-200){
-                                this.activeName = 'six';
+                        if(!this.intentionIf){
+                            if(this.$el.querySelector("#anchor-13").offsetTop){
+                                if( scroll > this.$el.querySelector("#anchor-13").offsetTop-200){
+                                    this.activeName = 'six';
+                                }
                             }
                         }
+
                         if(this.addData.projectSource==1){
                             if(this.$el.querySelector("#anchor-00").offsetTop){
                                 if(this.$el.querySelector("#anchor-00").offsetTop+200 > scroll){