Commit 36b56c9c by Sweet Zhang

上线分享弹窗

parent 2b44e888
...@@ -19,7 +19,7 @@ const config = { ...@@ -19,7 +19,7 @@ const config = {
stage, stage,
prod prod
} }
let env = 'dev'; let env = 'prod';
// if (process.env.NODE_ENV === 'development') { // if (process.env.NODE_ENV === 'development') {
// env = 'dev'; // env = 'dev';
// }else if (process.env.NODE_ENV === 'production') { // }else if (process.env.NODE_ENV === 'production') {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div id="app"><!--app-html--></div> <div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script> <script type="module" src="/main.js"></script>
<!-- 移动端调试 --> <!-- 移动端调试 -->
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script> <!-- <script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script>
<script>eruda.init();</script> <script>eruda.init();</script> -->
</body> </body>
</html> </html>
...@@ -113,28 +113,47 @@ ...@@ -113,28 +113,47 @@
} }
.batchDataLists view{ .batchDataLists view{
display: flex; display: flex;
text-align: center; justify-content: center;
border-bottom: 1px solid #e4e4e4; align-items: center;
} }
.batchDataLists view text:first-child{ .batchDataLists view text:first-child{
width: 0; display: inline-block;
flex: 0 0 35%; width: 100%;
flex: auto;
text-align: center;
border-right: 1px solid #e4e4e4; border-right: 1px solid #e4e4e4;
} }
.batchDataLists view text:last-child{
width: 0;
flex: 0 0 65%;
}
.batchDataLists view.batchDataTh{ .batchDataLists view.batchDataTh{
height: 60rpx;
background:linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%); background:linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
line-height: 60rpx;
border-top-left-radius: 12rpx; border-top-left-radius: 12rpx;
border-top-right-radius: 12rpx; border-top-right-radius: 12rpx;
min-height: 80rpx;
}
.batchDataTh .pvTitle{
display: flex;
flex-direction: column;
flex: 0 0 65%;
justify-content: center;
align-items: center;
}
.batchDataTh > view:first-child,.batchDataTd > view:first-child{
width: 0;
flex: 0 0 35%;
justify-content: center;
}
.batchDataTh > view:last-child,.batchDataTd > view:last-child{
width: 0;
flex: 0 0 65%;
justify-content: center;
}
.batchDataTh .pvTitle view{
border: none;
} }
.batchDataLists view.batchDataTd{ .batchDataLists view.batchDataTd{
display: flex;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
border-bottom: 1px solid #e4e4e4;
} }
.dataOptionContainer{ .dataOptionContainer{
margin: 20rpx 20rpx 0; margin: 20rpx 20rpx 0;
......
...@@ -28,14 +28,25 @@ ...@@ -28,14 +28,25 @@
</view> </view>
<!-- 批量数据输入区域 --> <!-- 批量数据输入区域 -->
<view class="batchDataLists"> <view class="batchDataLists">
<view class="batchDataTh"> <view class="batchDataTh" v-if="!pvFlag">
<text>保单年度</text> <view>保单年度</view>
<text>现金价值</text> <view>现金价值</view>
</view>
<view class="batchDataTh" v-if="pvFlag">
<view>保单年度</view>
<view class="pvTitle">
<view>总生存利益</view>
<view style="font-size: 24rpx;margin-top: 4rpx;">(现金价值+万能账户)</view>
</view>
</view> </view>
<scroll-view scroll-y="true" style="height: 560rpx;"> <scroll-view scroll-y="true" style="height: 560rpx;">
<view class="batchDataTd" v-for="item in irrAndSimpleInfos"> <view class="batchDataTd" v-for="item in irrAndSimpleInfos">
<text>{{item.nyear}}</text> <view>
<input class="uni-input" style="height: 100%;" type="digit" v-model="item.cashValue" placeholder="请输入数字,例如10000" maxlength="17"/> <text>{{item.nyear}}</text>
</view>
<view>
<input class="uni-input" style="height: 100%;" type="digit" v-model="item.cashValue" placeholder="输入数字,如100" maxlength="17"/>
</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -87,11 +98,13 @@ ...@@ -87,11 +98,13 @@
maxPolicyYear:105, maxPolicyYear:105,
policyYearLists:[{nyear:1,isActived:true,cashValue:''}], policyYearLists:[{nyear:1,isActived:true,cashValue:''}],
policyYearModalFlag:false, policyYearModalFlag:false,
calcuteData:null calcuteData:null,
pvFlag:false
} }
}, },
name:'dataImport', name:'dataImport',
onLoad() { onLoad(option) {
this.pvFlag = option.isUniversalAccount=='1' ? true : false;
this.bindPickerChange({detail:{value:this.index}}); this.bindPickerChange({detail:{value:this.index}});
this.calcuteData = uni.getStorageSync('calcuteData') ? JSON.parse(uni.getStorageSync('calcuteData')) : null; this.calcuteData = uni.getStorageSync('calcuteData') ? JSON.parse(uni.getStorageSync('calcuteData')) : null;
}, },
......
...@@ -126,14 +126,14 @@ ...@@ -126,14 +126,14 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
flex: 0 0 51%; flex: 0 0 50%;
} }
.inputContent .uni-input{ .inputContent .uni-input{
margin-right: 20rpx; margin-right: 20rpx;
text-align: right; text-align: right;
} }
.inputItem text{ .inputItem text{
flex: 0 0 49%; flex: 0 0 50%;
} }
.simpleDataResult{ .simpleDataResult{
background: #FFFFFF; background: #FFFFFF;
...@@ -192,13 +192,14 @@ ...@@ -192,13 +192,14 @@
} }
.optionContent{ .optionContent{
position: fixed; position: fixed;
bottom: 30rpx; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
padding-bottom: 30rpx;
} }
.optionContent button{ .optionContent button{
flex: 0 0 46%; flex: 0 0 46%;
...@@ -253,7 +254,7 @@ ...@@ -253,7 +254,7 @@
line-height: initial; line-height: initial;
} }
.cashValueContent .title button::after{ .cashValueContent .title button::after{
border: 1px solid #CEB07D; border: 2px solid #CEB07D;
border-radius: 12rpx; border-radius: 12rpx;
} }
.cashValueContent .title button:first-child{ .cashValueContent .title button:first-child{
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 没有关注公众号须先关注公众号才可以使用 --> <!-- 没有关注公众号须先关注公众号才可以使用 -->
<view class="qrcodeContainer" v-show="isNeedOfficialAccountQrcode"> <view class="qrcodeContainer" v-show="isNeedOfficialAccountQrcode">
<view class="qrcodeContent"> <view class="qrcodeContent">
<img src="../../static/images/qrcodeBg.png" alt="" srcset=""> <img src="../../static/images/qrcodeBg_1.png" alt="" srcset="">
</view> </view>
</view> </view>
<!-- 已关注公众号用户 --> <!-- 已关注公众号用户 -->
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<view class="banner"> <view class="banner">
<img src="/static/images/policyIrrBanner.png" alt="" srcset=""> <img src="/static/images/policyIrrBanner.png" alt="" srcset="">
<!-- 使用说明 --> <!-- 使用说明 -->
<text>使用说明</text> <!-- <text @click="instructionForUse">使用说明</text> -->
<view class="supportTips"> <view class="supportTips">
<img src="/static/images/cffpLogo.png" alt="" srcset=""> <img src="/static/images/cffpLogo.png" alt="" srcset="">
<text>本工具由CFFP财策师联盟提供技术支持</text> <text>本工具由CFFP财策师联盟提供技术支持</text>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</view> </view>
</view> </view>
<view class="inputItem"> <view class="inputItem">
<text>{{irrAndSimpleCalcuteParam.allFirstPayment > 0 ? '总生存利益(万能账户现价+现金价值)' :'现金价值'}}:</text> <text>{{irrAndSimpleCalcuteParam.allFirstPayment > 0 ? '总生存利益(现金价值+万能账户现价)' :'现金价值'}}:</text>
<view class="inputContent"> <view class="inputContent">
<input class="uni-input" type="digit" placeholder="请输入" min='1' maxlength="17" <input class="uni-input" type="digit" placeholder="请输入" min='1' maxlength="17"
v-model="irrAndSimple.cashValue"/> v-model="irrAndSimple.cashValue"/>
...@@ -278,11 +278,31 @@ ...@@ -278,11 +278,31 @@
} }
}) })
} }
if(
sessionStorage.getItem('shareTipsFlag')!='1' &&
!this.isNeedOfficialAccountQrcode &&
dataHandling.getQueryString('subscribe')=='1'){
uni.showModal({
title: '',
content: '好东西就要分享,您的分享,是我们持续提供好工具的动力',
showCancel:false,
confirmText:'确定',
success: function (res) {
if (res.confirm) {
sessionStorage.setItem('shareTipsFlag','1')
}
}
});
}
if(this.yearWithdrawal.length>0){ if(this.yearWithdrawal.length>0){
this.yearWithdrawalInfos.push({...this.yearWithdrawal,withdrawalType:this.withdrawalType?'1':'2'}) this.yearWithdrawalInfos.push({...this.yearWithdrawal,withdrawalType:this.withdrawalType?'1':'2'})
} }
}, },
methods: { methods: {
// 使用说明跳转
instructionForUse(){
window.location.href = 'https://mp.weixin.qq.com/s/V8RtUN9I2hECv2UiefF1HA';
},
// 数字千分位处理 // 数字千分位处理
numberConverter(val){ numberConverter(val){
return dataHandling.numberConverter(val) return dataHandling.numberConverter(val)
...@@ -414,7 +434,7 @@ ...@@ -414,7 +434,7 @@
} }
uni.setStorageSync('calcuteData',JSON.stringify(calcuteData)) uni.setStorageSync('calcuteData',JSON.stringify(calcuteData))
uni.navigateTo({ uni.navigateTo({
url: '/pages/dataImport/data-import' url: `/pages/dataImport/data-import?isUniversalAccount=${this.irrAndSimpleCalcuteParam.allFirstPayment > 0 ? '1' : '0'}`
}); });
// this.irrFlag = true; // this.irrFlag = true;
} }
...@@ -627,6 +647,7 @@ ...@@ -627,6 +647,7 @@
this.resultShowFlag = true; this.resultShowFlag = true;
} }
} }
} }
</script> </script>
......
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