diff --git a/src/components/common/CardPottom.vue b/src/components/common/CardPottom.vue index fcb71ad40839b484d0d970288b4d2d5294f409d1..6a2a204cea48cbd759e91f7ae5b4d20b85183a33 100644 --- a/src/components/common/CardPottom.vue +++ b/src/components/common/CardPottom.vue @@ -9,14 +9,14 @@ diff --git a/src/router/depositInterestTrial.routing.ts b/src/router/depositInterestTrial.routing.ts index f7deb8125fe407efee003b86dff075dd059a42bd..42013a3aab5c435fdbce08aa4311c6e7e2cb75f7 100644 --- a/src/router/depositInterestTrial.routing.ts +++ b/src/router/depositInterestTrial.routing.ts @@ -25,5 +25,19 @@ const depositInterestTrialRoutes = [ props: propsConvert, meta: { keepAlive: false, requiresAuth: true, name: "试算结果" }, }, + { + path: `/DepositRate`, + name: 'DepositRate', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/DepositInterestTrial/DepositRate.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "存款利率" }, + }, + { + path: `/RepayPlan`, + name: 'RepayPlan', + component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/DepositInterestTrial/RepayPlan.vue"), + props: propsConvert, + meta: { keepAlive: false, requiresAuth: true, name: "还款计划" }, + }, ]; export default depositInterestTrialRoutes; diff --git a/src/views/DepositInterestTrial/CountResult.vue b/src/views/DepositInterestTrial/CountResult.vue index d530b9bbaaf707fa1475129384d6fc24e2b783b2..ad337fe3d22c4ef906c53598e0f651054ce8542a 100644 --- a/src/views/DepositInterestTrial/CountResult.vue +++ b/src/views/DepositInterestTrial/CountResult.vue @@ -10,23 +10,53 @@
-
贷款利息试算金额
-
贷款利息(元)查看还款计划
+
¥{{result}}
-
{{result}}
-
贷款金额(元){{loanAmt}}
-
贷款期限(月){{loanTime}}
-
贷款利率(%){{loanRate}}
-
计划月还款(元){{result/loanTime}}
- -
还款方式{{choice}}
-
- -
+ font-style: normal;">{{result}}
+
本息合计(元)
+
{{resultPlus}}
+ +
+ + 贷款金额(元) + {{loanAmt}} + +
+
+ + 贷款期限(月) + {{loanTime}} + +
+
+ + 贷款利率(%) + {{loanRate}} +
- 确定 - 重新计算 +
+ + 计划月还款 + {{planMonthRepay}} + +
+
+ + 贷款种类 + {{loanType}} + +
+
+ + 还款方式 + {{repayType}} + +
+ 确定 + 重新计算 @@ -37,23 +67,32 @@ import {Component, Prop, Vue} from "vue-property-decorator"; name: "CountResult", }) export default class CountResult extends Vue{ - choice=""; + resultPlus=""; result=""; loanAmt=""; loanRate=""; + planMonthRepay = ""; loanTime=""; + repayType = ""; + loanType = ""; titleName="试算结果"; titleflag=true; mounted() { this.result = this.$route.params.result; this.loanAmt = this.$route.params.loanAmt; + this.resultPlus = (parseInt(this.result) + parseInt(this.loanAmt)).toString(); this.loanRate = this.$route.params.loanRate; this.loanTime = this.$route.params.loanTime; - this.choice = this.$route.params.choice; + this.repayType = this.$route.params.repayType; + this.planMonthRepay = this.$route.params.planMonthRepay; + this.loanType = this.$route.params.loanType; } returnCount() { + this.$router.back(); + } + toSeeRepayPlan() { this.$router.push({ - name: "DepositInterestTrial", + name: "RepayPlan", }); } } diff --git a/src/views/DepositInterestTrial/CountResultB.vue b/src/views/DepositInterestTrial/CountResultB.vue index e64b84066867a42dcb6486208a04f6cc59fc9d17..0d806557fc9b644bb07e67014aaddea7f2ce1c46 100644 --- a/src/views/DepositInterestTrial/CountResultB.vue +++ b/src/views/DepositInterestTrial/CountResultB.vue @@ -10,21 +10,47 @@
-
存款收益后账户金额
-
所得利息(元)
+
¥{{countResult}}
-
{{countResult}}
-
存款金额(元){{depositAmt}}
-
存款时长(月){{depositTime}}
-
存款利率(%){{depositRate}}
-
共计收益(元){{countResult-depositAmt}}
-
- -
+ font-style: normal;">{{countResult}}
+
本息合计(元)
+
{{result}}
+ +
+ + 储蓄方式 + {{saveType}} + +
+
+ + 定期类型 + {{timeType}} + +
+
+ + 期限 + {{time}} + +
+
+ + 年利率(%) + {{yearRate}} + +
+
+ + 存入金额(元) + {{depositAmt}} +
- 确定 - 重新计算 + 确定 + 重新计算 @@ -35,10 +61,13 @@ import {Component, Prop, Vue} from "vue-property-decorator"; name: "CountResultB", }) export default class CountResultB extends Vue{ - countResult=""; - depositAmt=""; - depositTime=""; - depositRate=""; + result="0"; + countResult="100"; + saveType=""; + timeType=""; + time=""; + yearRate=""; + depositAmt= ""; titleName="试算结果"; titleflag=true; returnCount() { @@ -47,10 +76,13 @@ export default class CountResultB extends Vue{ }); } mounted() { - this.countResult = this.$route.params.countResult; + this.saveType = this.$route.params.saveType; + this.timeType = this.$route.params.timeType; + this.time = this.$route.params.time=="1"?"一年":this.$route.params.time=="2"?"两年":"三年"; + this.yearRate = this.$route.params.yearRate; this.depositAmt = this.$route.params.depositAmt; - this.depositTime = parseInt(this.$route.params.depositTime).toString(); - this.depositRate = this.$route.params.depositRate; + this.countResult = this.$route.params.result; + this.result = (parseInt(this.$route.params.result)+parseInt(this.depositAmt)).toString(); } } diff --git a/src/views/DepositInterestTrial/DepositInterestTrial.vue b/src/views/DepositInterestTrial/DepositInterestTrial.vue index 35dfceb95224c74c32dc4c4b7d476597b8a31d2e..e645f2297877de9f67d0509d95f766fd5975226e 100644 --- a/src/views/DepositInterestTrial/DepositInterestTrial.vue +++ b/src/views/DepositInterestTrial/DepositInterestTrial.vue @@ -17,34 +17,42 @@
-
存款金额(元)
-
存款利息(%)
-
存入日期
-
取出日期
+
储蓄方式 + + +
+
定期类型 + + +
+
期限 + + +
+
年利率(%)
+
存入金额(元)
+
+
+ 查看基准存款利率
贷款金额(元)
贷款期限(月)
- +
计划月还款(元)
贷款利率(%)
- - -
还款方式 +
贷款种类 + + +
+
还款方式 {{item}}
- - - - - - -
- 计算 - 清除 + 计算 + 清除
计算 @@ -62,19 +70,56 @@ import {Test} from "@/views/DepositInterestTrial/Test"; }) export default class DepositInterestTrial extends Vue{ choices: string[] = ["利随本清","等额本金","等额本息"]; - choice = ""; + loanTypes: any[] = [ + { + value : "有抵押", + label : "有抵押", + },{ + value : "无抵押", + label : "无抵押", + } + ]; + saveTypes: any[] = [ + { + value : "定期", + label : "定期", + },{ + value : "非定期", + label : "非定期", + } + ]; + timeTypes: any[] = [ + { + value : "定存整取", + label : "定存整取", + },{ + value : "零存整取", + label : "零存整取", + },{ + value : "整存整取", + label : "整存整取", + } + ]; + times: any[] = [ + { + value : "1", + label : "一年", + },{ + value : "2", + label : "两年", + },{ + value : "3", + label : "三年", + } + ]; test2: any = { loanAmt: "", loanTime: "", + planMonthRepay : "", loanRate: "", + loanType: undefined, + repayType: "", }; - // value1 = 0; - // option1 = [ - // { text: '请选择还款方式', value: 0 }, - // { text: '利随本清', value: 1 }, - // { text: '等额本金', value: 2 }, - // { text: '等额本息', value: 3 }, - // ] test: Test = new Test();//测试数据 flag:boolean=true; flagA=true; @@ -95,37 +140,32 @@ export default class DepositInterestTrial extends Vue{ } countA() { let result = 0; - let yearA = parseInt(this.test.putDate.substring(0,4)); - let yearB = parseInt(this.test.getDate.substring(0,4)); - let monthA = parseInt(this.test.putDate.substring(4,6)); - let monthB = parseInt(this.test.getDate.substring(4,6)); - let dayA = parseInt(this.test.putDate.substring(6)); - let dayB = parseInt(this.test.getDate.substring(6)); - result = parseInt(this.test.depositAmt)+ parseInt(this.test.depositAmt)*parseInt(this.test.depositRate)*((yearB-yearA)*365+(monthB-monthA)*30+(dayB-dayA))/36500; - console.log(result); + result = parseInt(this.test.depositAmt)*parseInt(this.test.yearRate)/100*parseInt(this.test.time?this.test.time:"0"); this.$router.push({ name: "CountResultB", params: { - countResult: result.toString(), + saveType: this.test.saveType || "0", + timeType: this.test.timeType || "0", + time: this.test.time || "0", + yearRate: this.test.yearRate, depositAmt: this.test.depositAmt, - depositTime: (((yearB-yearA)*365+(monthB-monthA)*30+(dayB-dayA))/30).toString(), - depositRate: this.test.depositRate, + result: result.toString(), } }) } countB() { let result = 0; - result = parseInt(this.test2.loanAmt)+parseInt(this.test2.loanAmt)*parseInt(this.test2.loanRate)*parseInt(this.test2.loanTime)/100; - console.log(result); - console.log("**********"+JSON.stringify(this.choice)); + result = parseInt(this.test2.loanAmt)*parseInt(this.test2.loanRate)/100*parseInt(this.test2.loanTime)/12; this.$router.push({ name: "CountResult", params: { - result: result.toString(), loanAmt: this.test2.loanAmt, - loanRate: this.test2.loanRate, loanTime: this.test2.loanTime, - choice: this.choice, + planMonthRepay: this.test2.planMonthRepay, + loanRate: this.test2.loanRate, + loanType: this.test2.loanType, + repayType: this.test2.repayType, + result: result.toString(), } }) } @@ -133,7 +173,12 @@ export default class DepositInterestTrial extends Vue{ this.test = new Test(); } handleChoiceChange(value:any) { - this.choice = value; + this.test2.repayType = value; + } + toDepositRate() { + this.$router.push({ + name: "DepositRate" + }); } } diff --git a/src/views/DepositInterestTrial/DepositRate.vue b/src/views/DepositInterestTrial/DepositRate.vue new file mode 100644 index 0000000000000000000000000000000000000000..92e323340e14f7b14e70ceb1c221ac238eaf8d06 --- /dev/null +++ b/src/views/DepositInterestTrial/DepositRate.vue @@ -0,0 +1,107 @@ +/** +* @Author wangliang +* @date 20220825 +*/ + + + + + diff --git a/src/views/DepositInterestTrial/RepayPlan.vue b/src/views/DepositInterestTrial/RepayPlan.vue new file mode 100644 index 0000000000000000000000000000000000000000..5246759c9cb81a73cfbcfedac0d39f6491bcfd6d --- /dev/null +++ b/src/views/DepositInterestTrial/RepayPlan.vue @@ -0,0 +1,57 @@ + + + + + + diff --git a/src/views/DepositInterestTrial/Test.ts b/src/views/DepositInterestTrial/Test.ts index d170bb979b41dd976f9263d022819cd3bee519cf..8b6ea4b565b42fa323fce6230b0f39da98f57be7 100644 --- a/src/views/DepositInterestTrial/Test.ts +++ b/src/views/DepositInterestTrial/Test.ts @@ -1,19 +1,28 @@ export class Test { - depositAmt: string; - depositRate: string; + depositAmt: string; //存款金额 + yearRate: string; putDate: string; getDate: string; + saveType: string | undefined; + timeType: string | undefined; + time: string | undefined; constructor( options: { depositAmt?: string; - depositRate?: string; + yearRate?: string; putDate?: string; getDate?: string; + saveType?: string | undefined; + timeType?: string | undefined; + time?: string | undefined; } = {} ) { this.depositAmt = options.depositAmt || ""; - this.depositRate = options.depositRate || ""; + this.yearRate = options.yearRate || ""; this.putDate = options.putDate || ""; this.getDate = options.getDate || ""; + this.saveType = options.saveType; + this.timeType = options.timeType; + this.time = options.time; } } diff --git a/src/views/MyView/MyPage.vue b/src/views/MyView/MyPage.vue index 14c592cf6009c89685244f3fa6b408eb4d176778..7edc9d09c39d6f93544116a8b897cdb89750dd5c 100644 --- a/src/views/MyView/MyPage.vue +++ b/src/views/MyView/MyPage.vue @@ -12,6 +12,18 @@
+
+ + 2456 + 12 + 10 + + + 我的积分 + 卡券 + 特权 + +
@@ -108,11 +120,11 @@ export default class MyPage extends Vue { .card { position: absolute; - top: 21%; + top: 30%; left: 3%; right: 3%; width: 90%; - height: 25%; + height: 20%; margin: 2% auto; border-radius: 15px; display: flex; diff --git a/src/views/workbench/ExchangeRecord.vue b/src/views/workbench/ExchangeRecord.vue index c1a0a4169714d5f523d364d519f33747228d995d..15045e686871272c69a8d87846898f759989a740 100644 --- a/src/views/workbench/ExchangeRecord.vue +++ b/src/views/workbench/ExchangeRecord.vue @@ -8,7 +8,7 @@
- 2134 +
2134