订单页面调整,技师名称粗体

This commit is contained in:
曹磊 2024-07-22 17:50:17 +08:00
parent 69a7c9b7ac
commit 91201e5cd4
24 changed files with 749 additions and 770 deletions

View File

@ -2693,8 +2693,8 @@ export default {
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -37,7 +37,7 @@
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
@ -113,7 +113,7 @@
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view>
@ -135,7 +135,7 @@
<view class="add-con-cont" >{{order.endTime}}</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>
@ -171,7 +171,7 @@
</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>
@ -232,7 +232,7 @@
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
@ -250,7 +250,7 @@
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view>
@ -272,7 +272,7 @@
<view class="add-con-cont" >{{order.endTime}}</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>
@ -308,7 +308,7 @@
</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>
@ -350,7 +350,7 @@
</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">出行费用</view>
<view class="" style="color: #333;" v-if="order.taxiMoney">
<text style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text>
</view>
@ -370,22 +370,22 @@
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
@ -403,8 +403,8 @@
:key="index">{{items}}</text>
</view>
<view class="btnview">
<view class="item_money">
<text style="font-size: 24upx;"></text>
<view class="item_money">
<text style="font-size: 24upx;"></text>
<text>{{item.price}}</text>
/<text style="font-weight: 500;font-size: 24upx;">
{{item.duration}}分钟
@ -552,7 +552,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -564,7 +564,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -674,7 +674,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {//
@ -706,7 +706,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
goOrderJ(item,text) {//
@ -737,11 +737,11 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
goOrderS(item,text) {//
let that = this
that.shengji=text
let data = {
@ -764,7 +764,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
//
@ -796,7 +796,7 @@
})
// that.getOrder()
// that.showorderS=false;
} else {
uni.showToast({
title: res.msg,
@ -842,7 +842,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -900,9 +900,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -943,7 +943,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -961,25 +961,25 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -1017,7 +1017,7 @@
},
toggleQ(type,item) {//
this.qurenJd=item;
this.type = type
// open uni-popup type
this.$refs.popupQ.open(type)
@ -1043,7 +1043,7 @@
title:'操作失败!'
})
}
}).catch(() => {
this.getOrder()
//,
@ -1091,12 +1091,12 @@
title:'操作失败!'
})
}
}).catch(() => {
//,
that.getOrder()
});
},
fail: function(e) {
that.getOrder()
@ -1110,14 +1110,14 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'
})
}
},
toggle(type,item) {//
this.tiqianData=item;
@ -1125,12 +1125,12 @@
// open uni-popup type
this.$refs.popup.open(type);
},
gengBtn(){
this.btnShow=!this.btnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -1205,7 +1205,7 @@
}
});
},
payJZ() {
let that = this;
uni.showModal({
@ -1225,7 +1225,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1235,9 +1235,9 @@
url:'/my/order/payShengji?ordersId='+that.tordersId
})
}
that.getOrder()
} else {
uni.showToast({
title: ret.msg,
@ -1267,7 +1267,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1290,7 +1290,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1305,7 +1305,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1335,7 +1335,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1358,9 +1358,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1374,7 +1374,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1400,7 +1400,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1417,7 +1417,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.ordersId,
@ -1429,7 +1429,7 @@
title: '支付成功',
icon: 'none'
})
if(that.jiazhong=='加钟'){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
@ -1444,15 +1444,15 @@
});
// #endif
}
} else if (re.cancel) {
that.getOrder()
}
}
})
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -1481,7 +1481,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1524,7 +1524,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -1567,7 +1567,7 @@
})
// this.showpay = true
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
if (document.addEventListener) {
@ -1728,7 +1728,7 @@
/deep/.padding-bottom{
padding-bottom: 50px;
}
/deep/.u-drawer{
z-index:11 !important;
}
@ -1806,7 +1806,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1836,7 +1836,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1942,9 +1942,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1961,7 +1961,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -2053,10 +2053,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;
@ -2107,7 +2106,7 @@
font-size: 32rpx;
color: #333333;
margin-bottom: 22rpx;
}
page {
background: #f7f7f7;
@ -2349,4 +2348,4 @@
display: flex;
justify-content: space-between;
}
</style>
</style>

View File

