From d908ab82372442b0d3ccae198d5969c529b5e110 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 14 Jul 2020 16:07:02 +0800
Subject: [PATCH] =?UTF-8?q?yshop3.0=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig       | 1 -
 .env.development    | 2 +-
 .env.production     | 1 -
 .eslintignore       | 1 +
 .eslintrc.js        | 2 +-
 .gitignore          | 1 +
 .travis.yml         | 1 +
 README.md           | 2 +-
 babel.config.js     | 2 +-
 jest.config.js      | 1 -
 package.json        | 2 +-
 src/settings.js     | 2 +-
 src/views/login.vue | 2 +-
 vue.config.js       | 1 -
 14 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 998a803..271822f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,3 @@
-
 root = true
 
 [*]
diff --git a/.env.development b/.env.development
index 34879ad..fcdddbe 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ ENV = 'development'
 
 # 接口地址
 VUE_APP_BASE_API  = 'http://localhost:8001'
-VUE_APP_WS_API = 'ws://localhost:8000'
+VUE_APP_WS_API = 'ws://localhost:8001'
 
 
 # 是否启用 babel-plugin-dynamic-import-node插件
diff --git a/.env.production b/.env.production
index 6d0f9be..b8dc239 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,5 @@
 ENV = 'production'
 
-
 # 接口地址
 VUE_APP_BASE_API  = 'https://app2.yixiang.co'
 VUE_APP_WS_API = 'ws://app2.yixiang.co'
diff --git a/.eslintignore b/.eslintignore
index 486493c..a1bbc96 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -5,3 +5,4 @@ dist
 src/views
 
 
+
diff --git a/.eslintrc.js b/.eslintrc.js
index 3fda555..0c290b7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,7 @@ module.exports = {
   },
   extends: ['plugin:vue/recommended', 'eslint:recommended'],
 
-  //it is base on https://github.com/vuejs/eslint-config-vue
+
   rules: {
     "vue/max-attributes-per-line": [2, {
       "singleline": 10,
diff --git a/.gitignore b/.gitignore
index eec9ba5..38801a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,6 @@ selenium-debug.log
 *.sln
 *.local
 
+
 package-lock.json
 yarn.lock
diff --git a/.travis.yml b/.travis.yml
index 030c6e9..8c37787 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,4 @@ script: npm run test
 notifications:
   email: false
 
+
diff --git a/README.md b/README.md
index bf654d4..5fbbdd6 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2
 - 可以具体查看演示地址查看当前版本已经完成的功能，不再絮叨啦
 
 #### 项目结构
-项目采用分模块开发方式
+yshop3.0项目采用分模块开发方式
 - yshop-app       移动端API模块（H5+uniapp端的API）
 - yshop-admin     管理后台模块
 - yshop-weixin    微信相关模块
diff --git a/babel.config.js b/babel.config.js
index fc18456..1e8b2ce 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,5 @@
 const plugins = ['@vue/babel-plugin-transform-vue-jsx']
-// 生产环境移除 console
+// 生产环境移除
 if (process.env.NODE_ENV === 'production') {
   plugins.push('transform-remove-console')
 }
diff --git a/jest.config.js b/jest.config.js
index f5dd736..0412da8 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -15,7 +15,6 @@ 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,
   'coverageReporters': [
     'lcov',
     'text-summary'
diff --git a/package.json b/package.json
index f71952b..b751cce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "yshop-web",
   "version": "2.4.0",
-  "description": "yshop2.0 前端源码",
+  "description": "yshop3.0 前端源码",
   "author": "Zheng Jie",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/src/settings.js b/src/settings.js
index 45197e5..b923256 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  title: 'YSHOP-3.0-RC2',
+  title: 'YSHOP-3.0',
   /**
    * @description 是否显示 tagsView
    */
diff --git a/src/views/login.vue b/src/views/login.vue
index dcf827e..23744c1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        YSHOP后台管理系统-RC2
+        YSHOP后台管理系统-3.0
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
diff --git a/vue.config.js b/vue.config.js
index f05fbb6..5d77319 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,6 @@ function resolve(dir) {
 const name = defaultSettings.title // 网址标题
 const port = 8013 // 端口配置
 
-// All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   publicPath: '/',
   outputDir: 'dist',