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/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html index 8426cf3252a197648f6861ea711912e77add9944..d9a27e8ef7e21b1384e1a967606e213ac8c23d78 100644 --- a/src/assets/iconfont/demo_index.html +++ b/src/assets/iconfont/demo_index.html @@ -3,8 +3,8 @@ iconfont Demo - - + + @@ -960,9 +960,9 @@ 
@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1658900592121') format('woff2'),
-       url('iconfont.woff?t=1658900592121') format('woff'),
-       url('iconfont.ttf?t=1658900592121') format('truetype');
+  src: url('iconfont.woff2?t=1660790093357') format('woff2'),
+       url('iconfont.woff?t=1660790093357') format('woff'),
+       url('iconfont.ttf?t=1660790093357') format('truetype');
 }

第二步：定义使用 iconfont 的样式

diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 6957f7702367db938088c885beefcd26696ccb01..0a7b09b165dbb08a62afea5a2511e6e3ab8bac13 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3289090 */ - src: url('iconfont.woff2?t=1658900592121') format('woff2'), - url('iconfont.woff?t=1658900592121') format('woff'), - url('iconfont.ttf?t=1658900592121') format('truetype'); + src: url('iconfont.woff2?t=1660790093357') format('woff2'), + url('iconfont.woff?t=1660790093357') format('woff'), + url('iconfont.ttf?t=1660790093357') format('truetype'); } .iconfont { diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index e104405f2ecb2a7ec7b2904f13a8c759d3338c71..9c76d1991d3894ee8e76fb3b6f9b0582b38b0360 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 15a8d4e8cac57092ad69f7632093e0f300802e99..41da6c71a7a60bbc5e458cd147d2f029ec882478 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 8bb16df81ee11210bd8cb47a85b2d66f1dac6924..2947ed7b0b81d7a2eb5e8db1e227a0772550b587 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/components/common/CardPottom.vue b/src/components/common/CardPottom.vue index 97539efaa54032cf3b04cc2e980cbb44988af788..fcb71ad40839b484d0d970288b4d2d5294f409d1 100644 --- a/src/components/common/CardPottom.vue +++ b/src/components/common/CardPottom.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-07 16:13:13 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-12 10:47:05 + * @LastEditTime: 2022-08-18 11:07:05 * @FilePath: \mcep-h5\src\components\common\Bottom.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -18,16 +18,22 @@ 100,000,00 壹佰元整 + - 2456 - 12 - 10 + 已使用贷款金额（元） + 6，0000壹佰元整 - + diff --git a/src/components/common/Person.vue b/src/components/common/Person.vue index 3bd4b97c73ab63c3cbb45d75ab03e67c883fdd0e..b6f502b457855281a95deb7bf2c0e209c5b831a2 100644 --- a/src/components/common/Person.vue +++ b/src/components/common/Person.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-25 18:31:14 + * @LastEditTime: 2022-08-18 11:00:05 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -94,9 +94,9 @@ export default class Person extends Vue { //星星的点击事件 pushStarts(){ - this.$router.push({ - name:"level" - }) + // this.$router.push({ + // name:"level" + // }) } layoutDiss(){ this.$router.push({ diff --git a/src/components/common/Picket.vue b/src/components/common/Picket.vue index 6f8a3695e61ab8d4d4066f6e1a58a9173be8b370..2f6417c7f41ba697b14ff3b77918a9c952826938 100644 --- a/src/components/common/Picket.vue +++ b/src/components/common/Picket.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-12 15:54:23 + * @LastEditTime: 2022-08-18 13:55:42 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -89,9 +89,10 @@ export default class Picket extends Vue { -moz-font-feature-settings: "kern"; -moz-font-feature-settings: "kern=1"; font-kerning: normal; - width: 50%; + // width: 50%; border-radius: 4px; - text-align: center; + padding-left:1%; + // text-align: center; } .limitrange{ // margin-left: 3%; diff --git a/src/components/common/PicketAcced.vue b/src/components/common/PicketAcced.vue index 6170b6d243b0b9a58849a69b65f775c32cb7fadb..c7a7d9b06e246eb26deb5141163bc726b3370ede 100644 --- a/src/components/common/PicketAcced.vue +++ b/src/components/common/PicketAcced.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-25 14:28:53 + * @LastEditTime: 2022-08-18 14:13:40 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -10,9 +10,10 @@
-
+
+ {{ item.productname }} @@ -40,15 +41,15 @@
- + 还款计划 - {{ money }} + {{ money }} {{ moneyName }} @@ -27,18 +27,23 @@
+ - 内容 - 内容 - 内容 + 农村信用社向符合条件的客户发放的用于满足个人消费、生产经营流动资金等需求的一项贷款业务。 + 一次核定，三年有效，随用随贷，循环使用。 + 货款对象 + 最长不超过3年。 + 以借款人自有或第三人提供有权处置的有效资产抵押担保。 + +
@@ -55,7 +60,7 @@ export default class ProductCard extends Vue { @Prop({ default: "" }) money: string | undefined; //额度 @Prop({ default: "" }) moneyName: string | undefined;//额度大写 //立即登录 - activeNames = ["1"]; + activeNames = [""]; lodiing() { this.$router.push({ path: "/Recognition", diff --git a/src/components/common/Tool.vue b/src/components/common/Tool.vue index 8176dfbf0e814ac15702518533ed760c25419e27..ee3b976c73e5069226a7d6237f31f6d913e7b9a2 100644 --- a/src/components/common/Tool.vue +++ b/src/components/common/Tool.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-26 15:20:42 + * @LastEditTime: 2022-08-18 11:09:51 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -34,7 +34,7 @@ - 存款利息试算 + 利息试算 理财产品 自助贷款 积分商城 diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/Calculate.vue b/src/components/workbench/company-common-functions/auxiliary-tools/Calculate.vue new file mode 100644 index 0000000000000000000000000000000000000000..4aebf7895ca7498e3f0bb8041869436bd6785c78 --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/Calculate.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/FinancialTrial.vue b/src/components/workbench/company-common-functions/auxiliary-tools/FinancialTrial.vue new file mode 100644 index 0000000000000000000000000000000000000000..7aa9358aca0be9dc21483ff286934ebed70a0c53 --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/FinancialTrial.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/InterestPricing.vue b/src/components/workbench/company-common-functions/auxiliary-tools/InterestPricing.vue new file mode 100644 index 0000000000000000000000000000000000000000..a620f10d189ba6a81a2df746758452f6e0072abb --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/InterestPricing.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/LoanCalculation.vue b/src/components/workbench/company-common-functions/auxiliary-tools/LoanCalculation.vue new file mode 100644 index 0000000000000000000000000000000000000000..5ee516aaeb6a130620ab23945657f7dc2abfac7d --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/LoanCalculation.vue @@ -0,0 +1,345 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/RepaymentTrial.vue b/src/components/workbench/company-common-functions/auxiliary-tools/RepaymentTrial.vue new file mode 100644 index 0000000000000000000000000000000000000000..f32bbbd8b1039d1bd93ab3ed55abd8f0791e73b8 --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/RepaymentTrial.vue @@ -0,0 +1,375 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/ManufacturingTrial.vue b/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/ManufacturingTrial.vue new file mode 100644 index 0000000000000000000000000000000000000000..f2a04e8bbf45a468fcee53d25f2aa678eb8c05d1 --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/ManufacturingTrial.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/UnManufacturingTrial.vue b/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/UnManufacturingTrial.vue new file mode 100644 index 0000000000000000000000000000000000000000..306d380d294887ec987ea3ac9debf4590ec4fe1f --- /dev/null +++ b/src/components/workbench/company-common-functions/auxiliary-tools/financial-trial/UnManufacturingTrial.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/ContractSigningAndBilling.vue b/src/components/workbench/company-common-functions/business-inquiry/ContractSigningAndBilling.vue new file mode 100644 index 0000000000000000000000000000000000000000..e0c7ca431d50b8e72d6bc4ce08e8340d65dd0ac0 --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/ContractSigningAndBilling.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/LoanApplication.vue b/src/components/workbench/company-common-functions/business-inquiry/LoanApplication.vue new file mode 100644 index 0000000000000000000000000000000000000000..31abcc83cf24dca9b4f8f510d9b4a4498b1017b7 --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/LoanApplication.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/MarketingTask.vue b/src/components/workbench/company-common-functions/business-inquiry/MarketingTask.vue new file mode 100644 index 0000000000000000000000000000000000000000..a3e6f7825615d2d97ee3824150be32c64976d823 --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/MarketingTask.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/PeriodicInspection.vue b/src/components/workbench/company-common-functions/business-inquiry/PeriodicInspection.vue new file mode 100644 index 0000000000000000000000000000000000000000..414331df36b5455de249f7422711c26733624752 --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/PeriodicInspection.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/ProcessQuery.vue b/src/components/workbench/company-common-functions/business-inquiry/ProcessQuery.vue new file mode 100644 index 0000000000000000000000000000000000000000..cb3b157409f3609d937166c5e80a90e76918fae7 --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/ProcessQuery.vue @@ -0,0 +1,437 @@ + + + + diff --git a/src/components/workbench/company-common-functions/business-inquiry/RiskWarning.vue b/src/components/workbench/company-common-functions/business-inquiry/RiskWarning.vue new file mode 100644 index 0000000000000000000000000000000000000000..58cc04d19cd800d489dbdce9197af129646d2f5a --- /dev/null +++ b/src/components/workbench/company-common-functions/business-inquiry/RiskWarning.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/online-enquiry/AllOutlets.vue b/src/components/workbench/company-common-functions/online-enquiry/AllOutlets.vue new file mode 100644 index 0000000000000000000000000000000000000000..42da4b7dfdca01c70cd7c999f79dde5a72ac482f --- /dev/null +++ b/src/components/workbench/company-common-functions/online-enquiry/AllOutlets.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/online-enquiry/Area.vue b/src/components/workbench/company-common-functions/online-enquiry/Area.vue new file mode 100644 index 0000000000000000000000000000000000000000..dc5575fdeb6af7e5a0763dd150ed055e19cf537e --- /dev/null +++ b/src/components/workbench/company-common-functions/online-enquiry/Area.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/workbench/company-common-functions/online-enquiry/Nearby.vue b/src/components/workbench/company-common-functions/online-enquiry/Nearby.vue new file mode 100644 index 0000000000000000000000000000000000000000..28930fa2150e035c45145fe50f3e8a282752a755 --- /dev/null +++ b/src/components/workbench/company-common-functions/online-enquiry/Nearby.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/constants/api/login/login-mgt.api.ts b/src/constants/api/login/login-mgt.api.ts index c7e1cd2e3e8e2f73284136ad5f543bd9bf8d9892..96ab94996b454614fa8442e109d9427cdcdb0d4d 100644 --- a/src/constants/api/login/login-mgt.api.ts +++ b/src/constants/api/login/login-mgt.api.ts @@ -2,22 +2,22 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-05 14:56:29 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-06 15:09:50 + * @LastEditTime: 2022-08-17 19:55:50 * @FilePath: \mcep-h5\src\constants\api\login\login-mgt.api.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ import { MethodType } from "@/constants/enum/general/method-type.enum"; import { HeaderType } from "@/constants/enum/general/header-type.enum"; +const prefix = "http://localhost:9130/ms-system/api/v1/sysCustInfo/permit_endpoint" -const prefix = "http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint" const loginApi = { updatePicCode: { - url: prefix + "/kaptcha", + url: prefix + "/getVerifyCode", method: MethodType.POST.code, header: HeaderType.AUTH.code, }, loginSystem: { - url: prefix + "/login", + url: prefix + "/onlineLogin", method: MethodType.POST.code, header: HeaderType.AUTH.code, }, diff --git a/src/router/index.ts b/src/router/index.ts index 8d782f96186b2deaa5f251e43f43ddf8430a4575..1ef88764fc7e2b19721a9f7cd12731b27d174a1c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 15:41:06 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-22 16:54:54 + * @LastEditTime: 2022-08-18 13:50:06 * @FilePath: \mcep-h5\src\router\index.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -33,6 +33,7 @@ const routes: Array = [ }, { path: "/login", + name:"login", component: () => import(/* webpackChunkName: "login" */ "@/views/authentication/LoginView.vue"), //component: () => import(/* webpackChunkName: "login" */ "@/components/common/Tool.vue"), meta: { keepAlive: true, requiresAuth: true }, diff --git a/src/router/login.mgt.routing.ts b/src/router/login.mgt.routing.ts index ac85c851f3a841c5888c06b88304f4e95480e98b..ddbb26973709ba6120014b6e579cde82ac501e68 100644 --- a/src/router/login.mgt.routing.ts +++ b/src/router/login.mgt.routing.ts @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-05 10:08:57 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-12 14:30:24 + * @LastEditTime: 2022-08-18 13:42:05 * @FilePath: \mcep-h5\src\router\login.mgt.routing.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -32,5 +32,13 @@ const loginRoutes = [ props: propsConvert, meta: { keepAlive: false, requiresAuth: true, name: "主页" }, } + ,{ + path: `/LoginByID`, + name: 'LoginByID', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/authentication/LoginByID.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "主页" }, + } + ] export default loginRoutes; diff --git a/src/router/workbench.routing.ts b/src/router/workbench.routing.ts index 329335dc2d46133b1905e2b378915f2c55aa2cf9..f02d9c45a94f14a596c209c2a9c7a14be6ef7d0c 100644 --- a/src/router/workbench.routing.ts +++ b/src/router/workbench.routing.ts @@ -18,6 +18,13 @@ const workbenchRoutes = [ props: propsConvert, meta: { keepAlive: false, requiresAuth: true, name: "主页" }, }, + { + path: `/AccommodMain`, + name: 'AccommodMain', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/workbench/AccommodMain.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "贷款主页" }, + }, { path: `/Accommodation`, name: 'Accommodation', diff --git a/src/services/api.service.ts b/src/services/api.service.ts index ee66e28b3634ce9ebce0d1b1b673274ef9e0eaf5..25c7ee92de6c7e86f1ba63908e96b123123f8679 100644 --- a/src/services/api.service.ts +++ b/src/services/api.service.ts @@ -32,7 +32,7 @@ class ApiService { Vue.axios.interceptors.request.use( config => { config.headers['Access-Control-Allow-Origin'] = '*'; - config.headers['MCEP'] = 'MCEP'; + if(!config.headers['Content-Type']){ config.headers['Content-Type'] = 'application/json; charset=utf-8'; } @@ -172,12 +172,13 @@ class ApiService { } post(path: string, params: any, query: Query | undefined, requestConfig: AxiosRequestConfig): any { + path = query != null ? this.urlQueryConvert(path, query) : path; console.log("服务调用--" + path); - return Vue.axios.post(`${path}`, params, requestConfig).then(res=>{ - //TODO - return res.data - }); + + return Vue.axios.post(`${path}`, params, requestConfig).then(this.createBusCodeHandler(query)).catch(this.createErrorHandler()); + + } /** * POST请求 文件上传 @@ -211,7 +212,7 @@ class ApiService { general(api: any, query?: Query | undefined, params?: any | undefined, requestConfig?: AxiosRequestConfig | any): any { if (!!api.url && !!api.method) { if (requestConfig == null) { - + switch (api.header) { case HeaderType.BASE.code: requestConfig = this.createBasicHeaders(); @@ -268,27 +269,31 @@ class ApiService { * 服务返回统一解密处理 */ createBusCodeHandler(params?: any) { - return function(response: any) { + if (response.status === 200) { let data = response.data; + console.log("返回统一解密处理",params) if (params.tc === 'MCEP') { let encryData = data.data || {}; + console.log('返回原数据：', data); //移动后台 if (typeof encryData != 'object') { encryData = JSON.parse(encryData); } - //三方数据 - encryData.sm4key ? (data.data = SMUtil.decodeData(encryData)) : data; - if (data.data && typeof data.data != 'object') { - if (data.data.indexOf('{') > -1) { - data.data = JSON.parse(data.data); - } - } - // if (['local', 'production'].indexOf(process.env.NODE_ENV) == -1) { - console.log('返回数据：', data); + + // //三方数据 + // encryData.sm4key ? (data.data = SMUtil.decodeData(encryData)) : data; + // if (data.data && typeof data.data != 'object') { + // if (data.data.indexOf('{') > -1) { + // data.data = JSON.parse(data.data); + // } // } + if (['local', 'production'].indexOf(process.env.NODE_ENV) == -1) { + } + console.log('返回数据：', data); + if (data.code == '40902') { //token 失效，退出登录 NativeUI.confirm('', "登录超时,请退出重新登录").then(() => { @@ -316,6 +321,7 @@ class ApiService { console.log(data); //成功 // data = data.data; + // debugger if (typeof data != 'object') data = JSON.parse(data); data = data.sm4key ? SMUtil.decodeData(data) : data; if (typeof data != 'object') { diff --git a/src/views/MyView/LevelSent.vue b/src/views/MyView/LevelSent.vue index 9c315980c22683732316def7d76bd9fa2756ee02..907ef0c4ca105c536f6a3f2de8df82e69f6f53ed 100644 --- a/src/views/MyView/LevelSent.vue +++ b/src/views/MyView/LevelSent.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-14 13:57:33 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-25 19:35:52 + * @LastEditTime: 2022-08-18 10:59:51 * @FilePath: \mcep-h5\src\views\MyView\LevelSent.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -64,20 +64,7 @@ 我的特权
- +
diff --git a/src/views/MyView/MyPage.vue b/src/views/MyView/MyPage.vue index 6776b8edf9e5efb198f0adcad00702dafd976adb..14c592cf6009c89685244f3fa6b408eb4d176778 100644 --- a/src/views/MyView/MyPage.vue +++ b/src/views/MyView/MyPage.vue @@ -61,7 +61,7 @@ export default class MyPage extends Vue { productname: "我的贷款", //图片信息 img: "#icon-a-wodedaikuan16x16px", - flag: "Accommodation" + flag: "AccommodMain" }, { productname: "兑换记录", @@ -84,9 +84,9 @@ export default class MyPage extends Vue { name: "PersonLod" //参数 }) - } else if (item.flag === "Accommodation") { + } else if (item.flag === "AccommodMain") { this.$router.push({ - name: "Accommodation" + name: "AccommodMain" //参数 }) } else if ( item.flag === "ExchangeRecord") { diff --git a/src/views/authentication/LoginByID.vue b/src/views/authentication/LoginByID.vue new file mode 100644 index 0000000000000000000000000000000000000000..6af34fb4a90bedfe430667abe44440ba437ed008 --- /dev/null +++ b/src/views/authentication/LoginByID.vue @@ -0,0 +1,272 @@ + + + + diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue index 5cf588a093e32c54838dd6ff7a8e620b1e346cb8..28ddb0487650e8b211c93db564b37661d6e80419 100644 --- a/src/views/authentication/LoginView.vue +++ b/src/views/authentication/LoginView.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 15:41:06 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-22 15:10:30 + * @LastEditTime: 2022-08-18 13:43:29 * @FilePath: \mcep-h5\src\views\authentication\LoginView.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -11,7 +11,6 @@
-
@@ -84,6 +91,7 @@ import { Code } from "@/constants/enum/general/code.enum"; import { RestfulResponse } from "@/model/domain/RestfulResponse"; import commonApi from "@/constants/api/login/common.api"; import { sys } from "typescript"; +import { log } from "mathjs"; @Component({ @@ -101,11 +109,26 @@ export default class LoginView extends Vue { timer: any = "";//定时器 time: number = 60;//计数 imageVerifyKey: string = ""//验证码Key + passwordType = "password" + //方法 + switchPasswordType() { + this.passwordType = this.passwordType === 'password' ? 'text' : 'password' + } + //身份证号登录 + loginbyid() { + this.$router.push({ + name: `LoginByID` + }) + + } + //手机号 + verifyPhone() { + return /^1\d{10}$/.test(this.phone) // 返回true或false + } //获取图形验证码 _updatePicCode() { //请求图形验证码 apiService.general(loginApi.updatePicCode, undefined, undefined, undefined).then((response: RestfulResponse) => { - if (response.code == Code.SUCCESS.code) { this.imageSrc = 'data:image/png;base64,' + response.data.imageVerifyCodeStr.replace(/[\r\n]/g, ""); this.imageVerifyKey = response.data.imageVerifyKey @@ -147,16 +170,14 @@ export default class LoginView extends Vue { //this._updatePicCode(); let param = { phone: this.phone, - //图形Key - imageVerifyKey: this.imageVerifyKey, //图形验证码 - imgVerifyCode: this.imageSrcValue, + imageVerifyKey: this.imageSrcValue, //渠道 - loginType: "3", + loginType: "2", //手机验证码 - phoneVerifyCode: this.sms, + messCode: this.sms, //密码 - credential: this.password + passWord: this.password } apiService.general(loginApi.loginSystem, undefined, param, undefined).then((response: RestfulResponse) => { console.log(response); @@ -201,7 +222,7 @@ export default class LoginView extends Vue { }) } } - + diff --git a/src/views/workbench/AccommodDetails.vue b/src/views/workbench/AccommodDetails.vue index 510c84ebd66a030207751bc65bccf728a51f5903..03327918738e3da4fa66400b712b335be2a01f2c 100644 --- a/src/views/workbench/AccommodDetails.vue +++ b/src/views/workbench/AccommodDetails.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-07 16:13:13 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-25 13:47:03 + * @LastEditTime: 2022-08-18 14:19:37 * @FilePath: \mcep-h5\src\components\common\Bottom.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -14,7 +14,7 @@
- +
个人信息 @@ -43,13 +43,13 @@
- 借款信息 + 借据信息
- + @@ -63,7 +63,7 @@ - + @@ -77,28 +77,28 @@ - + - + - +
- + @@ -146,6 +146,7 @@ + diff --git a/src/views/workbench/Accommodation.vue b/src/views/workbench/Accommodation.vue index 6477ee29d5ada7cebab851d02f1dedc1a3c6ad3d..2ef014980434d494081f883ed8b157f5c572004f 100644 --- a/src/views/workbench/Accommodation.vue +++ b/src/views/workbench/Accommodation.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-07 16:13:13 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-25 14:38:19 + * @LastEditTime: 2022-08-18 14:18:52 * @FilePath: \mcep-h5\src\components\common\Bottom.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -16,10 +16,10 @@ + @onClickPicket="onClickPicket" > - + @@ -43,7 +43,7 @@ export default class Accommodation extends Vue { money: "30", guarantee: "担保", month: "12", - status: 2, + status: 1, time: "2022-02-18" }, { productname: "'企业之星'流动之星贷款", @@ -64,9 +64,12 @@ export default class Accommodation extends Vue { }] //点击还款计划事件 - onClickDetails() { + onClickDetails(status:any) { this.$router.push({ - name: "AccommodDetails" + name: "AccommodDetails", + params:{ + status:status + } }) } //点击body事件 diff --git a/src/views/workbench/PersonLod.vue b/src/views/workbench/PersonLod.vue index 323108498c632f61539a12ff5e094991fa4ffc7e..b920660c3812844225369c2001b4e6176420170f 100644 --- a/src/views/workbench/PersonLod.vue +++ b/src/views/workbench/PersonLod.vue @@ -40,6 +40,17 @@ + + + + + + + + + + +
修改
@@ -60,6 +71,8 @@ export default class PersonLod extends Vue { IdCard: string = ""//身份证号 phone: string = ""//手机号 liveAdress: string = ""//居住地址 + password : String =""//原始密码 + newPassword : String =""//原始密码 }