Merge branch 'dev-optimize-1124' into 'release'

职称考首页优化  code reviewer：张平

职称考首页优化  code reviewer：张平

See merge request !6

package-lock.json

@@ -2408,13 +2408,15 @@
           "version": "0.3.2",
           "resolved": "http://192.168.110.93:4873/array-unique/-/array-unique-0.3.2.tgz",
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "2.3.2",
           "resolved": "http://192.168.110.93:4873/braces/-/braces-2.3.2.tgz",
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.1.0",
             "array-unique": "^0.3.2",
@@ -2433,6 +2435,7 @@
               "resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
@@ -2615,6 +2618,7 @@
           "resolved": "http://192.168.110.93:4873/fill-range/-/fill-range-4.0.0.tgz",
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend-shallow": "^2.0.1",
             "is-number": "^3.0.0",
@@ -2627,6 +2631,7 @@
               "resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
@@ -3251,6 +3256,7 @@
           "resolved": "http://192.168.110.93:4873/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
           },
@@ -3260,6 +3266,7 @@
               "resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "is-buffer": "^1.1.5"
               }
@@ -3270,13 +3277,15 @@
           "version": "3.0.1",
           "resolved": "http://192.168.110.93:4873/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-6.0.2.tgz",
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "micromatch": {
           "version": "3.1.10",
@@ -3526,6 +3535,7 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -4987,7 +4997,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5402,7 +5413,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5458,6 +5470,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5501,12 +5514,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5848,7 +5863,8 @@
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "html-comment-regex": {
       "version": "1.1.2",

src/components/course/common-img-title.vue

+<template>
+  <div class="common-img-title">
+    <img v-show="imgType == 1" src="../../images/course/icon-title-gj.png" alt="">
+    <img v-show="imgType == 2" src="../../images/course/icon-title-zj.png" alt="">
+    <span >{{title}}</span>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "高级职称"
+    },
+    imgType: {
+      type: String | Number,
+      default: 1,
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+.common-img-title {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  height: 48px;
+  border-bottom: 1px solid #F0F1F2;
+  margin-bottom: 10px;
+  // padding: 0 15px;
+  & > img {
+    width: 20px;
+    height: 20px;
+  }
+  & > span {
+    margin-left: 4px;
+    font-size: 16px;
+    font-weight: 700;
+    color: #373839;
+  }
+}
+</style>

src/main.js

@@ -7,7 +7,6 @@ const mixins = require('@/utils/mixins');
 import '@/utils/rem'					// 引入自适应
 import '@/utils/yqy-bridge'				// 移动端服务
 import '@/utils/wxShare';
-// import FastClick from 'fastclick'
 import vueFilters from '@/utils/filter';
 import BuriedPoint, { sendBuriedData } from 'web-buried-point';
 import Vant from 'vant';
@@ -17,27 +16,21 @@ import { querystring } from '@/utils';
 //注册到vue原型上
 Vue.prototype.clipboard = clipboard;
 
-// if (!(process.env.BUILD_ENV === 'uat' || process.env.BUILD_ENV === 'pro')) {
-if (!(process.env.BUILD_ENV === 'pro')) {
+const envList = ['dev', 'test', 'uat'];
+const { BUILD_ENV } = process.env;
+if (envList.indexOf(BUILD_ENV) != -1) {
   const VConsole = require('vconsole');
-	let vConsole = new VConsole() // 初始化
+  new VConsole();
 }
 
 // 可调试
 // Vue.config.devtools = true;
 
-
 // 注册所有公用过滤器
 for (let key in vueFilters) {
 	Vue.filter(key, vueFilters[key])
 }
 
-// if ('addEventListener' in document) {
-//     document.addEventListener('DOMContentLoaded', function() {
-//         FastClick.attach(document.body);
-//     }, false);
-// }
-// Vue.use(DiscussTopicStencil)
 Vue.use(VueRouter)
 const router = new VueRouter({
 	routes,

src/router/router.js

 import App from '../App'
 
 const index = r => require.ensure([], () => r(require('../views/index')), 'index')
+const indexOld = r => require.ensure([], () => r(require('../views/index-old')), 'index-old')
 const merge = r => require.ensure([], () => r(require('../views/merge-detail')), 'merge')
 const shareMerge = r => require.ensure([], () => r(require('../views/share-merge-detail')), 'share-merge')
 const test = r => require.ensure([], () => r(require('../views/test-components')), 'test-components')
@@ -26,6 +27,10 @@ export default [{
       path: '/index',
       component: index
     },
+    {
+      path: '/index-old',
+      component: indexOld
+    },
     {
       path: '/home',
       component: index

src/utils/env-config.js

@@ -8,29 +8,30 @@ export const envConfig = {
     // baseUrl: 'http://10.177.15.180:10202/',
     // baseUrl: 'http://192.168.140.14:10201/',
 
-    apiUrl: 'https://test1-api.yunqueyi.com/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // apiUrl: 'https://dev-api.yunqueyi.com/',
+    // webPageUrl: 'https://dev-phome.yunqueyi.com/',
+    // hactiveUrl: 'https://dev-hactive.yunqueyi.com',
+    // fileUrl: 'https://dev-www.yunqueyi.com',
+    // appId: 'wx2c577552a2d28550', // 用于微信授权登录
+    // wxType: 15, // 分享、用户信息对应的appid
+    // tradeType: 4,
+
     baseUrl: 'https://test1-sc.yunqueyi.com/',
+    apiUrl: 'https://test1-api.yunqueyi.com/',
     webPageUrl: 'https://test1-phome.yunqueyi.com/',
     hactiveUrl: 'https://test1-hactive.yunqueyi.com',
     fileUrl: 'https://test1-www.yunqueyi.com',
-    appId: 'wx08b383d002c73f26', // 用于微信授权登录
+    // appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
+    appId: 'wx2c577552a2d28550', // 用于微信授权登录
     wxType: 15, // 分享、用户信息对应的appid
     tradeType: 4,
 
-    // appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
-
-    // baseUrl: 'https://test1-sc.yunqueyi.com/',
-    // apiUrl: 'https://test1-api.yunqueyi.com/',
-    // webPageUrl: 'https://test1-phome.yunqueyi.com/',
-    // hactiveUrl: 'https://dev-hactive.yunqueyi.com',
-    // fileUrl: 'https://test1-www.yunqueyi.com',
-    // appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
-
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // apiUrl: 'https://uat-api.yunqueyi.com/',
     // webPageUrl: 'https://uat-phome.yunqueyi.com/',
     // hactiveUrl: 'https://uat-hactive.yunqueyi.com',
-    // fileUrl: 'https://dev-www.yunqueyi.com',
+    // fileUrl: 'https://test1-www.yunqueyi.com',
     // appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
 
     // apiUrl: 'https://uat-api.yunqueyi.com/',

src/views/question-bank.vue

@@ -22,7 +22,7 @@
         <div class="course-item" v-for="(item, index) in subDirectoryModelList" :key="index">
           <div class="left-c">
             <p class="title-c">{{item.directoryName}}</p>
-            <p class="join-c" v-if="!bindStatus">{{item.joinUserNum}}人已参与</p>
+            <p class="join-c" v-if="!bindStatus">共{{item.sumTitle}}题 | {{item.joinUserNum}}人已参与</p>
             <div class="progress-course" v-else>
               <div class="progress-w"><van-progress :percentage="item.finishedRatio" :stroke-width="6" color="#449284" :show-pivot="false"/></div>
               <span class="mg-set">{{item.finishedRatio}}%</span><span>共{{item.sumTitle}}道</span>
@@ -31,6 +31,8 @@
           <div class="right-btn">
             <span v-if="!bindStatus && (item.freeFlag == 0)" @click="goStudy(item, '开始练习')">开始练习</span>
             <span v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice > 0)" @click="goStudy(item, '免费练习')">免费练习</span>
+            <p v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice > 0)">可练习{{item.freePractice}}题</p>
+
             <img v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice == 0)" src="../images/question/lock.png" @click="unlockHand">
             <span v-if="bindStatus == 1" @click="goStudy(item, setTxt(item.finishedRatio))">{{setTxt(item.finishedRatio)}}</span>
           </div>
@@ -594,6 +596,7 @@ export default {
         }
         .right-btn{
           display: flex;
+          flex-direction: column;
           align-items: center;
           span{
             display: inline-block;
@@ -612,6 +615,11 @@ export default {
             height: 15px;
             margin-right: 22.5px;
           }
+          p {
+            margin-top: 4px;
+            font-size: 12px;
+            color: #CAA861;
+          }
         }
       }
     }