Merge remote-tracking branch 'origin/master'

src/views/innovatecompany/lreleaseproject/litemlist.vue

@@ -2,7 +2,7 @@
     <div class="soutform loginedWrapper">
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: publicFun.isgetUserRoleFunc(5)?'/#/salerequire/list':'/litemlist' }">{{$t("litemlistjson.wrkbench")}}</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: publicFun.isgetUserRoleFunc(5)?'/salerequire/list':'/litemlist' }">{{$t("litemlistjson.wrkbench")}}</el-breadcrumb-item>
                 <el-breadcrumb-item>{{title}}</el-breadcrumb-item>
             </el-breadcrumb>
         </div>

src/views/innovatecompany/registeruser/aggregatetab.vue

@@ -3,7 +3,7 @@
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
                 <el-breadcrumb-item :to="{ path: publicFun.isgetUserRoleFunc(5)?'/salerequire/list':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }">{{$t("litemlistjson.wrkbench")}}</el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/registeruserlist' }">{{$t("usermanagement.registereduser")}}</el-breadcrumb-item>
+                <el-breadcrumb-item v-if="!this.$route.query.isSale" :to="{ path: '/registeruserlist' }">{{$t("usermanagement.registereduser")}}</el-breadcrumb-item>
                 <el-breadcrumb-item v-if="!this.$route.query.isSale">{{$t("usermanagement.accountinformation")}}</el-breadcrumb-item>
                 <el-breadcrumb-item v-if="this.$route.query.isSale==1">
                     <a href="/#/responsibleuser/list">{{$t("saleResponsibleUser.title")}}</a>

src/views/mobile/projectment/projectdetails.vue

@@ -89,57 +89,59 @@
                 </div>
             </div>
             <div v-if="companyInfo.projectSource!=1">
-                <div><span>{{$t("listproject.market")}}</span></div>
-                <p>
+                <div v-if="companyInfo.companyIndustryList&&companyInfo.companyIndustryList.length>=1||companyInfo.cooperationWay&&companyInfo.cooperationWay.length>=1||companyInfo.customerLabelList&&companyInfo.customerLabelList.length>=1||companyInfo.customerCase&&companyInfo.customerCase.length>=1">
+                    <span>{{$t("listproject.market")}}</span>
+                </div>
+                <p v-if="companyInfo.companyIndustryList&&companyInfo.companyIndustryList.length>=1">
                     <span>{{$t("listproject.fmcompanyIndustryList")}}</span>
                     <span>
                         <span v-for="(item,index) in companyInfo.companyIndustryList" :key="index"> {{item}} <i> {{companyInfo.companyIndustryList.length-1 == index ? '' : ' | '}} </i></span>
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.cooperationWay&&companyInfo.cooperationWay.length>=1">
                     <span>{{$t("listproject.fmcooperationWay")}}</span>
                     <span>
                         {{companyInfo.cooperationWay}}
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.customerLabelList&&companyInfo.customerLabelList.length>=1">
                     <span>{{$t("listproject.customerLabelList")}}</span>
                     <span>
                         <span v-for="(item,index) in companyInfo.customerLabelList" :key="index"> {{item}} <i> {{companyInfo.customerLabelList.length-1 == index ? '' : ' | '}} </i></span>
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.customerCase&&companyInfo.customerCase.length>=1">
                     <span>{{$t("listproject.customerCase")}}</span>
                     <span>{{companyInfo.customerCase}}</span>
                 </p>
             </div>
             <div v-if="companyInfo.projectSource!=1">
                 <div><span>{{$t("listproject.overview")}}</span></div>
-                <p>
+                <p v-if="companyInfo.companyCreateDate&&companyInfo.companyCreateDate.length>=1">
                     <span>{{$t("listproject.companyCreateDate")}}</span>
                     <span>
                         {{companyInfo.companyCreateDate}}
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.companyScale&&companyInfo.companyScale.length>=1">
                     <span>{{$t("listproject.companyScale")}}</span>
                     <span>
                         {{companyInfo.companyScale}}
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.companyFinancedAmount&&companyInfo.companyFinancedAmount.length>=1">
                     <span>{{$t("listproject.companyFinancedAmount")}}</span>
                     <span style="margin-left: 0.2rem">
                         {{companyInfo.companyFinancedAmount}}
                     </span>
                 </p>
-                <p>
+                <p v-if="companyInfo.companyValuation&&companyInfo.companyValuation.length>=1">
                     <span>{{$t("listproject.companyValuation")}}</span>
                     <span>
                         {{companyInfo.companyValuation}}
                     </span>
                 </p>
-                <div>
+                <div v-if="companyInfo.companyEmpList&&companyInfo.companyEmpList.length>=1">
                     <p style="width: 100%;font-weight: bold;margin: 0.2rem 0">
                         {{$t("releasejson.companyEmpList")}}
                     </p>
@@ -156,7 +158,7 @@
                         </template>
                     </el-table>
                 </div>
-                <div>
+                <div v-if="companyInfo.companyEventList&&companyInfo.companyEventList.length>=1">
                     <p style="width: 100%;font-weight: bold;margin: 0.2rem 0">
                         {{$t("releasejson.companyEventList")}}
                     </p>