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

订单页面调整

This commit is contained in:
曹磊 2024-07-20 09:56:22 +08:00
parent 0ec6588fca
commit a1632cf726
3 changed files with 351 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
my/order/revenueDetails.vue
View File

@ -94,29 +94,20 @@
<u-icon name="file-text"/> <u-icon name="file-text"/>
</span> </span>
</view> </view>
<view class="mian-view-list">
<span class="mian-view-list-title">下单时间</span>
<span class="mian-view-list-text">{{order.createTime}}</span>
</view>
<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.serveTime}}</span> <span class="mian-view-list-text">{{order.serveTime}}</span>
</view> </view>
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-view-list">
<view class="mian-content-list-title">出行方式</view> <span class="mian-view-list-title">下单时间</span>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <span class="mian-view-list-text">{{order.createTime}}</span>
<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">全程距离</span>
<span class="mian-content-list-text">{{order.km}}km</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">车费收益</span>
<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
</view>
<view class="mina-title">
<span class="mina-title-text">订单费用</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view">
<view class="mian-view-list" v-if="order.oldOrdersMassageList[0].userPackageDetail"> <view class="mian-view-list" v-if="order.oldOrdersMassageList[0].userPackageDetail">
<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<span class="mian-view-list-text"> <span class="mian-view-list-text">
@ -133,11 +124,6 @@
<span class="mian-view-list-title">项目金额</span> <span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.oldMassagePrice}}</span> <span class="mian-view-list-text">￥{{order.oldMassagePrice}}</span>
</view> </view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<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" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span> <span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
@ -147,15 +133,46 @@
<span class="mian-view-list-title">会员减免</span> <span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span> <span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-view-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span> <span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
</view> </view>
<view class="mina-title">
<span class="mina-title-text">出行费用</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view">
<view class="mian-view-list" v-if="order.tripWay">
<view class="mian-view-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-view-list-text">公交</view>
<view v-if="order.tripWay == 2" class="mian-view-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-view-list-text">免费</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">全程距离</span>
<span class="mian-view-list-text">{{order.km}}km</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">车费收益</span>
<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
</view>
</view>
<view class="mina-title">
<span class="mina-title-text">优惠卷信息</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view">
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
</view>
<view class="mina-title" v-if="order.addNum!=null"> <view class="mina-title" v-if="order.addNum!=null">
<span class="mina-title-text">加钟信息</span> <span class="mina-title-text">加钟信息</span>
<span class="mina-title-bor"></span> <span class="mina-title-bor"></span>
@ -182,11 +199,10 @@
<span class="mian-view-list-title">服务时长</span> <span class="mian-view-list-title">服务时长</span>
<span class="mian-view-list-text">{{order.addTime}}分钟</span> <span class="mian-view-list-text">{{order.addTime}}分钟</span>
</view> </view>
<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!=null?order.addNum:'-'}}</span> <span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view> </view> -->
<!-- <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" v-if="order.addArtificerMoney!=null">￥{{order.addArtificerMoney}}</span> <span class="mian-view-list-text" v-if="order.addArtificerMoney!=null">￥{{order.addArtificerMoney}}</span>
@ -441,19 +457,19 @@
<span class="mian-view-list-title">预约时间</span> <span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span> <span class="mian-view-list-text">{{order.serveTime}}</span>
</view> </view>
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-view-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view> <view class="mian-view-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <view v-if="order.tripWay == 1" class="mian-view-list-text">公交</view>
<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view> <view v-if="order.tripWay == 2" class="mian-view-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view> <view v-if="order.tripWay == 3" class="mian-view-list-text">免费</view>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">全程距离</span> <span class="mian-view-list-title">全程距离</span>
<span class="mian-content-list-text">{{order.km}}km</span> <span class="mian-view-list-text">{{order.km}}km</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">车费收益</span> <span class="mian-view-list-title">车费收益</span>
<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span> <span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span> <span class="mian-view-list-title">服务项目</span>
@ -479,12 +495,12 @@
<span class="mian-view-list-title">会员减免</span> <span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span> <span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-view-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span> <span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
</view> </view>
@ -514,11 +530,10 @@
<span class="mian-view-list-title">服务时长</span> <span class="mian-view-list-title">服务时长</span>
<span class="mian-view-list-text">{{order.addTime}}分钟</span> <span class="mian-view-list-text">{{order.addTime}}分钟</span>
</view> </view>
<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!=null?order.addNum:'-'}}</span> <span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view> </view> -->
<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" v-if="order.addMoney!=null">￥{{order.addMoney}}</span> <span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
@ -666,7 +681,7 @@
<view class="mian-money-num"> <view class="mian-money-num">
<span class="fuhao">￥</span> <span class="fuhao">￥</span>
<span class="number"> <span class="number">
{{order.massagePrice}} {{order.priceMarkup}}
</span> </span>
</view> </view>
</view> </view>
@ -729,23 +744,23 @@
<span class="mian-view-list-title">预约时间</span> <span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span> <span class="mian-view-list-text">{{order.serveTime}}</span>
</view> </view>
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-view-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view> <view class="mian-view-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <view v-if="order.tripWay == 1" class="mian-view-list-text">公交</view>
<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view> <view v-if="order.tripWay == 2" class="mian-view-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view> <view v-if="order.tripWay == 3" class="mian-view-list-text">免费</view>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">全程距离</span> <span class="mian-view-list-title">全程距离</span>
<span class="mian-content-list-text">{{order.km}}km</span> <span class="mian-view-list-text">{{order.km}}km</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">车费收益</span> <span class="mian-view-list-title">车费收益</span>
<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span> <span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<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.massagePrice}}</span> <span class="mian-view-list-text">￥{{order.priceMarkup}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span> <span class="mian-view-list-title">优惠券</span>
@ -761,12 +776,12 @@
<span class="mian-view-list-title">会员减免</span> <span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span> <span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-view-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span> <span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
</view> </view>
@ -776,7 +791,7 @@
</view> </view>
<view class="mian-content" style="margin-bottom: 10px;"> <view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">提成比例</span> <span class="mian-view-list-title">提成比例333</span>
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span> <span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
@ -960,19 +975,19 @@
<span class="mian-view-list-title">预约时间</span> <span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span> <span class="mian-view-list-text">{{order.serveTime}}</span>
</view> </view>
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-view-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view> <view class="mian-view-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <view v-if="order.tripWay == 1" class="mian-view-list-text">公交</view>
<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view> <view v-if="order.tripWay == 2" class="mian-view-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view> <view v-if="order.tripWay == 3" class="mian-view-list-text">免费</view>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">全程距离</span> <span class="mian-view-list-title">全程距离</span>
<span class="mian-content-list-text">{{order.km}}km</span> <span class="mian-view-list-text">{{order.km}}km</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">车费收益</span> <span class="mian-view-list-title">车费收益</span>
<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span> <span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
@ -1002,12 +1017,12 @@
<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span> <span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span> <span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-view-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span> <span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
</view> </view>
@ -1198,15 +1213,15 @@
<span class="mian-view-list-title">预约时间</span> <span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span> <span class="mian-view-list-text">{{order.serveTime}}</span>
</view> </view>
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-view-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view> <view class="mian-view-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <view v-if="order.tripWay == 1" class="mian-view-list-text">公交</view>
<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view> <view v-if="order.tripWay == 2" class="mian-view-list-text">出租</view>
<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view> <view v-if="order.tripWay == 3" class="mian-view-list-text">免费</view>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">全程距离</span> <span class="mian-view-list-title">全程距离</span>
<span class="mian-content-list-text">{{order.km}}km</span> <span class="mian-view-list-text">{{order.km}}km</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
@ -1220,9 +1235,9 @@
{{order.entryName}} {{order.entryName}}
</span> </span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">车费收益</span> <span class="mian-view-list-title">车费收益</span>
<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span> <span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">项目金额</span> <span class="mian-view-list-title">项目金额</span>
@ -1238,12 +1253,12 @@
<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span> <span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span> <span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-view-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-view-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span> <span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
</view> </view>
@ -1273,11 +1288,10 @@
<span class="mian-view-list-title">服务时长</span> <span class="mian-view-list-title">服务时长</span>
<span class="mian-view-list-text">{{order.addTime}}分钟</span> <span class="mian-view-list-text">{{order.addTime}}分钟</span>
</view> </view>
<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!=null?order.addNum:'-'}}</span> <span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view> </view> -->
<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" v-if="order.addMoney!=null">￥{{order.addMoney}}</span> <span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
@ -2959,7 +2973,7 @@
flex-direction: column; flex-direction: column;
height: 105px; height: 105px;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
padding: 0px 5px; padding: 0px 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.mian-content-list-title{ .mian-content-list-title{

207
pages/index/index.vue
View File

@ -435,77 +435,79 @@
今日服务 今日服务
</text> </text>
</view> </view>
<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
style="padding: 0 px;width: 100%;min-height: 100vh; background: #f5f5f5; margin-top: 12px;">
<view class="bgwhite radius margin-top-sm padding-bottom-sm"
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="bgwhite radius margin-top-sm padding-bottom-sm" <view class="xian" v-if="item.status == 6"></view>
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }" <view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)"> <view class="pintuan-title" >
<image src="../../static/clock.png" class="pintuan-img"></image>
<view class="xian" v-if="item.status == 6"></view> <span class="pintuan-text">服务倒计时</span>
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view class="pintuan-title" >
<image src="../../static/clock.png" class="pintuan-img"></image>
<span class="pintuan-text">服务倒计时</span>
</view>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675">
</uni-countdown> -->
<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
<view class="flex justify-between padding-sm ">
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-status" v-if="item.status == 1">待付款...</view>
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">进行中</view>
<view class="progress-status" v-if="item.status == 7">已出发</view>
<view class="progress-status" v-if="item.status == 8">已到达</view>
<view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="progress-status" v-if="item.status == 4">已取消</view>
<view class="progress-status" v-if="item.status == 9">待确认</view>
<view class="progress-status" v-if="item.status == 10" >待补单</view>
<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
</view>
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="80">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
<view class="u-font-18 text-bold u-line-1" style="width: 560rpx;">
<view class="margin-right-xs text-df margin-left-xs"
style="margin-top: 0rpx;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{ item.title }}
</view>
</view> </view>
<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view> <!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675">
</uni-countdown> -->
<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
<view class="flex justify-between padding-sm ">
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-status" v-if="item.status == 1">待付款</view>
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">进行中</view>
<view class="progress-status" v-if="item.status == 7">已出发</view>
<view class="progress-status" v-if="item.status == 8">已到达</view>
<view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="progress-status" v-if="item.status == 4" style="color: #666666;">已取消</view>
<view class="progress-status" v-if="item.status == 9&&!item.refusalContent">待确认</view>
<view class="progress-status" v-if="item.status == 9&&item.refusalContent">拒单审核中</view>
<view class="progress-status" v-if="item.status == 10" >待补单</view>
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
</view>
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="80">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
<view class="u-font-18 text-bold u-line-1" style="width: 560rpx;">
<view class="margin-right-xs text-df margin-left-xs"
style="margin-top: 0rpx;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{ item.title }}
</view>
</view>
<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class=" flex-sub ">
实收：<text class="text-df">￥</text><text
class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex text-right">
【{{ item.ordersNo }}】
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">取消订单</u-button> -->
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@click="bindphone(item.phone)">联系TA</u-button>
<u-button v-if="item.state == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button>
<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancel(item)">订单完成</u-button> -->
</view>
</view> </view>
</view> </view>
<view class="flex u-p-t-20 justify-between align-center padding-sm"> </mescroll-body>
<view class=" flex-sub ">
实收：<text class="text-df">￥</text><text
class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex text-right">
【{{ item.ordersNo }}】
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">取消订单</u-button> -->
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@click="bindphone(item.phone)">联系TA</u-button>
<u-button v-if="item.state == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button>
<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancel(item)">订单完成</u-button> -->
</view>
</view>
</view>
</view> </view>
<uni-popup ref="popup" type="center"> <uni-popup ref="popup" type="center">
<view style="background: #fff;width:658upx;height: 960upx; border-radius:17upx;position: relative;"> <view style="background: #fff;width:658upx;height: 960upx; border-radius:17upx;position: relative;">
@ -519,10 +521,14 @@
</template> </template>
<script> <script>
import MescrollMixin from "@/components/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
import mescrollBody from "@/components/mescroll-uni/components/mescroll-body/mescroll-body.vue";
import empty from '@/components/empty.vue' import empty from '@/components/empty.vue'
import * as websocketUtils from 'utils/websocketUtils.js'; import * as websocketUtils from 'utils/websocketUtils.js';
export default { export default {
mixins: [MescrollMixin], // 使用mixin
components: { components: {
mescrollBody,
empty empty
}, },
data() { data() {
@ -540,6 +546,7 @@ export default {
isLogin: false, isLogin: false,
userName: '', userName: '',
renzheng: 0, renzheng: 0,
num: 1,
goods: [], goods: [],
sumMoney: 0, //总收益 sumMoney: 0, //总收益
countOrderNum: 0, //总销量 countOrderNum: 0, //总销量
@ -1491,6 +1498,66 @@ export default {
} }
}) })
}, },
/*下拉刷新的回调 */
downCallback() {
// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
// loadSwiper();
// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
this.mescroll.resetUpScroll()
},
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
upCallback(page) {
console.log('upCallback-->',page);
// debugger;
if (!this.isLogin) {
uni.hideLoading();
if (this.mescroll) this.mescroll.endSuccess(); // 隐藏加载状态栏
return;
}
// debugger;
this.num = page.num;
let data = {
type: 1,
page: page.num,
limit: page.size,
startTime: '',
endTime: ''
}
this.$Request.getT('/app/artificer/selectTodayOrder', data).then(res => {
this.goods = [];
if (res.code == 0) {
res.data.list.forEach(d => {
if (d.status == 6 && d.endTime) {
let afterTimeStamp = new Date(d.endTime).getTime() / 1000;
let currentTimeStamp = new Date().getTime() / 1000;
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
console.log(currentTimeStamp,"currentTimeStamp=======？");
d.endOfServiceTimer = formatTimeStamp;
}
this.goods.push(d);
});
}
uni.hideLoading();
this.mescroll.endBySize(res.data.list.length, res.data.totalCount)
if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
this.goods = [...this.goods, ...res.data.list]; //追加新数据
this.goods.forEach(ret => {
if (ret.status == 6 && ret.endTime) {
let afterTimeStamp = new Date(ret.endTime).getTime() / 1000;
let currentTimeStamp = new Date().getTime() / 1000;
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
ret.endOfServiceTimer = formatTimeStamp;
}
if (this.$refs.countDownEl) this.$refs.countDownEl.update();
})
this.mescroll.endSuccess(res.data.list.length); // 隐藏加载状态栏
}).catch(() => {
//联网失败, 结束加载
this.mescroll.endErr();
});
},
} }
} }
</script> </script>
@ -1585,8 +1652,14 @@ page {
padding: 4rpx 10rpx; padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868); background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 28rpx; font-size: 28rpx;
} }
.progress-status-chaoshi{
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
font-size: 28rpx;
}
// .bg { // .bg {
// background-color: #05C25C; // background-color: #05C25C;
// } // }

