Merge branch '2.0' of github.com:lizouzt/iview-admin into 2.0

package-lock.json

@@ -4788,6 +4788,15 @@
         }
       }
     },
+    "eslint-plugin-cypress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.0.1.tgz",
+      "integrity": "sha512-iC17zJhUxW4JMGQYyxq2lYl5vCUDqGnC2Qkmt1mMk3kn5XIu6ypbtAbREDTC+cFY6SG7USlsmURjTAJ4LtlM6A==",
+      "dev": true,
+      "requires": {
+        "globals": "11.5.0"
+      }
+    },
     "eslint-plugin-import": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.12.0.tgz",

package.json

@@ -37,6 +37,7 @@
     "@vue/eslint-config-standard": "^3.0.0-beta.10",
     "@vue/test-utils": "^1.0.0-beta.10",
     "chai": "^4.1.2",
+    "eslint-plugin-cypress": "^2.0.1",
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
     "lint-staged": "^6.0.0",

src/main.js

@@ -11,10 +11,11 @@ import importDirective from '@/directive'
 import 'iview/dist/styles/iview.css'
 import './index.less'
 import '@/assets/icons/iconfont.css'
-import '@/mock'
+// import '@/mock'
 // 实际打包时应该不引入mock
-// import env from '@/config/env'
-// env === 'development' ? require('mock') : ''
+import env from '../config/env'
+/* eslint-disable */
+env === 'development' ? require('@/mock') : ''
 
 Vue.use(iView, {
   i18n: (key, value) => i18n.t(key, value)

src/view/join-page.vue

@@ -1,12 +1,6 @@
 <template>
   <div>
     <Row :gutter="20">
-      <i-col span="12">
-        <Card title="iview-admin开发者QQ群" shadow>
-          <img class="qq-group-img" :src="qqDev" alt="">
-          <p class="qq-group-intro">本群为愿意参与到iview-admin项目开发的开发者提供交流平台，进群需要为iview-admin提供优质有效的Pull requests。如果所提PR未达到要求或有缺陷，我们可以共同交流，争取做到最好。</p>
-        </Card>
-      </i-col>
       <i-col span="12">
         <Card title="iview-admin交流QQ群" shadow>
           <img class="qq-group-img" :src="qqFans" alt="">
@@ -19,13 +13,11 @@
 
 <script>
 import qqFans from '@/assets/images/qq-fance.jpg'
-import qqDev from '@/assets/images/qq-dev.jpg'
 export default {
   name: 'join_page',
   data () {
     return {
-      qqFans,
-      qqDev
+      qqFans
     }
   }
 }