修改：代码优化

Signed-off-by: skyselang <215817969@qq.com>

admin/static/css/chunk-2608ebd2.61a07266.css

@@ -1 +0,0 @@
-.login-container[data-v-1e89ce8b]{width:100%;min-height:100%;background-color:#2d3a4b;background-size:100% 100%;background-position:50%;overflow:hidden}.login-container .login-form[data-v-1e89ce8b]{position:relative;padding:160px 35px 0;margin:0 auto;width:520px;max-width:100%;overflow:hidden}.login-container .login-title[data-v-1e89ce8b]{position:relative}.login-container .login-title .login-title-name[data-v-1e89ce8b]{height:29px;margin:0 auto 22px auto;text-align:center;font-weight:700;font-size:26px;color:#eee}.login-container .login-logo[data-v-1e89ce8b]{margin-bottom:22px;text-align:center}.login-container .login-logo .login-logo-img[data-v-1e89ce8b]{height:130px}.login-container .login-captcha[data-v-1e89ce8b]{float:right;width:200px;height:36px;border-radius:4px}

admin/static/css/chunk-9f3c6b12.82815a52.css

@@ -1 +0,0 @@
-.yyl-top[data-v-885c02e4]{margin-top:2vh}.yyl-center[data-v-885c02e4]{text-align:center}.ya-top[data-v-5e0813ca]{margin-top:2vh}.ya-center[data-v-5e0813ca]{text-align:center}.apidoc-item[data-v-ecb8d96a]{color:#303133;font-size:14px;padding-right:30px}.el-icon-copy-document[data-v-ecb8d96a]{color:#1890ff}.ya-height-26[data-v-eab77bae]{height:26px}.ya-margin-left[data-v-eab77bae]{margin-left:10px}.ya-padding-left[data-v-eab77bae]{padding-left:10px}.ya-color-inherit[data-v-eab77bae]{color:inherit;padding:10px 20px 0 0}.ya-upload[data-v-eab77bae]{display:inline-block;margin-left:10px}.ya-file-card[data-v-eab77bae]{position:relative;overflow:hidden;background:#fff}.ya-file-name[data-v-eab77bae]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block;padding-right:0;font-size:14px}.ya-file-icon[data-v-eab77bae]{font-size:50px}.ya-file-img[data-v-eab77bae]{width:100%;height:100%}.ya-file-image[data-v-eab77bae]{max-width:100%;max-height:100%}.ya-file-ext[data-v-eab77bae]{position:absolute;width:100px;height:100px;top:-66px;right:-66px;-webkit-transform:rotate(45deg);transform:rotate(45deg);z-index:1000}.ya-file-ext span[data-v-eab77bae]{display:block;position:absolute;width:100px;bottom:0;text-align:center;font-size:14px;color:#fff;background:#c0c4cc}.image-logo[data-v-6227c102]{width:60px;height:100%}.image-favicon[data-v-6227c102]{width:32px;height:100%}.image-login-bg[data-v-6227c102]{width:150px;height:100%}.theme-message,.theme-picker-dropdown{z-index:99999!important}.theme-picker .el-color-picker__trigger{height:26px!important;width:26px!important;padding:2px}.theme-picker-dropdown .el-color-dropdown__link-btn{display:none}.el-card__body[data-v-6e8b41f2]{padding:20px 20px 0 20px}.login-container[data-v-1e89ce8b]{width:100%;min-height:100%;background-color:#2d3a4b;background-size:100% 100%;background-position:50%;overflow:hidden}.login-container .login-form[data-v-1e89ce8b]{position:relative;padding:160px 35px 0;margin:0 auto;width:520px;max-width:100%;overflow:hidden}.login-container .login-title[data-v-1e89ce8b]{position:relative}.login-container .login-title .login-title-name[data-v-1e89ce8b]{height:29px;margin:0 auto 22px auto;text-align:center;font-weight:700;font-size:26px;color:#eee}.login-container .login-logo[data-v-1e89ce8b]{margin-bottom:22px;text-align:center}.login-container .login-logo .login-logo-img[data-v-1e89ce8b]{height:130px}.login-container .login-captcha[data-v-1e89ce8b]{float:right;width:200px;height:36px;border-radius:4px}.custom-tree-node[data-v-bfea386c]{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:14px;padding-right:8px}.box-card[data-v-3b4fa64d]{text-align:center}.box-card .text[data-v-3b4fa64d]{font-size:20px;line-height:32px;font-weight:700;text-align:center}.ya-file[data-v-c557083c]{text-align:center;border:1px solid #dcdfe6}.ya-file-name[data-v-c557083c]{display:block;height:24px;line-height:24px;padding:0 4px;font-size:12px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ya-file-link[data-v-c557083c]{margin-right:6px}.ya-file[data-v-02baf99e]{text-align:center;border:1px solid #dcdfe6}.ya-file-name[data-v-02baf99e]{display:block;height:24px;line-height:24px;padding:0 4px;font-size:12px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ya-file-link[data-v-02baf99e]{margin-right:6px}.ya-margin-bottom[data-v-56f1529c]{margin-bottom:5px}.box-card[data-v-fc65f7a0]{text-align:center}.box-card .text[data-v-fc65f7a0]{font-size:20px;line-height:32px;font-weight:700;text-align:center}.box-card[data-v-e52a0838]{text-align:center}.box-card .text[data-v-e52a0838]{font-size:20px;line-height:32px;font-weight:700;text-align:center}

admin/static/js/chunk-2608ebd2.86bf6ab2.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2608ebd2"],{"35b0":function(t,e,a){"use strict";a.r(e);var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"login-container",style:{backgroundImage:"url("+t.login_bg_url+")"}},[a("el-form",{ref:"ref",staticClass:"login-form",attrs:{model:t.model,rules:t.rules,"label-position":"left"}},[a("div",{staticClass:"login-title"},[a("h3",{staticClass:"login-title-name"},[t._v(t._s(t.system_name))])]),a("div",{staticClass:"login-logo"},[t.logo_url?a("el-image",{staticClass:"login-logo-img",attrs:{src:t.logo_url,fit:"contain"}},[a("div",{staticClass:"image-slot",attrs:{slot:"error"},slot:"error"})]):a("div",{staticStyle:{height:"134px"}})],1),a("el-form-item",{attrs:{prop:"username"}},[a("el-input",{attrs:{type:"text",placeholder:"账号/手机/邮箱","prefix-icon":"el-icon-user",autocomplete:"on",clearable:""},model:{value:t.model.username,callback:function(e){t.$set(t.model,"username",e)},expression:"model.username"}})],1),a("el-form-item",{attrs:{prop:"password"}},[a("el-input",{attrs:{type:"password",placeholder:"请输入密码","prefix-icon":"el-icon-lock",autocomplete:"on",clearable:"","show-password":""},model:{value:t.model.password,callback:function(e){t.$set(t.model,"password",e)},expression:"model.password"}})],1),t.captcha_switch?a("el-form-item",{attrs:{prop:"captcha_code"}},[a("el-col",{attrs:{span:13}},[a("el-input",{attrs:{placeholder:"请输入验证码","prefix-icon":"el-icon-picture",autocomplete:"off",clearable:""},model:{value:t.model.captcha_code,callback:function(e){t.$set(t.model,"captcha_code",e)},expression:"model.captcha_code"}})],1),a("el-col",{attrs:{span:11}},[a("el-image",{staticClass:"login-captcha",attrs:{src:t.captcha_src,fit:"fill",alt:"验证码",title:"点击刷新验证码"},on:{click:t.captcha}})],1)],1):t._e(),a("el-button",{staticStyle:{width:"100%","margin-bottom":"30px"},attrs:{loading:t.loading,type:"primary"},nativeOn:{click:function(e){return e.preventDefault(),t.handleLogin.apply(null,arguments)}}},[t._v("登录")])],1)],1)},o=[],i=(a("5436"),a("697e"),a("5d63"),a("e208")),s=a("d369"),r={name:"AdminLogin",components:{},data:function(){return{name:"登录",system_name:"",loading:!1,redirect:void 0,otherQuery:{},captcha_switch:0,captcha_src:"",logo_url:"",login_bg_url:"",model:{username:"",password:"",captcha_id:"",captcha_code:""},rules:{username:[{required:!0,message:"请输入账号",trigger:"blur"}],password:[{required:!0,message:"请输入密码",trigger:"blur"}],captcha_code:[{required:!0,message:"请输入验证码",trigger:"blur"}]}}},watch:{$route:{handler:function(t){var e=t.query;e&&(this.redirect=e.redirect,this.otherQuery=this.getOtherQuery(e))},immediate:!0}},created:function(){this.setting()},mounted:function(){},destroyed:function(){},methods:{captcha:function(){var t=this;Object(i["a"])().then((function(e){t.captchaSet(e)}))},captchaSet:function(t){this.model.captcha_id="",this.model.captcha_code="",t.data.captcha_switch&&(this.captcha_src=t.data.captcha_src,this.model.captcha_id=t.data.captcha_id),this.captcha_switch=t.data.captcha_switch},setting:function(){var t=this;this.model.captcha_id="",this.model.captcha_code="",Object(i["d"])().then((function(e){t.captchaSet(e),t.login_bg_url=e.data.login_bg_url,t.system_name=e.data.system_name,t.logo_url=e.data.logo_url,t.$store.dispatch("settings/changeSetting",{key:"systemName",value:e.data.system_name}),t.$store.dispatch("settings/changeSetting",{key:"pageTitle",value:e.data.page_title}),t.$store.dispatch("settings/changeSetting",{key:"logoUrl",value:e.data.logo_url}),t.$store.dispatch("settings/changeSetting",{key:"faviconUrl",value:e.data.favicon_url})}))},handleLogin:function(){var t=this;this.$refs["ref"].validate((function(e){if(!e)return!1;t.loading=!0,t.$store.dispatch("user/login",t.model).then((function(){Object(s["a"])(),t.$router.push({path:t.redirect||"/",query:t.otherQuery}).catch((function(){t.loading=!1}))})).catch((function(){t.loading=!1}))}))},getOtherQuery:function(t){return Object.keys(t).reduce((function(e,a){return"redirect"!==a&&(e[a]=t[a]),e}),{})}}},l=r,n=(a("d29b"),a("0b56")),d=Object(n["a"])(l,c,o,!1,null,"1e89ce8b",null);e["default"]=d.exports},"7c59":function(t,e,a){},d29b:function(t,e,a){"use strict";a("7c59")}}]);

src/views/admin/components/UtilsStrtran.vue

@@ -23,7 +23,7 @@
             <el-button slot="append" icon="el-icon-document-copy" @click="copy(model.upper, $event)" />
           </el-input>
         </el-form-item>
-        <el-form-item label="反转" prop="rev">
+        <el-form-item label="翻转" prop="rev">
           <el-input v-model="model.rev">
             <el-button slot="append" icon="el-icon-document-copy" @click="copy(model.rev, $event)" />
           </el-input>

src/views/admin/database.vue

@@ -85,7 +85,7 @@
         </el-col>
         <!-- 数据库表信息 -->
         <el-col v-if="tableName">
-          <el-col :span="7">
+          <el-col :span="8">
             <el-descriptions :column="1" border>
               <el-descriptions-item label="表名">{{ tableInfo.Name }}</el-descriptions-item>
               <el-descriptions-item label="注释">{{ tableInfo.Comment }}</el-descriptions-item>
@@ -104,7 +104,7 @@
               <el-descriptions-item label="修改日期">{{ tableInfo.Update_time }}</el-descriptions-item>
             </el-descriptions>
           </el-col>
-          <el-col :span="17" class="dialog-body" :style="{height:height+50+'px'}">
+          <el-col :span="16" class="dialog-body" :style="{height:height+50+'px'}">
             <el-input v-model="tableDdl" type="textarea" :autosize="{ minRows: 25}" />
           </el-col>
         </el-col>
@@ -120,7 +120,7 @@
             <el-table-column prop="admin_user_id" label="用户ID" min-width="70" show-overflow-tooltip />
             <el-table-column prop="username" label="用户账号" min-width="100" show-overflow-tooltip />
             <el-table-column prop="create_time" label="备份时间" min-width="155" sortable="custom" />
-            <el-table-column label="操作" min-width="130" align="right" fixed="right">
+            <el-table-column label="操作" min-width="155" align="right" fixed="right">
               <template slot-scope="{ row }">
                 <el-button size="mini" type="text" @click="down(row)">下载</el-button>
                 <el-button size="mini" type="text" @click="restore(row)">还原</el-button>

src/views/cms/category.vue

@@ -271,24 +271,24 @@ export default {
       this.loading = true
       if (this.recycle) {
         recover(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.trees = res.data.tree
-          this.isExpandAll = false
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       } else {
         list(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.trees = res.data.tree
-          this.isExpandAll = false
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       }
     },
+    listData(data) {
+      this.data = data.list
+      this.trees = data.tree
+      this.isExpandAll = false
+      this.loading = false
+    },
     // 添加修改
     add(row) {
       this.dialog = true

src/views/cms/comment.vue

@@ -208,22 +208,23 @@ export default {
       this.loading = true
       if (this.recycle) {
         recover(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       } else {
         list(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       }
     },
+    listData(data) {
+      this.data = data.list
+      this.count = data.count
+      this.loading = false
+    },
     // 添加修改
     add() {
       this.dialog = true

src/views/cms/content.vue

@@ -389,24 +389,24 @@ export default {
       this.loading = true
       if (this.recycle) {
         recover(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.category(res.data.category)
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       } else {
         list(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.category(res.data.category)
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       }
     },
+    listData(data) {
+      this.data = data.list
+      this.count = data.count
+      this.category(data.category)
+      this.loading = false
+    },
     // 添加修改
     add() {
       this.dialog = true

src/views/file/group.vue

@@ -178,22 +178,23 @@ export default {
       this.loading = true
       if (this.recycle === 1) {
         recover(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       } else {
         list(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       }
     },
+    listData(data) {
+      this.data = data.list
+      this.count = data.count
+      this.loading = false
+    },
     // 添加修改
     add() {
       this.dialog = true

src/views/member/member-log.vue

@@ -185,7 +185,8 @@ export default {
       query: {
         page: 1,
         limit: 15,
-        search_field: 'username'
+        search_field: 'username',
+        date_field: 'create_time'
       },
       dialog: false,
       dialogTitle: '',

src/views/member/member.vue

@@ -364,34 +364,29 @@ export default {
       this.loading = true
       if (this.recycle) {
         recover(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          if (this.query.is_extra) {
-            this.reg_channels = res.data.reg_channels
-            this.reg_types = res.data.reg_types
-            this.regionData = res.data.region
-          }
-          this.query.is_extra = 0
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       } else {
         list(this.query).then(res => {
-          this.data = res.data.list
+          this.listData(res.data)
-          this.count = res.data.count
-          if (this.query.is_extra) {
-            this.reg_channels = res.data.reg_channels
-            this.reg_types = res.data.reg_types
-            this.regionData = res.data.region
-          }
-          this.query.is_extra = 0
-          this.loading = false
         }).catch(() => {
           this.loading = false
         })
       }
     },
+    listData(data) {
+      this.data = data.list
+      this.count = data.count
+      if (this.query.is_extra) {
+        this.reg_channels = data.reg_channels
+        this.reg_types = data.reg_types
+        this.regionData = data.region
+      }
+      this.query.is_extra = 0
+      this.loading = false
+    },
     // 添加修改
     add() {
       this.dialog = true

src/views/setting/region.vue

@@ -110,7 +110,7 @@
       <el-table-column :prop="idkey" label="ID" min-width="95" sortable="custom" />
       <el-table-column prop="region_pid" label="PID" min-width="95" />
       <el-table-column prop="region_sort" label="排序" min-width="80" sortable="custom" />
-      <el-table-column label="操作" width="130" fixed="right" align="right">
+      <el-table-column label="操作" width="130" align="right">
         <template slot-scope="{ row }">
           <el-button size="mini" type="text" title="添加下级" @click="add(row)">添加</el-button>
           <el-button size="mini" type="text" @click="edit(row)">修改</el-button>