Skip to content

S
sfp-program
Commit a763ebe2 by Chao Sun
Options

gitignore

parents f1c3f8b4 6c3581fb
Showing with 39 additions and 22 deletions
main.js
......@@ -10,10 +10,9 @@ Vue.config.productionTip = false;
Vue.prototype.axios = axios;
Vue.prototype.$api = api;
import { numberToCurrencyNo } from '@/utils/numberToCurrency'
import { numberToCurrencyNo } from './util/numberPipe';
// 配置全局过滤器，实现数字千分位格式
Vue.filter('numberToCurrency', numberToCurrencyNo)
App.mpType = 'app'
const app = new Vue({
api,
......
pages/dataImport/data-import.css
......@@ -19,6 +19,7 @@
border-top-right-radius: 40rpx;
padding: 20rpx 30rpx 0;
box-sizing: border-box;
overflow-y: scroll;
}
.policyYearContainer .modalTitle{
display: flex;
......
pages/dataImport/data-import.vue
......@@ -91,8 +91,8 @@
},
name:'dataImport',
onLoad() {
this.bindPickerChange({detail:{value:this.index}})
this.calcuteData = uni.getStorageSync('calcuteData')
this.bindPickerChange({detail:{value:this.index}});
this.calcuteData = uni.getStorageSync('calcuteData');
},
methods:{
// 选择间隔
......
pages/index/index.css
......@@ -25,15 +25,26 @@
width: 100%;
}
.banner{
height: 400rpx;
width: 100%;
position: relative;
}
.banner text{
position: absolute;
bottom: 40px;
left: 0;
color: #fff;
background: rgba(0,0,0,0.35);
padding: 2px 10px;
border-top-right-radius: 20px;
border-bottom-right-radius: 20px;
}
.banner img{
max-width: 100%;
width: 100%;
}
.tabTitle{
display: flex;
justify-content: space-around;
font-size: 16px;
font-size: 32rpx;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #333333;
......@@ -238,9 +249,6 @@
height: 40rpx!important;
line-height: 40rpx!important;
text-align: center;
border:3rpx #CEB07D solid;
color: #CEB07D;
border-radius: 50%;
font-size: 24rpx;
}
.qrcodeContainer{
......
pages/index/index.vue
......@@ -9,6 +9,8 @@
<view class="content" v-show="!isNeedOfficialAccountQrcode">
<view class="banner">
<img src="/static/images/policyIrrBanner.png" alt="" srcset="">
<!-- 使用说明 -->
<v-text>使用说明</v-text>
</view>
<scroll-view scroll-y="true" class="formInfoContainer">
<view class="tabTitle">
......@@ -69,7 +71,7 @@
</view>
</view>
<view class="inputItem">
<text>每年提取金额：</text>
<text style="white-space: nowrap;">每年提取金额：</text>
<view class="inputContent">
<input class="uni-input" type="number" placeholder="请输入"
v-model="item.yearWithdrawalAmount" /><label for="">元</label>
......@@ -93,10 +95,12 @@
<input class="uni-input withdrawNumber" type="number" placeholder="请输入"
v-model="item.yearWithdrawalAmount"/>
<view v-show="yearWithdrawalInfos.length>1">
<text @click="reduce(idx)">-</text>
<text @click="reduce(idx)"><svg t="1662455801913" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3447" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="3448" fill="#CEB07D"></path><path d="M731.428571 475.428571h-438.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h438.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="3449" fill="#CEB07D"></path></svg></text>
</view>
</view>
<text @click="add()" style="position: absolute;right: 0;">+</text>
<text @click="add()" style="position: absolute;right: 0;">
<svg t="1662455996735" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4399" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="4400" fill="#CEB07D"></path><path d="M731.428571 475.428571h-182.857142v-182.857142c0-21.942857-14.628571-36.571429-36.571429-36.571429s-36.571429 14.628571-36.571429 36.571429v182.857142h-182.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h182.857142v182.857142c0 21.942857 14.628571 36.571429 36.571429 36.571429s36.571429-14.628571 36.571429-36.571429v-182.857142h182.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="4401" fill="#CEB07D"></path></svg>
</text>
</view>
</view>
<!-- 现金价值信息 -->
......@@ -118,7 +122,7 @@
</view>
</view>
<view class="inputItem">
<text>总生存利益<text style="font-size: 14px;">（总领取金额+现金价值）</text>:</text>
<text>总生存利益<text style="font-size: 14px;">{{irrAndSimpleCalcuteParam.allFirstPayment > 0 ? '（万能账户现价+现金价值）' :'（现金价值）'}}</text>:</text>
<view class="inputContent">
<input class="uni-input" type="number" placeholder="请输入" min='1'
v-model="irrAndSimple.cashValue"/>
......@@ -138,11 +142,11 @@
<view class="simpleDataResult" v-if="resultShowFlag && calcuteMethod == '1'">
<view class="inputItem">
<text class="resultTitle">IRR复利</text>
<text class="calcNumber">{{irrAndSimpleResInfos.length>0?(irrAndSimpleResInfos[0]['irrValue'] * 100).toFixed(5):null}}%</text>
<text class="calcNumber">{{irrAndSimpleResInfos.length>0?(irrAndSimpleResInfos[0]['irrValue'] * 100).toFixed(3) | numberToCurrency:null}}%</text>
</view>
<view class="inputItem">
<text class="resultTitle">单利</text>
<text class="calcNumber">{{irrAndSimpleResInfos.length>0?(irrAndSimpleResInfos[0]['simpleValue'] * 100).toFixed(5):null}}%</text>
<text class="calcNumber">{{irrAndSimpleResInfos.length>0?(irrAndSimpleResInfos[0]['simpleValue'] * 100).toFixed(3) | numberToCurrency:null}}%</text>
</view>
</view>
<!-- 批量计算显示结果 -->
......@@ -157,9 +161,9 @@
</view>
<view class="resultTd" v-for="item in resIrrAndSimpleResInfos">
<text>{{item.nyear}}</text>
<text>{{item.cashValue}}</text>
<text class="resultNumber">{{(item.simpleValue*100).toFixed(5)}}%</text>
<text class="resultNumber">{{(item.irrValue * 100).toFixed(5)}}%</text>
<text>{{item.cashValue | numberToCurrency}}</text>
<text class="resultNumber">{{(item.simpleValue*100).toFixed(3)}}%</text>
<text class="resultNumber">{{(item.irrValue * 100).toFixed(3)}}%</text>
</view>
</view>
</scroll-view>
......@@ -190,7 +194,7 @@
import api from "../../api/api";
import {nanoid} from 'nanoid';
import dataHandling from "../../util/dataHandling";
import dataImport from "../dataImport/data-import.vue"
import dataImport from "../dataImport/data-import.vue";
export default {
data() {
......@@ -266,10 +270,15 @@
this.yearWithdrawalInfos = [].concat([{withdrawalType:'1',
withdrawalStart:null,
yearWithdrawalAmount:null}]);
<<<<<<< HEAD
}else{
//年金切换到增额时万能账户清空,提领信息清空
this.irrAndSimpleCalcuteParam.allFirstPayment = null;
this.yearWithdrawalInfos = [];
=======
}else if(e=='1'){
this.irrAndSimpleCalcuteParam.allFirstPayment = null;
>>>>>>> 6c3581fb58cc1331532f1e352624a05e5ba80ba7
}
this.resultShowFlag = false;
}
......
unpackage/dist/build/h5/assets/index.13d2da89.css deleted 100644 → 0
*{margin:0;-webkit-tap-highlight-color:transparent}html,body{-webkit-user-select:none;user-select:none;width:100%;height:100%}body{overflow-x:hidden;font-size:16px}uni-app,uni-page,uni-page-wrapper,uni-page-body{display:block;box-sizing:border-box;width:100%}uni-page-wrapper{position:relative}#app,uni-app,uni-page,uni-page-wrapper{height:100%}.uni-mask{position:fixed;z-index:999;top:0;right:0;left:0;bottom:0;background:rgba(0,0,0,.5)}.uni-fade-enter-active,.uni-fade-leave-active{transition-duration:.25s;transition-property:opacity;transition-timing-function:ease}.uni-fade-enter-from,.uni-fade-leave-active{opacity:0}.uni-loading,uni-button[loading]:before{background-color:transparent;background-image:url(data:image/svg+xml;base64,\ PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=);background-repeat:no-repeat}.uni-loading{width:20px;height:20px;display:inline-block;vertical-align:middle;animation:uni-loading 1s steps(12,end) infinite;background-size:100%}@keyframes uni-loading{0%{transform:rotate3d(0,0,1,0)}to{transform:rotate3d(0,0,1,360deg)}}body:after{position:fixed;content:"";left:-1000px;top:-1000px;animation:shadow-preload .1s;animation-delay:3s}@keyframes shadow-preload{0%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}to{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}}.uni-async-error{position:absolute;left:0;right:0;top:0;bottom:0;color:#999;padding:100px 10px;text-align:center}.uni-async-loading{box-sizing:border-box;width:100%;padding:50px;text-align:center}.uni-async-loading .uni-loading{width:30px;height:30px}
util/numerPipe.ts → util/numberPipe.ts
export function numberToCurrencyNo(value) {
if (!value) return 0
debugger;
if (!value) return 0;
// 获取整数部分
const intPart = Math.trunc(value)
// 整数部分处理，增加,
......
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