修改image(测试bug)

src/components/commons/ProjectItem.vue

@@ -50,7 +50,6 @@
   },
   methods: {
     goToProjectDetail (id) {
-      console.log(id)
       this.$router.push({name: 'Project', params: {projectId: id}})
     }
   }

src/components/commons/ProvinceCity.vue

@@ -55,10 +55,6 @@
       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() {

src/pages/DetailPage/CrowdDetail.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/Homepage/BrandCard.vue

@@ -2,12 +2,15 @@
   <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>
+      <el-button style="float: right; padding: 3px 0;line-height: 25px" type="text" @click="goToMoreAgency()">
+        more>>
+      </el-button>
     </div>
     <div style="height: 238px">
       <el-row :gutter="15">
         <el-col v-for="item in residentAgencyList" :key="item.id" :span="4" style="height: 90px; margin-bottom: 28px">
-          <img :src="item.agencyPhoto==null?defaultValue.image:item.agencyPhoto" :alt="item.evaluationAgencyName" style="width: 70%;height: 100%; cursor: pointer;" @click="goToDetail(item.userId)"/>
+          <img :src="item.agencyPhoto==null?defaultValue.image:item.agencyPhoto" :alt="item.evaluationAgencyName"
+               style="width: 70%;height: 100%; cursor: pointer;" @click="goToDetail(item.userId)"/>
         </el-col>
       </el-row>
     </div>
@@ -15,29 +18,29 @@
 </template>
 
 <script>
-  import {defaultValue} from '@/js/index.js'
+  import { defaultValue } from '@/js/index.js'
 
   export default {
     name: "BrandCard",
-    props:['residentAgencyList'],
+    props: ['residentAgencyList'],
     data() {
-      return{
+      return {
         defaultValue: defaultValue,
       }
     },
-    methods:{
-        goToMoreAgency(){
-            this.$router.push({
-                name: 'AgencyResidentList',
-            });
-        },
-        goToDetail(userId) {
-            this.$router.push({
-                name: 'NewAgencyDetail',
-                path:'/agency/detail',
-                query: {id: userId, type: 1}
-            })
-        },
+    methods: {
+      goToMoreAgency() {
+        this.$router.push({
+          name: 'AgencyResidentList',
+        });
+      },
+      goToDetail(userId) {
+        this.$router.push({
+          name: 'NewAgencyDetail',
+          path: '/agency/detail',
+          query: { id: userId, type: 1 }
+        })
+      },
     }
   }
 </script>

src/pages/Homepage/Homepage.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left">
-            <img class="logo-img" src="../../assets/img/logo-blue.png" :to="'/home'"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png" :to="'/home'"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>
@@ -17,7 +17,7 @@
                              :name="item.value" :key="item.value"></el-tab-pane>
               </el-tabs>
               <div class="search-input">
-                <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select">
+                <el-input ref="searchInput" placeholder="请输入内容" v-model="searchVal" class="input-with-select">
                   <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>
                 </el-input>
               </div>
@@ -208,7 +208,7 @@
           Http.get(Apis.USER.IS_PART.replace('{userId}', this.user.id)).then((res) => {
             this.$router.push('/project/create');
           }).catch((error) => {
-            notify('error', error.data)
+            notify('error', error)
           })
         }
       },
@@ -228,8 +228,10 @@
         }
         this.$router.push(this.homeTabArr.menuArr1[Number(tab.index)]&&this.homeTabArr.menuArr1[Number(tab.index)].linkTo);
       },
