From 7727f8746e80b6e3e6abf7df5f90fd48f1ebc3dd Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Sun, 07 Apr 2024 15:12:11 +0800
Subject: [PATCH] new
---
.env.development | 4 +-
src/main.js | 8 +++
yarn.lock | 37 ++++++++++++++++--
src/views/userlist/components/audituserdialog.vue | 54 +++++++++++++++------------
package.json | 2
5 files changed, 73 insertions(+), 32 deletions(-)
diff --git a/.env.development b/.env.development
index 4cfee17..a7c2748 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
NODE_ENV=development
VUE_APP_PREVIEW=true
# VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
- VUE_APP_API_BASE_URL=https://api.3falcon.com/
-# VUE_APP_API_BASE_URL=http://192.168.0.106:8091/
+# VUE_APP_API_BASE_URL=https://api.3falcon.com/
+ VUE_APP_API_BASE_URL=http://192.168.0.106:8091/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=http://www.ojwuf.com:8091/
# VUE_APP_API_BASE_URL=https://192.168.0.102:8091/
diff --git a/package.json b/package.json
index 53f3e1d..75a9359 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,10 @@
"dependencies": {
"@ant-design-vue/pro-layout": "^1.0.12",
"@antv/data-set": "^0.10.2",
- "ant-design-vue": "^1.7.8",
"axios": "^0.26.1",
"babel-loader": "8",
"core-js": "^3.21.1",
+ "element-ui": "^2.15.14",
"enquire.js": "^2.1.6",
"js-file-download": "^0.4.12",
"lodash.clonedeep": "^4.5.0",
diff --git a/src/main.js b/src/main.js
index a6dd56f..9d2c9b4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,9 @@
import themePluginConfig from '../config/themePluginConfig'
// mock
// WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
+// import Antd from 'ant-design-vue'
+// import 'ant-design-vue/dist/reset.css'
import bootstrap from './core/bootstrap'
import './core/lazy_use' // use lazy load components
import './permission' // permission control
@@ -21,10 +23,14 @@
// window['console']['log'] = function () {} // global style
Vue.config.productionTip = false
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+Vue.use(ElementUI)
Vue.prototype.$host = process.env.VUE_APP_API_BASE_URL
// mount axios to `Vue.$http` and `this.$http`
Vue.use(VueAxios)
+// Vue.use(Antd)
// use pro-layout components
Vue.component('pro-layout', ProLayout)
Vue.component('page-container', PageHeaderWrapper)
@@ -38,5 +44,5 @@
i18n,
// init localstorage, vuex, Logo message
created: bootstrap,
- render: (h) => h(App)
+ render: (h) => h(App),
}).$mount('#app')
diff --git a/src/views/userlist/components/audituserdialog.vue b/src/views/userlist/components/audituserdialog.vue
index e20506f..5265fe9 100644
--- a/src/views/userlist/components/audituserdialog.vue
+++ b/src/views/userlist/components/audituserdialog.vue
@@ -15,18 +15,18 @@
currentDetails.isActive == 0 || currentDetails.isActive == 1
? 'blue'
: currentDetails.isActive == 2
- ? 'green'
- : 'red'
+ ? 'green'
+ : 'red'
"
>
{{
currentDetails.isActive == 0
? '待认证'
: currentDetails.isActive == 1
- ? '待审核'
- : currentDetails.isActive == 2
- ? '认证成功'
- : '驳回'
+ ? '待审核'
+ : currentDetails.isActive == 2
+ ? '认证成功'
+ : '驳回'
}}
</a-tag>
</a-descriptions-item>
@@ -36,9 +36,9 @@
<a-descriptions-item label="身份证号码">
{{ currentDetails.idCard ? currentDetails.idCard : '--' }}
</a-descriptions-item>
- <a-descriptions-item label="身份证号码1">
+ <!-- <a-descriptions-item label="身份证号码1">
{{ currentDetails.vaildNumber ? currentDetails.vaildNumber : '--' }}
- </a-descriptions-item>
+ </a-descriptions-item> -->
<a-descriptions-item label="注册ip">
{{ currentDetails.regIp ? currentDetails.regIp : '--' }}
</a-descriptions-item>
@@ -48,14 +48,18 @@
<a-descriptions-item label="注册时间">
{{ currentDetails.regTime | moment }}
</a-descriptions-item>
- <!-- <a-descriptions-item label="身份证正面">
- <img :src="currentDetails.img2Key" alt="" style="width:140px;height: 70px;">
+ <a-descriptions-item label="身份证正面1">
+ <el-image style="width: 140px; height: 70px" :src="currentDetails.img1Key" :preview-src-list="srcList1">
+ </el-image>
+ <!-- style="width: 140px; height: 70px" -->
+ <!-- <img alt="" style="width: 140px; height: 70px" /> -->
</a-descriptions-item>
<a-descriptions-item label="身份证背面">
- <img :src="currentDetails.img1Key" alt="" style="width:140px;height: 70px;">
+ <el-image style="width: 140px; height: 70px" :src="currentDetails.img2Key" :preview-src-list="srcList2">
+ </el-image>
</a-descriptions-item>
- <a-descriptions-item label="手持身份证">
- <img :src="currentDetails.img3Key" alt="" style="width:140px;height: 70px;">
+ <!-- <a-descriptions-item label="手持身份证">
+ <img :src="currentDetails.img3Key" alt="" style="width: 140px; height: 70px" />
</a-descriptions-item> -->
</a-descriptions>
<div style="margin-top: 20px; display: flex; justify-content: center">
@@ -96,23 +100,25 @@
components: {},
props: {
currentDetails: {
- type: Object
+ type: Object,
},
getinit: {
type: Function,
- default: function () {}
- }
+ default: function () {},
+ },
},
- data () {
+ data() {
return {
userDialog: false,
bohuidialog: false,
bohuidialogloading: false,
- bohuiform: this.$form.createForm(this)
+ bohuiform: this.$form.createForm(this),
+ srcList1: [this.currentDetails.img1Key],
+ srcList2: [this.currentDetails.img2Key],
}
},
methods: {
- Okbohuidialog () {
+ Okbohuidialog() {
const form = this.$refs.bohuiform.form
form.validateFields((errors, values) => {
if (!errors) {
@@ -133,15 +139,15 @@
}
})
},
- Cancelbohuidialog () {
+ Cancelbohuidialog() {
this.bohuidialog = false
const form = this.$refs.bohuiform.form
form.resetFields()
},
- gettongguo (val) {
+ gettongguo(val) {
var data = {
userId: this.currentDetails.id,
- state: val
+ state: val,
}
userauthByAdmin(data).then((res) => {
if (res.status == 0) {
@@ -152,7 +158,7 @@
}
this.userDialog = false
})
- }
- }
+ },
+ },
}
</script>
diff --git a/yarn.lock b/yarn.lock
index b4a2969..f355532 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2776,7 +2776,7 @@
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-ant-design-vue@^1.6.2, ant-design-vue@^1.7.8:
+ant-design-vue@^1.6.2:
version "1.7.8"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661"
integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==
@@ -2914,6 +2914,13 @@
resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.5.2.tgz#68e866a96824e8b2694ff7a831c1a25c44d5e500"
integrity sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==
+async-validator@~1.8.1:
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.8.5.tgz#dc3e08ec1fd0dddb67e60842f02c0cd1cec6d7f0"
+ integrity sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==
+ dependencies:
+ babel-runtime "6.x"
+
async@^2.6.4:
version "2.6.4"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -2962,7 +2969,7 @@
eslint-visitor-keys "^1.0.0"
resolve "^1.12.0"
-babel-helper-vue-jsx-merge-props@^2.0.3:
+babel-helper-vue-jsx-merge-props@^2.0.0, babel-helper-vue-jsx-merge-props@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
@@ -4306,7 +4313,7 @@
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-deepmerge@^1.5.2:
+deepmerge@^1.2.0, deepmerge@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
@@ -4613,6 +4620,18 @@
integrity sha512-QzMTvOM+hSXzPGxO4XeHq8OJAJZ/0kZQRbIBVGlR4GRVWHdfv/I/udYzIcQCZtzN1LdwkrGsNPWTIDbC8Tj7PA==
dependencies:
batch-processor "^1.0.0"
+
+element-ui@^2.15.14:
+ version "2.15.14"
+ resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.14.tgz#3c34df79467636592812d720d2e6784e7a6ec2ea"
+ integrity sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==
+ dependencies:
+ async-validator "~1.8.1"
+ babel-helper-vue-jsx-merge-props "^2.0.0"
+ deepmerge "^1.2.0"
+ normalize-wheel "^1.0.1"
+ resize-observer-polyfill "^1.5.0"
+ throttle-debounce "^1.0.1"
emittery@^0.10.2:
version "0.10.2"
@@ -7795,6 +7814,11 @@
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+normalize-wheel@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45"
+ integrity sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==
+
npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -8877,7 +8901,7 @@
dependencies:
element-resize-detector "1.1.13"
-resize-observer-polyfill@^1.5.1:
+resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
@@ -9916,6 +9940,11 @@
resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
+throttle-debounce@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
+ integrity sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==
+
through2@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
--
Gitblit v1.9.3