@@ -165,11 +139,12 @@
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/SysCheckRuleList.vue b/ant-design-vue-jeecg/src/views/system/SysCheckRuleList.vue
index 783eb7d29735bbebbaa4032d27975ac4a5f5ae56..0308c91da2952cfabc53a8cdc4bf1aaa01b4f63b 100644
--- a/ant-design-vue-jeecg/src/views/system/SysCheckRuleList.vue
+++ b/ant-design-vue-jeecg/src/views/system/SysCheckRuleList.vue
@@ -3,18 +3,18 @@
diff --git a/ant-design-vue-jeecg/src/views/system/SysFillRuleList.vue b/ant-design-vue-jeecg/src/views/system/SysFillRuleList.vue
index 324eea093751097214847a8646b58d03cf707cf8..463344cefc630285cf907bbfcfa82ce785553f93 100644
--- a/ant-design-vue-jeecg/src/views/system/SysFillRuleList.vue
+++ b/ant-design-vue-jeecg/src/views/system/SysFillRuleList.vue
@@ -3,17 +3,17 @@
diff --git a/ant-design-vue-jeecg/src/views/system/UserList.vue b/ant-design-vue-jeecg/src/views/system/UserList.vue
index 1f3237fdc0bf0d7d93acf44e8f2469972cc3f09a..3cdf3833b3cf26d8b326847be8199b62d28f0f5a 100644
--- a/ant-design-vue-jeecg/src/views/system/UserList.vue
+++ b/ant-design-vue-jeecg/src/views/system/UserList.vue
@@ -65,11 +65,12 @@
-
添加用户
+
添加用户
导出
导入
+
回收站
@@ -120,9 +121,9 @@
- 编辑
+ 编辑
-
+
@@ -154,6 +155,11 @@
解冻
+
+
+ 代理人
+
+
@@ -167,6 +173,8 @@
+
+
@@ -179,14 +187,18 @@
import {putAction,getFileAccessHttpUrl} from '@/api/manage';
import {frozenBatch} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+ import SysUserAgentModal from "./modules/SysUserAgentModal";
import JInput from '@/components/jeecg/JInput'
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
+ import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
export default {
name: "UserList",
mixins: [JeecgListMixin],
components: {
+ JThirdAppButton,
+ SysUserAgentModal,
UserModal,
PasswordModal,
JInput,
@@ -366,9 +378,19 @@
handleChangePassword(username) {
this.$refs.passwordmodal.show(username);
},
+ handleAgentSettings(username){
+ this.$refs.sysUserAgentModal.agentSettings(username);
+ this.$refs.sysUserAgentModal.title = "用户代理人设置";
+ },
passwordModalOk() {
//TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
- }
+ },
+ onSyncFinally({isToLocal}) {
+ // 同步到本地时刷新下数据
+ if (isToLocal) {
+ this.loadData()
+ }
+ },
}
}
diff --git a/ant-design-vue-jeecg/src/views/system/modules/AddressListRight.vue b/ant-design-vue-jeecg/src/views/system/modules/AddressListRight.vue
index cad98ebaf2c513ec42ba086186e6ec2111359e89..a1f0f9ea02617dadc0019dcc6e6e3e95fe54a4db 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/AddressListRight.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/AddressListRight.vue
@@ -1,20 +1,20 @@
-
+
-
+
-
+
-
+
-
+
@@ -24,7 +24,7 @@
-
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/user/LoginPhone.vue b/ant-design-vue-jeecg/src/views/user/LoginPhone.vue
new file mode 100644
index 0000000000000000000000000000000000000000..67423594e144b418ac8a7531019da2f239173f3a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/user/LoginPhone.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/user/third/JeecgThirdLoginMixin.js b/ant-design-vue-jeecg/src/views/user/third/JeecgThirdLoginMixin.js
index 77445ace24ca2ac7d13a92cc129c452a901f1666..ff030ebbcc4d67c4128fa98e290287a370f49f8e 100644
--- a/ant-design-vue-jeecg/src/views/user/third/JeecgThirdLoginMixin.js
+++ b/ant-design-vue-jeecg/src/views/user/third/JeecgThirdLoginMixin.js
@@ -148,7 +148,7 @@ export const JeecgThirdLoginMixin = {
const hide = this.$message.loading('验证码发送中..', 0)
let smsParams = {}
smsParams.mobile = this.thirdPhone
- smsParams.smsmode = '1'
+ smsParams.smsmode = '0'
postAction('/sys/sms', smsParams).then(res => {
if (!res.success) {
setTimeout(hide, 0)
diff --git a/ant-design-vue-jeecg/yarn.lock b/ant-design-vue-jeecg/yarn.lock
index 7f3448b76db4a462b555aafbbf9a8ef7f342f300..38b203761cd4b26356a950e5cf31548fc54c88e4 100644
--- a/ant-design-vue-jeecg/yarn.lock
+++ b/ant-design-vue-jeecg/yarn.lock
@@ -888,10 +888,10 @@
cssnano-preset-default "^4.0.0"
postcss "^7.0.0"
-"@jeecg/antd-online-mini@2.4.3-RC":
- version "2.4.3-RC"
- resolved "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-2.4.3-RC.tgz#573f07254b63ffa7549df9dfc23cc8647734c275"
- integrity sha512-U/0W++7Og6SmqKqnDc0VFLDeEYmXCH4bMN+tUtAVLqwTxyln12cBSD7zD5zja1dWOxyrvt6pYC5cnGpH7CUVVQ==
+"@jeecg/antd-online-mini@2.4.5-RC":
+ version "2.4.5-RC"
+ resolved "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-2.4.5-RC.tgz#88740572f352a8baae694a83305f289b54e603c4"
+ integrity sha512-2Wxj7wr+j3YGU5W1NtOWGM/qv1bd28UVBAxMCIZ/vY12w8+qnaNK9IKri6oJmqYiB40UA9EUqsxE9iMlRfv3Ww==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
@@ -1659,9 +1659,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
color-convert "^2.0.1"
ant-design-vue@^1.7.2:
- version "1.7.4"
- resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.4.tgz#854e90985dc0fa9ccc6d681c104560c00eaaf855"
- integrity sha512-f9/4I34Yq562X70aspSFzw4BCuKRICzDvIocXpsYCC+B9+kjB8db246fpSMtV/1anqxcmGHf7Vh0XJ+ovHJKMw==
+ version "1.7.5"
+ resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.5.tgz#e7ed04cb358adc56be02c7453d2db026d2c405e3"
+ integrity sha512-QVrirCz6eetzui+Dv/ujMqUwIr8e/2H+pKr4VC3mpc+cHkw6L9cBRJK7DhfO7GTyK4EWKkEH3lfLWlD/XjUoQQ==
dependencies:
"@ant-design/icons" "^2.1.1"
"@ant-design/icons-vue" "^2.0.0"
@@ -2895,6 +2895,14 @@ cache-loader@^2.0.1:
normalize-path "^3.0.0"
schema-utils "^1.0.0"
+call-bind@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+ integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+ dependencies:
+ function-bind "^1.1.1"
+ get-intrinsic "^1.0.2"
+
call-me-maybe@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3660,6 +3668,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
+cron-parser@^2.10.0:
+ version "2.18.0"
+ resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+ integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
+ dependencies:
+ is-nan "^1.3.0"
+ moment-timezone "^0.5.31"
+
cross-env@^5.0.5:
version "5.2.1"
resolved "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d"
@@ -5678,6 +5694,15 @@ get-caller-file@^2.0.1:
resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+get-intrinsic@^1.0.2:
+ version "1.1.1"
+ resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+ integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+ dependencies:
+ function-bind "^1.1.1"
+ has "^1.0.3"
+ has-symbols "^1.0.1"
+
get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -6591,6 +6616,14 @@ is-mobile@^2.2.1:
resolved "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.2.tgz#f6c9c5d50ee01254ce05e739bdd835f1ed4e9954"
integrity sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==
+is-nan@^1.3.0:
+ version "1.3.2"
+ resolved "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+ integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+ dependencies:
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+
is-negative-zero@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
@@ -7637,6 +7670,18 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0, mkdirp@~0.5.1:
dependencies:
minimist "^1.2.5"
+moment-timezone@^0.5.31:
+ version "0.5.33"
+ resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
+ integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
+ dependencies:
+ moment ">= 2.9.0"
+
+"moment@>= 2.9.0":
+ version "2.29.1"
+ resolved "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+ integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
moment@^2.21.0:
version "2.27.0"
resolved "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"