yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

This commit is contained in:
kbing1981 2024-06-27 23:22:00 +08:00
parent 7d325f112f a227d1f3fc
commit 3e901e208c
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
my/order/revenueDetails.vue
View File

@ -27,14 +27,16 @@
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
x{{order.ordersMassageList[0].num}}
</view>
<view class="mian-money">
<view class="mian-money-title">项目价格：</view>
<view class="mian-money-num">
<span class="fuhao">￥</span>
<span class="number">{{order.payMoney}}</span>
<span class="number">
{{order.massagePrice}}
<span style="font-size: 12px;color: #666;">x{{order.ordersMassageList[0].num}}</span>
</span>
</view>
</view>
</view>
@ -52,7 +54,7 @@
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</span>
<image src="../../static/index/dianhua.png" mode=""></image>
<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
@ -101,7 +103,7 @@
<span class="mian-view-list-text">70.00%</span>
</view> -->
</view>
<view class="mian-view">
<view class="mian-view" v-if="order.status != 9">
<view class="mian-view-list">
<span class="mian-view-list-title">是否加钟</span>
<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span>
@ -119,7 +121,7 @@
<span class="mian-view-list-text">￥{{order.addMoney}}</span>
</view>
</view>
<view class="mian-view">
<view class="mian-view" v-if="order.status != 9">
<view class="mian-view-list">
<span class="mian-view-list-title">是否改价</span>
<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
@ -137,7 +139,7 @@
<span class="mian-view-list-text">￥{{order.gjcePrice}}</span>
</view>
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-content" style="margin-bottom: 10px;" v-if="order.status != 9">
<view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span>
@ -291,7 +293,7 @@
<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<!-- #ifndef H5 -->
<image src="../../static/images/index/jinji.png" class="bj_view" @tap="goBaoJing"></image>
<!-- #endif -->

17
pages/index/index.vue
View File

@ -80,10 +80,15 @@
<view class="djtit">当前等级</view>
<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
<view class="" style="margin-top: 20px;">
<text style="font-size: 30px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
<text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text>
<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
<view class="" style="margin-top: 20px;">
<text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
:percent="lineProgressData" :striped-active="true"></u-line-progress>
<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
@ -113,7 +118,7 @@
</view>
</view>
</u-popup>
</view>
</view> -->
<view class="flex align-center"
style="justify-content: space-evenly;text-align: center;">
<view class="" @click="dangqian">
@ -715,7 +720,7 @@ export default {
if (this.userId) {
console.log(this.userId, "dwdwadwdawd============>");
this.isLogin = true
this.getJinRiOrder();
// this.getJinRiOrder();
this.getUserInfo()
this.getFb()
@ -749,7 +754,7 @@ export default {
this.avatar = '../../static/logo.png'
clearInterval(this.time);
}
if (this.isLogin) this.getJinRiOrder();
// if (this.isLogin) this.getJinRiOrder();
this.getcity()
},
destroyed() {

15
pages/order/index.vue
View File

@ -358,6 +358,10 @@
that.longitude = res.longitude
}
});
this.mescroll.resetUpScroll()
this.upCallback({
num: this.num
});
},
onShow() {
let that = this;
@ -376,12 +380,10 @@
this.visitor = 0
this.avatar = '../../static/logo.png'
}
setTimeout(d => {
this.mescroll.resetUpScroll()
}, 1000)
this.upCallback({
num: this.num
});
// setTimeout(d => {
// this.mescroll.resetUpScroll()
// }, 1000)
},
watch: {
isTrue(newValue) {
@ -617,6 +619,7 @@
},
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
upCallback(page) {
console.log('upCallback-->',page);
// debugger;
if (!this.isLogin) {
uni.hideLoading();