yangjun
/
sadjv3_user
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_user

This commit is contained in:
Mr.jiang 2024-07-23 22:43:41 +08:00
parent 31f636ac0c 50512ffda2
commit 59de1c379d
33 changed files with 1666 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
my/address/address.vue
View File

@ -31,7 +31,7 @@
</view>
</view>
</view>
<view style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
<view class="push-button">
<button class="shouhuo" @tap="goAddress('')">
新增地址
</button>
@ -211,6 +211,16 @@
</script>
<style lang="less" scoped>
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.delete-btn{
margin-left: 10px;
}
@ -256,17 +266,16 @@
// @import '../../../static/less/index.less';
// @import '../../../static/css/index.css';
.shouhuo{
margin: 16rpx 30upx;
position: fixed;
bottom: -2upx;
display: inline-block;
width: 92%;
height: 80rpx;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
line-height: 80rpx;
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
page {
background: #f7f7f7;

31
my/order/complain.vue
View File

@ -46,7 +46,7 @@
</view>
</view>
<view class="sbu-btn">
<view class="push-button">
<button type="primary" style="" class="feedback-submit" @tap="send">提交</button>
</view>
@ -239,17 +239,26 @@
<style>
.feedback-submit {
width: 652rpx;
height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
color: #FFFFFF;
margin: 16rpx 30upx;
position: fixed;
bottom: 0upx;
line-height: 92rpx;
font-size: 32rpx;
display: inline-block;
width: 92%;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.sbu-btn{
display: flex;

37
my/order/feedback.vue
View File

@ -20,8 +20,10 @@
<u-rate :count="count" v-model="value" active-color="#019C88"></u-rate>
</view>
</view>
<view class="push-button">
<button type="primary" class="feedback-submit" @tap="send">提交</button>
</view>
</view>
</template>
<script>
@ -152,7 +154,7 @@
text-align: center;
font-weight: 400;
font-size: 25rpx;
color: #ED782E;
color: #999;
}
@font-face {
font-family: uniicons;
@ -370,19 +372,26 @@
.feedback-star.active:after {
content: '\e438';
}
.feedback-submit {
width: 95%;
height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
line-height: 92rpx;
text-align: center;
color: #FFFFFF;
margin-top: 32upx;
font-size: 42rpx;
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0;
margin-bottom: 20px;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.feedback-submit {
display: inline-block;
width: 92%;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
</style>

259
my/order/pay.vue
View File

@ -12,8 +12,8 @@
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType.massageImg"
v-if="order.userPackageDetailId==null" style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
v-else style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg" v-else
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
@ -35,7 +35,7 @@
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;">
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
@ -83,9 +83,7 @@
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">
<span>{{order.artificer.artificerName}}</span>
</view>
<view class="d-title"><span>{{order.artificer.artificerName}}</span></view>
<!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
@ -94,7 +92,7 @@
@click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
</image>
@ -102,7 +100,7 @@
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
</view>
</view> -->
</view>
</view>
<!-- 普通项目信息 -->
@ -114,27 +112,25 @@
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font" >{{order.serveTime}}</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{order.createTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
@ -157,18 +153,15 @@
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;">
<text>
￥{{order.massageMoney}}
</text>
<text>￥{{order.massageMoney}}</text>
</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.tripWay" >
<view class="flex justify-between jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
@ -178,9 +171,17 @@
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -189,8 +190,9 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="value-font" v-else>-</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-￥{{order.couponMoney}}</view>
<view class="value-font value-font" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -199,12 +201,13 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
@ -239,7 +242,7 @@
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font" >{{order.serveTime}}</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
@ -251,11 +254,14 @@
<view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">
{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word-r value-font">
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
@ -263,26 +269,26 @@
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目价格</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">应付金额</view>
<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;">
<text>
￥{{order.massagePrice}}
</text>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">实付金额：</view>
<view class="line-word-r value-font" style="font-weight: bold;">
￥<text>0</text>
</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.tripWay" >
<view class="flex justify-between jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
@ -292,20 +298,29 @@
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line-end jusitify-line"></view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<!-- <view class="jusitify-line-end jusitify-line"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-￥{{order.couponMoney}}</view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">费用明细</view>
@ -313,23 +328,24 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
<view class="add-con-cont value-font"><text style="font-weight: bold;">￥0</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<!-- <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计：</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
￥{{order.payMoneyTotal}}
￥{{order.taxiMoney}}
</text>
</view>
</view>
@ -338,7 +354,7 @@
<view style="height: 100rpx;"></view>
</view>
<view class="showBtn tabber" v-if="order.status ==1">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<!-- <u-button
@ -356,18 +372,15 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==2">
<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
<u-button
v-if="order.cancelBtnShow == 'true'"
@click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button
v-if="order.btnShow == 'true'"
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="btns">
<u-button v-if="order.btnShow == 'true'" :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" class="btns">
修改订单
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
@ -377,8 +390,7 @@
class="btns">
去评价
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
去投诉
@ -394,59 +406,69 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view class="showBtn tabber" v-if="order.status==6"
:style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view v-if="order.earlyFinishReason==null" class="gengduo" @click.stop="gengBtn">更多</view>
<view v-else class="gengduo"></view>
<view v-if="order.earlyFinishReason==null">
<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
<u-button shape="circle" :plain="true" @click="toggle('center',order)" class="btns">
提前结束
</u-button>
<u-button v-if="order.isSupplement!=2"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
<u-button v-if="order.isSupplement!=2" shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)" class="btns">
服务升级
</u-button>
<u-button
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns">
<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" shape="circle"
:plain="true" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" class="btns">
加钟
</u-button>
<u-button
v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail" shape="circle"
:plain="true" @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns">
加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns" :hair-line="false">
<view class="showBtn-view" v-if="gengBtnShow==true"
:style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view
v-if="order.cancelBtnShow == 'true'"
:custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns"
:hair-line="true">
取消订单
</view>
<view
shape="circle" :plain="true"
<view shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
class="eject-btns">
充值
</view>
<view :custom-style="customStyle2"
shape="circle" :plain="true"
<view :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns">
去投诉
</view>
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="eject-btns">
联系客服</view>
</view>
</view>
<view v-else>
<view class="showBtn tabber">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)" class="btns">
充值
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="btns">
联系客服
</u-button>
</view>
</view>
</view>
<view class="showBtn tabber" v-if="order.status ==7">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button
v-if="order.cancelBtnShow == 'true'"
@click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button
@ -461,7 +483,9 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==8">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button
v-if="order.cancelBtnShow == 'true'"
class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
取消订单
</u-button>
<u-button
@ -476,7 +500,9 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==9">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button
v-if="order.cancelBtnShow == 'true'"
class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
取消订单
</u-button>
<u-button v-if="order.refusalContent" :custom-style="customStyle2"
@ -489,7 +515,9 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==10">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"S>
<u-button
v-if="order.cancelBtnShow == 'true'"
@click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button :custom-style="customStyle2"
@ -659,7 +687,7 @@
<view class="popup-content">
<view class="popup-head">
<span>确认拒单</span>
<span @click="closePopupQ(type)">x</span>
<span @click="closePopup(type)"><image style="width: 50rpx; height:50rpx;" src="../../static/close.png"></image></span>
</view>
<view class="popup-mian">
<view class="popup-mian-textarea">
@ -749,6 +777,7 @@ export default {
jiazhong:'',
shengji:'',
gengBtnShow:false,
cancelBtnShow:true,
}
},
onLoad(e) {
@ -1300,7 +1329,8 @@ export default {
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
var timestamp = parseInt(date.getTime()); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time=parseInt(new Date(this.order.serveTime).getTime())
@ -1309,6 +1339,24 @@ export default {
}else{
this.$set(this.order, 'btnShow', 'false')
}
const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
if(timestamp-time<fifteenTime){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
if(this.order.cancelBtnShow == 'true'){
if(this.order.addNum == null){
if(this.order.isSupplement == null){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}
let aliphone = this.$queue.getData('aliphone');
if (aliphone === '是' && this.order.artificer) {
this.ysPhone(this.order.phone, this.order.artificer.phone);
@ -2265,6 +2313,7 @@ export default {
//取消订单扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
console.log(resa);
if (resa.code == 0) {
that.page = 1;
uni.showModal({
@ -2281,7 +2330,7 @@ export default {
}
});
} else {
that.$queue.showToast(res.msg);
that.$queue.showToast(resa.msg);
}
})
},
@ -2339,9 +2388,12 @@ export default {
/deep/.u-size-default{
width: 85px !important;
height:34rpx;
line-height: 34rpx;
font-size: 28rpx;
}
/deep/.btns{
color: #019C88 !important;
margin-left: 10rpx !important;
height:70rpx;
font-size: 30rpx;
}
/deep/.padding-bottom{
padding-bottom: 20rpx;
@ -2515,12 +2567,7 @@ export default {
display: flex;
flex-direction: column;
}
/deep/.btns{
color: #019C88 !important;
margin-left: 10rpx !important;
height:70rpx;
font-size: 30rpx;
}
.eject-btns{
height:60rpx;
line-height: 60rpx;

46
my/order/payJaZ.vue
View File

@ -183,10 +183,17 @@
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font" >{{order.km}}km</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -348,9 +355,17 @@
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<!-- <view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
@ -359,7 +374,7 @@
<view class="line-word title-font">优惠券</view>
<view class="line-word value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="jusitify-line-end"></view>
<view>
<view class="justify-title-nav">
@ -407,13 +422,13 @@
<view class="line-word-r value-font">
<text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line">
<!-- <view class="jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text>
</view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="jusitify-line">
<view class="line-word title-font">加钟费用</view>
<view class="line-word-r value-font" >
@ -1818,19 +1833,6 @@ export default {
font-size: 24rpx;
margin: 10px 0px;
}
.showBtnClass{
position: absolute;
background: #fff;
display: flex;
flex-direction: column;
width: 100px;
left: 0;
margin-bottom: 43px;
margin-left: 10px;
border-radius: 20rpx 20rpx 20rpx 0;
box-shadow: 0px 0px 3px 0px #b5b5b5;
padding: 15rpx 5rpx;
}
.dingshi,.btns{
width: 0px !important;
padding: 0px 42px !important;
@ -2044,8 +2046,8 @@ export default {
position: absolute;
background-color: #ffffff;
padding: 10px;
bottom:10rpx;
left:30rpx;
bottom:90rpx;
left:50rpx;
box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius: 10rpx;
}

2
my/order/payModifyDd.vue
View File

@ -119,7 +119,7 @@
<span >项目价格</span>
</view>
<view >
<span class="line-word-r value-font">￥{{orderXm.price}}</span>
<span class="line-word-r value-font">￥{{orderXm.priceMarkup}}</span>
</view>
</view>
</view>

817
my/order/payModifyTcMyDaiB.vue
View File

File diff suppressed because it is too large Load Diff

63
my/order/payShengji.vue
View File

@ -23,6 +23,7 @@
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
</view>
</view>
@ -155,7 +156,7 @@
<view class="line-word-r value-font" style="color: #019c88;" v-else>￥{{order.oldPriceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="line-word title-font">会员减免</view>
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.oldVipReductionMoney==null">-￥{{order.vipReductionMoney}}</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-else>-￥{{order.oldVipReductionMoney}}</view>
</view>
@ -172,7 +173,6 @@
</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
@ -189,7 +189,15 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -378,7 +386,7 @@
</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav jusitify-line">
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
@ -394,9 +402,17 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<!-- <view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
@ -405,7 +421,7 @@
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
</view>
</view> -->
<view class="jusitify-line-end"></view>
<view>
<view class="justify-title-nav">
@ -433,7 +449,6 @@
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view>
@ -486,13 +501,13 @@
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<!-- <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text>
</view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">升级费用</view>
<view class="value-font">
@ -548,35 +563,39 @@
</view>
</view>
<view class="showBtn-view" v-show="btnShow==true">
<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
<view :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns">
去投诉
</view>
<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
</view>
</view>
<view class="showBtn-mian" v-else>
<view class="showBtn" style="justify-content: center;">
<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
去投诉
</u-button>
<u-button :custom-style="customStyle2"
v-if="order.status=='1'"
shape="circle" :plain="true"
@click="quzhifu(order)"
class="dingshi">
class="btns">
去支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" v-if="order.status=='3'"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns">
去评价
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
</view>
</view>
</view>

234
my/order/payding.vue
View File

@ -67,23 +67,23 @@
</view>
</view>
</view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="add-content">
<view class="" v-if="order.artificer">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">客户姓名</view>
<view class="add-con-cont value-font">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font">
{{order.userName}}
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">联系方式</view>
<view class="add-con-cont value-font">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress">
<view class="add-con-title title-font">服务地址</view>
<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view>
<view class="serverAddress jusitify-line">
<view class="line-word title-font">服务地址</view>
<view class="value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
@ -91,8 +91,8 @@
<view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
<view class="margin-left-sm flex" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">{{order.artificer.artificerName}}</view>
<!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
@ -100,9 +100,10 @@
@click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
<!-- <view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view> -->
<view class="level_button">{{order.technicianTypeName}}</view>
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@ -119,51 +120,50 @@
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">预约时间</view>
<view class="add-con-cont value-font">{{order.serveTime}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">下单时间</view>
<view class="add-con-cont value-font">{{order.createTime}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{order.createTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav ">
<view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">项目名称</view>
<view class="add-con-cont value-font">{{order.entryName}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">服务时长</view>
<view class="add-con-cont value-font">{{order.duration}}分钟</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">项目原价</view>
<view class="add-con-cont value-font">￥{{order.massagePrice}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目原价</view>
<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null">
<view class="add-con-title title-font">会员减免</view>
<view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
<view class="flex justify-between jusitify-line" v-if="order.userPackageDetailId==null">
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="add-con-title title-font">小计：</view>
<view class="add-con-cont value-font" style="font-weight: bold;">￥<text>{{order.massageMoney}}</text></view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.massageMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
@ -172,29 +172,37 @@
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin" v-if="order.tripWay">
<view class="add-con-title title-font">出行方式</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 3">免费</view>
<view class="flex justify-between jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between add-lin" v-if="order.km">
<view class="add-con-title title-font">全程距离</view>
<view class="add-con-cont value-font">{{order.km}}km</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font">￥{{order.taxiMoney}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="line-word-r value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav ">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">优惠券</view>
<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="add-con-cont value-font" v-else>-</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view class="jusitify-line-end"></view>
@ -209,19 +217,19 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="fei-view">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">订单费用</view>
<view class="add-con-cont value-font">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font">
<text style="font-weight: bold;">￥{{order.massageMoney}}</text>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">优惠券</view>
<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
@ -234,15 +242,15 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" class="btns"
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns"
v-if="(order.status != 3 && order.status != 4 && order.status != 5) && yhqxSel != '否' && order.cancelBtnShow == 'true'">取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
v-if="order.status == 1"
class="btns">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
class="btns">联系客服</u-button>
</view>
</view>
@ -484,7 +492,8 @@
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
var timestamp = parseInt(date.getTime());
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time=parseInt(new Date(this.order.serveTime).getTime())
@ -494,6 +503,24 @@
this.$set(this.order, 'btnShow', 'false')
}
console.log("sadasdsa0",this.order)
const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
if(timestamp-time<fifteenTime){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
if(this.order.cancelBtnShow == 'true'){
if(this.order.addNum == null){
if(this.order.isSupplement == null){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}
let aliphone = this.$queue.getData('aliphone');
if (aliphone === '是' && this.order.artificer) {
this.ysPhone(this.order.phone, this.order.artificer.phone);
@ -1580,14 +1607,14 @@
display: flex;
flex-direction: column;
}
/deep/.btns{
/deep/.btns{
color: #019C88 !important;
margin-left: 10rpx !important;
height:64rpx;
font-size: 28rpx;
}
height:70rpx;
font-size: 30rpx;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
width: 85px !important;
}
.showBtn-mian{
width: 100%;
@ -1697,15 +1724,16 @@
}
.list-pay{
width: 100%;
padding: 10px 29rpx;
padding: 10rpx 29rpx;
margin-bottom: 40rpx;
}
.pay-ding-top{
width: 100%;
height: 50px;
height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px;
border-top-right-radius: 12px;
padding: 0px 14px;
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
padding: 0px 29rpx;
}
.pay-ding,.feiuong{
background-color: #ffffff;
@ -1723,9 +1751,10 @@
color: #333333;
}
.d-touxiang{
width: 60rpx;
height: 60rpx;
width: 55rpx;
height: 55rpx;
border-radius: 50%;
border: 1px solid #f2fffd;
}
.money-pay-jia{
font-weight: 400;
@ -1946,37 +1975,29 @@
justify-content: space-between;
align-items: center;
}
.add-content {
background: #fff;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.head-text{
font-size:30rpx;
}
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
padding: 4rpx 20rpx;
background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
border-radius: 16rpx 16rpx 16rpx 1rpx;
color: #e95c3b;
font-size: 12px;
border: 1px solid #fd967c;
}
.add-lin{
height: 74rpx;
line-height: 74rpx;
}
.add-con-title{
color: #666;
font-size: 30rpx;
}
.add-con-cont{
color: #333;
font-size: 30rpx;
line-height: 80rpx;
text-align:right;
}
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
font-size: 12px;
}
.justify-title-nav{
width: 90%;
display: flex;
@ -1997,6 +2018,13 @@
font-size: 32rpx;
color: #333;
}
.jusitify-line {
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.jusitify-line-end{
height:1px;
border-bottom: 1px #e5e5e5 solid;

87
my/order/paydingTCX.vue
View File

@ -174,7 +174,15 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font">￥{{order.taxiMoney}}</view>
<view class="add-con-cont value-font">￥{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.nightTravelMoney">
<view class="add-con-title title-font">夜间出行</view>
<view class="add-con-cont value-font">￥{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="add-con-title title-font">小计：</view>
<view class="add-con-cont value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view class="jusitify-line-end"></view>
@ -206,20 +214,20 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true"
v-if="order.status != 3 &&
order.status != 4 &&
order.status != 5
order.status != 5 && order.cancelBtnShow == 'true'
"
>取消订单
class="btns">取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
v-if="order.status == 1||order.status == 10"
class="dingshi">立即支付
class="btns">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
class="btns">联系客服</u-button>
</view>
</view>
@ -571,7 +579,8 @@
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
var timestamp = parseInt(date.getTime());
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time=parseInt(new Date(this.order.serveTime).getTime())
@ -580,6 +589,24 @@
}else{
this.$set(this.order, 'btnShow', 'false')
}
const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
if(timestamp-time<fifteenTime){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
if(this.order.cancelBtnShow == 'true'){
if(this.order.addNum == null){
if(this.order.isSupplement == null){
this.$set(this.order, 'cancelBtnShow', 'true')
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}else{
this.$set(this.order, 'cancelBtnShow', 'false')
}
}
console.log("sadasdsa0",this.order)
let aliphone = this.$queue.getData('aliphone');
if (aliphone === '是' && this.order.artificer) {
@ -1694,8 +1721,10 @@
flex-direction: column;
}
/deep/.btns{
background: #019C88 !important;
color: #fff !important;
color: #019C88 !important;
margin-left: 10rpx !important;
height:70rpx;
font-size: 30rpx;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
@ -1713,21 +1742,51 @@
font-size: 25rpx;
color: #7D7D7D;
}
.showBtn-view{
.showBtn-view {
display: flex;
flex-direction: column;
align-items: center;
position: absolute;
background-color: #ffffff;
padding: 10px;
bottom: 90rpx;
left: 50rpx;
box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius: 10rpx;
}
.showBtn-view:before {
position: absolute;
left: 20rpx;
bottom: -12rpx;
width: 20rpx;
height: 20rpx;
background: #ffffff;
margin-top: -2px;
border-right: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
content: '';
}
.showBtn {
width: 100%;
justify-content: flex-end;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-top: 20rpx;
}
.showBtn,.hideBtn{
.hideBtn {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{

2
my/setting/index.vue
View File

@ -150,7 +150,7 @@
.content {
width: 100%;
height: 100vh;
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
/*background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');*/
background-position: center center;
background-repeat: no-repeat;
background-size: 100% 100%;

2
pages/cooperate/index.vue
View File

@ -65,7 +65,7 @@
width:400rpx;
height: 60rpx;
position: absolute;
top:120rpx;
top:100rpx;
left:40rpx;
}
.cop-img2{

12
pages/index/index.vue
View File

@ -10,7 +10,7 @@
</view> -->
<view class="index-line" >
<view class="flex">
<image class="salogo" src="../../static/salogo.gif"></image>
<view><image class="salogo" src="../../static/salogo.gif"></image></view>
<view v-if="XCXIsSelect != '否'" class="flex locate-line"
@tap="goCity">
<!--<image src="../../static/liliao-1.png" class="dingwei-img"></image>-->
@ -1230,9 +1230,10 @@
flex-wrap: wrap;
}
.salogo{
width: 140rpx;
height: 36rpx;
margin-left: 20rpx;
width: 130rpx;
height: 32rpx;
margin-left: 34rpx;
margin-top:6rpx ;
}
.index-yanzheng{
width: 100rpx;
@ -2087,7 +2088,8 @@
align-items: center;
}
.index-mian{
width: 100%;
width: 98%;
margin: 4rpx auto;
display: flex;
flex-direction: row;
justify-content: space-between;

37
pages/my/fuwuGengduo.vue
View File

@ -396,46 +396,50 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:14rpx;
top:19rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
/deep/.uni-searchbar{
width: 240px;
width: 230px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
}
.service-head-top-left{
display: flex;
@ -450,7 +454,6 @@
align-items: center;
justify-content: space-between;
position: fixed;
background-color: #fff;
z-index: 999;
}

48
pages/my/index.vue
View File

@ -33,8 +33,9 @@
<view @click="chonghi('明细')">钱包明细<span class="view-more"></span></view>
</view>
<view class="my-head-mian-top">
<view class="flex" style="align-items: flex-end;">
<view class="flex money-list">
<!--<image class="money-img" src="../../static/money2.png" mode="" @click="qidai()"></image>-->
<view>钱包金额(元)</view>
<view class="my-head-mian-top-yuE">{{money}}</view>
</view>
@ -60,7 +61,7 @@
</view>
</view>
<view class="my-head-bottom back-width" @click="goNav('/my/vip/index')">
<image src="../../static/my-kaitonghuiyuan.png" mode="widthFix" v-if="isVip=='1'"></image>
<image src="../../static/activate3.png" mode="widthFix" v-if="isVip=='1'"></image>
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='0'"></image>
<!-- <image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVip"></image>
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip"></image> -->
@ -117,7 +118,7 @@
<view class="my-use-title">常用功能</view>
<view class="my-use-view">
<view class="my-use-list" v-for="(item,index) in useList" :key="index" @click="useToUrl(item)">
<image :src="item.urlImg" mode=""></image>
<image style="padding: 3rpx;" :src="item.urlImg" mode=""></image>
<span class="my-use-list-text">{{item.text}}</span>
</view>
</view>
@ -820,8 +821,8 @@
font-size: 14px;
}
.my-use-list image{
width: 70rpx;
height: 70rpx;
width: 76rpx;
height: 76rpx;
}
.my-use{
background: #FFFFFF;
@ -841,7 +842,7 @@
}
.my-serve-view{
width: 98%;
margin: 16px auto;
margin: 10px auto;
display: flex;
flex-direction: row;
align-items: center;
@ -849,7 +850,7 @@
}
.my-use-list{
width: 25%;
margin-top: 20px;
margin-top: 10px;
display: flex;
flex-direction: column;
align-items: center;
@ -861,8 +862,8 @@
justify-content: center;
}
.my-serve-list image{
width: 80rpx;
height: 80rpx;
width: 76rpx;
height: 76rpx;
}
.my-serve-list-text{
color: #6C6C6C;
@ -888,10 +889,10 @@
padding: 10px;
display: flex;
flex-direction: column;
margin: 0px auto 12px auto;
margin: 0px auto 8px auto;
}
.my-serve,.my-serve{
height: 260rpx;
height: 240rpx;
background: #FFFFFF;
border-radius: 21rpx;
padding: 12px 14px;
@ -920,7 +921,7 @@
justify-content: center;
}
.my-head-mian-bottom{
width: 86%;
width: 80%;
margin: 0 auto;
display: flex;
flex-direction: row;
@ -930,10 +931,17 @@
border-top: 1px #F6F6F6 solid;
padding-top: 20rpx;
}
.money-list{
display: flex;
flex-direction: column;
align-items: center;
font-size: 20rpx;
margin-top: 20rpx;
}
.my-head-mian-top-yuE{
font-size: 60rpx;
color: #111111;
margin-top: 30rpx;
margin-top: 6rpx;
font-weight: bold;
}
.my-head-mian-top-view-chong,.my-head-mian-top-view-ming{
@ -945,7 +953,7 @@
font-size: 28rpx;
}
.my-head-mian-top-view-chong{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
background: linear-gradient(90deg, #1bc8ac, #1bc8ac, #1bc8ac);
color: #fff;
}
.my-head-mian-top-view-ming{
@ -954,12 +962,12 @@
}
.my-head-mian-top-view-qian{
width: 100%;
color: #019c88;
background: linear-gradient(90deg, #e8f7f3, #e5f7f3);
color: #2f9e8d;
background: linear-gradient(90deg, #edfbfb, #effafc);
margin: 0 auto;
border-radius:20rpx 20rpx 0 0;
height: 64rpx;
line-height: 66rpx;
height: 76rpx;
line-height: 74rpx;
display: flex;
flex-direction: row;
justify-content: space-between;
@ -984,7 +992,7 @@
display: flex;
flex-direction: row;
align-items: center;
margin-top: 30rpx;
margin-top: 20rpx;
justify-content: center;
}
.my-head-mian-top{
@ -1021,7 +1029,7 @@
}
.my-head-texa{
font-size: 26rpx;
color: #788298;
color: #555;
}
.my-head-vip{
width: 28rpx;

7
pages/my/indextaociliaoList.vue
View File

@ -453,18 +453,19 @@
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
margin-right: 15rpx;
}
.search-btn{
text-align: center;
line-height: 28px;
color: #fff;
position: absolute;
right:14rpx;
right:26rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar{
width: 240px;
width: 230px;
border-radius: 31rpx;
position: relative;
}
@ -511,7 +512,7 @@
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
margin-top: 14rpx;
}
.service-head-top-left{
display: flex;

50
pages/my/newTeaml.vue
View File

@ -300,12 +300,14 @@
font-size: 30rpx;
}
.seckill-rob{
width: 30%;
width:50%;
height: 60rpx;
background: linear-gradient(90deg, #fb2d30, #fc2e37);
text-align: center;
background:#fb2d30 url('../../static/seckill4-1.png');
background-size: 40% 100%;
background-repeat: no-repeat;
line-height: 60rpx;
border-radius: 0 10rpx 10rpx 0;
text-indent: 70rpx;
}
.seckill-img{
width: 70rpx;
@ -480,7 +482,7 @@
}
/deep/.zp-paging-container-content{
width: 95%;
margin: 50px auto 0px auto;
margin: 45px auto 0px auto;
}
.fenlei{
display: flex;
@ -513,46 +515,52 @@
}
.search-btn{
text-align: center;
line-height: 31px;
color: #fff;
line-height: 28px;
color: #333;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:26rpx;
top: 20rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
background: #18A689;
width: 110rpx;
height: 50rpx;
background: #e4e4e4;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
height: 30px;
border-radius: 30px !important;
background-color: #f4f4f4 !important;
/*border: 1px solid #09a28a;*/
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
margin-right: 15rpx;
}
/deep/.uni-searchbar{
width: 240px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 14rpx;
}
.service-head-top-left{
display: flex;

54
pages/my/newTeamlDetail.vue
View File

@ -3,7 +3,7 @@
<view class="header">
<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
<!--<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>-->
</view>
<view class="group-buy">
<view class="group-buy-left">
@ -18,8 +18,7 @@
</view>
<view class="group-buy-right">
<view class="group-text">距结束仅剩</view>
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down>
<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down>
<!-- <uni-countdown :show-day="false" :font-size="13" :day="day" :hour="hours" :minute="minutes" :second="seconds" /> -->
<!-- <view><span>08</span>:<span>08</span>:<span>08</span></view> -->
</view>
@ -50,9 +49,9 @@
</view>
</view>
<view class="teamwork-plate" v-if="ordersData!=''&&newTime>0">
<view class="teamwork-list">{{mainData.buyGroupNum}}人在拼团，可直接参与</view>
<view class=" flex teamwork-line" v-for="(itema,index) in ordersData" :key="index">
<view>
<view>{{mainData.buyGroupNum}}人在拼团，可直接参与</view>
<view v-for="(itemL,indexL) in itema.orderList" :key="indexL" class="avatar">
<image style="width: 30px; height: 30px; border-radius:50%;" :src="itemL.avatar"></image>
<span>{{itemL.phone}}</span>
@ -61,8 +60,7 @@
<view class="flex" style="align-items: center;">
<view class="teamwork-se">
<view>还差<span class="team-text">{{itema.lessNum}}人</span>拼成</view>
<view>剩余<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down></view>
<view>剩余<u-count-down :timestamp="endOfServiceTimer" @change="onCountdownChange"></u-count-down></view>
</view>
<view class="teamwork-button" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,itema.groupNo)" v-if="mainData.isNewer!='1'&&newTime>0">去拼团</view>
</view>
@ -258,6 +256,10 @@
}
</script>
<style scoped>
.teamwork-list{
font-size: 30rpx;
padding: 10rpx 0;
}
.avatar{
display: flex;
flex-direction: row;
@ -837,7 +839,7 @@
}
.header-bottom-title-num span:nth-child(2){
font-weight: bold;
color: #08A28A;
color: #f52b1b;
}
.header-bottom-title-num span:nth-child(3){
color: #848485;
@ -913,32 +915,35 @@
padding: 30rpx 30rpx;
background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
display: flex;
justify-content: space-between;
}
.group_amount{
color: #fff;
display: flex;
align-items: flex-end;
}
.group_amount span:nth-child(2){
font-size: 50rpx;
font-size: 80rpx;
font-weight: bold;
line-height:68rpx;
}
.group-rule{
display: flex;
flex-direction:column;
align-items: center;
margin-left: 10rpx;
}
.group-rule span:nth-child(1){
color: #fff;
font-size:22rpx;
font-size:24rpx;
text-decoration: line-through;
}
.group-rule span:nth-child(2){
text-align: center;
padding: 2rpx 15rpx;
padding: 1rpx 8rpx;
background:#fff;
color: #ed4b3e;
font-size: 24rpx;
border-radius: 3rpx;
font-size: 22rpx;
border-radius: 6rpx;
}
.group-buy-right{
width: 34%;
@ -977,16 +982,16 @@
}
.teamwork-line{
display: flex;
padding: 15rpx 0;
padding:14rpx 12rpx;
justify-content: space-between;
}
.teamwork-button{
padding: 2rpx 15rpx;
/* background:#ed4b3e ; */
color:#fff;
height: 50rpx;
line-height: 50rpx;
margin-top: 15rpx;
height: 60rpx;
line-height: 58rpx;
margin-top: 10rpx;
border-radius: 6rpx;
margin-left: 15rpx;
}
@ -994,12 +999,13 @@
color: #ed4b3e;
}
.teamwork-se{
width: 300rpx;
font-size: 24rpx;
text-align: center;
margin-top: 6rpx;
text-align: left;
padding: 2rpx 0;
}
.tewmwork-prompt{
font-size: 24rpx;
font-size: 22rpx;
color: #ed4b3e;
margin-top: 12rpx;
}
@ -1010,10 +1016,10 @@
.tewmork-key span{
height: 30rpx;
line-height: 30rpx;
padding: 0 8rpx;
font-size: 20rpx;
border: 1px #ed4b3e solid ;
color: #ed4b3e;
padding: 4rpx 14rpx;
font-size: 22rpx;
background: linear-gradient(90deg, #feeaf4, #fef0f0, #fdf2ec);
color: #f52b1b;
border-radius: 6rpx;
margin-right: 6rpx;
margin-top: 6rpx;

34
pages/my/newseckill.vue
View File

@ -50,7 +50,12 @@
<view class="item-view">
<view class="view-cata">
<view class="item-view-title">{{item.title}}</view>
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view>
<view class="flex" style="margin-top: 10rpx;">
<view class="xiaoer item-view-biao">{{item.classifyName}}</view>
<view class="shop_label" v-if="tagsData">
<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
</view>
</view>
<view class="item-view-bottom-qian">
<span>￥</span>
@ -58,15 +63,13 @@
<!-- <span>/{{item.serviceCount}}次</span> -->
<span>￥{{item.oldPrice}}</span>
</view>
<view class="shop_label" v-if="tagsData">
<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
</view>
<view class="item-view-bottom">
<view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
</view>
<view class="item-view-bottom-btn">
查看
开抢
</view>
</view>
</view>
@ -330,8 +333,10 @@
text-overflow: ellipsis;
}
.item-view-biao{
padding: 1px 5px;
border-radius: 15rpx 3rpx 15rpx 3rpx;
padding: 1px 8px;
border-radius: 10rpx 3rpx 10rpx 3rpx;
font-size: 22rpx;
margin-right: 10rpx;
}
.tuina{
background-color:#d1f2df;
@ -358,6 +363,13 @@
color: #999;
margin-right: 5rpx;
}
.shop_label{
padding: 1rpx 8rpx;
background:#d9ffee ;
color: #019C88;
font-size: 22rpx;
border-radius: 30rpx;
}
.item-view-xiangmu{
width: 100%;
display: flex;
@ -368,7 +380,7 @@
}
.item-view-title{
font-weight: bold;
font-size: 32rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
}
@ -475,7 +487,7 @@
line-height: 28px;
color: #fff;
position: absolute;
right:14rpx;
right:26rpx;
top: 25rpx;
height: 29px !important;
}
@ -497,6 +509,7 @@
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
margin-right: 15rpx;
}
/deep/.uni-searchbar{
width: 230px;
@ -538,6 +551,7 @@
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
align-items: left;
flex-direction: column;
}
</style>

2
pages/my/newseckilldetails.vue
View File

@ -3,7 +3,7 @@
<view class="header">
<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
<!--<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>-->
</view>
<view class="group-buy">
<view class="group-buy-left">

54
pages/my/orderDetailsList.vue
View File

@ -19,7 +19,7 @@
<template slot="content">
<!-- 升级订单 -->
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<view class="flex justify-between">
<view class="flex justify-between st-title">
<view class="flex align-center profile-img">
<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
@ -39,8 +39,8 @@
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class=" u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null">
<view class="margin-top-sm"></view>
<view class=" u-flex" v-if="item.ordersMassageList[0].userPackageDetail==null">
<view class="u-m-r-10">
<image :src="item.ordersMassageList[0].massageType.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view>
@ -60,7 +60,7 @@
</view>
</view>
</view>
<view class=" u-flex u-p-t-30" v-else>
<view class=" u-flex" v-else>
<view class="u-m-r-10">
<image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view>
@ -187,6 +187,9 @@
</script>
<style scoped>
.st-title{
padding-top:20rpx;
}
.dingdan-cont{
width: 100%;
display: flex;
@ -377,8 +380,8 @@
height: 140px;
background: #FFFFFF;
border-radius: 21rpx;
padding: 0px 5px;
margin: 20px auto 0px auto;
padding: 0px 12px;
margin: 20rpx auto 0px auto;
}
.item-detail {
@ -436,46 +439,50 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 101rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 2px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
/deep/.uni-searchbar{
width: 240px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 44rpx;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
}
.service-head-top-left{
display: flex;
@ -490,7 +497,8 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color: #fff;
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1;
}
</style>

93
pages/order/index.vue
View File

@ -41,7 +41,7 @@
</u-avatar>
</view>
<view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;">
<view class="text-bold u-line-1">
<view class=" text-lg "
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
@ -83,7 +83,7 @@
</view>
<view class="showBtn" v-if="item.status ==2">
<u-button
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
@ -95,7 +95,7 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -109,19 +109,19 @@
去投诉
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==4">
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==5">
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -129,15 +129,21 @@
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">
更多
</view>
<view class="gengduoShow">
<view class="gengduoShow" v-if="item.earlyFinishReason==null">
<u-button
v-if="item.addNum==null&&item.isSupplement==null&&item.isSupplement!=2"
v-if="item.addNum==null&&item.isSupplement==null"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns"
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
服务升级
</u-button>
<u-button
v-else-if="item.addNum==null&&item.isSupplement!=2"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns"
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
服务升级
</u-button>
<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
充值
@ -147,13 +153,17 @@
加钟
</u-button>
</view>
<view class="gengduoShow" v-else>
<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
充值
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="gengduoBtn">
联系客服
</view>
<view v-if="item.addNum==null&&item.oldOrdersId==null"
<view v-if="item.cancelBtnShow == 'true'"
@click="cancelOrder(item)" class="gengduoBtn">
取消订单
</view>
@ -181,7 +191,7 @@
</view>
</view>
<view class="showBtn" v-if="item.status ==7">
<u-button
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
@ -193,12 +203,12 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==8">
<u-button
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
@ -210,12 +220,12 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==9">
<u-button
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
@ -226,12 +236,12 @@
拒单详情
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==10">
<u-button
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
@ -246,7 +256,7 @@
立即预约
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -518,24 +528,43 @@
page: this.page,
limit: this.limit
}
// selectOrdersList
this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => {
if (res.code == 0) {
uni.hideLoading();
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
this.goods = [...this.goods, ...res.data.list]; //追加新数据
var timestamp = this.timeToMilliseconds(this.getCurrentTime);
// var timestamp = this.timeToMilliseconds(this.getCurrentTime);
var timestamp = (new Date()).getTime();
var twoTime=2* 60 * 60 * 1000;
var fifteenTime = 15 * 60 * 1000; // 15分钟的毫秒数
var time='';
for(var i=0;i<this.goods.length;i++){
time=this.timeToMilliseconds(this.goods[i].serveTime.slice(11, 16))
// time=this.timeToMilliseconds(this.goods[i].serveTime.slice(11, 16))
time= new Date(this.goods[i].serveTime).getTime()
if(time - timestamp>twoTime){
this.$set(this.goods[i], 'btnShow', 'true')
}else{
this.$set(this.goods[i], 'btnShow', 'false')
}
if(timestamp-time<fifteenTime){
this.$set(this.goods[i], 'cancelBtnShow', 'true')
}else{
this.$set(this.goods[i], 'cancelBtnShow', 'false')
}
if(this.goods[i].cancelBtnShow == 'true'){
if(this.goods[i].addNum == null){
if(this.goods[i].isSupplement == null){
this.$set(this.goods[i], 'cancelBtnShow', 'true')
}else{
this.$set(this.goods[i], 'cancelBtnShow', 'false')
}
}else{
this.$set(this.goods[i], 'cancelBtnShow', 'false')
}
}
}
console.log("this.goods[i].serveTime.slice(15, 16)",this.goods)
}
@ -823,13 +852,13 @@
onReachBottom: function() {
this.page = this.page + 1;
this.getOrderList();
console.log("asd",this.totalCount)
if (this.totalCount==undefined&&this.orderList!='') {
uni.showToast({
title: '已经到底了~',
icon: 'none'
})
}
// console.log("asd",this.totalCount)
// if (this.totalCount==undefined&&this.orderList!='') {
// uni.showToast({
// title: '已经到底了~',
// icon: 'none'
// })
// }
},
onPullDownRefresh: function() {
this.page = 1;

37
pages/shop/index.vue
View File

@ -424,46 +424,53 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:26rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 10rpx;
margin-right: 15rpx;
}
/deep/.uni-searchbar{
width: 240px;
width: 230px;
border-radius: 31rpx;
position: relative;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 14rpx;
}
.service-head-top-left{
display: flex;

BIN
static/activate3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
static/background-img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 405 KiB

After

Width:  |  Height:  |  Size: 313 KiB

BIN
static/background-img5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
static/salogo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/seckill4-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
static/seckill4-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
static/seckill4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
static/wallet3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

8
uview-ui/components/u-count-down/u-count-down.vue
View File

@ -107,17 +107,17 @@ export default {
// 字体颜色
color: {
type: String,
default: '#303133'
default: '#fff'
},
// 字体大小，单位rpx
fontSize: {
type: [Number, String],
default: 30
default:26
},
// 背景颜色
bgColor: {
type: String,
default: '#fff'
default: '#222222'
},
// 数字框高度，单位rpx
height: {
@ -132,7 +132,7 @@ export default {
// 边框颜色
borderColor: {
type: String,
default: '#303133'
default: '#e83530'
},
// 是否显示秒
showSeconds: {

2
uview-ui/libs/request/index.js
View File

@ -102,7 +102,7 @@ class Request {
constructor() {
this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://192.168.2.15:8187/',
// baseUrl: 'http://192.168.2.222:8187/',
baseUrl: 'https://sausers.blxinchuang.com/', // 请求的根域名
// baseUrl: 'http://1.92.152.160/', // 请求的根域名
// baseUrl: 'http://120.46.52.165/', // 请求的根域名