更换logo，用户管理优化完成

Aaronzk · Nov 22, 2019 · d99fb71 · d99fb71
1 parent ea08543
commit d99fb71
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 371 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/api/job.js b/src/api/job.js
@@ -36,19 +36,4 @@ export function edit(data) {
   })
 }
 
-export function downloadJob(params) {
-  return request({
-    url: 'api/job/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
-export default {
-  add,
-  edit,
-  del,
-  getAllJob,
-  downloadJob
-}
+export default { add, edit, del }
diff --git a/src/api/user.js b/src/api/user.js
@@ -8,15 +8,6 @@ export function add(data) {
   })
 }
 
-export function downloadUser(params) {
-  return request({
-    url: 'api/users/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
 export function del(id) {
   return request({
     url: 'api/users/' + id,
@@ -51,3 +42,6 @@ export function updateEmail(code, data) {
     data
   })
 }
+
+export default { add, edit, del }
+
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
@@ -19,7 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 200px;
+$sideBarWidth: 205px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import Logo from '@/assets/images/logo.png'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -24,8 +25,8 @@ export default {
   },
   data() {
     return {
-      title: 'EL-ADMIN 后台管理',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+      title: 'ELADMIN-后台管理',
+      logo: Logo
     }
   }
 }
@@ -57,7 +58,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 6px;
     }
 
     & .sidebar-title {

diff --git a/src/mixins/crud.js b/src/mixins/crud.js
@@ -8,7 +8,7 @@ export default {
       // 表格数据
       data: [],
       // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
-      sort: ['id,desc', 'createTime,asc'],
+      sort: ['id,desc'],
       // 页码
       page: 0,
       // 每页数据条数

diff --git a/src/utils/validate.js b/src/utils/validate.js
@@ -64,6 +64,11 @@ export function validEmail(email) {
   return reg.test(email)
 }
 
+export function isvalidPhone(phone) {
+  const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+  return reg.test(phone)
+}
+
 /**
  * @param {string} str
  * @returns {Boolean}

diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
@@ -36,6 +36,7 @@
           </div>
         </el-card>
       </el-col>
+      <!-- 用户日志 -->
       <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="19">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -143,6 +144,7 @@ export default {
         duration: 2500
       })
     },
+    // 刷新日志
     refresh() {
       this.ico = 'el-icon-loading'
       this.init()

diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue