technology and square

README.md

@@ -27,8 +27,9 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
 > /src/style/main.scss 中更改 `$--color-primary`，`$color-primary-background`
 - 数据配置
 > /src/config/index.js
+- 组件展示配置
+> /src/config/index.js
 - logo配置
 
-- 组件展示配置
 
 

src/config/index.js

@@ -30,6 +30,8 @@ export const home_searchTypeArr = [
     "value": "3"
   }
 ];
+//home_searchType
+export const home_searchType = '0';
 //home_homeTabArr_default
 export const home_homeTabArr_left = [
   //注意：这里的第一个元素的name是"homepage"
@@ -44,7 +46,6 @@ export const home_homeTabArr_right = [
 ];
 //home_homeTabArr_default，注意这里的值一定要和一个home_homeTabArr_*中的name值对应
 export const home_homeTabArr_default = "homepage";
-
 //home页container组件展示
 export const HOME_DISPLAY = {
   test_menu: true,
@@ -59,3 +60,53 @@ export const HOME_DISPLAY = {
   hot_contest: true
 }
 
+//technology页配置(导航数据 + 组件展示)
+//technology_searchTypeArr
+export const technology_searchTypeArr = [
+  {
+    "name": "众测工具",
+    "value": "2",
+    "label": '工具'
+  },
+  {
+    "name": "众测案例",
+    "value": "3",
+    "label": '案例'
+  },
+  {
+    "name": "技术文章",
+    "value": "0",
+    "label": '文章'
+  },
+  {
+    "name": "论文专著",
+    "value": "1",
+    "label": '专著'
+  }
+];
+//technology_searchType
+export const technology_searchType = '2';
+//technology页container组件展示
+export const TECHNOLOGY_DISPLAY = {
+  hot_article: true
+}
+
+//square页配置(导航数据 + 组件展示)
+//square_searchTypeArr
+export const square_searchTabArr = [
+  { label: "项目", name: "project" },
+  { label: "任务", name: "task" }
+];
+export const square_menuArr = [
+  { label: "首页", name: "squareHome" },
+  { label: "测试项目", name: "project" },
+  { label: "测试任务", name: "task" }
+];
+export const square_searchType = 'project';
+export const square_currTab = 'squareHome';
+export const SQUARE_DISPLAY = {
+  popular_project: true,
+  popular_task: true,
+}
+
+

src/pages/Homepage/Homepage.vue

@@ -88,7 +88,7 @@ import WaterfallSlot from 'vue-waterfall/lib/waterfall-slot'
 import {getAllFields, storageGet} from '@/js/index.js'
 import {notify} from "../../constants";
 import Apis from '@/js/api'
-import {logoTitle, home_searchTypeArr, home_homeTabArr_left,
+import {logoTitle, home_searchTypeArr, home_homeTabArr_left,home_searchType,
   home_homeTabArr_right,home_homeTabArr_default,HOME_DISPLAY} from "../../config";
 
 // console.log(commonData);
@@ -118,7 +118,7 @@ export default {
       user: {},
       isLogin: false,
       loading: false,
-      searchType: '0',
+      searchType: home_searchType,
       searchTypeArr: home_searchTypeArr,
       searchVal: '',
       homeTabArr: {

src/pages/Homepage/HotCrowd.vue

@@ -14,7 +14,6 @@
               {{item.name}}
             </div>
             <div class="list-item-info">
-
             </div>
           </div>
         </el-col>

src/pages/Square/Square2.0.vue

@@ -13,7 +13,7 @@
           <div class="search-nav">
             <div id="search-block " class="">
               <el-tabs v-model="searchType" type="card" @tab-click="handleTypeClick">
-                <el-tab-pane v-for="item in tabArr" :label="item.label" :name="item.name" :key="item.label"></el-tab-pane>
+                <el-tab-pane v-for="item in searchTabArr" :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" ref="searchInput">
@@ -57,8 +57,8 @@
           </el-pagination>
         </el-col>
         <el-col :span="6"  class="popular-modules" style="padding-left: 15px">
-          <PopularProject :hotCrowdTestProjectVOs="hotCrowdTestProjectVOs" style="margin-bottom: 15px"/>
-          <PopularTask :hotCrowdTaskVOs="hotCrowdTaskVOs"/>
+          <PopularProject :hotCrowdTestProjectVOs="hotCrowdTestProjectVOs" style="margin-bottom: 15px" v-if="SQUARE_DISPLAY.popular_project"/>
+          <PopularTask :hotCrowdTaskVOs="hotCrowdTaskVOs" v-if="SQUARE_DISPLAY.popular_task"/>
         </el-col>
       </el-row>
     </div>
@@ -74,27 +74,21 @@
   import PopularTask from './PopularTask'
   import {storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
-  import {logoTitle} from "../../config";
+  import {logoTitle,square_searchTabArr,square_menuArr,square_searchType,square_currTab,SQUARE_DISPLAY} from "../../config";
 
   export default {
     name: 'Square2.0',
     data(){
       return {
         logoTitle,
+        SQUARE_DISPLAY,
         user: {},
         isLogin: false,
-        searchType:'project',
+        searchType:square_searchType,
         searchVal: '',
-        currTab:'squareHome',
-        tabArr : [
-          {label:"项目",name:"project"},
-          {label:"任务",name:"task"}
-        ],
-        menuArr: [
-          {label:"首页",name:"squareHome"},
-          {label:"测试项目",name:"project"},
-          {label:"测试任务",name:"task"}
-        ],
+        currTab:square_currTab,
+        searchTabArr : square_searchTabArr,
+        menuArr: square_menuArr,
         projectAndTaskArr:[],
         type: 0,
         hotCrowdTestProjectVOs:[],
@@ -136,6 +130,7 @@
       },
       handleTypeClick(tab){
         this.searchType = tab.name;
+        this.currTab = tab.name;
         this.activePage = 1;
         this.$refs.searchInput.focus()
       },

src/pages/Technology/Technology2.0.vue

@@ -58,8 +58,8 @@
           >
           </el-pagination>
         </el-col>
-        <el-col :span="6"  class="popular-modules">
-          <HotActicle :articleArr="articleArr" @refreshHotArticle="loadHotArticles"/>
+        <el-col :span="6"  class="popular-modules" v-if="TECHNOLOGY_DISPLAY.hot_article">
+          <HotActicle :articleArr="articleArr" @refreshHotArticle="loadHotArticles" />
         </el-col>
       </el-row>
     </div>
@@ -78,7 +78,7 @@
   import PopularProject from '../Square/PopularProject'
   import {storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
-  import {logoTitle} from "../../config";
+  import {logoTitle,technology_searchTypeArr,technology_searchType,TECHNOLOGY_DISPLAY} from "../../config";
 
   export default {
     name: 'Technology2.0',
@@ -94,32 +94,12 @@
     data(){
       return {
         logoTitle,
+        TECHNOLOGY_DISPLAY,
         loading: false,
         isLogin: false,
         searchVal: '',
-        searchType:'2',
-        searchTypeArr:[
-          {
-            "name": "众测工具",
-            "value": "2",
-            "label":'工具'
-          },
-          {
-            "name": "众测案例",
-            "value": "3",
-            "label":'案例'
-          },
-          {
-            "name": "技术文章",
-            "value": "0",
-            "label":'文章'
-          },
-          {
-            "name": "论文专著",
-            "value": "1",
-            "label":'专著'
-          }
-        ],
+        searchType:technology_searchType,
+        searchTypeArr:technology_searchTypeArr,
         articleArr:[],
         keyword:"",
         activePage:1,