diff --git a/package.json b/package.json index 50d6b92d3a99315c333ee9416b8c38f74568f6c0..3900791f62d06251f63ff3c9fb6c11b2344a0886 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "better-scroll": "^2.4.2", "core-js": "^3.6.5", "echarts": "^5.3.0", + "element-ui": "^2.4.6", "express": "^4.17.1", "mathjs": "^9.4.4", "sm-crypto": "^0.3.7", @@ -28,27 +29,26 @@ "vant": "^2.12.29", "vconsole": "^3.12.0", "vue": "^2.6.11", - "vue-awesome-swiper": "^4.1.1", + "vue-awesome-swiper": "^5.0.1", "vue-axios": "^3.2.5", - "vue-baidu-map": "^0.21.22", + "vue-baidu-map": "^0.18.7", "vue-class-component": "^7.2.3", "vue-esign": "^1.0.5", "vue-jsonp": "^2.0.0", "vue-property-decorator": "^9.1.2", "vue-qr": "^3.2.4", "vue-router": "^3.2.0", - "vuex": "^3.5.1", - "element-ui": "^2.4.6" + "vuex": "^3.5.1" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-typescript": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.3.0", - "@vue/cli-service": "~4.5.0", + "@vue/cli-plugin-babel": "^5.0.8", + "@vue/cli-plugin-eslint": "^5.0.8", + "@vue/cli-plugin-router": "^5.0.8", + "@vue/cli-plugin-typescript": "^5.0.8", + "@vue/cli-plugin-vuex": "^5.0.8", + "@vue/cli-service": "^5.0.8", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "babel-plugin-import": "^1.13.3", diff --git a/src/constants/api/login/login-mgt.api.ts b/src/constants/api/login/login-mgt.api.ts index 395f34e273810466f91b190465253e2c026c0c68..d8a549f5dfd9f3d8ea355a0d1bc2cc933a4f49c1 100644 --- a/src/constants/api/login/login-mgt.api.ts +++ b/src/constants/api/login/login-mgt.api.ts @@ -8,8 +8,8 @@ */ import { MethodType } from "@/constants/enum/general/method-type.enum"; import { HeaderType } from "@/constants/enum/general/header-type.enum"; - -const prefix = "http://10.0.0.118:9130/ms-system/api/v1/sysCustInfo/permit_endpoint" +// http://10.0.1.9:9130 +const prefix = "http://localhost:9135//ms-system/api/v1/sysCustInfo/permit_endpoint" const loginApi = { updatePicCode: { diff --git a/src/public/ts/SMEncryt.ts b/src/public/ts/SMEncryt.ts index 3eb0e521cdf837157c951085d6735c40215b3e05..cff30a11a6b76c91101090020dae3ddf7bb55244 100644 --- a/src/public/ts/SMEncryt.ts +++ b/src/public/ts/SMEncryt.ts @@ -11,7 +11,6 @@ export default { * @return {Object} jsonstr 返回加密后的json数据 */ encryptData(jsonstr: any) { - debugger let encryData = {}; try { // SM2 加密秘钥 @@ -57,11 +56,10 @@ export default { jsonData = JSON.parse(jsonData); } try { - debugger let sm2 = require('sm-crypto').sm2, sm3 = require('sm-crypto').sm3, sm4 = require('sm-crypto').sm4, - privateKey = '0494FEF4897CF4E9C9CB994B66B29E9B3EAF2C5C59EBEDB703B0F980199CEA7BDBF177AB3E65A17F3E96227977C55423929975CE535B715AC21E0AB23B9858AB4F', //SM2公钥 + privateKey = '7666A8CA12A27CF6C440A1CFECB4B1BB7055F2FB3435E957EB35142FAB881EFB', //SM2公钥 sm4Key = '', orSm4Key = jsonData.sm4key; orSm4Key = orSm4Key.substr(2, orSm4Key.length - 2); diff --git a/src/services/api.service.ts b/src/services/api.service.ts index 266e155de2b8ff2bc6c73a1e96e846b565a2afcf..501668f9283a5c0c9b2917696817ec71c09201a0 100644 --- a/src/services/api.service.ts +++ b/src/services/api.service.ts @@ -32,7 +32,8 @@ class ApiService { Vue.axios.interceptors.request.use( config => { config.headers['Access-Control-Allow-Origin'] = '*'; - config.headers['MCEP'] = 'MCEP'; + //开启 + // config.headers['MCEP'] = 'MCEP'; if(!config.headers['Content-Type']){ config.headers['Content-Type'] = 'application/json; charset=utf-8'; } @@ -175,7 +176,12 @@ class ApiService { path = query != null ? this.urlQueryConvert(path, query) : path; console.log("服务调用--" + path); - return Vue.axios.post(`${path}`, params, requestConfig).then(this.createBusCodeHandler(query)).catch(this.createErrorHandler()) + return Vue.axios.post(`${path}`, params, requestConfig).then(res=>{ + //TODO + console.log(res); + + return res.data + }); } /** * POST请求 文件上传 diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue index 815a533926b0c1ab7deeb1560124f735144e8ff5..4375e69d68c485864b113164d9feea111734505a 100644 --- a/src/views/authentication/LoginView.vue +++ b/src/views/authentication/LoginView.vue @@ -105,7 +105,6 @@ export default class LoginView extends Vue { //获取图形验证码 _updatePicCode() { //请求图形验证码 - debugger apiService.general(loginApi.updatePicCode, undefined, undefined, undefined).then((response: RestfulResponse) => { //console.log(response); @@ -153,7 +152,7 @@ export default class LoginView extends Vue { //图形验证码 imageVerifyKey: this.imageSrcValue, //渠道 - loginType: "3", + loginType: "2", //手机验证码 messCode: this.sms, //密码 diff --git a/src/views/login/ForgetPassView.vue b/src/views/login/ForgetPassView.vue index 70db62b2a6666b5bd56ef60ab0d837ec81969a27..c3c4837e301e895d5cf63a6169b0ade1e4cd64ab 100644 --- a/src/views/login/ForgetPassView.vue +++ b/src/views/login/ForgetPassView.vue @@ -13,46 +13,99 @@
- + -

密码重置

+

+ 密码重置 +

- 请使用注册手机号进行密码重置 + 请使用注册手机号进行密码重置
手机号码 - +
新密码 - + + +
-
+
新密码 - + + +
短信验证码
- - + - + - 获取短信验证码 + 获取短信验证码 - -
-
- 登录 +
+ 登录
@@ -60,34 +113,39 @@ @@ -147,8 +205,6 @@ getPhonePost(){ font-kerning: normal; } - - .van-col--15 { margin-top: 2%; } @@ -157,10 +213,10 @@ getPhonePost(){ margin-left: 6%; } -.forget {} +.forget { +} .sopan { - margin-top: 5px; margin-left: 6%; } diff --git a/src/views/login/Register.vue b/src/views/login/Register.vue index a1de9f3692af8ccc2c0ea7472db12fad917bee90..f77b828b348235daae20cae8ae1579efb65f5188 100644 --- a/src/views/login/Register.vue +++ b/src/views/login/Register.vue @@ -24,37 +24,46 @@
手机号码 - - 身份证号 + +
+ +
+ 身份证号 - + +
- 短信验证码 -
+ +
短信验证码 - {{getCmstotal}} + {{getCmstotal}} + + +
设置密码 +
确认密码 +
-
+
注册
@@ -168,6 +177,7 @@ getPhonePost(){ .logindiv { line-height: 20px; + margin-bottom: 10px; } .van-button {