Commit bbc88645 by Chao Sun

新建组件&公用组件提取

parents 27679d8a 36b56c9c
{ {
"hash": "a8071bec", "hash": "df8c90de",
"browserHash": "4aa27071", "browserHash": "b3a2b26f",
"optimized": { "optimized": {
"nanoid": { "nanoid": {
"src": "../../node_modules/nanoid/index.browser.js", "src": "../../node_modules/nanoid/index.browser.js",
"file": "nanoid.js", "file": "nanoid.js",
"fileHash": "8fa96e9e", "fileHash": "65e128fe",
"needsInterop": false "needsInterop": false
} }
}, },
......
...@@ -14,4 +14,22 @@ ...@@ -14,4 +14,22 @@
<style> <style>
/*每个页面公共css */ /*每个页面公共css */
.banner{
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{
width: 100%;
}
</style> </style>
const env = 'dev';
const dev = { const dev = {
base_url:'https://mdev.zuihuibi.cn', base_url:'https://mdev.zuihuibi.cn',
api_url:'https://mdev.zuihuibi.cn/api', api_url:'https://mdev.zuihuibi.cn/api',
...@@ -20,6 +19,14 @@ const config = { ...@@ -20,6 +19,14 @@ const config = {
stage, stage,
prod prod
} }
let env = 'prod';
// if (process.env.NODE_ENV === 'development') {
// env = 'dev';
// }else if (process.env.NODE_ENV === 'production') {
// env = 'prod';
// }else if (process.env.NODE_ENV === 'uat'){
// env = 'stage';
// }
let baseURL = config[env].base_url; let baseURL = config[env].base_url;
let apiURL = config[env].api_url; let apiURL = config[env].api_url;
......
...@@ -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>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"topWindow": false, "topWindow": false,
"navigationBarTitleText": "金融工具" "navigationBarTitleText": "CFFP财策师联盟"
} }
}, },
{ {
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
"topWindow": false, "topWindow": false,
"navigationBarTitleText": "批量数据计算" "navigationBarTitleText": "批量数据计算"
} }
},
{
"path": "pages/housePurchase/housePurchase",
"style": {
"topWindow": false,
"navigationBarTitleText": "购房能力测算"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
...@@ -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;
}, },
...@@ -147,9 +160,10 @@ ...@@ -147,9 +160,10 @@
}, },
// 粘贴并识别 // 粘贴并识别
pasteDataDistinguish(){ pasteDataDistinguish(){
const pasteDataLists = this.pasteData.trim().split('\n'); let pasteDataListsOrigin = this.pasteData.trim().split('\n');
console.log(pasteDataLists) let pasteDataLists;
if(pasteDataLists.length<=0 || pasteDataLists.every((item)=>item=='')){ pasteDataLists = pasteDataListsOrigin.map(item=>item.trim());
if(pasteDataLists.length<=0 || pasteDataLists.every((item)=>item=='')){
uni.showModal({ uni.showModal({
title: '数据识别结果', title: '数据识别结果',
content: '检测到您并没有导入数据,请重新操作', content: '检测到您并没有导入数据,请重新操作',
......
<template>
<view class="supportDeclarationContainer">
<img src="/static/images/cffpLogo.png" alt="" srcset="">
<text>本工具由CFFP财策师联盟提供技术支持</text>
</view>
</template>
<script>
export default{
data(){
},
name:'foot',
components:{
},
onLoad(){
},
methods:{
}
}
</script>
<style>
.supportDeclarationContainer{
padding-bottom: 60px;
text-align: center;
color: #ccc;
display: flex;
justify-content: center;
align-items: center;
}
.supportDeclarationContainer img{
width: 60rpx;
}
</style>
\ No newline at end of file
<template>
<view class="supportTips">
<img src="/static/images/cffpLogo.png" alt="" srcset="">
<text>本工具由CFFP财策师联盟提供技术支持</text>
</view>
</template>
<script>
export default{
data(){
},
name:'head',
components:{
},
onLoad(){
},
methods:{
}
}
</script>
<style>
.supportTips{
position: absolute;
top: 0;
right: 0;
display: flex;
justify-content: center;
align-items: center;
font-size: 26rpx;
width: 100%;
padding: 0rpx 12rpx;
background: rgba(255,255,255,.5);
color: #000;
}
.supportTips text{
white-space: nowrap;
}
.supportTips img{
width: 60rpx;
}
</style>
\ No newline at end of file
<template>
<view class="wrapper">
<view class="banner">
<!--头部技术支持组件-->
<head></head>
<img src="../../static/images/banner.png" alt="banner" srcset="">
</view>
<view class="content">
<!--底部技术支持组件-->
<foot></foot>
</view>
</view>
<!--旧房贷款余额组件-->
<loanBalance></loanBalance>
<!--规划参数组件-->
<planningParameters></planningParameters>
</template>
<script>
import loanBalance from './loanBalance.vue';
import planningParameters from './loanBalance.vue';
import head from '../header/header.vue';
import foot from '../footer/footer.vue';
export default{
data(){
},
components:{
loanBalance,
planningParameters,
head,
foot
},
onLoad(){
},
methods:{
}
}
</script>
<style>
</style>
\ No newline at end of file
<template>
</template>
<script>
export default{
data(){
},
name:'loanBalance',
components:{
},
onLoad(){
},
methods:{
}
}
</script>
<style>
</style>
\ No newline at end of file
<template>
</template>
<script>
export default{
data(){
},
name:'planningParameters',
components:{
},
onLoad(){
},
methods:{
}
}
</script>
<style>
</style>
\ No newline at end of file
...@@ -24,23 +24,6 @@ ...@@ -24,23 +24,6 @@
.logo { .logo {
width: 100%; width: 100%;
} }
.banner{
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{
width: 100%;
}
.tabTitle{ .tabTitle{
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
...@@ -107,14 +90,14 @@ ...@@ -107,14 +90,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;
...@@ -173,13 +156,14 @@ ...@@ -173,13 +156,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%;
...@@ -234,7 +218,7 @@ ...@@ -234,7 +218,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{
...@@ -269,4 +253,4 @@ ...@@ -269,4 +253,4 @@
font-size: 24rpx; font-size: 24rpx;
text-align: left; text-align: left;
color: red; color: red;
} }
\ No newline at end of file
...@@ -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> <head></head>
</view> </view>
<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer"> <scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
<view class="tabTitle"> <view class="tabTitle">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,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"/>
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<foot></foot>
<!-- 操作 --> <!-- 操作 -->
<view class="optionContent"> <view class="optionContent">
<button type="default" plain="true" form-type="reset" <button type="default" plain="true" form-type="reset"
...@@ -201,7 +202,9 @@ ...@@ -201,7 +202,9 @@
import dataHandling from "../../util/dataHandling"; import dataHandling from "../../util/dataHandling";
import dataImport from "../dataImport/data-import.vue"; import dataImport from "../dataImport/data-import.vue";
import { inject } from "vue"; import { inject } from "vue";
import foot from '../footer/footer.vue';
import head from '../header/header.vue';
export default { export default {
data() { data() {
return { return {
...@@ -231,7 +234,9 @@ ...@@ -231,7 +234,9 @@
} }
}, },
components:{ components:{
dataImport dataImport,
foot,
head
}, },
onLoad() { onLoad() {
if(!uni.getStorageSync('businessNo')){ if(!uni.getStorageSync('businessNo')){
...@@ -269,11 +274,31 @@ ...@@ -269,11 +274,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)
...@@ -405,7 +430,7 @@ ...@@ -405,7 +430,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;
} }
...@@ -618,6 +643,7 @@ ...@@ -618,6 +643,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