Merge remote-tracking branch 'origin/master'

src/views/bigbusiness/pages/detail.vue

@@ -2,7 +2,7 @@
     <div element-loading-background="rgba(0, 0, 0, 0.8)">
         <div class="detailWrapper" v-if="hasDataVisible">
             <div class="basicInfoWrap">
-                <basicInfoCmpt :companyInfo="basicInfo" :requireInfo="{}" :isTrans="isTrans" :require="2"
+                <basicInfoCmpt :companyInfo="basicInfo" :requireInfo="{}" :isTrans="isTrans&&$route.query.id" :require="2"
                                v-if="basicInfo" :isShare="false" :isRequireList='1'></basicInfoCmpt>
             </div>
             <ul class="navWrap" :class="isPosition?'':'fixedWrap'">
@@ -36,7 +36,7 @@
                                 width="300"
                                 header-align="left">
                             <template slot-scope="scope">
-                                <p style="font-weight: bold;padding-left: 15px;">{{isTrans?scope.row.transRequirementName:scope.row.requirementName}}</p>
+                                <p style="font-weight: bold;padding-left: 15px;">{{isTrans&&$route.query.id?scope.row.transRequirementName:scope.row.requirementName}}</p>
                                 <div v-if="isFlag">
                                     <el-tag v-if="scope.row.requirementStatus=='RA05'" size="mini" type="info" style="margin-left: 10px;">{{$t("commonTitle.requireDue")}}</el-tag>
                                     <el-tag v-if="scope.row.requirementStatus=='RA04'" size="mini" type="info" style="margin-left: 10px;">{{$t("commonTitle.requireSaleOut")}}</el-tag>
@@ -148,20 +148,20 @@
                             <p style="width: 100%;">
                                 <span style="vertical-align: top;padding-top:5px;">{{$t("indexCount.industryFlag")}}：</span>
                                 <!--<span>{{basicInfo.companyLabel}}</span>-->
-                                <span class="targetLabel" v-if="!isTrans&&basicInfo.companyLabelList">
+                                <span class="targetLabel" v-if="!isTrans&&$route.query.id&&basicInfo.companyLabelList">
                                     <el-tag size="small" effect="plain" v-for="item in basicInfo.companyLabelList" :key="item" style="margin-right: 5px;font-size: 14px;margin-bottom: 10px;">{{item}}</el-tag>
                                 </span>
-                                <span v-if="!isTrans&&!basicInfo.companyLabelList">{{$t('emptyDataTitle.noData')}}</span>
+                                <span v-if="!isTrans&&$route.query.id&&!basicInfo.companyLabelList">{{$t('emptyDataTitle.noData')}}</span>
 
-                                <span class="targetLabel" v-if="isTrans&&basicInfo.transCompanylabel&&basicInfo.transCompanylabel.length>0">
+                                <span class="targetLabel" v-if="isTrans&&$route.query.id&&basicInfo.transCompanylabel&&basicInfo.transCompanylabel.length>0">
                                     <el-tag size="small" effect="plain" v-for="item in basicInfo.transCompanylabel" :key="item" style="margin-right: 5px;font-size: 14px;margin-bottom: 10px;">{{item}}</el-tag>
                                 </span>
-                                <span v-if="isTrans&&basicInfo.transCompanylabel&&basicInfo.transCompanylabel.length==0" style="line-height: 30px;">{{$t('emptyDataTitle.noData')}}</span>
+                                <span v-if="isTrans&&$route.query.id&&basicInfo.transCompanylabel&&basicInfo.transCompanylabel.length==0" style="line-height: 30px;">{{$t('emptyDataTitle.noData')}}</span>
                             </p>
                         </li>
                         <li>
                             <p style="width: 100%;"><span>{{$t("bigBusiness.detailInfo.companyIntro")}}：</span><span
-                                    class="requirementContent">{{isTrans?basicInfo.transCompanyIntroduction:basicInfo.companyIntroduction}}</span>
+                                    class="requirementContent">{{isTrans&&$route.query.id?basicInfo.transCompanyIntroduction:basicInfo.companyIntroduction}}</span>
                             </p>
                         </li>
                     </ul>
@@ -172,7 +172,7 @@
                     {{$t("bigBusiness.detailInfo.editCompanyInfo")}}
                 </el-button>
                 <el-button type="primary" plain @click="handleGo" v-if="$route.query.id">{{$t('workPlace.goreturn')}}</el-button>
-                <el-button type="primary" plain @click="handleTranslate">{{isTrans?$t("mobile.showOldActicle"):$t("mobile.translateTitle")}}</el-button>
+                <el-button type="primary" plain @click="handleTranslate">{{isTrans&&$route.query.id?$t("mobile.showOldActicle"):$t("mobile.translateTitle")}}</el-button>
                 <span class="ques">
                     <el-popover
                             ref="popover1"