Skip to content

S
sfp-program
Commit a7fab1af by Chao Sun
Options

Merge branch 'master' of http://139.224.139.2:9091/Sweet/sfp-program into master

parents 6db8ed24 1e728dfd
Showing with 15 additions and 12 deletions
pages/dataImport/data-import.vue
......@@ -170,7 +170,6 @@
console.log('用户点击确定');
if(this.irrAndSimpleInfos.length>0){
const minLength = Math.min(pasteDataLists.length,this.irrAndSimpleInfos.length) ;
console.log(minLength)
for(let i=0;i<minLength;i++){
this.irrAndSimpleInfos[i]['cashValue'] = pasteDataLists[i];
}
......@@ -180,6 +179,13 @@
}
}
});
}else{
if(this.irrAndSimpleInfos.length>0){
const minLength = Math.min(pasteDataLists.length,this.irrAndSimpleInfos.length) ;
for(let i=0;i<minLength;i++){
this.irrAndSimpleInfos[i]['cashValue'] = pasteDataLists[i];
}
}
}
},
// 全部清空
......@@ -227,9 +233,9 @@
});
}else{
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
title: res['message'],
duration: 2000,
icon: 'none'
})
}
})
......
pages/index/index.vue
......@@ -143,7 +143,7 @@
</view>
</view>
<!-- 现金价值单利复利结果展示 -->
<view class="resultContent">
<view class="resultContent" id="resultContent">
<!-- 单次计算显示结果 -->
<view id="simpleDataResult" class="simpleDataResult" v-if="resultShowFlag && calcuteMethod == '1'">
<view class="inputItem">
......@@ -206,6 +206,7 @@
export default {
data() {
return {
scrollTop:0,
isNeedOfficialAccountQrcode:true,
calcuteType:'1', //计算类型(1:增额; 2:年金)
withdrawalType:'1', //提领方式(1:正常提领; 2:减保取现)
......@@ -513,7 +514,7 @@
}
}
//提领信息判断
if(this.yearWithdrawalInfos.length>0){
if(this.yearWithdrawalInfos && this.yearWithdrawalInfos.length>0){
for (let i = 0; i < this.yearWithdrawalInfos.length; i++) {
//增额提领信息校验
if(this.calcuteType == 1){
......@@ -614,11 +615,7 @@
withdrawalType:this.withdrawalType?'1':'2',
decimal: 5
};
// document.getElementById(simpleDataResult).scrollIntoView({
// behavior: "smooth",
// block: "end",
// inline: "end"
// });
api.irrAndSimpleCalcute(params).then(res=>{
console.log(res)
if(res.success === true){
......
unpackage/dist/build/h5/index.html
......@@ -14,7 +14,7 @@
<title>sfp</title>
<!--preload-links-->
<!--app-context-->
<script type="module" crossorigin src="/sfp/assets/index.33444e48.js"></script>
<script type="module" crossorigin src="/sfp/assets/index.ac2778ca.js"></script>
<link rel="stylesheet" href="/sfp/assets/index.13d2da89.css">
</head>
<body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment