This commit is contained in:
Mr.jiang 2024-06-27 23:21:22 +08:00
parent 6898967190
commit da46dc2308
3 changed files with 20 additions and 15 deletions

View File

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

View File

@ -715,7 +715,7 @@ export default {
if (this.userId) { if (this.userId) {
console.log(this.userId, "dwdwadwdawd============>"); console.log(this.userId, "dwdwadwdawd============>");
this.isLogin = true this.isLogin = true
this.getJinRiOrder(); // this.getJinRiOrder();
this.getUserInfo() this.getUserInfo()
this.getFb() this.getFb()
@ -749,7 +749,7 @@ export default {
this.avatar = '../../static/logo.png' this.avatar = '../../static/logo.png'
clearInterval(this.time); clearInterval(this.time);
} }
if (this.isLogin) this.getJinRiOrder(); // if (this.isLogin) this.getJinRiOrder();
this.getcity() this.getcity()
}, },
destroyed() { destroyed() {

View File

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