Skip to content

M
mcep-h5
提交 9d7140b6 编写于 作者: “grape”'s avatar “grape”
浏览文件
操作

Merge branch 'master' of http://zyys.donghuajinyun.com/gitlib/jiangzaicheng/mcep-h5

上级 313a072f 1ed0c6b0
隐藏空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 54 行删除
src/views/DepositInterestTrial/DepositInterestTrial.vue
浏览文件 @ 9d7140b6
......@@ -29,7 +29,8 @@
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field is-link readonly :value="this.typeValue" label="储蓄方式" input-align="right" placeholder="请选择" @click="showTypes = true" />
<!-- <van-field is-link readonly :value="this.typeValue" label="储蓄方式" input-align="right" placeholder="请选择储蓄方式" @click="showTypes = true" />-->
<van-field is-link readonly :value="test.saveType" label="储蓄方式" input-align="right" placeholder="请选择储蓄方式" @click="showTypes = true" />
<van-popup v-model="showTypes" round position="bottom">
<van-picker
show-toolbar
......@@ -52,7 +53,10 @@
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field is-link readonly :value="timeTypeValue" label="存款类型" input-align="right" placeholder="请选择" @click="showTimeTypes = true"/>
<!-- <van-field is-link readonly :value="timeTypeValue" label="定期类型" input-align="right" placeholder="请选择定期类型" @click="showTimeTypes = true"/>-->
<van-field is-link readonly :value="test.timeType" label="定期类型" input-align="right" placeholder="请选择定期类型" @click="showTimeTypes = true"/>
<van-popup v-model="showTimeTypes" round position="bottom">
<van-picker
show-toolbar
......@@ -75,7 +79,8 @@
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field is-link readonly :value="timeValue" label="期限" input-align="right" placeholder="请选择" @click="showTimes = true"/>
<!-- <van-field is-link readonly :value="timeValue" label="期限" input-align="right" placeholder="请选择期限" @click="showTimes = true"/>-->
<van-field is-link readonly :value="test.time" label="期限" input-align="right" placeholder="请选择期限" @click="showTimes = true"/>
<van-popup v-model="showTimes" round position="bottom">
<van-picker
show-toolbar
......@@ -97,20 +102,20 @@
<div class="d-flex" style="margin-top: 6%;margin-left: 5%;margin-bottom: 6%">存入金额(元)<van-field v-model="test.depositAmt" placeholder="请输入" style="width: 50%;margin-top: -4%;margin-left: auto" input-align="right"></van-field></div> -->
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field :value="test.yearRate" label="年利率(%)" input-align="right" placeholder="请输入 " >
<van-field v-model="test.yearRate" label="年利率(%)" input-align="right" placeholder="请输入 " >
</van-field>
</van-col>
</van-row>
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field :value="test.yearRate" label="存入金额(元)" input-align="right" placeholder="请输入 " />
<van-field v-model="test.depositAmt" label="存入金额(元)" input-align="right" placeholder="请输入 " />
</van-col>
</van-row>
</div>
<!-- <div v-if="flag" style="margin-top: 160px; text-align: right; margin-right: 10px; font-size: 12px; color: #3672F1" @click="toDepositRate">-->
<!-- 查看基准存款利率-->
......@@ -123,23 +128,23 @@
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field :value="test2.loanAmt" label="贷款金额(元)" input-align="right" placeholder="请输入 " />
<van-field v-model="test2.loanAmt" label="贷款金额(元)" input-align="right" placeholder="请输入 " />
</van-col>
</van-row>
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field :value="test2.loanTime" label="贷款期限(月)" input-align="right" placeholder="请输入 " />
<van-field v-model="test2.loanTime" label="贷款期限(月)" input-align="right" placeholder="请输入 " />
</van-col>
</van-row>
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field :value="test2.loanTime" label="贷款利率(%)" input-align="right" placeholder="请输入 " />
<van-field v-model="test2.loanRate" label="贷款利率(%)" input-align="right" placeholder="请输入 " />
</van-col>
</van-row>
......@@ -155,7 +160,7 @@
<van-row type="flex" class="layoutName">
<van-col span="24">
<van-field style="color: red;" is-link readonly :value="choiceValue" label="还款方式" input-align="right" placeholder="请选择还款方式" @click="showChoices = true"/>
<van-field style="color: red;" is-link readonly :value="test2.repayType" label="还款方式" input-align="right" placeholder="请选择还款方式" @click="showChoices = true"/>
<van-popup v-model="showChoices" round position="bottom">
<van-picker
show-toolbar
......@@ -172,7 +177,7 @@
</div>
<!-- <div style="margin-top:-60px;"> -->
<div v-if="flag">
<van-button style="width: 90%;margin-left: 5%;background-color: #3672F1;position: absolute;margin-top: 60%;height: 6%;border-radius: 5px; border-color: #3672F1" type="primary" @click="countA">计算</van-button>
......@@ -219,7 +224,7 @@ export default class DepositInterestTrial extends Vue{
];
onConfirmTypes(typeValue: string) {
this.typeValue = typeValue;
this.test.saveType = typeValue;
this.showTypes = false;
}
// choices: any[] = [
......@@ -252,13 +257,13 @@ export default class DepositInterestTrial extends Vue{
"利随本清",
"等额本金",
"等额本息",
"按月结息(到期一次性还本)",
"按季结息(到期一次性还本)",
"按月结息(到期一次性还本)",
"按年结息(到期一次性还本)",
];
onConfirmChoices(choiceValue: string) {
this.choiceValue = choiceValue;
this.test2.repayType = choiceValue;
this.showChoices = false;
}
// timeTypes: any[] = [
......@@ -277,14 +282,11 @@ export default class DepositInterestTrial extends Vue{
showTimeTypes:any=false;
timeTypes: any[] = [
"定存整取",
"定存整取",
"零存整取",
"零存整取",
"整存整取",
"整存整取",
];
onConfirmTimeTypes(timeTypeValue: string) {
this.timeTypeValue = timeTypeValue;
this.test.timeType = timeTypeValue;
this.showTimeTypes = false;
}
......@@ -306,12 +308,12 @@ export default class DepositInterestTrial extends Vue{
times: any[] = [
"一年",
"两年",
"三年",
"三年",
];
onConfirmTimes(timeValue: string) {
this.timeValue = timeValue;
this.test.time = timeValue;
this.showTimes = false;
}
test2: any = {
......@@ -342,35 +344,44 @@ export default class DepositInterestTrial extends Vue{
}
countA() {
let result = 0;
result = parseInt(this.test.depositAmt)*parseInt(this.test.yearRate)/100*parseInt(this.test.time?this.test.time:"0");
this.$router.push({
name: "CountResultB",
params: {
saveType: this.test.saveType || "0",
timeType: this.test.timeType || "0",
time: this.test.time || "0",
yearRate: this.test.yearRate,
depositAmt: this.test.depositAmt,
result: result.toString(),
}
})
result = parseInt(this.test.depositAmt)*parseInt(this.test.yearRate)/100*parseInt(this.test.time=="一年"?"1":this.test.time=="两年"?"2":"3");
console.log("@@@@"+this.test.depositAmt)
if(this.test.depositAmt==""||this.test.yearRate==""||this.test.time==""){
alert("请输入数据");
}else{
this.$router.push({
name: "CountResultB",
params: {
saveType: this.test.saveType || "0",
timeType: this.test.timeType || "0",
time: this.test.time=="一年"?"1":this.test.time=="两年"?"2":"3",
yearRate: this.test.yearRate,
depositAmt: this.test.depositAmt,
result: result.toString(),
}
})
}
}
countB() {
let result = 0;
result = parseInt(this.test2.loanAmt)*parseInt(this.test2.loanRate)/100*parseInt(this.test2.loanTime)/12;
this.$router.push({
name: "CountResult",
params: {
routeName: "aaa",
loanAmt: this.test2.loanAmt,
loanTime: this.test2.loanTime,
planMonthRepay: this.test2.planMonthRepay,
loanRate: this.test2.loanRate,
loanType: this.test2.loanType,
repayType: this.test2.repayType,
result: result.toString(),
}
})
if(this.test2.loanAmt==""||this.test2.loanRate==""||this.test2.loanTime==""){
alert("请输入数据")
}else{
this.$router.push({
name: "CountResult",
params: {
routeName: "aaa",
loanAmt: this.test2.loanAmt,
loanTime: this.test2.loanTime,
planMonthRepay: this.test2.planMonthRepay,
loanRate: this.test2.loanRate,
loanType: this.test2.loanType,
repayType: this.test2.repayType,
result: result.toString(),
}
})
}
}
clearData() {
this.test = new Test();
......@@ -413,7 +424,7 @@ export default class DepositInterestTrial extends Vue{
padding: 1.5% 0% 1.5% 0%;
position: absolute;
background-color: #ffffff;
width: 90%;
margin-left: 5%;
margin-top: -25%;
......@@ -421,7 +432,7 @@ export default class DepositInterestTrial extends Vue{
}
.layoutName {
font-family: "Arial Normal", "Arial";
font-weight: 400;
font-style: normal;
font-size: 13px;
......
src/views/authentication/LoginView.vue
浏览文件 @ 9d7140b6
......@@ -149,7 +149,7 @@ export default class LoginView extends Vue {
}
//手机号
verifyPhone(s:string) {
return /^1[3-9]\d{9}$/.test(s) // 返回true或false
return /^(13[0-9]|14[01,4-9]|15[0-3,5-9]|16[5-7]|17[0135678]|18[0-9]|19[189])\d{8}$/.test(s) // 返回true或false
}
//获取图形验证码
_updatePicCode() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或