@ -397,25 +397,25 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font" v-if="order.oldMassageMoney==null">
<text style="font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r value-font" v-else><text style="font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<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="jusitify-line">
<view class="line-word title-font">优惠券</view>
<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 class="jusitify-line">
<view class="line-word title-font">加钟费用</view>
<view class="line-word title-font">加钟费用</view>
<view class="line-word-r value-font" >
<text style="font-weight: bold;" v-if="order.addMoney">{{order.addMoney}}</text>
<text class="line-word-r value-font" v-else>-</text>
@ -2184,9 +2184,9 @@ export default {
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
color: #333333;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
width: 55rpx;

View File

@ -1692,10 +1692,9 @@
margin-top: 10px;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -14,7 +14,7 @@
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -23,7 +23,7 @@
<span></span>
<span>{{orderXm.price}}/</span>
</view>
<view>
<uni-number-box :width='27' :min="1" @change="changeValue" />
</view>
@ -33,10 +33,10 @@
</view>
</view>
</view>
</view>
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">次卡详情</span>
@ -65,7 +65,7 @@
</view>
</view>
</view>
<view class="detail-foot-title">
项目次卡
</view>
@ -73,7 +73,7 @@
</view>
</view>
<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
<view class="liliao-top" style="width: 30%;">
<span>平台优惠劵</span>
@ -86,9 +86,9 @@
</view>
</view>
</view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -140,7 +140,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -187,7 +187,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -199,7 +199,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -270,13 +270,13 @@
if(this.couponId){
this.youhuiF(this.couponId)
}
this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -394,7 +394,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -410,7 +410,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -483,7 +483,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -493,13 +493,13 @@
url: '../address/address?id=' + 2
})
}
},
changeLog(e){//
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -604,7 +604,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
@ -827,7 +827,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -921,7 +921,7 @@
}
});
},
//
pay() {
let that = this
@ -1322,7 +1322,7 @@
padding: 29rpx;
margin-top: 10px;
}
.pay-title{
font-weight: bold;
font-size: 31rpx;
@ -1397,7 +1397,7 @@
align-items: center;
padding: 15px 0px;
}
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
@ -1438,7 +1438,7 @@
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
width: 100%;
display: flex;
@ -1715,11 +1715,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1810,7 +1808,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1824,7 +1822,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1858,7 +1856,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2041,4 +2039,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -8,21 +8,21 @@
<view class="" style="width: 160upx;height: 160upx;">
<image :src="(orderXm.ordersMassageList && orderXm.ordersMassageList.length > 0 && orderXm.ordersMassageList[0].massageType && orderXm.ordersMassageList[0].massageType.massageImg)?orderXm.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="head-bottom margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
{{orderXm.entryName}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{orderXm.duration}}分钟
</view>
</view>
<view class="money-pay">
@ -81,7 +81,7 @@
</view>
</view>
<view class="padding margin-top-sm header-view">
<view class="jusitify-line" @click="liliaoshi(orderXm)">
<view class="line-word" >
<span>技师</span>
@ -142,7 +142,7 @@
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<!-- <view class="margin-top-xl pay-ding">
@ -171,7 +171,7 @@
<view class="push-button">
<view class="que-btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -223,7 +223,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -270,7 +270,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -282,7 +282,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -340,7 +340,7 @@
let Time = year + '-' + fullDate
this.yearsDate = Time;
this.jishiName=this.$queue.getData('getJishi');
this.couponId=this.$queue.getData('youhui');
if(this.couponId){
this.youhuiF(this.couponId)
@ -357,7 +357,7 @@
console.log("jishiName",this.jishiName)
}
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -467,7 +467,7 @@
// this.showpay = true;
this.goOrder()
}
},
textareaChange(e){//
this.textareaData=e.detail.value
@ -491,7 +491,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -507,7 +507,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(item){
@ -582,7 +582,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -592,14 +592,14 @@
url: '../address/address?id=' + 5
})
}
},
changeLog(e){//
console.log("11111",e)
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -711,7 +711,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
@ -934,7 +934,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1028,7 +1028,7 @@
}
});
},
//
pay() {
let that = this
@ -1420,7 +1420,7 @@
border-radius: 24rpx;
padding: 29rpx;
}
.pay-title{
font-weight: bold;
font-size: 30rpx;
@ -1562,7 +1562,7 @@
justify-content: space-between !important;
}
.liliao{
margin-top: 17px;
margin-top: 17px;
}
.fuwu-time-view{
text-align: right;
@ -1719,11 +1719,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1814,7 +1812,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1828,7 +1826,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1862,7 +1860,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2063,4 +2061,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -34,7 +34,7 @@
{{orderXm.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<span></span>
@ -91,7 +91,7 @@
</view>
</view>
<view class="padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" >
<span>技师</span>
@ -149,7 +149,7 @@
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="orderXm.remark" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<!-- <view class="margin-top-xl pay-ding">
@ -175,9 +175,9 @@
</view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -229,7 +229,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -277,7 +277,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -289,7 +289,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -366,7 +366,7 @@
console.log("orderXm",this.orderXm)
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -442,7 +442,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
@ -465,7 +465,7 @@
icon: 'none'
})
// that.getOrder()
} else {
uni.showToast({
title: ret.msg,
@ -503,7 +503,7 @@
})
// that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -520,7 +520,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -560,9 +560,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -591,7 +591,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@ -604,9 +604,9 @@
});
// #endif
}
},
changeValue(value){
this.number=value
},
@ -680,7 +680,7 @@
// this.showpay = true;
this.goOrder()
}
},
textareaChange(e){//
this.textareaData=e.detail.value
@ -704,7 +704,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -720,7 +720,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -793,7 +793,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -803,14 +803,14 @@
url: '../address/address?id=' + 2
})
}
},
changeLog(e){//
console.log("11111",e)
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -885,7 +885,7 @@
}
});
},
saveJZ(classifyId) {
let data = {
parentId: classifyId,
@ -945,7 +945,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1039,7 +1039,7 @@
}
});
},
//
pay() {
let that = this
@ -1364,7 +1364,7 @@
}
})
},
}
}
}
</script>
@ -1431,7 +1431,7 @@
}
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
.header-bottom-money-zhen span{
@ -1717,11 +1717,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 16px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1812,7 +1810,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1826,7 +1824,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1860,7 +1858,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2048,4 +2046,4 @@
font-size: 30rpx;
}
.zhuangtai{}
</style>
</style>

