Skip to content

C
CFFP-HB
Commit 0b7a8596 by yuzhenWang
Options

Merge branch 'feature-20250625wyz-修改申请加盟' into 'dev' 

修改统计弹窗，修复支付宝支付跳登录页发布生产

See merge request !39
parents ab6294c3 7f763246
Showing with 74 additions and 18 deletions
manifest.json
......@@ -185,7 +185,7 @@
}
}
},
"disableReload": true // 添加这行禁用自动刷新
"disableReload" : true // 添加这行禁用自动刷新
},
"uniStatistics" : {
"enable" : false
......
pages.json
......@@ -475,6 +475,7 @@
"navigationBarTitleText": "批量数据计算"
}
}
],
"subPackages": [{
"root": "myPackageA",
......
pages/index/index.vue
......@@ -130,30 +130,57 @@
<view class="">
<text class="iconfont icon-a-tuandui3 leftIcon" ></text>
<text>团队有效人数</text>
<text class="iconfont icon-weiwancheng rightIcon" ></text>
<text
v-if="partnerStatistic.totalPeopleNum<partnerStatistic.reachPeopleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalPeopleNum}} / {{partnerStatistic.reachPeopleNum}}</text>
<text v-if="partnerStatistic.peopleNum>0">（相差{{partnerStatistic.peopleNum}}人）</text>
</view>
</view>
<view class="">
<view class="" v-if="partnerStatistic.reachSingeSaleNum>0">
<view class="" >
<text class="iconfont icon-xiaoshoue leftIcon" ></text>
<text>个人标准销售累计金额</text>
<text class="iconfont icon-duihao2 rightIcon" ></text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text
v-if="partnerStatistic.totalSingeSaleNum<partnerStatistic.reachSingeSaleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalSingeSaleNum}}元 / {{partnerStatistic.reachSingeSaleNum}}元</text>
<text >{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 / {{partnerStatistic.reachSingeSaleNum.toFixed(2)}}元</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSaleNum>0">
<view class="">
<text class="iconfont icon-ddailirenshu leftIcon" ></text>
<text>团队标准销售累计金额</text>
<text class="iconfont icon-weiwancheng rightIcon" ></text>
<!-- <text class="iconfont icon-weiwancheng rightIcon" ></text> -->
<text
v-if="partnerStatistic.totalSaleNum<partnerStatistic.reachSaleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalSaleNum}}元 / {{partnerStatistic.reachSaleNum}}元</text>
<text v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum}}元）</text>
<text >{{partnerStatistic.totalSaleNum.toFixed(2)}}元 / {{partnerStatistic.reachSaleNum.toFixed(2)}}元</text>
<text v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum.toFixed(2)}}元）</text>
</view>
</view>
......@@ -311,7 +338,7 @@
for (let key in this.partnerStatistic) {
if(key!='peopleNum' && key!='reachPeopleNum'&& key!='totalPeopleNum'){
if(key){
this.partnerStatistic[key] = this.partnerStatistic[key].toFixed(2)
this.partnerStatistic[key] = Number(this.partnerStatistic[key].toFixed(2))
}
}
}
......
pages/personalCenter/personalCenter.vue
......@@ -87,30 +87,57 @@
<view class="">
<text class="iconfont icon-a-tuandui3 leftIcon" ></text>
<text>团队有效人数</text>
<text class="iconfont icon-weiwancheng rightIcon" ></text>
<text
v-if="partnerStatistic.totalPeopleNum<partnerStatistic.reachPeopleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalPeopleNum}} / {{partnerStatistic.reachPeopleNum}}</text>
<text v-if="partnerStatistic.peopleNum>0">（相差{{partnerStatistic.peopleNum}}人）</text>
</view>
</view>
<view class="">
<view class="" v-if="partnerStatistic.reachSingeSaleNum>0">
<view class="" >
<text class="iconfont icon-xiaoshoue leftIcon" ></text>
<text>个人标准销售累计金额</text>
<text class="iconfont icon-duihao2 rightIcon" ></text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text
v-if="partnerStatistic.totalSingeSaleNum<partnerStatistic.reachSingeSaleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalSingeSaleNum}}元 / {{partnerStatistic.reachSingeSaleNum}}元</text>
<text >{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 / {{partnerStatistic.reachSingeSaleNum.toFixed(2)}}元</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSaleNum>0">
<view class="">
<text class="iconfont icon-ddailirenshu leftIcon" ></text>
<text>团队标准销售累计金额</text>
<text class="iconfont icon-weiwancheng rightIcon" ></text>
<!-- <text class="iconfont icon-weiwancheng rightIcon" ></text> -->
<text
v-if="partnerStatistic.totalSaleNum<partnerStatistic.reachSaleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalSaleNum}}元 / {{partnerStatistic.reachSaleNum}}元</text>
<text v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum}}元）</text>
<text >{{partnerStatistic.totalSaleNum.toFixed(2)}}元 / {{partnerStatistic.reachSaleNum.toFixed(2)}}元</text>
<text v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum.toFixed(2)}}元）</text>
</view>
</view>
......@@ -231,11 +258,12 @@
for (let key in this.partnerStatistic) {
if(key!='peopleNum' && key!='reachPeopleNum'&& key!='totalPeopleNum'){
if(key){
this.partnerStatistic[key] = this.partnerStatistic[key].toFixed(2)
this.partnerStatistic[key] = Number(this.partnerStatistic[key].toFixed(2))
}
}
}
this.$refs.applyPopup.open()
}else {
uni.showToast({
title: res['message'],
......
util/router.js
......@@ -28,7 +28,7 @@ export default function initApp(){
let pages = getCurrentPages()
let pagesLength = pages.length
if(!uni.getStorageSync('loginType')){
if(whiteList.indexOf(e.url)==-1&&!uni.getStorageSync('loginType')){
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor')
uni.navigateTo({
......
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