fix homepage

src/pages/Homepage/BrandCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card class="test-card">
+  <el-card class="test-card" style="margin-top: 15px">
     <div slot="header" class="clearfix test-card-header">
       <span>入驻品牌机构</span>
       <a class="pull-right" style="color: rgba(0, 118, 203, 1); cursor: pointer" @click="goToMoreAgency()">more>></a>

src/pages/Homepage/Homepage.vue

@@ -42,6 +42,12 @@
         <el-col :span="19" class="test-type-wrapper">
           <TestMenu :testTypeList="homeData.testTypeList"></TestMenu>
           <TestCard :applicationTypeList="homeData.applicationTypeList"></TestCard>
+          <el-row>
+            <ResourceAndTool :resourceList="homeDataNoCache.resourceList"></ResourceAndTool>
+          </el-row>
+          <el-row>
+            <BrandCard :residentAgencyList = homeData.residentAgencyList></BrandCard>
+          </el-row>
         </el-col>
         <el-col :span="5"  class="homepage-right-modules">
           <LoginCard/>
@@ -51,14 +57,6 @@
           <HotContest :competitionList="homeData.competitionList"/>
         </el-col>
       </el-row>
-      <el-row :gutter="15">
-        <el-col :span="12">
-          <ResourceAndTool :resourceList="homeDataNoCache.resourceList"></ResourceAndTool>
-        </el-col>
-        <el-col :span="12">
-          <BrandCard :residentAgencyList = homeData.residentAgencyList></BrandCard>
-        </el-col>
-      </el-row>
       <InstitutionCard></InstitutionCard>
     </div>
   </div>

src/pages/Homepage/ResourceAndTool.vue

@@ -5,7 +5,11 @@
       <el-button style="float: right; padding: 3px 0;line-height: 25px" type="text"  @click="getMore()">more>></el-button>
     </div>
     <div>
-      <div v-for="item in resourceList" :key="item.code"><span style="cursor: pointer" @click="goToDetail(item.code)">{{item.name}}</span></div>
+      <el-row>
+        <el-col :span="8" v-for="item in resourceList" :key="item.code" >
+          <span style="cursor: pointer" @click="goToDetail(item.code)">{{item.name}}</span>
+        </el-col>
+      </el-row>
     </div>
   </el-card>
 </template>

src/pages/UserCenter/EnterpriseAuth.vue

@@ -88,7 +88,15 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="身份证到期时间">
-          <el-input :disabled="!canEdit" v-model="enterpriseForm.idCardDeadTime" placeholder="请按身份证背面“有效期限”如实填写"></el-input>
+          <el-date-picker
+            v-model="enterpriseForm.idCardDeadTime"
+            style="width: 100%"
+            align="right"
+            type="date"
+            placeholder="请按身份证背面“有效期限”如实填写"
+            :disabled="!canEdit"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="家庭或单位地址">
           <el-input :disabled="!canEdit" v-model="enterpriseForm.address"></el-input>
@@ -199,7 +207,7 @@
       submitEnterpriseAuth() {
         Http.put(`/api/user/${this.user.id}/agency`, this.enterpriseForm).then(res => {
           if (res) {
-            notify('success', '认证成功');
+            notify('success', '提交成功');
             this.$router.push('/personal/authentication')
           }
         })
@@ -211,7 +219,7 @@
             this.authType = 1  //企业已参与认证
             this.authStatus = res.agencyVO.authStatus
             //成功和审核中状态不可编辑，认证失败状态可编辑
-            // this.authStatus.style === 'info' ? this.canEdit = true : null
+            this.authStatus.style !== 'info' ? this.canEdit = true : null
             this.failureReason = res.agencyVO.explain
             this.setFormInfo(res.agencyVO);
           } else {

src/pages/UserCenter/IndividualAuth.vue

@@ -32,7 +32,15 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="身份证到期时间">
-        <el-input :disabled="!canEdit" v-model="individualForm.idCardDeadTime" placeholder="请按身份证背面“有效期限”如实填写"></el-input>
+        <el-date-picker
+          v-model="individualForm.idCardDeadTime"
+          style="width: 100%"
+          align="right"
+          type="date"
+          placeholder="请按身份证背面“有效期限”如实填写"
+          :disabled="!canEdit"
+          >
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="家庭或单位地址">
         <el-input :disabled="!canEdit" v-model="individualForm.address"></el-input>
@@ -153,25 +161,25 @@
           idCardDeadTime: "",
           address: ""
         },
-        failureReason:'',
+        failureReason: '',
         authType: -1,
         authDetail: {},
         authStatus: '',
-        canEdit:false
+        canEdit: false
       }
     },
     methods: {
-      setUserInfo(){
+      setUserInfo() {
         this.user = storageGet('user') && storageGet('user').userVO;
       },
       submitIndividualAuth() {
         Http.put(`/api/user/${this.user.id}/personalAuth`, this.individualForm).then(res => {
           if (res) {
-            notify('success', '认证成功');
+            notify('success', '提交成功');
             this.$router.push('/personal/authentication')
           }
-        }).catch(err=>{
-          notify('error',err.data)
+        }).catch(err => {
+          notify('error', err.data)
         })
       },
       //获取当前认证状态
@@ -188,20 +196,20 @@
             this.authType = 0  //未参与个人认证
             this.canEdit = true
           }
-        }).catch(err=>{
-          notify('error',err.data)
+        }).catch(err => {
+          notify('error', err.data)
         })
       },
       setFormInfo(detail) {
         //回显认证信息
         this.individualForm.roleList = detail.roleList,
-        this.individualForm.realName = detail.realName,
-        this.individualForm.gender = detail.gender,
-        this.individualForm.idCard = detail.idCard,
-        this.individualForm.address = detail.address,
-        this.individualForm.idCardPositivePhoto = detail.idCardPositivePhoto,
-        this.individualForm.idCardBackPhoto = detail.idCardBackPhoto,
-        this.individualForm.idCardDeadTime = detail.idCardDeadTime
+          this.individualForm.realName = detail.realName,
+          this.individualForm.gender = detail.gender,
+          this.individualForm.idCard = detail.idCard,
+          this.individualForm.address = detail.address,
+          this.individualForm.idCardPositivePhoto = detail.idCardPositivePhoto,
+          this.individualForm.idCardBackPhoto = detail.idCardBackPhoto,
+          this.individualForm.idCardDeadTime = detail.idCardDeadTime
       },
       //文件上传前的响应函数
       beforeFileUpload(file) {
@@ -254,7 +262,7 @@
 </script>
 
 <style scoped lang="less">
-  .avatar-uploader{
+  .avatar-uploader {
     border-radius: 6px;
     cursor: pointer;
     position: relative;
@@ -263,9 +271,11 @@
     width: 270px;
     height: 170px;
   }
+
   .avatar-uploader .el-upload:hover {
     border-color: #409EFF;
   }
+
   .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
@@ -274,6 +284,7 @@
     line-height: 178px;
     text-align: center;
   }
+
   .avatar {
     width: 270px;
     height: 170px;