Merge remote-tracking branch 'origin/master'

src/views/integralpage/settlementbar.vue

@@ -49,7 +49,7 @@
                 optionsradio:null,
                 resultsDesc:'',
                 imagesIf:'',
-                uploadPicture: '/base/upload/uploadPicture',//图片上传地址
+                uploadPicture: '/base/upload/uploadOriginalImg',//图片上传地址
                 uploadPictureList:[],
                 projectPicUrlList:[],
             }

src/views/lndustryfocusview/lndustryfocus.vue

@@ -99,7 +99,7 @@
                 <p>{{endatajson.bottom.contnet}} <span style="color: #FF9E29;cursor: pointer">{{endatajson.bottom.gohome}}</span></p>
             </div>
         </div>
-        <PageBottom></PageBottom>
+<!--        <PageBottom></PageBottom>-->
     </div>
 </template>
 

src/views/mobile/projectment/projectdetails.vue

@@ -30,34 +30,34 @@
         <div class="contentclassed" v-if="!companyInfo.projectCreatedBy">
             <div v-if="companyInfo.projectSource!=1">
                 <div><span>{{$t("listproject.projectbasic")}}</span></div>
-                <p v-if="companyInfo.companyName&&typeof companyInfo.companyName=='Array'&&companyInfo.companyName.length>=1">
+                <p v-if="companyInfo.companyName&&companyInfo.companyName.length>=1">
                     <span>{{$t("listproject.companyname")}}</span>
                     <span>{{companyInfo.companyName}}</span>
                 </p>
-                <p v-if="companyInfo.projectIndustryList&&typeof companyInfo.projectIndustryList=='Array'&&companyInfo.projectIndustryList.length>=1">
+                <p v-if="companyInfo.projectIndustryList&&companyInfo.projectIndustryList.length>=1">
                     <span>{{$t("listproject.projectIndustryList")}}</span>
                     <span v-for="(item,index) in companyInfo.projectIndustryList" :key="index"> {{item}} <i> {{companyInfo.projectIndustryList.length-1 == index ? '' : ' | '}} </i></span>
                 </p>
-                <p v-if="companyInfo.projectModel&&typeof companyInfo.projectModel=='Array'&&companyInfo.projectModel.length>=1">
+                <p v-if="companyInfo.projectModel&&companyInfo.projectModel.length>=1">
                     <span>{{$t("listproject.projectModel")}}</span>
                     <span>{{companyInfo.projectModel}}</span>
                 </p>
-                <p v-if="companyInfo.projectPhase&&typeof companyInfo.projectPhase=='Array'&&companyInfo.projectPhase.length>=1">
+                <p v-if="companyInfo.projectPhase&&companyInfo.projectPhase.length>=1">
                     <span>{{$t("listproject.projectPhase")}}</span>
                     <span>{{companyInfo.projectPhase}}</span>
                 </p>
-                <p v-if="companyInfo.projectInstroduction&&typeof companyInfo.projectInstroduction=='Array'&&companyInfo.projectInstroduction.length>=1">
+                <p v-if="companyInfo.projectInstroduction&&companyInfo.projectInstroduction.length>=1">
                     <span>{{$t("releasejson.projectInstroduction")}}</span>
                     <span style="display: block;line-height: 0.5rem;margin-top: 0.2rem">{{companyInfo.projectInstroduction}}</span>
                 </p>
-                <p v-if="companyInfo.projectPicUrlList&&typeof companyInfo.projectPicUrlList=='Array'&&companyInfo.projectPicUrlList.length>=1">
+                <p v-if="companyInfo.projectPicUrlList&&companyInfo.projectPicUrlList.length>=1">
                     <span>{{$t("releasejson.projectPicUrlList")}}</span>
                     <span style="display: block;line-height: 0.5rem;margin-top: 0.2rem">
                         <el-image style="width: 100px;border: 1px solid #E7E9F5;border-radius:10px;margin-right: 20px; height: 100px" v-for="(item,index) in companyInfo.projectPicUrlList" :key="index" :src="item" :preview-src-list="getSrcList(index)">
                                     </el-image>
                     </span>
                 </p>
