diff --git a/test_client/package-lock.json b/test_client/package-lock.json index d8ada6d..e5f68c7 100644 --- a/test_client/package-lock.json +++ b/test_client/package-lock.json @@ -3451,8 +3451,8 @@ }, "china-area-data": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/china-area-data/-/china-area-data-5.0.1.tgz", - "integrity": "sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw==" + "resolved": "https://registry.npm.taobao.org/china-area-data/download/china-area-data-5.0.1.tgz", + "integrity": "sha1-eUO4OgYZ8DO7WJPagMtG5S5EvmY=" }, "chokidar": { "version": "2.1.8", @@ -5035,8 +5035,8 @@ }, "element-china-area-data": { "version": "5.0.2", - "resolved": "https://registry.npmjs.org/element-china-area-data/-/element-china-area-data-5.0.2.tgz", - "integrity": "sha512-vLQuvOKJy/uiX7MRHEk3x/j09hipuIl6DJ/C4XFUG7D7Pj3O47sy+Y6aAArM6k9v8cD9UX6e+yz2S4J+IPnZ8g==", + "resolved": "https://registry.npm.taobao.org/element-china-area-data/download/element-china-area-data-5.0.2.tgz", + "integrity": "sha1-AGwmWUuIZcthmZQGPHMlYuRYPTA=", "requires": { "china-area-data": "^5.0.1", "lodash-es": "^4.17.15" @@ -9900,8 +9900,8 @@ }, "lodash-es": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + "resolved": "https://registry.npm.taobao.org/lodash-es/download/lodash-es-4.17.21.tgz?cache=0&sync_timestamp=1613836280924&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash-es%2Fdownload%2Flodash-es-4.17.21.tgz", + "integrity": "sha1-Q+YmxG5lkbd1C+srUBFzkMYJ4+4=" }, "lodash.defaultsdeep": { "version": "4.6.1", diff --git a/test_client/src/assets/background.jpg b/test_client/src/assets/background.jpg new file mode 100644 index 0000000..8a89eb8 Binary files /dev/null and b/test_client/src/assets/background.jpg differ diff --git a/test_client/src/assets/logo.png b/test_client/src/assets/logo.png new file mode 100644 index 0000000..dcdebbf Binary files /dev/null and b/test_client/src/assets/logo.png differ diff --git a/test_client/src/layout/components/Navbar.vue b/test_client/src/layout/components/Navbar.vue index a277ecb..d9379ab 100644 --- a/test_client/src/layout/components/Navbar.vue +++ b/test_client/src/layout/components/Navbar.vue @@ -5,6 +5,9 @@
+
+ {{name}} +
@@ -49,7 +52,8 @@ export default { computed: { ...mapGetters([ 'sidebar', - 'avatar' + 'avatar', + 'name' ]) }, methods: { diff --git a/test_client/src/layout/components/Sidebar/Logo.vue b/test_client/src/layout/components/Sidebar/Logo.vue index f6dc3b6..603b02a 100644 --- a/test_client/src/layout/components/Sidebar/Logo.vue +++ b/test_client/src/layout/components/Sidebar/Logo.vue @@ -2,11 +2,11 @@
- -

{{ title }}

+ +

{{ title }}

- +

{{ title }}

diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js index 50add36..af2b724 100644 --- a/test_client/src/router/index.js +++ b/test_client/src/router/index.js @@ -120,7 +120,7 @@ export const asyncRoutes = [ path: 'claim', name: 'Claim', component: () => import('@/views/crm/claim.vue'), - meta: { title: '认领学员', icon: '', perms: ['consumer_view'] } + meta: { title: '认领学员', icon: '', perms: ['consumer_claim'] } }, { path: 'candidate', diff --git a/test_client/src/settings.js b/test_client/src/settings.js index 62625c2..a976dad 100644 --- a/test_client/src/settings.js +++ b/test_client/src/settings.js @@ -6,11 +6,11 @@ module.exports = { * @type {boolean} true | false * @description Whether fix the header */ - fixedHeader: false, + fixedHeader: true, /** * @type {boolean} true | false * @description Whether show the logo in sidebar */ - sidebarLogo: false + sidebarLogo: true } diff --git a/test_client/src/views/crm/claim.vue b/test_client/src/views/crm/claim.vue index 437411d..e287927 100644 --- a/test_client/src/views/crm/claim.vue +++ b/test_client/src/views/crm/claim.vue @@ -69,7 +69,7 @@ type="primary" size="small" @click="handleClaim(scope)" - :disabled="!checkPermission(['consumer_claim'])" + v-if="checkPermission(['consumer_claim'])" >认领 diff --git a/test_client/src/views/crm/company.vue b/test_client/src/views/crm/company.vue index 7925ef3..ba050f2 100644 --- a/test_client/src/views/crm/company.vue +++ b/test_client/src/views/crm/company.vue @@ -62,7 +62,7 @@ {{ scope.row.create_time }} - + @@ -75,14 +75,14 @@ size="small" @click="handleEdit(scope)" icon="el-icon-edit" - :disabled="!checkPermission(['company_update'])" + v-if="checkPermission(['company_update'])" >
- +
单位
@@ -122,7 +122,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新 + >重置
@@ -239,23 +239,20 @@ size="small" @click="handleEdit(scope)" icon="el-icon-edit" - :disabled="!checkPermission(['consumer_update'])" - v-if="!scope.row.is_superconsumer" + v-if="checkPermission(['consumer_update'])" > 解微 @@ -299,25 +296,6 @@ - diff --git a/test_client/src/views/login/index.vue b/test_client/src/views/login/index.vue index 7901c51..31919a0 100644 --- a/test_client/src/views/login/index.vue +++ b/test_client/src/views/login/index.vue @@ -1,11 +1,19 @@ @@ -56,7 +71,7 @@ // import { validUsername } from '@/utils/validate' export default { - name: 'Login', + name: "Login", data() { // const validateUsername = (rule, value, callback) => { // if (!validUsername(value)) { @@ -67,78 +82,82 @@ export default { // } const validatePassword = (rule, value, callback) => { if (value.length < 4) { - callback(new Error('密码长度小于4位!')) + callback(new Error("密码长度小于4位!")); } else { - callback() + callback(); } - } + }; return { loginForm: { - username: '', - password: '' + username: "", + password: "", }, loginRules: { - username: [{ required: true, trigger: 'blur', message: "请输入账户" }], - password: [{ required: true, trigger: 'blur', validator: validatePassword, message: "请输入密码" }] + username: [{ required: true, trigger: "blur", message: "请输入账户" }], + password: [ + { + required: true, + trigger: "blur", + validator: validatePassword, + message: "请输入密码", + }, + ], }, loading: false, - passwordType: 'password', - redirect: undefined - } + passwordType: "password", + redirect: undefined, + }; }, watch: { $route: { - handler: function(route) { - this.redirect = route.query && route.query.redirect + handler: function (route) { + this.redirect = route.query && route.query.redirect; }, - immediate: true - } + immediate: true, + }, }, methods: { showPwd() { - if (this.passwordType === 'password') { - this.passwordType = '' + if (this.passwordType === "password") { + this.passwordType = ""; } else { - this.passwordType = 'password' + this.passwordType = "password"; } this.$nextTick(() => { - this.$refs.password.focus() - }) + this.$refs.password.focus(); + }); }, handleLogin() { - this.$refs.loginForm.validate(valid => { + this.$refs.loginForm.validate((valid) => { if (valid) { - this.loading = true - this.$store.dispatch('user/login', this.loginForm).then(() => { - this.$router.push({ path: this.redirect || '/crm/consumer' }) - this.loading = false - }).catch(() => { - this.loading = false - }) + this.loading = true; + this.$store + .dispatch("user/login", this.loginForm) + .then(() => { + this.$router.push({ path: this.redirect || "/crm/consumer" }); + this.loading = false; + }) + .catch(() => { + this.loading = false; + }); } else { - console.log('error submit!!') - return false + console.log("error submit!!"); + return false; } - }) - } - } -} + }); + }, + }, +};