145
pages/order/index.vue
View File

@ -68,28 +68,37 @@
:key='index' @click="clickItem(item)"> --> :key='index' @click="clickItem(item)"> -->
<view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index' style="position: relative;" <view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index' style="position: relative;"
@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)"> @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view class="pintuan-title" >
<image src="../../static/clock.png" class="pintuan-img"></image>
<span class="pintuan-text">服务倒计时</span>
</view>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675">
</uni-countdown> -->
<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
<view class="flex justify-between padding-sm"> <view class="flex justify-between padding-sm">
<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view> <view class="progress-text">预约时间：{{ item.serveTime }}</view>
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> --> <!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
<view class="progress-status" v-if="item.status == 2">待服务</view> <view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 3">已完成待评价</view> <view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> <view class="progress-status" v-if="item.status == 4" style="color: #666666;">已取消</view>
<view class="progress-status" v-if="item.status == 5">已完成</view> <view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">服务中</view> <view class="progress-status" v-if="item.status == 6">服务中</view>
<view class="progress-status" v-if="item.status == 7">技师出发</view> <view class="progress-status" v-if="item.status == 7">技师出发</view>
<view class="progress-status" v-if="item.status == 8">技师到达</view> <view class="progress-status" v-if="item.status == 8">技师到达</view>
<view class="progress-status" v-if="item.status ==9">待确认</view> <view class="progress-status" v-if="item.status ==9&&!item.refusalContent">待确认</view>
<view class="progress-status" v-if="item.status == 9&&item.refusalContent" >拒单审核中</view>
<view class="progress-status" v-if="item.status ==10">待补单</view> <view class="progress-status" v-if="item.status ==10">待补单</view>
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view> <!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> --> <view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
<view style="color: #333;">{{ item.serveTime }}</view>
<view v-if="item.status == 9&& item.refusalContent" class="judan">
拒单审核中...
</view>
</view> </view>
<view class="xian"></view>
<!-- mescroll-downwarp --> <!-- mescroll-downwarp -->
<view class=" u-flex padding-sm"> <view class=" u-flex padding-sm">
<view class="u-m-r-10"> <view class="u-m-r-10">
@ -98,24 +107,24 @@
</u-avatar> </u-avatar>
</view> </view>
<view class="u-flex-1 margin-left-xs"> <view class="u-flex-1 margin-left-xs">
<view class="u-font-18 u-line-1 top-title"> <view class="u-font-16 u-line-1 top-title">
<view class="margin-right-xs order-details "> <view class="margin-right-xs">
{{ item.title }} {{ item.title }}
</view> </view>
</view> </view>
<view class="flex"> <view class="text-cut">{{ item.address }}</view>
<view style="width: 100px"> </view>
<text class="text-xl text-bold">￥{{ item.artificerMoneyTotal}}</text> </view>
</view> <view class=" u-flex padding-sm2">
<view class="flex text-right"> <view class="flex align-center">
<text style="margin:4px 60px 0px 0px;font-size: 16px;">【{{ item.ordersNo}}】</text> <view class="flex-sub">
</view> 实收：￥<text class="text-df">{{ item.artificerMoneyTotal}}</text>
</view> </view>
<view class="text-cut" style="color: #999;">{{ item.address }}</view> <view class="flex text-right">
<text>【{{ item.ordersNo}}】</text>
</view>
</view> </view>
</view> </view>
<view class="flex u-p-t-20 justify-between align-center padding-sm"> <view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class="flex text-right" style="width: 100%;flex-direction: column;"> <view class="flex text-right" style="width: 100%;flex-direction: column;">
@ -149,28 +158,10 @@
</view> </view>
</view> </view>
<view class="hideBtn" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}"> <view class="hideBtn" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<!-- refusalContent不等于空并且status == 9 就是拒单审核中 --> <!-- refusalContent不等于空并且status == 9 就是拒单审核中 -->
</view> </view>
</view> </view>
</view> </view>
<view class="xian" v-if="item.status == 6"></view>
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时
</view>
<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :showDay="false" :fontSize="'14'"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675" /> -->
<!-- <uni-countdown :day="item.endTime.day" :hour="item.endTime.hour" :minute="item.endTime.minute"
:second="item.endTime.second">
</uni-countdown> -->
</view>
</view> </view>
<empty v-if="goods.length == 0"></empty> <empty v-if="goods.length == 0"></empty>
<!-- 开始时间 --> <!-- 开始时间 -->
@ -1141,13 +1132,27 @@
} }
.pintuan_syrs { .pintuan_syrs {
color: #999999; color: #fff;
font-size: 20upx; font-size: 20upx;
margin: 15rpx;
display: flex; display: flex;
padding-right: 18upx; padding-right: 18upx;
background: #5abfb2 ;
padding: 10rpx;
border-radius: 10rpx;
}
.pintuan-title{
font-size: 30rpx;
font-family: Helvetica Neue, Helvetica, sans-serif;
color: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.pintuan-img{
width: 40rpx;
height: 40rpx;
} }
.labe { .labe {
width: 42px; width: 42px;
background: #FFE45A; background: #FFE45A;
@ -1177,12 +1182,34 @@
/deep/.radius { /deep/.radius {
border-radius: 20rpx; border-radius: 20rpx;
} }
.progress-status{ .progress-text{
color: #019c88;
font-weight: bold;
font-size: 30rpx; font-size: 30rpx;
margin-top: -5rpx; color: #666;
padding-top: 8rpx;
} }
.progress-status{
// color: #019c88;
// font-weight: bold;
// font-size: 30rpx;
// margin-top: -5rpx;
color: #fff;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 28rpx;
}
.progress-status-chaoshi{
// color: #019c88;
// font-weight: bold;
// font-size: 30rpx;
// margin-top: -5rpx;
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
font-size: 28rpx;
}
.order-details{ .order-details{
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
@ -1211,4 +1238,24 @@
.text-cut{ .text-cut{
width: 75%; width: 75%;
} }
.padding-sm2{
padding: 0px 11px;
}
.text-df{
font-size: 20px;
font-weight: bold;
}
.text-right {
text-align: right;
}
.flex-sub {
flex: 1;
}
.align-center {
align-items: center;
width: 100%;
}
.u-font-16{
font-weight: bold;
}
</style> </style>