Commit e16e05d8 by Sweet Zhang

联调接口

parent d7c9a320
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
} }
.simpleDataResult .calcNumber{ .simpleDataResult .calcNumber{
text-align: right; text-align: right;
font-size: 20px;
} }
.simpleDataResult .inputItem:last-child{ .simpleDataResult .inputItem:last-child{
border:none; border:none;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
/><label for=""></label> /><label for=""></label>
</view> </view>
</view> </view>
<view class="inputItem" v-show="calcuteType===2"> <view class="inputItem" v-show="calcuteType==='2'">
<text>万能账户首年交费<text style="font-size: 24rpx;">(如有)</text></text> <text>万能账户首年交费<text style="font-size: 24rpx;">(如有)</text></text>
<view class="inputContent"> <view class="inputContent">
<input class="uni-input" type="number" placeholder="请输入" <input class="uni-input" type="number" placeholder="请输入"
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
</view> </view>
</view> </view>
<!-- 提领信息 --> <!-- 提领信息 -->
<view class="claimInfomationContent"> <view class="claimInfomationContent" v-if="!(calcuteType==='2' && irrAndSimpleCalcuteParam.allFirstPayment)">
<view class="title"> <view class="title">
<text>提领信息</text> <text>提领信息</text>
<view style="display: flex;" @click="changeWithdrawalType()" v-show="calcuteType==='1'"> <view style="display: flex;" @click="changeWithdrawalType" v-show="calcuteType==='1'">
<view class="radioButton" :class="{'selected':!withdrawalType}"></view> <view class="radioButton" :class="{'selected':!withdrawalType}"></view>
<text style="margin-left: 10rpx;">减保取现</text> <text style="margin-left: 10rpx;">减保取现</text>
</view> </view>
...@@ -125,18 +125,18 @@ ...@@ -125,18 +125,18 @@
<!-- 现金价值单利复利结果展示 --> <!-- 现金价值单利复利结果展示 -->
<view class="resultContent"> <view class="resultContent">
<!-- 单次计算显示结果 --> <!-- 单次计算显示结果 -->
<view class="simpleDataResult" v-show="resultShowFlag"> <view class="simpleDataResult" v-if="resultShowFlag && calcuteMethod == '1'">
<view class="inputItem"> <view class="inputItem">
<text class="resultTitle">IRR复利</text> <text class="resultTitle">IRR复利</text>
<text class="calcNumber">0%</text> <text class="calcNumber">{{irrAndSimpleResInfos[0]['irrValue'] * 100}}%</text>
</view> </view>
<view class="inputItem"> <view class="inputItem">
<text class="resultTitle">单利</text> <text class="resultTitle">单利</text>
<text class="calcNumber">0%</text> <text class="calcNumber">{{irrAndSimpleResInfos[0]['simpleValue'] * 100}}%</text>
</view> </view>
</view> </view>
<!-- 批量计算显示结果 --> <!-- 批量计算显示结果 -->
<view class="batchDataResult" v-show="resultShowFlag"> <view class="batchDataResult" v-if="resultShowFlag && calcuteMethod == '2'">
<scroll-view scroll-y="true" class="scroll-Y"> <scroll-view scroll-y="true" class="scroll-Y">
<view class="scroll-view-item"> <view class="scroll-view-item">
<view class="resultTh"> <view class="resultTh">
...@@ -203,11 +203,15 @@ ...@@ -203,11 +203,15 @@
cashValue:undefined cashValue:undefined
}, },
yearWithdrawalInfos:[], yearWithdrawalInfos:[],
irrAndSimpleInfos:[] irrAndSimpleInfos:[],
irrAndSimpleResInfos:[] // 计算结果
} }
}, },
onLoad() { onLoad() {
this.yearWithdrawalInfos.push(this.yearWithdrawal) if(!uni.getStorageSync('businessNo')){
uni.setStorageSync('businessNo', nanoid());
}
this.yearWithdrawalInfos.push(this.yearWithdrawal)
}, },
methods: { methods: {
switchTab(e){ switchTab(e){
...@@ -286,27 +290,23 @@ ...@@ -286,27 +290,23 @@
calcuteType:this.calcuteType, calcuteType:this.calcuteType,
businessType:this.businessType, businessType:this.businessType,
calcuteMethod:this.calcuteMethod, calcuteMethod:this.calcuteMethod,
businessNo:nanoid(), // businessNo:uni.getStorageSync('businessNo'),
mobile: "17352689126", businessNo:'businessNo20220829000000001',
loginNo: "17352689126", mobile: null,
loginNo: null,
wechat_unionid: "wx_17352689126", wechat_unionid: "wx_17352689126",
yearWithdrawalInfos:this.yearWithdrawalInfos, yearWithdrawalInfos:null,
irrAndSimpleInfos:[].push({nyear:this.irrAndSimple.nyear,cashValue:this.irrAndSimple.cashValue}), irrAndSimpleInfos:this.irrAndSimpleInfos.concat([this.irrAndSimple]),
withdrawalType:this.withdrawalType?'1':'2', withdrawalType:this.withdrawalType?'1':'2',
decimal: 5, decimal: 5
// "irrAndSimpleInfos": [
// {
// "nyear": 10,
// "cashValue": 90000
// },
// {
// "nyear": 15,
// "cashValue": 99000
// }
// ]
}; };
api.irrAndSimpleCalcute(params).then(res=>{ api.irrAndSimpleCalcute(params).then(res=>{
console.log(res) console.log(res)
if(res.success === true){
this.irrAndSimpleResInfos = res.data.irrAndSimpleResInfos;
console.log(this.irrAndSimpleResInfos)
this.resultShowFlag = true;
}
}) })
} }
} }
......
import api from "../api/api"; import api from "../api/api";
import {baseURL,apiURL,sfpURL} from "../environments/environment"; import {baseURL,apiURL,sfpURL} from "../environments/environment";
// 白名单,不需要携带token就允许被访问的接口 // 白名单,不需要携带token就允许被访问的接口
<<<<<<< HEAD
const whiteApiList = ['/api/authorize/obtainToken']
=======
const whiteApiList = [`/api/authorize/obtainToken`] const whiteApiList = [`/api/authorize/obtainToken`]
>>>>>>> 20eb17e444fb451ad26e91c66292178c8cb3acd4
export const interceptor = () => { export const interceptor = () => {
......
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