-                <p v-if="companyInfo.projectLightspotList&&typeof companyInfo.projectLightspotList=='Array'&&companyInfo.projectLightspotList.length>=1">
+                <p v-if="companyInfo.projectLightspotList&&companyInfo.projectLightspotList.length>=1">
                     <span>{{$t("releasejson.projectlight")}}:</span>
                     <el-row style="margin-top: 20px">
                         <el-col style="border: 1px solid #E8EAF3;padding: 15px 15px 15px;margin-bottom: 20px;border-radius: 3px;line-height: 22px" v-for="(item,index) in companyInfo.projectLightspotList" :key="index">
@@ -89,59 +89,59 @@
                 </div>
             </div>
             <div v-if="companyInfo.projectSource!=1">
-                <div v-if="companyInfo.companyIndustryList&&typeof companyInfo.companyIndustryList=='Array'&&companyInfo.companyIndustryList.length>=1||companyInfo.cooperationWay&&typeof companyInfo.cooperationWay=='Array'&&companyInfo.cooperationWay.length>=1||companyInfo.customerLabelList&&typeof companyInfo.customerLabelList=='Array'&&companyInfo.customerLabelList.length>=1||companyInfo.customerCase&&typeof companyInfo.customerCase=='Array'&&companyInfo.customerCase.length>=1">
+                <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&&typeof companyInfo.companyIndustryList=='Array'&&companyInfo.companyIndustryList.length>=1">
+                <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 v-if="companyInfo.cooperationWay&&typeof companyInfo.cooperationWay=='Array'&&companyInfo.cooperationWay.length>=1">
+                <p v-if="companyInfo.cooperationWay&&companyInfo.cooperationWay.length>=1">
                     <span>{{$t("listproject.fmcooperationWay")}}</span>
                     <span>
                         {{companyInfo.cooperationWay}}
                     </span>
                 </p>
-                <p v-if="companyInfo.customerLabelList&&typeof companyInfo.customerLabelList=='Array'&&companyInfo.customerLabelList.length>=1">
+                <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 v-if="companyInfo.customerCase&&typeof companyInfo.customerCase=='Array'&&companyInfo.customerCase.length>=1">
+                <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 v-if="companyInfo.companyCreateDate&&typeof companyInfo.companyCreateDate=='Array'&&companyInfo.companyCreateDate.length>=1">
+                <p v-if="companyInfo.companyCreateDate&&companyInfo.companyCreateDate.length>=1">
                     <span>{{$t("listproject.companyCreateDate")}}</span>
                     <span>
                         {{companyInfo.companyCreateDate}}
                     </span>
                 </p>
-                <p v-if="companyInfo.companyScale&&typeof companyInfo.companyScale=='Array'&&companyInfo.companyScale.length>=1">
+                <p v-if="companyInfo.companyScale&&companyInfo.companyScale.length>=1">
                     <span>{{$t("listproject.companyScale")}}</span>
                     <span>
                         {{companyInfo.companyScale}}
                     </span>
                 </p>
-                <p v-if="companyInfo.companyFinancedAmount&&typeof companyInfo.companyFinancedAmount=='Array'&&companyInfo.companyFinancedAmount.length>=1">
+                <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 v-if="companyInfo.companyValuation&&typeof companyInfo.companyValuation=='Array'&&companyInfo.companyValuation.length>=1">
+                <p v-if="companyInfo.companyValuation&&companyInfo.companyValuation.length>=1">
                     <span>{{$t("listproject.companyValuation")}}</span>
                     <span>
                         {{companyInfo.companyValuation}}
                     </span>
                 </p>
-                <div v-if="companyInfo.companyEmpList&&typeof companyInfo.companyEmpList=='Array'&&companyInfo.companyEmpList.length>=1">
+                <div v-if="companyInfo.companyEmpList&&companyInfo.companyEmpList.length>=1">
                     <p style="width: 100%;font-weight: bold;margin: 0.2rem 0">
                         {{$t("releasejson.companyEmpList")}}
                     </p>
@@ -158,7 +158,7 @@
                         </template>
                     </el-table>
                 </div>
-                <div v-if="companyInfo.companyEventList&&typeof companyInfo.companyEventList=='Array'&&companyInfo.companyEventList.length>=1">
+                <div v-if="companyInfo.companyEventList&&companyInfo.companyEventList.length>=1">
                     <p style="width: 100%;font-weight: bold;margin: 0.2rem 0">
                         {{$t("releasejson.companyEventList")}}
                     </p>
@@ -548,7 +548,6 @@
                             }
                             if(this.isshow){
                                 if(this.translateNum){
-                                    console.log(22222)
                                     this.translateNum = false;
                                     this.gettransAxios();
                                 }