-      handleTypeClick(tab) {
-        this.searchType = tab.name
+      handleTypeClick(tab,e) {
+        this.searchType = tab.name;
+        // e.target.style.backgroundColor = $color-primary
+        this.$refs.searchInput.focus()
       },
       handleSearchData() {
         if (this.searchType == 0) {
@@ -258,6 +260,7 @@
     mounted(){
       this.setUserInfo();
       this.loadData();
+      this.$refs.searchInput.focus()
     },
     watch:{
       getUserInfo(val){

src/pages/Homepage/HotContest.vue

@@ -46,6 +46,7 @@
 </script>
 
 <style lang="scss">
+  @import "../../style/main";
   .popular-card {
     margin-bottom: 5px;
   }
@@ -111,8 +112,8 @@
         font-size: 16px;
         font-family: Roboto;
         font-weight: 400;
-        color: rgba(0, 117, 203, 1);
         line-height: 48px;
+        color: $--color-primary;
       }
     }
   }

src/pages/Homepage/LoginCard.vue

@@ -16,7 +16,7 @@
         <a :href="loginUrl">
           <el-button type="primary" size="mini" class="pull-left login-btn" v-if="!isLogin">登录</el-button>
         </a>
-        <el-button type="danger" size="mini" class="pull-right cancel-btn" v-if="isLogin" @click.native="userLogout()">
+        <el-button type="primary" size="mini" class="pull-right cancel-btn" v-if="isLogin" @click.native="userLogout()">
           登出
         </el-button>
       </div>
@@ -36,7 +36,7 @@
         isLogin: false,
         user: {},
         loginUrl: process.env.LOGIN_URL,
-        userImg: require('../../assets/img/logo-project.png')
+        userImg: require('../../assets/image/logo-transparent.png')
       }
     },
     computed: {
@@ -80,6 +80,8 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
+
   .login-card {
     margin-bottom: 13px;
 
@@ -108,22 +110,6 @@
       width: 100%;
       height: 28px;
       margin-top: 20px;
-
-      .login-btn {
-        background-color: rgba(0, 118, 203, 1);
-
-        &:hover {
-          background-color: rgba(0, 118, 203, 0.8);
-        }
-      }
-
-      .cancel-btn {
-        background-color: rgba(217, 92, 93, 1);
-
-        &:hover {
-          background-color: rgba(217, 92, 93, 0.8);
-        }
-      }
     }
   }
 </style>

src/pages/Homepage/TestCard.vue

@@ -2,10 +2,10 @@
   <div class="card-waterfull">
     <el-row :gutter="20">
       <waterfall
-                        :line-gap="400"
-                        :min-line-gap="150"
-                        :max-line-gap="200"
-                        :single-max-width="400"
+        :line-gap="400"
+        :min-line-gap="150"
+        :max-line-gap="200"
+        :single-max-width="400"
         :watch="applicationTypeList">
         <!-- each component is wrapped by a waterfall slot -->
 
@@ -16,7 +16,7 @@
           :order="index"
           :key="item.code"
         >
-          <el-card class="test-card" :body-style="{width:'300'}" >
+          <el-card class="test-card" :body-style="{width:'300'}">
             <div slot="header" class="clearfix test-card-header">
               <span>{{item.name}}</span>
             </div>
