yshop2.0.2,修复issue#I1B8RB,#I1B49Y,#I1BASM,#I1B9O7,#I1B9ED

.editorconfig

@@ -1,4 +1,4 @@
-# https://editorconfig.org
+
 root = true
 
 [*]

.env.development

@@ -4,5 +4,6 @@ ENV = 'development'
 VUE_APP_BASE_API  = 'http://localhost:8000'
 VUE_APP_WS_API = 'ws://localhost:8000'
 
+
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -1,5 +1,6 @@
 ENV = 'production'
 
+
 # 接口地址
 VUE_APP_BASE_API  = 'https://yshopapi.dayouqiantu.cn'
 VUE_APP_WS_API = 'ws://yshopapi.dayouqiantu.cn'

.eslintignore

@@ -3,3 +3,5 @@ src/assets
 public
 dist
 src/views
+
+

.eslintrc.js

@@ -11,7 +11,6 @@ module.exports = {
   },
   extends: ['plugin:vue/recommended', 'eslint:recommended'],
 
-  // add your custom rules here
   //it is base on https://github.com/vuejs/eslint-config-vue
   rules: {
     "vue/max-attributes-per-line": [2, {

.gitignore

@@ -10,7 +10,7 @@ tests/**/coverage/
 tests/e2e/reports
 selenium-debug.log
 
-# Editor directories and files
+#  directories and files
 .idea
 .vscode
 *.suo

.travis.yml

@@ -3,3 +3,4 @@ node_js: 10
 script: npm run test
 notifications:
   email: false
+

LICENSE

@@ -176,7 +176,7 @@ recommend that a file or class name and description of purpose be included on
 the same "printed page" as the copyright notice for easier identification within
 third-party archives.
 
-   Copyright 2019 Zheng Jie
+   Copyright 2019 Zheng Jie, hu peng
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

babel.config.js

@@ -1,5 +1,5 @@
 const plugins = ['@vue/babel-plugin-transform-vue-jsx']
-// 生产环境移除console
+// 生产环境移除 console
 if (process.env.NODE_ENV === 'production') {
   plugins.push('transform-remove-console')
 }

jest.config.js

@@ -15,7 +15,7 @@ module.exports = {
   ],
   collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
   coverageDirectory: '<rootDir>/tests/unit/coverage',
-  // 'collectCoverage': true,
+  //  'collectCoverage': true,
   'coverageReporters': [
     'lcov',
     'text-summary'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "yshop-web",
   "version": "2.4.0",
-  "description": "yshop 前端源码",
+  "description": "yshop2.0 前端源码",
   "author": "Zheng Jie",
   "license": "Apache-2.0",
   "scripts": {

plopfile.js

@@ -5,3 +5,4 @@ module.exports = function(plop) {
   plop.setGenerator('view', viewGenerator)
   plop.setGenerator('component', componentGenerator)
 }
+

postcss.config.js

@@ -3,3 +3,4 @@ module.exports = {
     autoprefixer: {}
   }
 }
+

src/components/material/index.vue

@@ -103,6 +103,7 @@
                         :src="item.url"
                         fit="contain"
                         :preview-src-list="[item.url]"
+                        z-index="999"
                       />
                       <div>
                         <el-checkbox class="material-name" :label="item.url">
@@ -458,6 +459,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  /deep/ .el-icon-circle-close{
+    color: red;
+  }
   .material-name{
     padding: 8px 0px;
   }

src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  title: 'YSHOP-2.0dev',
+  title: 'YSHOP-2.0',
   /**
    * @description 是否显示 tagsView
    */

src/views/shop/goods/index2.vue

@@ -9,16 +9,6 @@
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd" />
@@ -101,7 +91,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreProduct'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, isShow: 0 }
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 0, isDel: 0 }
       const query = this.query
       const type = query.type
       const value = query.value

src/views/shop/goods/index3.vue

@@ -9,16 +9,6 @@
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd" />