Merge remote-tracking branch 'origin/v3.3'

package.json

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

src/settings.js

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

src/views/login.vue

@@ -19,7 +19,7 @@
       </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        YSHOP后台管理系统-3.2
+        YSHOP后台管理系统-3.3
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">