Merge branch 'master' into wx

# Conflicts:
#	src/components/wechat/index.vue
#	src/router/page/index.js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pigx-ui",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "private": true,
   "scripts": {
     "pre": "yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
@@ -18,7 +18,7 @@
     "net": "^1.0.2",
     "nprogress": "^0.2.0",
     "script-loader": "^0.7.2",
-    "sockjs-client": "^1.3.0",
+    "sockjs-client": "^1.0.0",
     "stompjs": "^2.3.3",
     "vue": "^2.5.16",
     "vue-axios": "^2.1.2",

src/api/admin/dept.js

@@ -17,14 +17,6 @@
 
 import request from '@/router/axios'
 
-export function fetchDeptTree (query) {
-  return request({
-    url: '/admin/dept/user-tree',
-    method: 'get',
-    params: query
-  })
-}
-
 export function fetchTree (query) {
   return request({
     url: '/admin/dept/tree',

src/const/crud/admin/user.js

@@ -14,7 +14,7 @@
  * this software without specific prior written permission.
  * Author: lengleng (wangiegie@gmail.com)
  */
-import { getDetails } from '@/api/admin/user'
+import {getDetails} from '@/api/admin/user'
 
 var validateUsername = (rule, value, callback) => {
   getDetails(value).then(response => {
@@ -57,13 +57,13 @@ export const tableOption = {
       required: true,
       message: '请输入用户名'
     },
-    {
-      min: 3,
-      max: 20,
-      message: '长度在 3 到 20 个字符',
-      trigger: 'blur'
-    },
-    { validator: validateUsername, trigger: 'blur' }
+      {
+        min: 3,
+        max: 20,
+        message: '长度在 3 到 20 个字符',
+        trigger: 'blur'
+      },
+      {validator: validateUsername, trigger: 'blur'}
     ]
   }, {
     label: '密码',
@@ -93,12 +93,12 @@ export const tableOption = {
   }, {
     label: '手机号',
     prop: 'phone',
-    type: 'phone',
+    type: 'tel',
     value: '',
     span: 24,
     rules: [{
-      min: 6,
-      max: 20,
+      min: 11,
+      max: 11,
       message: '长度在 11 个字符',
       trigger: 'blur'
     }]

src/page/index/top/top-setting.vue

@@ -7,7 +7,7 @@
          :class="{'setting__content--show':box}">
       <div class="setting__header">版权信息</div>
       <div class="setting__body setting__about">
-        <p>Version：PigX 2.6.0</p>
+        <p>Version：PigX 2.7.0</p>
         <p>Copyright: Pig4Cloud ©2018-2025</p>
       </div>
       <div class="setting__header">设置

src/page/login/index.vue

@@ -11,7 +11,7 @@
              src="/img/logo.png"
              alt="">
         <p class="title">{{website.infoTitle}}</p>
-        <p>v 2.6.0</p>
+        <p>v 2.7.0</p>
       </div>
       <div class="login-border">
         <div class="login-main">

src/page/wel.vue

@@ -7,14 +7,14 @@
             <img src="https://img.shields.io/badge/Avue-原子弹-green.svg" alt="Build Status">
           </a>
           <img src="https://img.shields.io/badge/Spring%20Boot-2.1.3.RELEASE-yellowgreen.svg" alt="Downloads">
-          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.RELEASE-blue.svg" alt="Coverage Status">
+          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR1-blue.svg" alt="Coverage Status">
         </span>
         <br/>
         <span>
           <el-collapse v-model="activeNames">
             <el-collapse-item title="完整的微服务架构" name="1">
               <div>基于Spring Cloud Gateway</div>
-              <div>基于Spring Cloud Greenwich.RELEASE</div>
+              <div>基于Spring Cloud Greenwich.SR1</div>
               <div>基于Spring Boot 2.1.3.RELEASE</div>
             </el-collapse-item>
             <el-collapse-item title="完善的权限控制" name="2">

src/styles/common.scss

@@ -18,8 +18,6 @@
 @import './media.scss';
 //通用配置
 @import './normalize.scss';
-//微信编辑器
-@import './wechat/index.scss';
 
 a{
   text-decoration: none;

src/styles/wechat/index.scss

@@ -1,5 +0,0 @@
-
-@import "./wechat/css/base.css";
-@import "./wechat/css/index.css";
-@import "./wechat/css/lib.css";
-@import "./wechat/css/media_dialog&emotion_editor&msg_tab&emoji&msg_sender&tooltip.css";

src/views/admin/role/index.vue

@@ -72,7 +72,6 @@
           <el-button size="mini"
                      type="text"
                      icon="el-icon-plus"
-                     plain
                      @click="handlePermission(scope.row,scope.index)"
                      v-if="roleManager_btn_perm">权限
           </el-button>

src/views/admin/user/index.vue

@@ -115,7 +115,7 @@
 <script>
   import {addObj, delObj, fetchList, getObj, putObj} from "@/api/admin/user";
   import {deptRoleList} from "@/api/admin/role";
-  import {fetchDeptTree,fetchTree} from "@/api/admin/dept";
+  import {fetchTree} from "@/api/admin/dept";
   import {tableOption} from '@/const/crud/admin/user';
   import {mapGetters} from "vuex";
   import {constants} from 'fs';
@@ -175,7 +175,7 @@
     },
     methods: {
       init() {
-        fetchDeptTree().then(response => {
+        fetchTree().then(response => {
           this.treeData = response.data.data;
         });
       },