@@ -36,45 +36,44 @@
 
   export default {
     name: "TestCard",
-    props:['applicationTypeList'],
-    data(){
-      return{
-      }
+    props: ['applicationTypeList'],
+    data() {
+      return {}
     },
-    components:{
+    components: {
       Waterfall,
       WaterfallSlot
     },
-    methods:{
-    },
-    mounted() {
-      // console.log(this.applicationTypeList)
-    }
+    methods: {},
+    mounted() {}
   }
-
-
 </script>
 
 <style lang="scss">
-.test-card {
-  border: none;
-  .el-card__header{
-    height:48px !important;
-    background:rgba(233,240,250,1) !important;
-    padding: 12px 15px !important;
-  }
-  .test-card-header {
-    border-left: 5px solid #0076cb;
-    padding-left: 5px;
+  @import "../../style/main";
+
+  .test-card {
+    border: none;
+
+    .el-card__header {
+      height: 48px !important;
+      background: $__color-primary-background !important;
+      padding: 12px 15px !important;
+    }
+
+    .test-card-header {
+      border-left: 5px solid $__color-primary;
+      padding-left: 5px;
+    }
   }
-}
 
   .card-waterfull {
     .el-card {
       width: 98% !important;
     }
+
     .el-row {
-      margin:  0 !important;
+      margin: 0 !important;
     }
   }
 </style>

src/pages/Homepage/TestMenu.vue

@@ -30,6 +30,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
   .test-menu-wrapper {
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 4px 30px 0px rgba(8, 6, 6, 0.08);
@@ -64,7 +65,7 @@
       .more-test {
         width: 20px;
         height: 20px;
-        background: #0076cb;
+        background: $--color-primary;
         border-radius: 50%;
         color: white;
         padding: 5px;

src/pages/HomepageSearch/AgencyList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/AgencyResidentList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/CompetitionList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/CrowdList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/ExpertList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/ResourceList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/HomepageSearch/UserList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/Square/PopularProject.vue

@@ -52,6 +52,8 @@
 </script>
 
 <style lang="scss">
+  @import "../../style/main";
+
   .popular-card {
     margin-bottom: 15px;
   }
@@ -109,7 +111,7 @@
         font-size:16px;
         font-family:Roboto;
         font-weight:400;
-        color:rgba(0,117,203,1);
+        color:$--color-primary;
         line-height: 48px;
       }
     }

src/pages/Square/PopularProjectAndTaskList.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png"/>
+            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/Square/Square2.0.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png" />
+            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>
@@ -16,7 +16,7 @@
                 <el-tab-pane v-for="item in tabArr" :label="item.label" :name="item.name" :key="item.label"></el-tab-pane>
               </el-tabs>
               <div class="search-input">
-                <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select">
+                <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select" ref="searchInput">
                   <el-button class="search-button" slot="append"  type="primary" @click="handleSearchData">搜索</el-button>
                 </el-input>
               </div>
@@ -135,6 +135,7 @@
       handleTypeClick(tab){
         this.searchType = tab.name;
         this.activePage = 1;
+        this.$refs.searchInput.focus()
       },
 
       loadData(){

src/pages/Square/SquareCard.vue

@@ -109,6 +109,8 @@
 </script>
 
 <style lang="scss">
+  @import "../../style/main";
+
   .square-card .el-card__body {
     padding: 0 !important;
   }
@@ -146,7 +148,7 @@
         font-size: 14px;
         font-family: Source Han Sans CN;
         font-weight: bold;
-        color: rgba(0, 117, 203, 1);
+        color: $--color-primary;
       }
 
       .card-detail-info {
@@ -163,8 +165,7 @@
   }
 
   .card-footer {
-    background: rgba(233, 239, 249, 1);
-    /*height: 40px;*/
+    background: $color-primary-background;
 
     .card-footer-row {
       padding: 15px 10px;

src/pages/Technology/CrowdCase.vue

@@ -48,6 +48,8 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
+
   .technology-card {
     .card-wrapper {
       .technology-img {
@@ -76,7 +78,7 @@
     .get-info-btn {
       display: inline-block;
       color: white;
-      background-color: #0076cb;
+      background-color: $--color-primary;
       border-radius: 50%;
       width: 18px;
       height: 18px;

src/pages/Technology/CrowdTool.vue

@@ -46,6 +46,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
   .technology-card {
     .card-wrapper {
       .technology-img {
@@ -84,7 +85,7 @@
       .get-info-btn {
         display: inline-block;
         color: white;
-        background-color: #0076cb;
+        background-color: $--color-primary;
         border-radius: 50%;
         width: 18px;
         height: 18px;

src/pages/Technology/HotActicle.vue

@@ -57,6 +57,8 @@
 </script>
 
 <style lang="scss">
+  @import "../../style/main";
+
   .popular-card {
     margin-bottom: 15px;
   }
@@ -115,10 +117,9 @@
         font-size:16px;
         font-family:Roboto;
         font-weight:400;
-        color:rgba(0,117,203,1);
+        color:$--color-primary;
       }
     }
-
   }
 
 

src/pages/Technology/Technology2.0.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png" />
+            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>

src/pages/Technology/TechnologyCard.vue

@@ -22,7 +22,7 @@
                   {{item.time_interval}}
                 </el-col>
                 <el-col :span="8">
-                  <span style="color: rgba(0,117,203,1)">{{item.reading}}</span>阅读
+                  <span class="reading-count">{{item.reading}}</span>阅读
                 </el-col>
               </el-row>
             </div>
@@ -55,6 +55,8 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
+
   .technology-card {
     .card-wrapper {
       .technology-img {
@@ -79,6 +81,10 @@
           font-family:Source Han Sans CN;
           font-weight:400;
           color:rgba(0,0,0,1);
+
+          .reading-count {
+            color:$--color-primary;
+          }
         }
       }
 

src/pages/Technology/TechnologyMore.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/img/logo-blue.png" />
+            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
             <span class="logo-title">群智众测平台</span>
           </div>
         </el-col>