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:
yangjun 2024-07-01 22:17:15 +08:00
parent d1ecd1c0b4 72ea63d67d
commit 65b257c933
12 changed files with 1190 additions and 2993 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1885
my/order/revenueDetails - 副本.vue
View File

File diff suppressed because it is too large Load Diff

939
my/order/revenueDetails.vue
View File

@ -7,6 +7,8 @@
</view> </view>
<view class="header"></view> <view class="header"></view>
<view class="mian"> <view class="mian">
<!-- 包含升级又加钟的信息 -->
<view v-if="order.isSupplement=='2'&&order.addNum!=null">
<view class="mian-top"> <view class="mian-top">
<view class="countDown" style="text-align: center;" v-if="order.status == 6"> <view class="countDown" style="text-align: center;" v-if="order.status == 6">
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675" <u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
@ -93,7 +95,7 @@
<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 && order.ordersMassageList"> <span class="mian-view-list-text" v-if="order && order.ordersMassageList">
{{(order.ordersMassageList[0].massageType || {}).title}} {{order.oldEntryName}}
</span> </span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
@ -104,14 +106,6 @@
<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-view-list">
<span class="mian-view-list-title">预计开始时间</span>
<span class="mian-view-list-text">{{order.startTime!=null?order.startTime:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">预计结束时间</span>
<span class="mian-view-list-text">{{order.endTime!=null?order.endTime:'-'}}</span>
</view> -->
<view class="mian-content-list" v-if="order.tripWay"> <view class="mian-content-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view> <view class="mian-content-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view> <view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
@ -126,10 +120,6 @@
<span class="mian-content-list-title">车费收益</span> <span class="mian-content-list-title">车费收益</span>
<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span> <span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
</view> </view>
<!-- <view class="mian-content-list">
<span class="mian-content-list-title">提现手续费</span>
<span class="mian-content-list-text">-￥{{order.pingTaxiMoney}}</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.oldMassagePrice}}</span> <span class="mian-view-list-text">￥{{order.oldMassagePrice}}</span>
@ -138,10 +128,6 @@
<span class="mian-view-list-title">优惠券</span> <span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span> <span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view> </view>
<!-- <view class="mian-view-list">
<span class="mian-view-list-title">升级金额</span>
<span class="mian-view-list-text"> ￥{{order.sumMoney}}</span>
</view> -->
<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!=null?'是':'-'}}</span> <span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
@ -151,8 +137,6 @@
<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"> <view class="mina-title">
<span class="mina-title-text">加钟信息</span> <span class="mina-title-text">加钟信息</span>
<span class="mina-title-bor"></span> <span class="mina-title-bor"></span>
@ -236,34 +220,6 @@
<span class="mian-view-list-text" v-else>-</span> <span class="mian-view-list-text" v-else>-</span>
</view> </view>
</view> </view>
<!-- <view class="mina-title">
<span class="mina-title-text">扣费明细</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-content-list">
<span class="mian-content-list-title">渠道扣费</span>
<span class="mian-content-list-text">-￥{{order.channelDeduction}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">储值扣费</span>
<span class="mian-content-list-text">-￥{{order.valueStorageDeduction}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">管理费扣费</span>
<span class="mian-content-list-text">-￥{{order.pingMoney}}</span>
</view>
<view class="yingde" style="background: #FFF1DE;">
<view class="yingde-title">小计</view>
<view class="yingde-money">
<span class="fuhao-hei">-￥</span>
<span class="num-hei">{{koufeiMoney}}</span>
</view>
</view>
</view> -->
<view class="mina-title"> <view class="mina-title">
<span class="mina-title-text">预计收益</span> <span class="mina-title-text">预计收益</span>
<span class="mina-title-bor"></span> <span class="mina-title-bor"></span>
@ -293,30 +249,6 @@
<span class="mian-view-list-title">升级收益</span> <span class="mian-view-list-title">升级收益</span>
<span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:0}}</span> <span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:0}}</span>
</view> </view>
<!-- <view class="mian-view-list">
<span class="mian-view-list-title">扣费信息</span>
<span class="mian-view-list-text" style="color: rgb(255, 96, 0);"> -￥
{{
order.channelDeduction+order.valueStorageDeduction+order.pingMoney
}}</span>
</view> -->
<!-- <view class="mian-content-list">
<span class="mian-content-list-title">渠道扣费</span>
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.channelDeduction}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">储值扣费</span>
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.valueStorageDeduction}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">管理费扣费</span>
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.pingMoney}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">服务费扣费</span>
<span class="mian-content-list-text">￥4.54</span>
</view> -->
</view> </view>
<view class="yiji"> <view class="yiji">
<view class="yuji-title">技师收益</view> <view class="yuji-title">技师收益</view>
@ -369,6 +301,871 @@
</view> </view>
</view> </view>
</view>
<!-- 包含加钟的信息 -->
<view v-if="order.addNum!=null">
<view class="mian-top">
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="74" separator-size="74" @change="onCountdownChange"></u-count-down>
</view>
<view class="mian-top-head">
<image v-if="order && order.ordersMassageList"
:src="(order.ordersMassageList[0].massageType || {}).massageImg"
class="mian-top-head-img"></image>
<view class="mian-top-head-right">
<view class="mian-title" v-if="order && order.ordersMassageList">
<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
<view class="nav-btn" v-if="order.status ==2">待服务</view>
<view class="nav-btn" v-if="order.status ==3">待评价</view>
<!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
<view class="nav-btn" v-if="order.status ==5">已完成</view>
<view class="nav-btn" v-if="order.status ==6">服务中</view>
<view class="nav-btn" v-if="order.status ==7">技师出发</view>
<view class="nav-btn" v-if="order.status ==8">技师到达</view>
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
</view>
<view class="mian-money" style="justify-content: space-between;">
<view class="flex" style="flex-direction: row;align-items: center;">
<view class="mian-money-title">项目价格：</view>
<view class="mian-money-num">
<span class="fuhao">￥</span>
<span class="number">
{{order.massagePrice}}
</span>
</view>
</view>
<view class="jiajian">
<view class="jian">-</view>
<view class="view-num">{{order.ordersMassageList[0].num}}</view>
<view class="jia">+</view>
<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
</view>
</view>
</view>
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
<u-icon name="file-text"></u-icon>
</span>
<span v-else>
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</span>
<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</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" @tap="copy(order.ordersNo)">
<span class="mian-view-list-title">订单编号</span>
<span class="mian-view-list-text">
{{order.ordersNo}}
<u-icon name="file-text"/>
</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text">
{{order.entryName}}
</span>
</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">
<span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span>
</view>
<view class="mian-content-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
<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.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</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">{{order.addNum!=null?'是':'否'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text">{{order.addEntryName!=null?order.addEntryName:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目价格</span>
<span class="mian-view-list-text" v-if="order.addPrice!=null">￥{{order.addPrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟数量</span>
<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view>
<view class="mian-view-list">
<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-else>-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money" v-if="order.addArtificerMoney!=null">
<span class="fuhao-hei">￥</span>
<span class="num-hei">{{order.addArtificerMoney}}</span>
</view>
<span class="mian-view-list-text" v-else>-</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">否</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money">
<!-- <span class="fuhao-hei">￥</span> -->
<span class="num-hei">-</span>
</view>
</view>
</view>
<view class="mina-title">
<span class="mina-title-text">预计收益</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-view-list">
<span class="mian-view-list-title">提成比例</span>
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目收益</span>
<span class="mian-view-list-text"> ￥{{order.artificerMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">车费收益</span>
<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟收益</span>
<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级收益</span>
<span class="mian-view-list-text"> ￥0</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
<view class="yingde-money">
<span class="fuhao-heis">￥</span>
<span class="num-heis">
<!-- {{jishishouyi}} -->
{{order.artificerMoneyTotal}}
</span>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap justify-between">
<view class="flex margin-bottom-sm"
style="width: 48%;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in order.startImg" :key="index"
@click="saveImg( order.startImg,index)">
<image :src="image" style="width: 100%;height: 100%;border-radius: 10upx;"
mode="aspectFill">
</image>
</view>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap">
<view v-if="startImgs.length">
<view class="flex margin-right-sm flex-wrap">
<view class="flex"
style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in startImgs" :key="index">
<image :src="pictureEcho[0]" style="width: 100%;height: 100%;"></image>
<view style="z-index: 0;position: absolute;top: -15rpx;right: -15rpx;"
@click="removeImg(index,1)">
<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
</view>
</view>
</view>
</view>
<view class="flex align-center justify-center padding-tb "
style="background: #f5f5f5;width: 200rpx;height: 200rpx;">
<view class="text-center" @click="addImage(1)">
<image src="../static/photo.png" style="width:60upx;height: 50upx;"></image>
<view class="text-sm">上传照片</view>
</view>
</view>
</view>
</view>
</view>
<!-- 包含升级的信息 -->
<view v-if="order.isSupplement=='2'">
<view class="mian-top">
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="74" separator-size="74" @change="onCountdownChange"></u-count-down>
</view>
<view class="mian-top-head">
<image v-if="order && order.ordersMassageList"
:src="(order.ordersMassageList[0].massageType || {}).massageImg"
class="mian-top-head-img"></image>
<view class="mian-top-head-right">
<view class="mian-title" v-if="order && order.ordersMassageList">
<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
<view class="nav-btn" v-if="order.status ==2">待服务</view>
<view class="nav-btn" v-if="order.status ==3">待评价</view>
<!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
<view class="nav-btn" v-if="order.status ==5">已完成</view>
<view class="nav-btn" v-if="order.status ==6">服务中</view>
<view class="nav-btn" v-if="order.status ==7">技师出发</view>
<view class="nav-btn" v-if="order.status ==8">技师到达</view>
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
</view>
<view class="mian-money" style="justify-content: space-between;">
<view class="flex" style="flex-direction: row;align-items: center;">
<view class="mian-money-title">项目价格：</view>
<view class="mian-money-num">
<span class="fuhao">￥</span>
<span class="number">
{{order.massagePrice}}
</span>
</view>
</view>
<view class="jiajian">
<view class="jian">-</view>
<view class="view-num">{{order.ordersMassageList[0].num}}</view>
<view class="jia">+</view>
<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
</view>
</view>
</view>
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
<u-icon name="file-text"></u-icon>
</span>
<span v-else>
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</span>
<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</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" @tap="copy(order.ordersNo)">
<span class="mian-view-list-title">订单编号</span>
<span class="mian-view-list-text">
{{order.ordersNo}}
<u-icon name="file-text"/>
</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text" v-if="order && order.ordersMassageList">
{{order.oldEntryName}}
</span>
</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">
<span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span>
</view>
<view class="mian-content-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
<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.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.oldMassagePrice}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</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">否</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟数量</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟费用</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money">
<!-- <span class="fuhao-hei">￥</span> -->
<span class="num-hei">-</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">
<span class="mian-view-list-title">是否升级</span>
<span class="mian-view-list-text">{{order.isSupplement!=null?'是':'否'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前项目</span>
<span class="mian-view-list-text">{{order.oldEntryName!=null?order.oldEntryName:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前价格</span>
<span class="mian-view-list-text" v-if="order.oldMassagePrice!=null">￥{{order.oldMassagePrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后项目</span>
<span class="mian-view-list-text">{{order.entryName!=null?order.entryName:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后价格</span>
<span class="mian-view-list-text" v-if="order.massagePrice!=null">￥{{order.massagePrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<!-- <view class="mian-view-list">
<span class="mian-view-list-title">升级金额</span>
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> -->
<view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span>
<span class="mian-view-list-text" v-if="order.payMoney!=null">￥{{order.payMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money" v-if="order.artificerMoney!=null">
<span class="fuhao-hei">￥</span>
<span class="num-hei">{{order.artificerMoney}}</span>
</view>
<span class="mian-view-list-text" v-else>-</span>
</view>
</view>
<view class="mina-title">
<span class="mina-title-text">预计收益</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-view-list">
<span class="mian-view-list-title">提成比例</span>
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目收益</span>
<span class="mian-view-list-text"> ￥{{order.oldArtificerMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">车费收益</span>
<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟收益</span>
<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级收益</span>
<span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:0}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
<view class="yingde-money">
<span class="fuhao-heis">￥</span>
<span class="num-heis">
<!-- {{jishishouyi}} -->
{{order.artificerMoneyTotal}}
</span>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap justify-between">
<view class="flex margin-bottom-sm"
style="width: 48%;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in order.startImg" :key="index"
@click="saveImg( order.startImg,index)">
<image :src="image" style="width: 100%;height: 100%;border-radius: 10upx;"
mode="aspectFill">
</image>
</view>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap">
<view v-if="startImgs.length">
<view class="flex margin-right-sm flex-wrap">
<view class="flex"
style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in startImgs" :key="index">
<image :src="pictureEcho[0]" style="width: 100%;height: 100%;"></image>
<view style="z-index: 0;position: absolute;top: -15rpx;right: -15rpx;"
@click="removeImg(index,1)">
<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
</view>
</view>
</view>
</view>
<view class="flex align-center justify-center padding-tb "
style="background: #f5f5f5;width: 200rpx;height: 200rpx;">
<view class="text-center" @click="addImage(1)">
<image src="../static/photo.png" style="width:60upx;height: 50upx;"></image>
<view class="text-sm">上传照片</view>
</view>
</view>
</view>
</view>
</view>
<!-- 包含没有升级或者加钟的信息 -->
<view v-if="order.isSupplement!='2'&&order.addNum==null">
<view class="mian-top">
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="74" separator-size="74" @change="onCountdownChange"></u-count-down>
</view>
<view class="mian-top-head">
<image v-if="order && order.ordersMassageList"
:src="(order.ordersMassageList[0].massageType || {}).massageImg"
class="mian-top-head-img"></image>
<view class="mian-top-head-right">
<view class="mian-title" v-if="order && order.ordersMassageList">
<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
<view class="nav-btn" v-if="order.status ==2">待服务</view>
<view class="nav-btn" v-if="order.status ==3">待评价</view>
<!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
<view class="nav-btn" v-if="order.status ==5">已完成</view>
<view class="nav-btn" v-if="order.status ==6">服务中</view>
<view class="nav-btn" v-if="order.status ==7">技师出发</view>
<view class="nav-btn" v-if="order.status ==8">技师到达</view>
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
</view>
<view class="mian-money" style="justify-content: space-between;">
<view class="flex" style="flex-direction: row;align-items: center;">
<view class="mian-money-title">项目价格：</view>
<view class="mian-money-num">
<span class="fuhao">￥</span>
<span class="number">
{{order.massagePrice}}
</span>
</view>
</view>
<view class="jiajian">
<view class="jian">-</view>
<view class="view-num">{{order.ordersMassageList[0].num}}</view>
<view class="jia">+</view>
<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
</view>
</view>
</view>
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
<u-icon name="file-text"></u-icon>
</span>
<span v-else>
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</span>
<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</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" @tap="copy(order.ordersNo)">
<span class="mian-view-list-title">订单编号</span>
<span class="mian-view-list-text">
{{order.ordersNo}}
<u-icon name="file-text"/>
</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text">
{{(order.ordersMassageList[0].massageType || {}).title}}
</span>
</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">
<span class="mian-view-list-title">预约时间</span>
<span class="mian-view-list-text">{{order.serveTime}}</span>
</view>
<view class="mian-content-list" v-if="order.tripWay">
<view class="mian-content-list-title">出行方式</view>
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
<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.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</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">否</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟数量</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟费用</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money">
<!-- <span class="fuhao-hei">￥</span> -->
<span class="num-hei">-</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">
<span class="mian-view-list-title">是否升级</span>
<span class="mian-view-list-text">否</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级前价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后项目</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后价格</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="yingde" style="background: #EBEBEB;">
<view class="yingde-title">小计</view>
<view class="yingde-money">
<span class="num-hei">-</span>
</view>
</view>
</view>
<view class="mina-title">
<span class="mina-title-text">预计收益</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-view-list">
<span class="mian-view-list-title">提成比例</span>
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">项目收益</span>
<span class="mian-view-list-text"> ￥{{order.artificerMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">车费收益</span>
<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟收益</span>
<span class="mian-view-list-text">-</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级收益</span>
<span class="mian-view-list-text">-</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
<view class="yingde-money">
<span class="fuhao-heis">￥</span>
<span class="num-heis">
<!-- {{jishishouyi}} -->
{{order.artificerMoneyTotal}}
</span>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap justify-between">
<view class="flex margin-bottom-sm"
style="width: 48%;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in order.startImg" :key="index"
@click="saveImg( order.startImg,index)">
<image :src="image" style="width: 100%;height: 100%;border-radius: 10upx;"
mode="aspectFill">
</image>
</view>
</view>
</view>
<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view>
<view class="flex flex-wrap">
<view v-if="startImgs.length">
<view class="flex margin-right-sm flex-wrap">
<view class="flex"
style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
v-for="(image,index) in startImgs" :key="index">
<image :src="pictureEcho[0]" style="width: 100%;height: 100%;"></image>
<view style="z-index: 0;position: absolute;top: -15rpx;right: -15rpx;"
@click="removeImg(index,1)">
<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
</view>
</view>
</view>
</view>
<view class="flex align-center justify-center padding-tb "
style="background: #f5f5f5;width: 200rpx;height: 200rpx;">
<view class="text-center" @click="addImage(1)">
<image src="../static/photo.png" style="width:60upx;height: 50upx;"></image>
<view class="text-sm">上传照片</view>
</view>
</view>
</view>
</view>
</view>
<view class="footers"> <view class="footers">
<view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2"> <view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2">
现在出发 现在出发

35
pages/index/currentIncome.vue
View File

@ -38,10 +38,10 @@
<span class="shouyi-text">{{item.km}}km</span> <span class="shouyi-text">{{item.km}}km</span>
</view> </view>
</view> </view>
<view class="mian-foot-dan shouyi-text"> <view class="mian-foot-dan shouyi-text od-number">
订单编号 : {{item.ordersNo}} 订单编号 : {{item.ordersNo}}
</view> </view>
<view class="mian-foot-adder shouyi-text"> <view class="mian-foot-adder shouyi-text add-text">
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
@ -208,9 +208,10 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 8rpx;
} }
.mian-foot-adder{ .mian-foot-adder{
margin: 2px 0px; margin: 3px 0px;
} }
.mian-dingwei image{ .mian-dingwei image{
width: 18.75rpx; width: 18.75rpx;
@ -236,19 +237,20 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.mian-foot-list{ .mian-foot-list{
width: 75%; width: 73%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.mian-foot-img image{ .mian-foot-img image{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx;
} }
.mian-foot-img{ .mian-foot-img{
width: 158rpx; width: 160rpx;
height: 188rpx; height: 160rpx;
background: #E6E6E6; background: #E6E6E6;
border-radius: 14rpx; border-radius: 30rpx;
} }
.mian-foot{ .mian-foot{
@ -260,7 +262,7 @@
} }
.shouyi-text{ .shouyi-text{
color: #7D7D7D; color: #7D7D7D;
font-size: 22rpx; font-size: 26rpx;
} }
.mian-head-time span:nth-child(2){ .mian-head-time span:nth-child(2){
color: #11957C; color: #11957C;
@ -271,7 +273,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 26rpx;
} }
.mian-head-biao{ .mian-head-biao{
width: 130rpx; width: 130rpx;
@ -297,11 +299,12 @@
.mian-view{ .mian-view{
width: 95%; width: 95%;
background-color: #fff; background-color: #fff;
padding: 10px; padding: 12px;
border-radius: 24rpx; border-radius: 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 10px; margin: 26rpx auto;
} }
.mian{ .mian{
width: 100%; width: 100%;
@ -352,7 +355,7 @@
width: 100%; width: 100%;
height: 300rpx; height: 300rpx;
padding: 15px; padding: 15px;
background:#fff url('../../static/index/fun_banner4.png'); background:#f5f5f5 url('../../static/index/fun_banner4.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;
@ -364,4 +367,12 @@
height: 100vh; height: 100vh;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.od-number{
font-size: 24rpx;
color: #7ea866;
}
.add-text{
font-size: 26rpx;
color: #999;
}
</style> </style>

42
pages/index/currentPoints.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view class="header-top-btn" @click="wangqi">往期积分</view> <view class="header-top-btn" @click="wangqi">往期积分</view>
</view> </view>
<view class="header-bottom" style="margin-bottom: 40rpx;"> <view class="header-bottom" style="margin-bottom: 50rpx;">
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view> <view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
<view class="header-text">当前积分</view> <view class="header-text">当前积分</view>
</view> </view>
@ -52,10 +52,10 @@
<span class="shouyi-text">{{item.km}}km</span> <span class="shouyi-text">{{item.km}}km</span>
</view> </view>
</view> </view>
<view class="mian-foot-dan shouyi-text"> <view class="mian-foot-dan od-number">
订单编号 : {{item.ordersNo}} 订单编号 : {{item.ordersNo}}
</view> </view>
<view class="mian-foot-adder shouyi-text"> <view class="mian-foot-adder shouyi-text add-text">
服务地址 : {{item.accomplishAddress}} 服务地址 : {{item.accomplishAddress}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
@ -332,7 +332,7 @@
<style scoped> <style scoped>
.tapNav-name{ .tapNav-name{
font-weight: bold; font-weight: bold;
font-size: 28rpx; font-size: 30rpx;
color: #333333; color: #333333;
} }
@ -355,6 +355,7 @@
background-color: #fff; background-color: #fff;
border-radius: 15rpx; border-radius: 15rpx;
margin-top: -30px; margin-top: -30px;
padding: 10rpx 0;
} }
.tapNav-view{ .tapNav-view{
height: 40px; height: 40px;
@ -483,7 +484,9 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.view-num{ .view-num{
color: #029D88 !important; color: #fb672b !important;
font-weight: bold;
font-size: 30rpx;
} }
.mian-bottom{ .mian-bottom{
width: 100%; width: 100%;
@ -491,9 +494,10 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 8rpx;
} }
.mian-foot-adder{ .mian-foot-adder{
margin: 2px 0px; margin: 3px 0px;
} }
.mian-dingwei image{ .mian-dingwei image{
width: 18.75rpx; width: 18.75rpx;
@ -519,26 +523,27 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.mian-foot-list{ .mian-foot-list{
width: 75%; width: 73%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.mian-foot-img image{ .mian-foot-img image{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx;
} }
.mian-foot-img{ .mian-foot-img{
width: 158rpx; width: 160rpx;
height: 188rpx; height: 160rpx;
background: #E6E6E6; background: #E6E6E6;
border-radius: 14rpx; border-radius: 30rpx;
} }
.mian-foot{ .mian-foot{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.mian-list-top-time span{ .mian-list-top-time span{
@ -592,8 +597,8 @@
} }
.view-title-left-text{ .view-title-left-text{
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 28rpx;
color: #333333; color: #019c88;
margin-left: 5px; margin-left: 5px;
} }
.view-title-left-shuxian{ .view-title-left-shuxian{
@ -685,4 +690,15 @@
background-color: #f7f7f7; background-color: #f7f7f7;
overflow: scroll; overflow: scroll;
} }
.od-number{
font-size: 24rpx;
color: #7ea866;
}
.add-text{
font-size: 26rpx;
color: #999;
}
.mian-bottom-xiang{
color: #7D7D7D;
}
</style> </style>

4
pages/index/index.vue
View File

@ -1647,6 +1647,7 @@ page {
border-radius: 10px; border-radius: 10px;
padding: 30rpx; padding: 30rpx;
background: #fff; background: #fff;
text-align:center;
} }
.tapDsalk { .tapDsalk {
@ -1659,12 +1660,10 @@ page {
} }
.sda { .sda {
width: 36px;
height: 36px; height: 36px;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
border-radius: 30px; border-radius: 30px;
background-color: #f7f7f7;
justify-content: center; justify-content: center;
} }
@ -1672,6 +1671,7 @@ page {
font-size: 26rpx; font-size: 26rpx;
color: #999999; color: #999999;
margin-top: 6px; margin-top: 6px;
text-align:center;
} }
.online-tag { .online-tag {

2
pages/index/technicianLevel.vue
View File

@ -13,7 +13,7 @@
<span>{{ artificerData.beginTime }}~{{ artificerData.finishTime }}</span> <span>{{ artificerData.beginTime }}~{{ artificerData.finishTime }}</span>
</view> </view>
<view class="header-right-text"> <view class="header-right-text">
备注: 本期等级是根据技师上个同期的业绩最终计算得出 备注: 本期等级是根据技师上个周期的业绩最终计算得出
</view> </view>
</view> </view>
<view class="header-right-bottom"> <view class="header-right-bottom">

10
pages/my/index.vue
View File

@ -7,7 +7,7 @@
<image :src="avatar" class="head-port"" <image :src="avatar" class="head-port""
@click="goNav('/pages/my/userinfo')"></image> @click="goNav('/pages/my/userinfo')"></image>
</view> </view>
<view class="u-flex-1 text-white" v-if="isLogin && userName"> <view class="u-flex-1" v-if="isLogin && userName">
<view class="u-font-18 "> <view class="u-font-18 ">
<view class="flex align-center" style="margin-bottom: 5px;"> <view class="flex align-center" style="margin-bottom: 5px;">
<view class="margin-left-sm">{{ userName }}</view> <view class="margin-left-sm">{{ userName }}</view>
@ -168,7 +168,7 @@
证件资质 证件资质
</view> </view>
</view> </view>
<view class="sdza" @click="goHetong()" <view class="sdza" @click="goNfeedback()"
style="background: url(../../static/images/my/gyw06.png);background-size: cover;"> style="background: url(../../static/images/my/gyw06.png);background-size: cover;">
<image src="../../static/images/my/hetong.png" <image src="../../static/images/my/hetong.png"
style="width: 54rpx;height: 60rpx;margin-bottom: 4px;margin-top: 20px;"></image> style="width: 54rpx;height: 60rpx;margin-bottom: 4px;margin-top: 20px;"></image>
@ -415,12 +415,6 @@
url:'/my/feedback/index' url:'/my/feedback/index'
}) })
}, },
// 跳转合同页面
goHetong(){
uni.navigateTo({
url:'/pages/hetong/index'
})
},
getMyPageNum() { getMyPageNum() {
let artificerId = uni.getStorageSync("artificerId"); let artificerId = uni.getStorageSync("artificerId");
console.log("artificerId--->",artificerId); console.log("artificerId--->",artificerId);

737
pages/order/index - 副本.vue
View File

@ -1,737 +0,0 @@
<!-- 菜单悬浮的原理: 通过给菜单添加position:sticky实现, 用法超简单, 仅APP端的低端机不兼容 https://caniuse.com/#feat=css-sticky -->
<template>
<view class="content">
<!-- 对于mescroll-body: 需设置:sticky="true", 此应避免在mescroll-body标签前面加其他非定位的元素, 否则下拉区域会被挤出, 无法会隐藏.-->
<!-- 对于mescroll-uni: 则无需设置:sticky="true", 无其他限制和要求 -->
<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
<view class="sticky-tabs">
<view class=" u-flex padding ding-view">
<view class="u-m-r-10">
<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 100rpx;"
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view class="u-flex-1 u-m-l-10 " v-if="isLogin && userName">
<view class="u-font-18 text-bold">
<view class="flex align-center" style="justify-content: space-between;">
<view class="margin-left-sm " style="color: #ffffff;">{{ userName }}</view>
<view class="labe zhuangtai" @tap="stateSave">
<view v-if="isTrue">已上线</view>
<view v-if="!isTrue">已离线</view>
</view>
</view>
<view class="flex margin-left-sm margin-top-xs"
style="font-size: 22rpx;font-weight: 500;color: #ffffff;">
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
暂未实名认证
</view>
<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
实名审核中
</view>
<view v-if="renzheng == 2">
已实名认证
</view>
<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
实名已拒绝
</view>
</view>
</view>
</view>
<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')"
style="color: #ffffff;">
登录
</view>
</view>
<!-- <view class="flex align-center padding-left bg">
<image src="../../static/images/data.png" style="width: 26upx;height: 26upx;"></image>
<view class="margin-left-xs flex align-center" style="color: #999999;">
<view @click="bindData(1)">{{startTime?startTime:'开始时间'}}</view>
至
<view @click="bindData(2)">{{endTime?endTime:'结束时间'}}</view>
</view>
</view> -->
<!-- <me-tabs v-model="tabIndex" nameKey='title' :tabs="tabs" @change="tabChange"></me-tabs> -->
<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
</u-tabs>
</view>
<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
style="padding: 0 16px;width: 100%;min-height: 100vh;">
<!-- 数据列表 -->
<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
:key='index' @click="clickItem(item)"> -->
<view class="bgwhite radius margin-bottom-sm padding-bottom-sm " v-for="(item, index) in goods" :key='index'
@click="goNav('/my/order/pay?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm">
<view class="text-green" v-if="item.status == 1">待付款...</view>
<view class="text-green" v-if="item.status == 2">待服务</view>
<view class="text-green" v-if="item.status == 5">已完成</view>
<view class="text-green" v-if="item.status == 6">服务中</view>
<view class="text-green" v-if="item.status == 7">已出发</view>
<view class="text-green" v-if="item.status == 8">已到达</view>
<view class="text-green" v-if="item.status == 3">待评价</view>
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</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 class="text-green">预约时间：{{ item.serveTime }}</view>
</view>
<view class="xian"></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="100">
</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.sumArtificerMoney
}}</text>
</view>
<view class="flex text-right">
<!-- <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 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: #096f4b;">服务倒计时
</view>
<u-count-down :timestamp="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>
<empty v-if="goods.length == 0"></empty>
<!-- 开始时间 -->
<u-picker v-model="startshow" mode="time" :params="paramsStart" @confirm="startData"></u-picker>
<!-- 结束时间 -->
<u-picker v-model="endshow" mode="time" :params="paramsEnd" @confirm="endData"></u-picker>
</mescroll-body>
</view>
</template>
<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 meTabs from "@/components/mescroll-uni/me-tabs/me-tabs.vue";
import empty from '@/components/empty.vue'
import * as websocketUtils from 'utils/websocketUtils.js';
export default {
mixins: [MescrollMixin], // 使用mixin
components: {
mescrollBody,
meTabs,
empty
},
data() {
return {
endOfServiceTimer: null,
goods: [], // 数据列表
num: 1,
game: [],
tabs: [{
//这四个都支持支持class,style,src,onClick,等html内容
//选中图片
activityImageProps: {
src: '../../static/images/order_01.png',
style: 'width: 26px;height: 26px;',
},
//未选中时的样式
noactivityImageProps: {
src: '../../static/images/order_011.png',
style: 'width: 26px;height: 26px;',
},
//选中时的文字
activityTitleTextProps: {
class: 'activityTitleTextProps',
},
//未选中时的文字
noactivityTitleTextProps: {
class: 'noactivityTitleTextProps',
},
name: '今日订单',
status: '1'
}, {
activityImageProps: {
src: '../../static/images/order_02.png',
style: 'width: 26px;height: 26px;',
},
noactivityImageProps: {
src: '../../static/images/order_022.png',
style: 'width: 26px;height: 26px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
},
noactivityTitleTextProps: {
class: 'noactivityTitleTextProps',
},
name: '待服务',
status: '2'
}, {
activityImageProps: {
src: '../../static/images/order_03.png',
style: 'width: 26px;height: 26px;',
},
noactivityImageProps: {
src: '../../static/images/order_033.png',
style: 'width: 26px;height: 26px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
},
noactivityTitleTextProps: {
class: 'noactivityTitleTextProps',
},
name: '已完成',
status: '3'
}, {
activityImageProps: {
src: '../../static/images/order_04.png',
style: 'width: 26px;height: 26px;',
},
noactivityImageProps: {
src: '../../static/images/order_044.png',
style: 'width: 26px;height: 26px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
},
noactivityTitleTextProps: {
class: 'noactivityTitleTextProps',
},
name: '历史订单',
status: '4'
}],
tabIndex: 0, // tab下标
isTrue: true,
page: 1,
limit: 10,
userId: 0,
status: 1,
nickName: '',
customStyle: {
color: '#999999',
border: '2rpx solid #999999',
// backgroundColor: '#1E1F31',
border: "8rpx",
width: '180rpx',
height: '54rpx',
margin: "0 0 0 20rpx"
},
customStyle1: {
color: '#096f4b',
border: '2rpx solid #096f4b',
border: "8rpx",
width: '180rpx',
height: '54rpx',
margin: "0 0 0 20rpx"
},
latitude: '',
longitude: '',
avatar: '../../static/logo.png',
isLogin: true,
userName: '',
renzheng: 0,
startshow: false,
endshow: false,
paramsStart: {
year: true,
month: true,
day: true,
hour: false,
minute: false,
second: false
},
paramsEnd: {
year: true,
month: true,
day: true,
hour: false,
minute: false,
second: false
},
startTime: '',
endTime: '',
}
},
onLoad() {
this.$queue.showLoading("加载中...");
this.userId = uni.getStorageSync('userId')
this.nickName = uni.getStorageSync('nickName')
let that = this;
uni.getLocation({
type: 'wgs84',
success: function(res) {
console.log('当前位置的经度：' + res.longitude);
console.log('当前位置的纬度：' + res.latitude);
that.$queue.setData('longitude', res.longitude);
that.$queue.setData('latitude', res.latitude);
that.latitude = res.latitude
that.longitude = res.longitude
}
});
},
onShow() {
let that = this;
this.userId = uni.getStorageSync('userId')
if (this.userId) {
this.getArtificer()
this.isLogin = true
this.getUserInfo()
} else {
this.isLogin = false
this.userName = ''
this.browse = 0
this.fans = 0
this.follow = 0
this.visitor = 0
this.avatar = '../../static/logo.png'
}
setTimeout(d => {
this.mescroll.resetUpScroll()
}, 1000)
this.upCallback({
num: this.num
});
},
watch: {
isTrue(newValue) {
if (newValue) {
this.$queue.showToast('您已上线');
} else {
this.$queue.showToast('您已离线');
}
},
isLogin(newValue) {
if (!newValue) {
this.goods = [];
}
}
},
methods: {
//获取理疗师的信息
getArtificer() {
this.$Request.getT("/app/artificer/selectArtificer").then(res => {
if (res.code == 0) {
if (res.data) {
if (res.data.status == 1) {
this.isTrue = true
} else if (res.data.status == 2) {
this.isTrue = false
}
} else {
this.isTrue = false
}
websocketUtils.changeGoLiveFn(this.isTrue);
uni.setStorageSync('artificerId', res.data?.artificerId)
}
});
},
stateSave() {
this.$Request.postT('/app/artificer/updateArtificer').then(res => {
if (res.code == 0) {
this.getArtificer();
} else {
this.$queue.showToast(res.msg);
}
});
},
// 拨打电话
bindphone(phone) {
let that = this
uni.showModal({
title: '提示',
content: '是否拨打电话',
success: function(res) {
if (res.confirm) {
console.log('用户点击确定', phone);
uni.makePhoneCall({
phoneNumber: phone //仅为示例
});
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
/*下拉刷新的回调 */
downCallback() {
// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
// loadSwiper();
// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
this.mescroll.resetUpScroll()
},
timeFormat(param) {
return param < 10 ? '0' + param : param;
},
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
upCallback(page) {
// debugger;
if (!this.isLogin) {
uni.hideLoading();
if (this.mescroll) this.mescroll.endSuccess(); // 隐藏加载状态栏
return;
}
// debugger;
let curTab = this.tabs[this.tabIndex].status
this.num = page.num;
let data = {
type: curTab,
page: page.num,
limit: page.size,
startTime: this.startTime,
endTime: this.endTime
}
this.$Request.get('/app/artificer/selectTodayOrder', data).then(res => {
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 => {
switch (ret.state) {
case '1':
ret.statusName = '今日订单'
break;
case '2':
ret.statusName = '待完成'
break;
case '3':
ret.statusName = '已完成'
break;
case '4':
ret.statusName = '历史订单'
break;
}
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);
this.endOfServiceTimer = formatTimeStamp;
}
if (this.$refs.countDownEl) this.$refs.countDownEl.update();
})
this.mescroll.endSuccess(res.data.list.length); // 隐藏加载状态栏
}).catch(() => {
//联网失败, 结束加载
this.mescroll.endErr();
});
},
// 切换菜单
tabChange(index) {
this.tabIndex = index
this.goods = []; // 置空列表,显示加载进度条
this.mescroll.resetUpScroll()
},
// 取消订单
cancelOrder(e) {
let that = this
uni.showModal({
title: '提示',
content: '确认取消订单吗？取消订单将会被扣除信用分！',
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId,
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.mescroll.resetUpScroll()
} else {
that.$queue.showToast(res.msg);
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
// 完成订单
cancel(e) {
let that = this
uni.showModal({
title: '提示',
content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId,
accomplishLongitude: that.longitude,
accomplishLatitude: that.latitude
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.mescroll.resetUpScroll()
websocketUtils.uploadAudioEnd(); //关闭音频上传
} else {
that.$queue.showToast(res.msg);
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//时间弹框开关
bindData(index) {
console.log(index, 1111)
if (index == 1) {
this.startshow = true
} else if (index == 2) {
this.endshow = true
}
},
//开始时间
startData(e) {
// console.log(e)
this.startTime = e.year + ' ' + e.month + '-' + e.day
},
// 结束时间
endData(e) {
this.endTime = e.year + ' ' + e.month + '-' + e.day
// console.log(this.endTime)
this.mescroll.resetUpScroll()
},
goNav(e, name) {
console.log(e)
if (this.userId) {
uni.navigateTo({
url: e
})
} else {
uni.showModal({
title: '提示',
content: '您还未登录,请先登录',
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
uni.navigateTo({
url: '/pages/public/login'
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
})
}
},
getUserInfo() {
this.$Request.get("/app/user/selectUserById").then(res => {
if (res.code == 0) {
this.userName = res.data.userName
this.invitationCode = res.data.invitationCode
this.avatar = res.data.avatar ? res.data.avatar : '../../static/logo.png'
this.isAuthentication = res.data.isAuthentication
// uni.setStorageSync('isAuthentication', res.data.isAuthentication)
uni.setStorageSync('avatar', res.data.avatar)
uni.setStorageSync('invitationCode', res.data.invitationCode)
uni.setStorageSync('zhiFuBao', res.data.zhiFuBao)
uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName)
if (res.data.isAuthentication == 0 || res.data.isAuthentication == null) {
this.renzheng = 0
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 1) {
this.renzheng = 1
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 2) {
this.renzheng = 2
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 3) {
this.renzheng = 3
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 4) {
this.renzheng = 4
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 5) {
this.renzheng = 5
uni.setStorageSync("renzheng", this.renzheng)
} else if (res.data.isAuthentication == 6) {
this.renzheng = 6
uni.setStorageSync("renzheng", this.renzheng)
}
}
});
},
}
}
</script>
<style lang="scss">
/*
sticky生效条件：
1、父元素不能overflow:hidden或者overflow:auto属性。(mescroll-body设置:sticky="true"即可, mescroll-uni本身没有设置overflow)
2、必须指定top、bottom、left、right4个值之一，否则只会处于相对定位
3、父元素的高度不能低于sticky元素的高度
4、sticky元素仅在其父元素内生效,所以父元素必须是 mescroll
*/
.ding-view{
width: 95%;
height: 290rpx;
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
border-radius: 24rpx;
margin: 10px auto 0px auto;
align-items: end;
}
.content{
width: 100%;
height: 100vh;
background-image: url('../../static/index/swim.jpg');
background-repeat: no-repeat;
background-size: 100%;
display: flex;
flex-direction: column;
align-items: center;
padding-bottom: 30px;
}
.u-tabs {
padding: 16px;
width: 90%;
height: 199rpx;
background: #F7F7F7 !important;
border-radius: 21rpx;
margin: -70px auto 0px auto;
}
/deep/.u-scroll-view {
padding: 10px 16px !important;
}
/deep/.u-tab-item {
height: auto !important;
line-height: normal !important;
width: 25% !important;
padding: 0 !important;
}
/deep/.u-tab-bar {
display: none !important;
}
.sticky-tabs {
width: 100%;
z-index: 990;
position: fixed;
top: 0px;
// background-color: #fff;
}
/deep/.activityTitleTextProps {
color: #096f4b;
font-size: 14px;
}
/deep/.noactivityTitleTextProps {
color: #666666;
font-size: 14px;
}
// 使用mescroll-uni,则top为0
.mescroll-uni,
/deep/.mescroll-uni {
.sticky-tabs {
top: 300upx;
}
}
.demo-tip {
padding: 18upx;
font-size: 24upx;
text-align: center;
}
/deep/.page-box {
background: top !important;
}
.bg {
background-image: linear-gradient(to right, #223845, #00a85b);
padding: 16px 16px 36px 16px;
}
.bgwhite {
background-color: #FFFFFF;
}
.xian {
width: 100%;
height: 1rpx;
border: 1rpx solid #f8f8f8;
margin-top: 20rpx;
}
.pintuan_syrs {
color: #999999;
font-size: 20upx;
margin: 20rpx 20rpx 0rpx;
display: flex;
padding-right: 18upx;
}
.labe {
width: 42px;
background: #FFE45A;
border-radius: 15rpx 0rpx 15rpx 0rpx;
display: inline-flex;
align-items: center;
color: #7A3A00;
font-size: 22rpx;
font-weight: 400;
height: 36rpx;
margin-left: 20rpx;
justify-content: center;
text {
width: 12rpx;
height: 12rpx;
background: #20C675;
border-radius: 50%;
margin-right: 8rpx;
}
}
</style>

3
pages/order/index.vue
View File

@ -1146,7 +1146,8 @@
font-size: 30rpx; font-size: 30rpx;
} }
.order-details{ .order-details{
font-size: 34rpx; font-size: 32rpx;
font-weight: bold;
} }
</style> </style>

BIN
static/index/fun_banner4 - 副本.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
unpackage/release/apk/__UNI__B37C795__20240626092226.apk
View File

Binary file not shown.

BIN
unpackage/release/apk/__UNI__B37C795__20240626150355.apk
View File

Binary file not shown.