View File

@ -14,7 +14,7 @@
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -107,8 +107,8 @@
</view>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title">备注</view>
@ -116,7 +116,7 @@
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<!-- <view class="margin-top-xl pay-ding">
@ -142,9 +142,9 @@
</view>
<view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -196,7 +196,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -243,7 +243,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -255,7 +255,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -328,7 +328,7 @@
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -401,7 +401,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
changeValue(value){
@ -474,7 +474,7 @@
// this.showpay = true;
this.goOrder()
}
},
textareaChange(e){//
this.textareaData=e.detail.value
@ -498,7 +498,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -514,7 +514,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -587,7 +587,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -597,14 +597,14 @@
url: '../address/address?id=' + 6
})
}
},
changeLog(e){//
console.log("11111",e)
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -679,7 +679,7 @@
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
@ -900,7 +900,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -994,7 +994,7 @@
}
});
},
//
pay() {
let that = this
@ -1319,7 +1319,7 @@
}
})
},
}
}
}
</script>
@ -1380,7 +1380,7 @@
}
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
.header-bottom-money-zhen span{
@ -1665,11 +1665,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 16px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1760,7 +1758,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1774,7 +1772,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1808,7 +1806,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2002,4 +2000,4 @@
.head-title{
font-size: 30rpx;
}
</style>
</style>

View File

@ -14,7 +14,7 @@
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -32,10 +32,10 @@
</view>
</view>
</view>
</view>
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">疗程详情</span>
@ -64,7 +64,7 @@
</view>
</view>
</view>
<view class="detail-foot-title">
服务疗程
</view>
@ -72,7 +72,7 @@
</view>
</view>
<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
<view class="liliao-top" style="width: 30%;">
<span>平台优惠劵</span>
@ -140,7 +140,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -187,7 +187,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -199,7 +199,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -270,13 +270,13 @@
if(this.couponId){
this.youhuiF(this.couponId)
}
this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -394,7 +394,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -410,7 +410,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -483,7 +483,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -493,13 +493,13 @@
url: '../address/address?id=' + 2
})
}
},
changeLog(e){//
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -604,7 +604,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
@ -827,7 +827,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -921,7 +921,7 @@
}
});
},
//
pay() {
let that = this
@ -1323,7 +1323,7 @@
padding: 29rpx;
margin-top: 10px;
}
.pay-title{
font-weight: bold;
font-size: 31rpx;
@ -1398,7 +1398,7 @@
align-items: center;
padding: 15px 0px;
}
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
@ -1439,7 +1439,7 @@
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
width: 100%;
display: flex;
@ -1716,11 +1716,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1811,7 +1809,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1825,7 +1823,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1859,7 +1857,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2043,4 +2041,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -14,7 +14,7 @@
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -32,9 +32,9 @@
</view>
</view>
</view>
</view>
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">优惠劵</span>
@ -57,8 +57,8 @@
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -110,7 +110,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -157,7 +157,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -169,7 +169,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -239,14 +239,14 @@
if(this.couponId){
this.youhuiF(this.couponId)
}
this.ordersId = this.$queue.getData('ordersId');
console.log("this.ordersId=======",this.ordersId)
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -304,7 +304,7 @@
// sumMoney: that.orderXm.price,
// oldSumMoney: that.mainData.oldPrice*that.detailData.length,
// sumMoney: that.mainData.price*that.detailData.length,
}
that.$Request.postJson("/app/user/package/order/insertFlashOrders", data).then(res => {
that.showorder = false
@ -319,7 +319,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
changeValue(value){
@ -400,7 +400,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -416,7 +416,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -489,7 +489,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -499,13 +499,13 @@
url: '../address/address?id=' + this.orderXm.type
})
}
},
changeLog(e){//
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -580,7 +580,7 @@
}
});
},
payJZ() {
let that = this;
uni.showModal({
@ -602,7 +602,7 @@
uni.switchTab({
url: '/pages/my/index'
})
} else {
uni.showToast({
title: ret.msg,
@ -636,7 +636,7 @@
})
// that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -653,7 +653,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -705,9 +705,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -742,7 +742,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@ -761,13 +761,13 @@
});
// #endif
}
} else if (re.cancel) {
// that.getOrder()
}
}
})
},
saveJZ(classifyId) {
let data = {
@ -828,7 +828,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -922,7 +922,7 @@
}
});
},
//
pay() {
let that = this
@ -986,8 +986,8 @@
that.getOrder()
// that.getOrder()
// this.$queue.showToast('');
},
fail: function(err) {
// this.$queue.showToast('');
@ -1001,7 +1001,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1059,9 +1059,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1096,7 +1096,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1114,15 +1114,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1283,7 +1283,7 @@
<style lang="scss" scoped>
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
.header-bottom-money{
width: 100%;
@ -1352,7 +1352,7 @@
padding: 29rpx;
margin-top: 10px;
}
.pay-title{
font-weight: bold;
font-size: 31rpx;
@ -1373,7 +1373,7 @@
font-size: 24rpx;
color: #049E89;
margin: 5rpx 0;
}
.detail-foot-nav-bor{
width: 45px;
@ -1434,7 +1434,7 @@
align-items: center;
padding: 15rpx 0px;
}
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
@ -1476,7 +1476,7 @@
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
width: 100%;
display: flex;
@ -1747,11 +1747,9 @@
justify-content: space-between;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1842,7 +1840,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1856,7 +1854,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1890,7 +1888,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2101,4 +2099,4 @@
.zhuangtai{
color: #029D88;
}
</style>
</style>

View File

@ -14,7 +14,7 @@
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -32,9 +32,9 @@
</view>
</view>
</view>
</view>
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">套餐详情</span>
@ -63,7 +63,7 @@
</view>
</view>
</view>
<view class="detail-foot-title">
服务项目{{index+1}}
</view>
@ -86,8 +86,8 @@
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -139,7 +139,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -186,7 +186,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -198,7 +198,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -269,14 +269,14 @@
if(this.couponId){
this.youhuiF(this.couponId)
}
this.ordersId = this.$queue.getData('ordersId');
console.log("this.ordersId=======",this.ordersId)
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -345,7 +345,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
changeValue(value){
@ -426,7 +426,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -442,7 +442,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -515,7 +515,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -525,13 +525,13 @@
url: '../address/address?id=' + this.orderXm.type
})
}
},
changeLog(e){//
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -606,7 +606,7 @@
}
});
},
payJZ() {
let that = this;
uni.showModal({
@ -628,7 +628,7 @@
uni.switchTab({
url: '/pages/my/index'
})
} else {
uni.showToast({
title: ret.msg,
@ -662,7 +662,7 @@
})
// that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -679,7 +679,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -731,9 +731,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -768,7 +768,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@ -787,13 +787,13 @@
});
// #endif
}
} else if (re.cancel) {
// that.getOrder()
}
}
})
},
saveJZ(classifyId) {
let data = {
@ -854,7 +854,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -948,7 +948,7 @@
}
});
},
//
pay() {
let that = this
@ -1012,8 +1012,8 @@
that.getOrder()
// that.getOrder()
// this.$queue.showToast('');
},
fail: function(err) {
// this.$queue.showToast('');
@ -1027,7 +1027,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1085,9 +1085,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1122,7 +1122,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1140,15 +1140,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1310,7 +1310,7 @@
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
.header-bottom-money{
width: 100%;
display: flex;
@ -1378,7 +1378,7 @@
padding: 29rpx;
margin-top: 10px;
}
.pay-title{
font-weight: bold;
font-size: 31rpx;
@ -1403,13 +1403,13 @@
flex-direction: row;
align-items: baseline;
}
.xiangmu-cont-top-left{
font-weight: normal;
font-size: 26rpx;
color: #049E89;
margin: 5rpx 0;
}
.detail-foot-nav-bor{
width: 64px;
@ -1470,7 +1470,7 @@
align-items: center;
padding: 15rpx 0px;
}
.tese span:nth-child(1){
font-weight: bold;
font-size: 24rpx;
@ -1512,7 +1512,7 @@
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
width: 100%;
display: flex;
@ -1783,11 +1783,9 @@
justify-content: space-between;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1878,7 +1876,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1892,7 +1890,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1926,7 +1924,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2137,4 +2135,4 @@
.zhuangtai{
color: #029D88;
}
</style>
</style>

View File

@ -13,7 +13,7 @@
<view class="flex head-title-right">
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
@ -22,7 +22,7 @@
<text class="title-font">服务时长</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view>
</view>
<view class="money-pay">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
@ -38,7 +38,7 @@
</view>
</view>
</view>
</view>
<view class="header-padd header-view header-margin">
<view v-if="!detailaddress">请选择地址</view>
@ -64,7 +64,7 @@
</span>
</view>
</view>
</view>
</view>
<view class="header-view header-padd header-margin ">
@ -97,11 +97,11 @@
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@ -154,7 +154,7 @@
立即支付
</u-button>
</view>
</view>
</u-popup>
<!-- 预约弹窗 -->
@ -201,7 +201,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -213,7 +213,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -287,13 +287,13 @@
if(this.couponId){
this.youhuiF(this.couponId)
}
this.ordersId = this.orderXm.id;
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
},
onShow() {
this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) {
@ -368,7 +368,7 @@
],
userPackageDetailId : that.ordersId
}
that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
that.showorder = false
if (res.code == 0) {
@ -383,7 +383,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
changeValue(value){
@ -438,7 +438,7 @@
url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
})
},
textareaChange(e){//
this.textareaData=e.detail.value
console.log("adsadas0",this.textareaData)
@ -461,7 +461,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
youhui(){//
@ -477,7 +477,7 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
liliaoshi(){
@ -551,7 +551,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -561,13 +561,13 @@
url: '../address/address?id=' + 4
})
}
},
changeLog(e){//
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -642,7 +642,7 @@
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
@ -655,7 +655,7 @@
// console.log('');
that.$Request.post("/app/artificer/payOrders", {
ordersId: that.ordersId,
}).then(ret => {
uni.hideLoading();
if (ret.code == 0) {
@ -864,7 +864,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -958,7 +958,7 @@
}
});
},
//
pay() {
let that = this
@ -1021,7 +1021,7 @@
})
// that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -1038,7 +1038,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1096,9 +1096,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1139,7 +1139,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1157,15 +1157,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1332,7 +1332,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1419,7 +1419,7 @@
padding: 29rpx;
margin-top: 10px;
}
.header-bottom-money-zhen span{
color: #F95900 ;
}
@ -1488,7 +1488,7 @@
align-items: center;
padding: 15px 0px;
}
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
@ -1529,7 +1529,7 @@
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
width: 100%;
display: flex;
@ -1813,10 +1813,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1906,7 +1905,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1920,7 +1919,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1954,7 +1953,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-top: 1px;
width: 100%;
@ -2195,4 +2194,4 @@
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
</style>
</style>

