fix

src/components/authen/AgencyAuthentication.vue

@@ -439,7 +439,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/authen/AgencyAuthenticationCreate.vue

@@ -409,7 +409,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/authen/EnterpriseAuthentication.vue

@@ -340,7 +340,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/authen/EnterpriseAuthenticationCreate.vue

@@ -312,7 +312,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/authen/IndividualAuthentication.vue

@@ -329,7 +329,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/authen/IndividualAuthenticationCreate.vue

@@ -286,7 +286,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/cheat/AgencyAdd.vue

@@ -475,7 +475,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/cheat/AgencyDetail.vue

@@ -293,7 +293,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/cheat/ProjectAdd.vue

@@ -692,7 +692,7 @@
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/commons/Header2.0.vue

@@ -15,7 +15,7 @@
             <li>
             <li v-if="isLogin">
               <el-dropdown>
-                <span class="el-dropdown-link">
+                <span class="el-dropdown-link" style="color:rgb(153,153,153)">
                   {{user.userVO.name}}<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown">
@@ -197,7 +197,7 @@
         userLogout () {
             this.isLogin = false
             logout().then((res) => {
-                location.reload();
+                // location.reload();
                 this.$router.push('/home')
             })
 
@@ -399,7 +399,7 @@
     display: inline-block;
   }
 
-  .header-nav ul li a {
+  .header-nav ul li a{
     color: inherit;
     padding: 5px;
     font-weight: 500;

src/components/commons/NProvinceCity.vue

@@ -21,7 +21,7 @@
       style="width: calc(50% - 20px);margin-right: 0px"
     >
       <el-select v-model="city" :loading="loadingCity" @change="cityChanged" placeholder="请选择" :disabled="isModifyMode">
-        <el-option :key="''" :label="'请选择'" :value="''"></el-option>
+<!--        <el-option :key="''" :label="'请选择'" :value="''"></el-option>-->
         <el-option v-for="item in cities" :key="item.code" :label="item.name" :value="item.code"></el-option>
       </el-select>
     </el-form-item>
@@ -90,13 +90,14 @@ export default {
     buildCityArr(proCode) {
       this.loadingCity = true;
       let proItem = (this.provinces || []).find(p => p.code === proCode);
-      return (proItem && proItem.cities) || []
+      this.cities =  (proItem && proItem.cities) || [];
+      this.loadingCity = false;
     }
   },
   watch:{
     provinceCode(val){
-      this.province=val
-      this.cities=this.buildCityArr(val)
+      this.province = val
+      this.buildCityArr(val)
     },
     cityCode(val){
       this.city=val

src/components/commons/ProvinceCity.vue

@@ -50,13 +50,15 @@ export default {
     this.provinces = provinceCity.provinces;
   },
   mounted() {
-    this.province = this.provinceCode;
-    this.provinceChanged(this.provinceCode);
-    this.city = this.cityCode;
-    console.log(this.city)
-    console.log(this.province)
-    console.log(this.provinceCode)
-    console.log(this.cityCode)
+    this.$nextTick(()=>{
+      this.province = this.provinceCode;
+      this.provinceChanged(this.provinceCode);
+      this.city = this.cityCode;
+      console.log(this.city)
+      console.log(this.province)
+      console.log(this.provinceCode)
+      console.log(this.cityCode)
+    })
   },
   data() {
     return {
@@ -107,6 +109,10 @@ export default {
       this.province = this.provinceCode
       this.city = this.cityCode
     },
+    // provinceCode(val){
+    //   console.log("pro code change in pro city com",val)
+    //   this.provinceChanged(val)
+    // },
 
   },
 };

src/components/project/ProjectCreate.vue

@@ -579,7 +579,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/report/ProjectReport.vue

@@ -294,7 +294,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/report/ProjectReportCreate.vue

@@ -267,7 +267,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/report/TaskReport.vue

@@ -299,7 +299,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/report/TaskReportCreate.vue

@@ -250,7 +250,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/task/Task.vue

@@ -794,7 +794,7 @@
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 

src/components/task/TaskCreate.vue

@@ -400,7 +400,7 @@ export default {
   }
 
   .el-form-item /deep/ .el-tabs__content {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
     overflow: auto;
   }
 </style>

src/pages/DetailPage/ExpertDetail.vue

@@ -106,6 +106,6 @@
   }
 
   .el-form-item {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
   }
 </style>

src/pages/DetailPage/ResourceDetail.vue

@@ -137,6 +137,6 @@
   }
 
   .el-form-item {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
   }
 </style>

src/pages/DetailPage/UserDetail.vue

@@ -102,6 +102,6 @@
   }
 
   .el-form-item {
-    max-height: 120px !important;
+    /*max-height: 120px !important;*/
   }
 </style>

src/pages/Square/PopularProject.vue

@@ -6,7 +6,8 @@
       <span class="popular-header-title">热门项目</span>
       <el-button style="float: right; padding: 3px 0;line-height: 25px" type="text" @click="goToMore()">more>></el-button>
     </div>
-    <div class="popular-list">
+    <div v-if="!hotCrowdTestProjectVOs.length" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
+    <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTestProjectVOs" :key="item.id">
         <el-col :span="19">
           <img src="../../assets/img/logo-project.png" alt="logo-project" class="pull-left project-logo-img">

src/pages/Square/PopularTask.vue

@@ -5,7 +5,8 @@
       <span class="popular-header-title">热门任务</span>
       <el-button style="float: right; padding: 3px 0" type="text" class="pull-right"  @click="goToMore()">more>></el-button>
     </div>
-    <div class="popular-list">
+    <div v-if="!hotCrowdTaskVOs.length" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
+    <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTaskVOs" :key="item.id">
         <el-col :span="19">
           <img src="../../assets/img/logo-blue.png" alt="logo-project" class="pull-left project-logo-img">

src/pages/UserCenter/EnterpriseAuth.vue

@@ -207,7 +207,7 @@
     data() {
       return {
         loading: false,
-        active: 1,
+        active: 0,
         user: {},
         canEdit: false,
         authType: -1,

src/router/index.js

@@ -21,7 +21,7 @@ export default new Router({
   routes: [
     {
       path: '/',
-      name: 'Index',
+      name: 'Home',
       component: resolve => require(['@/pages/Homepage/Homepage'], resolve),
       meta: {
         title: '',