Merge remote-tracking branch 'origin/master'

src/components/mobile/screenCmpt.vue

@@ -2,7 +2,7 @@
     <div class="wrapper">
         <div class="contentScreen" v-if="!isCity">
             <p class="screenTitle">{{titleName}}</p>
-            <div class="firstLine" :class="screenchildListIf?'lineWrap':''">
+            <div class="firstLine" :class="secondVisible?'lineWrap':''">
                 <ul>
                     <li v-for="item in wholeList" :class="checkboxGroup.length==0?'activeLi':''"  @click="wholeClik">{{item}}</li>
                     <li v-for="item in screenlist" :class="item.checked?'activeLi':''" v-if="screenchildListIf" @click="checkClik(item)">{{item.industryName}}</li>
@@ -20,7 +20,7 @@
         </div>
         <div class="contentScreen" v-if="isCity">
             <p class="screenTitle">{{titleName}}</p>
-            <div class="lineWrap">
+            <div :class="secondCityVisible||countryIf?'lineWrap':''">
                 <ul>
                     <li v-for="item in wholeList" :class="checkboxlocation.length==0?'activeLi':''" @click="wholeClikCity">{{item}}</li>
                     <li v-for="item in cityList" :class="item.checked?'activeLi':''" @click="changecity(item)">{{item.lab}}</li>

src/components/mobile/searchList.vue

@@ -143,7 +143,7 @@
             </mt-loadmore>
 
         </div>
-        <noData v-if="hasData" :nodata="true"></noData>
+        <noData style="padding-top: 2rem" v-if="hasData" :nodata="true"></noData>
         <selectScreen v-if="isVisible&&$route.query.tab==2||isVisible&&isMargin" @active="groupdata"></selectScreen>
         <selectScreenProject v-if="isVisible&&$route.query.tab==1" @active="groupdataProject"></selectScreenProject>
     </div>

src/views/innovatecompany/bannerconfig/bannerconfigs.vue

@@ -2,7 +2,7 @@
     <div class="soutform loginedWrapper">
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/litemlist' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/projectdynamics' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
                 <el-breadcrumb-item>轮播图</el-breadcrumb-item>
             </el-breadcrumb>
         </div>

src/views/innovatecompany/bannerconfig/homeconfigs.vue

@@ -2,7 +2,7 @@
     <div class="soutform loginedWrapper">
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/litemlist' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/projectdynamics' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
                 <el-breadcrumb-item>开机报</el-breadcrumb-item>
             </el-breadcrumb>
         </div>