View File

@ -40,7 +40,7 @@
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
@ -143,26 +143,26 @@
<view class="add-con-cont">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目原价</view>
<view class="add-con-title">项目原价</view>
<view class="add-con-cont">{{order.massagePrice}}</view>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" style="color: #F93731;">{{order.priceMarkup}}</view>
</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">会员减免</view>
<view class="add-con-cont">-{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计</view>
<view class="" style="color: #333;"><text
style="font-size: 35rpx;font-weight: bold;">{{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>
@ -191,7 +191,7 @@
<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
<view class="beizhu">{{order.remark}}</view>
@ -220,7 +220,7 @@
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 32rpx;">{{order.payMoneyTotal}}</span>
</view>
</view>
</view>
</view>
</view>
@ -236,7 +236,7 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 -->
@ -292,7 +292,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -304,7 +304,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -411,7 +411,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {
@ -442,17 +442,17 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -499,7 +499,7 @@
},
toggleQ(type,item) {//
this.qurenJd=item;
this.type = type
// open uni-popup type
this.$refs.popupQ.open(type)
@ -525,7 +525,7 @@
title:'操作失败!'
})
}
}).catch(() => {
this.getOrder()
//,
@ -573,12 +573,12 @@
title:'操作失败!'
})
}
}).catch(() => {
//,
that.getOrder()
});
},
fail: function(e) {
that.getOrder()
@ -592,14 +592,14 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'
})
}
},
toggle(type,item) {//
this.tiqianData=item;
@ -607,12 +607,12 @@
// open uni-popup type
this.$refs.popup.open(type);
},
gengBtn(){
this.btnShow=!this.btnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -710,13 +710,13 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.sumMoney + '元吗?',
@ -893,7 +893,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -922,7 +922,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -965,7 +965,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -1078,7 +1078,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1130,7 +1130,7 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
} else {
uni.showToast({
title: rea.msg,
@ -1139,9 +1139,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1159,7 +1159,7 @@
url:'/pages/order/index'
})
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}else{
uni.showToast({
title: '支付失败',
@ -1189,10 +1189,10 @@
div.innerHTML = rea.data //form
document.body.appendChild(div)
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1211,16 +1211,16 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1328,7 +1328,7 @@
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}
@ -1475,7 +1475,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1505,7 +1505,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1607,9 +1607,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1626,7 +1626,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1718,10 +1718,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;
@ -2010,4 +2009,4 @@
border-bottom: 1px #f4f4f4 solid;
margin: 15px 0;
}
</style>
</style>

View File

@ -2439,8 +2439,8 @@
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -96,8 +96,8 @@
</view>
</view>
</view>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@ -131,7 +131,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -143,7 +143,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -223,7 +223,7 @@
this.single=e;
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -546,7 +546,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1018,7 +1018,7 @@
align-items: center;
justify-content: space-between;
}
.youhui-mian,.youhui-mian-list{
width: 100%;
display: flex;
@ -1216,11 +1216,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
padding: 10px 15px 0px 15px;
width: 100%;
}
.checkbox-data{
padding: 0px 11px;
@ -1311,7 +1309,7 @@
border-radius: 14rpx;
padding: 7px;
}
.pay-ding{
padding-bottom: 15px;
}
@ -1325,7 +1323,7 @@
width: 49rpx;
height: 44rpx;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
@ -1359,7 +1357,7 @@
flex-direction: row;
align-items: center;
}
.content{
padding-bottom: 140rpx;
padding-top: 20px;
@ -1550,4 +1548,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -1718,10 +1718,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 60rpx;

View File

@ -36,10 +36,10 @@
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="list-pay">
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">订单编号</view>
@ -83,18 +83,18 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
@ -147,7 +147,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -159,7 +159,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -235,11 +235,11 @@
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -278,10 +278,10 @@
}
})
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -359,7 +359,7 @@
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.payMoney + '元吗?',
@ -518,7 +518,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -547,7 +547,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -590,7 +590,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -627,7 +627,7 @@
}
});
},
//
pay() {
let that = this
@ -690,7 +690,7 @@
})
that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -707,7 +707,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -765,9 +765,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -808,7 +808,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -826,15 +826,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1067,7 +1067,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1097,7 +1097,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1199,9 +1199,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1218,7 +1218,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1310,8 +1310,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -1541,4 +1541,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -38,7 +38,7 @@
{{order.ordersMassageList[0].massageType.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
@ -194,13 +194,13 @@
<span>服务价格</span>
<span>{{order.price}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span>-{{order.couponMoney}}</span>
</view>
<view class="fei-view-list">
<view>会员减免</view>
<view>-{{order.vipReductionMoney}}</view>
</view>
@ -240,7 +240,7 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
@ -403,7 +403,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -415,7 +415,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -522,7 +522,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {
@ -553,17 +553,17 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -601,7 +601,7 @@
},
toggleQ(type,item) {//
this.qurenJd=item;
this.type = type
// open uni-popup type
this.$refs.popupQ.open(type)
@ -630,7 +630,7 @@
title:'操作失败!'
})
}
}).catch(() => {
this.getOrder()
//,
@ -678,12 +678,12 @@
title:'操作失败!'
})
}
}).catch(() => {
//,
that.getOrder()
});
},
fail: function(e) {
that.getOrder()
@ -697,14 +697,14 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'
})
}
},
toggle(type,item) {//
this.tiqianData=item;
@ -712,12 +712,12 @@
// open uni-popup type
this.$refs.popup.open(type);
},
gengBtn(){
this.btnShow=!this.btnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -793,7 +793,7 @@
});
},
goOrder(item) {
let that = this
let data = {
classifyId:item.classifyId,
@ -814,13 +814,13 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.sumMoney + '元吗?',
@ -1000,7 +1000,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -1029,7 +1029,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1072,7 +1072,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -1145,7 +1145,7 @@
url:'/pages/order/index'
})
that.getOrder()
} else {
uni.showToast({
title: res.msg,
@ -1180,9 +1180,9 @@
url:'/pages/order/index'
})
that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -1199,7 +1199,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1217,7 +1217,7 @@
url:'/pages/order/index'
})
that.callPay(rea.data);
} else {
uni.showToast({
title: rea.msg,
@ -1250,7 +1250,7 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
} else {
uni.showToast({
title: rea.msg,
@ -1259,9 +1259,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1278,7 +1278,7 @@
url:'/pages/order/index'
})
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
});
// #endif
@ -1301,10 +1301,10 @@
div.innerHTML = rea.data //form
document.body.appendChild(div)
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1319,19 +1319,19 @@
url:'/pages/order/index'
})
that.setPayment('alipay', rea.data);
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1580,7 +1580,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1610,7 +1610,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1712,9 +1712,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1731,7 +1731,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1823,8 +1823,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -2054,4 +2054,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -36,10 +36,10 @@
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="list-pay">
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">订单编号</view>
@ -71,7 +71,7 @@
<span style="color: rgb(249, 55, 49);">-{{order.couponMoney}}</span>
</view>
<view class="fei-view-list" v-if="order.vipReductionMoney">
<view>会员减免</view>
<view>-{{order.vipReductionMoney}}</view>
</view>
@ -84,18 +84,18 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
@ -148,7 +148,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -160,7 +160,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -236,11 +236,11 @@
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -279,10 +279,10 @@
}
})
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -360,7 +360,7 @@
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.payMoney + '元吗?',
@ -519,7 +519,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -548,7 +548,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -591,7 +591,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -628,7 +628,7 @@
}
});
},
//
pay() {
let that = this
@ -703,7 +703,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -761,9 +761,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -804,7 +804,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -822,15 +822,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1066,7 +1066,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1096,7 +1096,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1198,9 +1198,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1217,7 +1217,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1309,8 +1309,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -1540,4 +1540,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -85,13 +85,13 @@
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
@ -144,7 +144,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -156,7 +156,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -282,7 +282,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -292,16 +292,16 @@
url: '../address/address?id=' + this.orderXm.type
})
}
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -340,10 +340,10 @@
}
})
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -421,7 +421,7 @@
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.payMoney + '元吗?',
@ -580,7 +580,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -609,7 +609,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -652,7 +652,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -689,7 +689,7 @@
}
});
},
//
pay() {
let that = this
@ -748,7 +748,7 @@
url:'/pages/my/newseckill?text='+'index'
})
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -765,7 +765,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -821,9 +821,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -863,7 +863,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -881,15 +881,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1089,7 +1089,7 @@
}
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
/deep/.u-drawer{
z-index:11 !important;
@ -1168,7 +1168,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1198,7 +1198,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1300,9 +1300,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1319,7 +1319,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1410,8 +1410,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -1643,4 +1643,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -38,7 +38,7 @@
<text class="title-font">服务时长</text><text class="value-font">{{order.duration}}分钟</text>
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
@ -115,7 +115,7 @@
<view class="add-con-title title-font">预约时间</view>
<view class="add-con-cont 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>
@ -142,7 +142,7 @@
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">项目价格</view>
<view class="add-con-cont value-font" style="color: #019c88;">{{order.massagePrice}}</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.vipReductionMoney}}</view>
@ -150,7 +150,7 @@
<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>
</view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="title-font">实付金额</view>
<view class="add-con-cont value-font" style="font-weight: bold;">
@ -208,12 +208,12 @@
<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"
v-if="order.status != 3 &&
order.status != 4 &&
order.status != 4 &&
order.status != 5
"
>取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1||order.status == 10"
class="dingshi">立即支付
@ -221,7 +221,7 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
@ -384,7 +384,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -396,7 +396,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -506,7 +506,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {
@ -537,17 +537,17 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -594,7 +594,7 @@
},
toggleQ(type,item) {//
this.qurenJd=item;
this.type = type
// open uni-popup type
this.$refs.popupQ.open(type)
@ -620,7 +620,7 @@
title:'操作失败!'
})
}
}).catch(() => {
this.getOrder()
//,
@ -668,12 +668,12 @@
title:'操作失败!'
})
}
}).catch(() => {
//,
that.getOrder()
});
},
fail: function(e) {
that.getOrder()
@ -687,14 +687,14 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'
})
}
},
toggle(type,item) {//
this.tiqianData=item;
@ -702,12 +702,12 @@
// open uni-popup type
this.$refs.popup.open(type);
},
gengBtn(){
this.btnShow=!this.btnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -805,13 +805,13 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.artificerTaxiMoney + '元吗?',
@ -988,7 +988,7 @@
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.showpay = false
uni.hideLoading();
that.setPayment('alipay', rea.data);
@ -1078,7 +1078,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1099,7 +1099,7 @@
url:'/pages/order/index'
})
that.callPay(rea.data);
} else {
uni.hideLoading();
uni.showToast({
@ -1136,7 +1136,7 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
} else {
uni.hideLoading();
uni.showToast({
@ -1146,9 +1146,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1168,7 +1168,7 @@
url:'/pages/order/index'
})
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}else{
uni.hideLoading();
}
@ -1196,10 +1196,10 @@
div.innerHTML = rea.data //form
document.body.appendChild(div)
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1217,21 +1217,21 @@
url:'/pages/order/index'
})
that.setPayment('alipay', rea.data);
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -1260,7 +1260,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1303,7 +1303,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -1346,7 +1346,7 @@
// })
this.showpay = true
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
if (document.addEventListener) {
@ -1595,7 +1595,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1625,7 +1625,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1727,7 +1727,7 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
@ -1828,7 +1828,6 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 32rpx;
color: #333333;
font-weight: bold;
@ -2118,4 +2117,4 @@
font-size: 30rpx;
color: #333333;
}
</style>
</style>

View File

@ -85,13 +85,13 @@
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
@ -144,7 +144,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -156,7 +156,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -282,7 +282,7 @@
this.province = res.data.province
this.city = res.data.city
this.district = res.data.district
// this.getChuXing();
}
// uni.hideLoading();
@ -292,16 +292,16 @@
url: '../address/address?id=' + this.orderXm.type
})
}
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -340,10 +340,10 @@
}
})
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -421,7 +421,7 @@
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.payMoney + '元吗?',
@ -580,7 +580,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -609,7 +609,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -652,7 +652,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -689,7 +689,7 @@
}
});
},
//
pay() {
let that = this
@ -748,7 +748,7 @@
url:'/pages/my/indextaociliaoList?type='+that.orderXm.type+'&name='+'index'
})
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -765,7 +765,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -821,9 +821,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -863,7 +863,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -881,15 +881,15 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1089,7 +1089,7 @@
}
.ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx;
}
/deep/.u-drawer{
z-index:11 !important;
@ -1168,7 +1168,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1198,7 +1198,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1300,9 +1300,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1319,7 +1319,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1410,8 +1410,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -1643,4 +1643,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -38,7 +38,7 @@
{{order.ordersMassageList[0].massageType.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
@ -120,7 +120,7 @@
<view style="color: #999;font-size: 26rpx;">预约时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
</view>
<!-- <view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">开始服务时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.startTime}}</view>
@ -141,7 +141,7 @@
<view style="color: #999;font-size: 26rpx;">下单时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">项目名称</view>
@ -154,17 +154,17 @@
<view class="flex justify-between">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.massagePrice}}</view>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-{{order.vipReductionMoney}}</view>
</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">小计</view>
<view class="" style="color: #333;"><text
style="font-size: 35rpx;font-weight: bold;">{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">出行方式</view>
@ -180,14 +180,14 @@
<view style="color: #999;font-size: 26rpx;">出行交通费用</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.taxiMoney}}</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">优惠券信息</view>
<view class="flex justify-between justify-between" v-if="order.couponMoney">
<view style="color: #999;font-size: 26rpx;">优惠券</view>
<view class="" style="color: #F93731;font-size: 26rpx;">-{{order.couponMoney}}</view>
</view>
<view class="flex justify-between" v-if="order.addNum" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">加钟次数</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.addNum}}</view>
@ -245,18 +245,18 @@
-<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view>
</view>
<!-- <view class="fei-view-list">
<span>服务价格</span>
<span>{{order.price}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span>-{{order.couponMoney}}</span>
</view>
<view class="fei-view-list">
<span>服务费用</span>
<span>{{order.massageMoney}}</span>
@ -284,7 +284,7 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
@ -447,7 +447,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
customStyle2: {
@ -459,7 +459,7 @@
// #ifndef MP-WEIXIN
width: '310upx',
// #endif
// #endif
margin: '0 10upx',
},
id: '',
@ -566,7 +566,7 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {
@ -597,17 +597,17 @@
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
getTimeStampWithoutSeconds(date) {
// UTC
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
//
return utcDate.getTime();
@ -645,7 +645,7 @@
},
toggleQ(type,item) {//
this.qurenJd=item;
this.type = type
// open uni-popup type
this.$refs.popupQ.open(type)
@ -671,7 +671,7 @@
title:'操作失败!'
})
}
}).catch(() => {
this.getOrder()
//,
@ -719,12 +719,12 @@
title:'操作失败!'
})
}
}).catch(() => {
//,
that.getOrder()
});
},
fail: function(e) {
that.getOrder()
@ -738,14 +738,14 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因!'
})
}
},
toggle(type,item) {//
this.tiqianData=item;
@ -753,12 +753,12 @@
// open uni-popup type
this.$refs.popup.open(type);
},
gengBtn(){
this.btnShow=!this.btnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 1 2
let kefu = this.$queue.getData('kefu'); // 1 2
let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) {
if (kefu == 1) {
@ -856,13 +856,13 @@
} else {
that.$queue.showToast(res.msg)
}
});
},
payJZ() {
let that = this;
if (that.openWay == 1) { //
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.sumMoney + '元吗?',
@ -1021,7 +1021,7 @@
}
},
//
selectWay: function(item) {
this.openWay = item.id;
@ -1050,7 +1050,7 @@
bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd)
uni.openLocation({
latitude: latitude - 0, //-
latitude: latitude - 0, //-
longitude: longitude - 0, //-
name: name, //
address: detailsadd, //
@ -1093,7 +1093,7 @@
url: e
})
},
delOrder(e) {
let that = this
uni.showModal({
@ -1199,7 +1199,7 @@
})
that.getOrder()
// this.$queue.showToast('');
// uni.switchTab({
// url: '/pages/my/index'
// })
@ -1216,7 +1216,7 @@
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@ -1274,9 +1274,9 @@
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@ -1311,7 +1311,7 @@
document.forms[0].submit()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@ -1329,13 +1329,13 @@
});
// #endif
}
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
if (that.openWay == 1) { //
that.$Request.post("/app/artificer/payOrders", {
@ -1486,7 +1486,7 @@
});
// #endif
}
},
callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") {
@ -1736,7 +1736,7 @@
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
@ -1766,7 +1766,7 @@
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
@ -1868,9 +1868,9 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
@ -1887,7 +1887,7 @@
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1979,8 +1979,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -2210,4 +2210,4 @@
justify-content: space-between;
align-items: center;
}
</style>
</style>

View File

@ -134,7 +134,7 @@
v-if="item.addNum==null&&item.isSupplement==null&&item.isSupplement!=2"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
服务升级
</u-button>
@ -472,6 +472,7 @@
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
this.$queue.setData('getJishi','')
console.log(item);
if(item.isSupplement=='2'){//
if(item.addNum||item.isSupplement=='2'){
uni.navigateTo({