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

优化调整

This commit is contained in:
曹磊 2025-02-08 16:35:24 +08:00
parent 0d53e764c9
commit 96d12206ed
39 changed files with 567 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -360,7 +360,7 @@
this.$queue.setData('glsNum', res.data.value);
}
});
//用户是否可以取消订单 377
//用户是否可以订单退款 377
this.$Request.get('/app/common/type/377').then(res => {
if (res.code == 0) {
this.$queue.setData('yhqxSel', res.data.value);
@ -402,7 +402,7 @@
this.$queue.setData('msTimeDate', res.data.value);
}
});
// 取消订单扣除百分比 419
// 订单退款扣除百分比 419
this.$Request.get('/app/common/type/419').then(res => {
if (res.code == 0) {
this.$queue.setData('closeKC', res.data.value);

399
my/order/pay.vue
View File

@ -22,14 +22,15 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9&&!order.refusalContent">待接单</view>
<view v-if="order.status ==9&&order.refusalContent" class="zhuangtaijd">拒单审核</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -384,7 +385,7 @@
<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">
@ -444,7 +445,7 @@
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"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
@ -479,7 +480,7 @@
<u-button
v-if="order.cancelBtnShow == 'true'"
@click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
订单退款
</u-button>
<u-button
v-if="order.btnShow == 'true'"
@ -496,7 +497,7 @@
<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.btnShow == 'true'"
@ -513,7 +514,7 @@
<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"
shape="circle" :plain="true"
@ -528,7 +529,7 @@
<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"
v-if="order.packageType=='104'||order.packageType=='105'||order.packageType=='106'||order.packageType=='111'||order.packageType=='112'"
@ -861,7 +862,8 @@ export default {
if (re.confirm) {
that.$queue.showLoading('支付中...')
console.log('用户点击确定');
if (that.openWay == 1) { //零钱支付
//只能零钱支付，微信等支付0元时报错。
// if (that.openWay == 1) { //零钱支付
that.$Request.post("/app/artificer/payOrders", {
ordersId: that.order.ordersId,
userPackageDetailId : that.order.userPackageDetailId
@ -883,199 +885,199 @@ export default {
})
}
});
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
// #ifdef MP-WEIXIN
let data = {
ordersId: that.order.ordersId,
type: 3,
userPackageDetailId : that.order.userPackageDetailId
}
that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
console.log(ret)
if (ret.code == 0) {
uni.hideLoading();
uni.requestPayment({
provider: 'wxpay',
timeStamp: ret.data.timestamp,
nonceStr: ret.data.noncestr,
package: ret.data.package,
signType: ret.data.signType,
paySign: ret.data.sign,
success: function(ret) {
console.log(ret)
uni.showToast({
title: '支付成功',
icon: 'none'
})
uni.switchTab({
url:'/pages/order/index'
})
that.getOrder()
// this.$queue.showToast('支付成功');
// } else if (that.openWay == 2) { //微信支付
// that.$queue.showLoading('支付中...')
// // #ifdef MP-WEIXIN
// let data = {
// ordersId: that.order.ordersId,
// type: 3,
// userPackageDetailId : that.order.userPackageDetailId
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
// console.log(ret)
// if (ret.code == 0) {
// uni.hideLoading();
// uni.requestPayment({
// provider: 'wxpay',
// timeStamp: ret.data.timestamp,
// nonceStr: ret.data.noncestr,
// package: ret.data.package,
// signType: ret.data.signType,
// paySign: ret.data.sign,
// success: function(ret) {
// console.log(ret)
// uni.showToast({
// title: '支付成功',
// icon: 'none'
// })
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.getOrder()
// // this.$queue.showToast('支付成功');
that.showpayL = false
},
fail: function(err) {
uni.hideLoading();
// this.$queue.showToast('支付失败');
uni.showToast({
title: '支付失败',
icon: 'nones'
});
that.getOrder()
}
});
}
});
// #endif
// that.showpayL = false
// },
// fail: function(err) {
// uni.hideLoading();
// // this.$queue.showToast('支付失败');
// uni.showToast({
// title: '支付失败',
// icon: 'nones'
// });
// that.getOrder()
// }
// });
// }
// });
// // #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
let data = {
ordersId: that.order.ordersId,
type: 2,
userPackageDetailId : that.order.userPackageDetailId
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// // #ifdef H5
// let ua = navigator.userAgent.toLowerCase();
// if (ua.indexOf('micromessenger') != -1) {
// let data = {
// ordersId: that.order.ordersId,
// type: 2,
// userPackageDetailId : that.order.userPackageDetailId
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
if (rea.code == 0) {
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
that.getOrder()
that.showpayL = false;
uni.switchTab({
url:'/pages/order/index'
})
that.callPay(rea.data);
// if (rea.code == 0) {
// uni.hideLoading();
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// that.showpayL = false;
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.callPay(rea.data);
} else {
uni.hideLoading();
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
} else {
let data = {
ordersId: that.order.ordersId,
type: 4,
userPackageDetailId : that.order.userPackageDetailId
}
// debugger;
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// const urlArr = window.location.href;
// const hostUrl = urlArr.split("/");
// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
// const url = '&redirect_url=' + callBack + 'my/order/pay';
// window.location = rea.mweb_url + url
that.showpay = false
if (rea.code == 0) {
uni.showToast({
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
uni.hideLoading();
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
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({
// title: rea.msg,
// icon: 'none'
// })
// }
// });
// } else {
// let data = {
// ordersId: that.order.ordersId,
// type: 4,
// userPackageDetailId : that.order.userPackageDetailId
// }
// // debugger;
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// // const urlArr = window.location.href;
// // const hostUrl = urlArr.split("/");
// // const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
// // const url = '&redirect_url=' + callBack + 'my/order/pay';
// // window.location = rea.mweb_url + url
// that.showpay = false
// if (rea.code == 0) {
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.showpayL = false
// uni.hideLoading();
// const urlArr = window.location.href;
// const hostUrl = urlArr.split("/");
// 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({
title: rea.msg,
icon: 'none'
})
}
});
}
// } else {
// uni.hideLoading();
// uni.showToast({
// title: rea.msg,
// icon: 'none'
// })
// }
// });
// }
// #endif
// // #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
type: 1,
userPackageDetailId : that.order.userPackageDetailId
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// // #ifdef APP
// let data = {
// ordersId: that.order.ordersId,
// type: 1,
// userPackageDetailId : that.order.userPackageDetailId
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
if (rea.code == 0) {
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
// if (rea.code == 0) {
// uni.hideLoading();
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.showpayL = false
// that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}else{
uni.hideLoading();
}
});
// #endif
} else if (that.openWay == 3) { //支付宝支付
that.$queue.showLoading('支付中...')
// #ifdef H5
let data = {
ordersId: that.order.ordersId,
type: 2,
userPackageDetailId : that.order.userPackageDetailId
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
// }else{
// uni.hideLoading();
// }
// });
// // #endif
// } else if (that.openWay == 3) { //支付宝支付
// that.$queue.showLoading('支付中...')
// // #ifdef H5
// let data = {
// ordersId: that.order.ordersId,
// type: 2,
// userPackageDetailId : that.order.userPackageDetailId
// }
// that.$Request.post('/app/aliPay/payOrder', data).then(
// rea => {
// uni.hideLoading();
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.showpayL = false
// const div = document.createElement('div')
// div.innerHTML = rea.data //此处form就是后台返回接收到的数据
// document.body.appendChild(div)
// document.forms[0].submit()
});
// #endif
// });
// // #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
type: 1,
userPackageDetailId : that.order.userPackageDetailId
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
that.setPayment('alipay', rea.data);
// // #ifdef APP-PLUS
// let data = {
// ordersId: that.order.ordersId,
// type: 1,
// userPackageDetailId : that.order.userPackageDetailId
// }
// that.$Request.post('/app/aliPay/payOrder', data).then(
// rea => {
// uni.hideLoading();
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// uni.switchTab({
// url:'/pages/order/index'
// })
// that.showpayL = false
// that.setPayment('alipay', rea.data);
});
// #endif
}
// });
// // #endif
// }
} else if (re.cancel) {
uni.hideLoading();
@ -2309,7 +2311,7 @@ export default {
}
});
},
cancelOrders(data){//取消订单
cancelOrders(data){//订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -2324,13 +2326,13 @@ export default {
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
//订单退款扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
console.log(resa);
@ -2338,7 +2340,7 @@ export default {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
content: '是否确认订单退款？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
@ -2668,6 +2670,11 @@ export default {
font-weight: bold;
font-size: 32rpx;
}
.zhuangtaijd{
color: #e04f3c;
font-weight: bold;
font-size: 32rpx;
}
.head-title-right{
display: flex;
flex-direction: row;

14
my/order/payCLDetail.vue
View File

@ -19,14 +19,14 @@
</view>
<!-- <view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view> -->
</view>
@ -1643,18 +1643,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

22
my/order/payJaZ.vue
View File

@ -22,14 +22,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -526,7 +526,7 @@
class="btns">
去评价
</u-button>
<u-button shape="circle" :plain="true" @click="goChat" class="btns">联系客服</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="btns">联系客服</u-button>
</view>
</view>
@ -1737,7 +1737,7 @@ export default {
}
});
},
cancelOrders(data){//取消订单
cancelOrders(data){//订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -1752,20 +1752,20 @@ export default {
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
//订单退款扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
content: '是否确认订单退款？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
@ -1845,9 +1845,9 @@ export default {
.eject-btns{
height:60rpx;
line-height: 60rpx;
border-bottom: 1px solid #f7f7f7;
border-bottom: 1px solid #019C88;
padding: 0 20rpx;
color: #666666;
color: #019C88;
}
.be-remarks{
border: 1px dashed #FE912E;

4
my/order/payModify.vue
View File

@ -1296,12 +1296,12 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyCi.vue
View File

@ -1173,18 +1173,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyDd.vue
View File

@ -1317,18 +1317,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

14
my/order/payModifyDzhifu.vue
View File

@ -16,14 +16,14 @@
</view>
<view class="zhuangtai">
<view v-if="orderXm.status ==1">待支付</view>
<view v-if="orderXm.status ==2">待服务</view>
<view v-if="orderXm.status ==2">已接单</view>
<view v-if="orderXm.status ==5">已完成</view>
<view v-if="orderXm.status ==6">服务中</view>
<view v-if="orderXm.status ==7">技师出发</view>
<view v-if="orderXm.status ==8">技师到达</view>
<view v-if="orderXm.status ==7">已出发</view>
<view v-if="orderXm.status ==8">已到达</view>
<view v-if="orderXm.status ==3">待评价</view>
<view v-if="orderXm.status ==4">已取消</view>
<view v-if="orderXm.status ==9">待确认</view>
<view v-if="orderXm.status ==9">待接单</view>
<view v-if="orderXm.status ==10">待补单</view>
</view>
</view>
@ -1394,18 +1394,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyJsDetail.vue
View File

@ -1289,18 +1289,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyLiao.vue
View File

@ -1174,18 +1174,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyMs.vue
View File

@ -1236,18 +1236,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyQy.vue
View File

@ -1175,18 +1175,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/payModifyTc.vue
View File

@ -1257,18 +1257,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

4
my/order/payModifyTcMy.vue
View File

@ -1325,12 +1325,12 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

16
my/order/payModifyTcMyDaiB.vue
View File

@ -23,14 +23,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -293,7 +293,7 @@
<view class="showBtn tabber">
<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="true"
v-if="order.status == 1" class="btns">立即支付
@ -1383,7 +1383,7 @@
}
});
},
cancelOrders(data) { //取消订单
cancelOrders(data) { //订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -1401,7 +1401,7 @@
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
let data = {
@ -1409,7 +1409,7 @@
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)

12
my/order/payShengji.vue
View File

@ -2027,7 +2027,7 @@
}
});
},
cancelOrders(data){//取消订单
cancelOrders(data){//订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -2042,20 +2042,20 @@
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
//订单退款扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
content: '是否确认订单退款？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
@ -2786,9 +2786,9 @@
.eject-btns{
height:60rpx;
line-height: 60rpx;
border-bottom: 1px solid #f7f7f7;
border-bottom: 1px solid #019C88;
padding: 0 20rpx;
color: #666666;
color: #019C88;
}
.Service-add{
font-size:30rpx;

6
my/order/payYouHui.vue
View File

@ -890,18 +890,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

16
my/order/payding.vue
View File

@ -22,14 +22,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -255,7 +255,7 @@
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<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'">取消订单
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="true"
v-if="order.status == 1"
@ -1343,7 +1343,7 @@
}
});
},
cancelOrders(data){//取消订单
cancelOrders(data){//订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -1360,13 +1360,13 @@
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/paydingCi.vue
View File

@ -911,18 +911,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

16
my/order/paydingDd.vue
View File

@ -20,14 +20,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待付款...</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -232,7 +232,7 @@
<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 == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">订单退款
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
@ -1409,18 +1409,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/paydingLiao.vue
View File

@ -906,18 +906,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/paydingMs.vue
View File

@ -78,7 +78,7 @@
<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> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
@ -970,7 +970,7 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
let data = {
@ -978,7 +978,7 @@
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/paydingPt.vue
View File

@ -78,7 +78,7 @@
<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> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
@ -970,7 +970,7 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
let data = {
@ -978,7 +978,7 @@
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

14
my/order/paydingTCX.vue
View File

@ -20,14 +20,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -219,7 +219,7 @@
order.status != 4 &&
order.status != 5 && order.cancelBtnShow == 'true'
"
class="btns">取消订单
class="btns">订单退款
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
@ -1449,12 +1449,12 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

6
my/order/paydingTc.vue
View File

@ -90,7 +90,7 @@
<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> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
@ -925,7 +925,7 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let that = this
let data = {
@ -933,7 +933,7 @@
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {

304
my/order/paydingXiuGai.vue
View File

@ -20,14 +20,14 @@
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待付款...</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==2">已接单</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==7">已出发</view>
<view v-if="order.status ==8">已到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==9">待接单</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
@ -275,7 +275,7 @@
<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 == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">订单退款
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
@ -1337,155 +1337,155 @@
}
})
if (that.openWay == 1) { //零钱支付
that.$Request.post("/app/artificer/payOrders", {
ordersId: that.order.ordersId,
}).then(res => {
uni.hideLoading();
if (res.code == 0) {
uni.showToast({
title: '支付成功'
})
that.getOrder()
} else {
uni.showToast({
title: res.msg,
icon: 'none'
})
}
});
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
// #ifdef MP-WEIXIN
let data = {
ordersId: that.order.ordersId,
type: 3
}
that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
console.log(ret)
if (ret.code == 0) {
uni.hideLoading();
uni.requestPayment({
provider: 'wxpay',
timeStamp: ret.data.timestamp,
nonceStr: ret.data.noncestr,
package: ret.data.package,
signType: ret.data.signType,
paySign: ret.data.sign,
success: function(ret) {
console.log(ret)
uni.showToast({
title: '支付成功',
icon: 'none'
})
that.getOrder()
// this.$queue.showToast('支付成功');
// if (that.openWay == 1) { //零钱支付
// that.$Request.post("/app/artificer/payOrders", {
// ordersId: that.order.ordersId,
// }).then(res => {
// uni.hideLoading();
// if (res.code == 0) {
// uni.showToast({
// title: '支付成功'
// })
// that.getOrder()
// } else {
// uni.showToast({
// title: res.msg,
// icon: 'none'
// })
// }
// });
// } else if (that.openWay == 2) { //微信支付
// that.$queue.showLoading('支付中...')
// // #ifdef MP-WEIXIN
// let data = {
// ordersId: that.order.ordersId,
// type: 3
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
// console.log(ret)
// if (ret.code == 0) {
// uni.hideLoading();
// uni.requestPayment({
// provider: 'wxpay',
// timeStamp: ret.data.timestamp,
// nonceStr: ret.data.noncestr,
// package: ret.data.package,
// signType: ret.data.signType,
// paySign: ret.data.sign,
// success: function(ret) {
// console.log(ret)
// uni.showToast({
// title: '支付成功',
// icon: 'none'
// })
// that.getOrder()
// // this.$queue.showToast('支付成功');
// uni.switchTab({
// url: '/pages/my/index'
// })
},
fail: function(err) {
// this.$queue.showToast('支付失败');
uni.showToast({
title: '支付失败',
icon: 'nones'
});
that.getOrder()
}
});
}
});
// #endif
// // uni.switchTab({
// // url: '/pages/my/index'
// // })
// },
// fail: function(err) {
// // this.$queue.showToast('支付失败');
// uni.showToast({
// title: '支付失败',
// icon: 'nones'
// });
// that.getOrder()
// }
// });
// }
// });
// // #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
let data = {
ordersId: that.order.ordersId,
type: 2
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
that.showpay = false
if (rea.code == 0) {
that.callPay(rea.data);
} else {
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
} else {
let data = {
ordersId: that.order.ordersId,
type: 4
}
// debugger;
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// const urlArr = window.location.href;
// const hostUrl = urlArr.split("/");
// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
// const url = '&redirect_url=' + callBack + 'my/order/pay';
// window.location = rea.mweb_url + url
that.showpay = false
if (rea.code == 0) {
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
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,
icon: 'none'
})
}
});
}
// // #ifdef H5
// let ua = navigator.userAgent.toLowerCase();
// if (ua.indexOf('micromessenger') != -1) {
// let data = {
// ordersId: that.order.ordersId,
// type: 2
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// that.showpay = false
// if (rea.code == 0) {
// that.callPay(rea.data);
// } else {
// uni.showToast({
// title: rea.msg,
// icon: 'none'
// })
// }
// });
// } else {
// let data = {
// ordersId: that.order.ordersId,
// type: 4
// }
// // debugger;
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// // const urlArr = window.location.href;
// // const hostUrl = urlArr.split("/");
// // const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
// // const url = '&redirect_url=' + callBack + 'my/order/pay';
// // window.location = rea.mweb_url + url
// that.showpay = false
// if (rea.code == 0) {
// const urlArr = window.location.href;
// const hostUrl = urlArr.split("/");
// 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,
// icon: 'none'
// })
// }
// });
// }
// #endif
// // #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
type: 1
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
console.log(rea)
that.showpay = false
if (rea.code == 0) {
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
});
// #endif
} else if (that.openWay == 3) { //支付宝支付
that.$queue.showLoading('支付中...')
// #ifdef H5
let data = {
ordersId: that.order.ordersId,
type: 2
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
});
// #endif
// // #ifdef APP
// let data = {
// ordersId: that.order.ordersId,
// type: 1
// }
// that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// console.log(rea)
// that.showpay = false
// if (rea.code == 0) {
// that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
// }
// });
// // #endif
// } else if (that.openWay == 3) { //支付宝支付
// that.$queue.showLoading('支付中...')
// // #ifdef H5
// let data = {
// ordersId: that.order.ordersId,
// type: 2
// }
// that.$Request.post('/app/aliPay/payOrder', data).then(
// rea => {
// const div = document.createElement('div')
// div.innerHTML = rea.data //此处form就是后台返回接收到的数据
// document.body.appendChild(div)
// document.forms[0].submit()
// });
// // #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
type: 1
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.setPayment('alipay', rea.data);
});
// #endif
}
// // #ifdef APP-PLUS
// let data = {
// ordersId: that.order.ordersId,
// type: 1
// }
// that.$Request.post('/app/aliPay/payOrder', data).then(
// rea => {
// that.setPayment('alipay', rea.data);
// });
// // #endif
// }
},
callPay: function(response) {
@ -1563,18 +1563,18 @@
}
});
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

2
my/takeOrder/index.vue
View File

@ -180,7 +180,7 @@
this.goods = []; // 置空列表,显示加载进度条
this.mescroll.resetUpScroll()
},
// 取消订单
// 订单退款
cancelOrder(e, status) {
let that = this
let content = ''

6
my/takeOrder/takeDetail.vue
View File

@ -103,7 +103,7 @@
<!-- <view class="flex tabber padding-top-sm padding-bottom-sm align-center" v-if="isTrue == 0">
<u-button @click="cancelOrder(order)" shape="circle" class="margin-right-sm " :custom-style="customStyle"
:hair-line="false">取消订单
:hair-line="false">订单退款
</u-button>
<u-button @click="pay" class="margin-right-sm " shape="circle" :custom-style="customStyle2"
:hair-line="false">立即支付
@ -231,7 +231,7 @@
}
})
},
// 取消订单
// 订单退款
cancelOrder(e, status) {
let that = this
let content = ''
@ -296,7 +296,7 @@
})
},
// 取消订单
// 订单退款
// cancelOrder(e) {
// let data = {
// id: e.ordersId,

4
package/pages/zysc/member/orderdetail.vue
View File

@ -180,7 +180,7 @@
<view v-if="state === 2 && isRefund != 2 && isExpress != 2" class='view_button' @tap='gorefund(list)'>退款
</view>
<view v-if="state === 4" class='view_button' @tap='gopinglun(list)'>去评价</view>
<!-- <view v-if="state === 1" class='view_button' @tap='gocancle(list)'>取消订单</view> -->
<!-- <view v-if="state === 1" class='view_button' @tap='gocancle(list)'>订单退款</view> -->
<view v-if="state === 1" style="color: #05C25C;border: 1px solid #05C25C;" class='view_button'
@tap='goPay(list)'>去支付</view>
</view>
@ -341,7 +341,7 @@
}
uni.showModal({
title: '温馨提示',
content: '确定要取消订单并退款吗？',
content: '确定要订单退款并退款吗？',
showCancel: true,
cancelText: '取消',
confirmText: '确认',

2
package/pages/zysc/my/myList.vue
View File

@ -65,7 +65,7 @@
<view v-if="item.status == '已退款' || item.status == '已收货' || item.status == '已取消'"
class='view_button' @tap='deleteOder(item.id)'>删除订单</view>
<view v-if="item.status == '待发货'" class='view_button' @tap='goRemind(item)'>提醒发货</view>
<!-- <view v-if="item.status == '待付款'" class='view_button' @tap='gocancle(item)'>取消订单</view> -->
<!-- <view v-if="item.status == '待付款'" class='view_button' @tap='gocancle(item)'>订单退款</view> -->
<view v-if="item.status == '待付款'" class='view_button'
style="color: #05C25C;border: 3upx solid #05C25C;" @tap='goPay(item)'>去支付</view>
</view>

23
pages/index/index.vue
View File

@ -14,8 +14,9 @@
<view v-if="XCXIsSelect != '否'" class="flex locate-line"
@tap="goCity">
<!--<image src="../../static/liliao-1.png" class="dingwei-img"></image>-->
<view class="localName">{{ city }}</view>
<view class="view-more"></view>
<view class="localName">{{ city }}
<view class="view-more"></view>
</view>
</view>
</view>
<!-- <view class="index-top-left font-size-34">盛安到家</view> -->
@ -123,9 +124,10 @@
</view>
</view>
<view class="index-guanggao width">
<image class="index-guanggao-pintuan" @click="qidai()" src="../../static/pintuan.png" mode="widthFix"></image>
<!-- <image class="index-guanggao-pintuan" @click="qidai()" src="../../static/pintuan.png" mode="widthFix"></image> -->
<image class="index-guanggao-pintuan index-interval" @click="goNav('/pages/my/newseckill?text='+'index')" src="../../static/cika2.png" mode="widthFix"></image>
<view class="index-guanggao-right">
<image class="index-guanggao-right-cika index-interval" @click="goNav('/pages/my/newseckill?text='+'index')" src="../../static/cika2.png" mode="widthFix"></image>
<!-- <image class="index-guanggao-right-cika index-interval" @click="goNav('/pages/my/newseckill?text='+'index')" src="../../static/cika2.png" mode="widthFix"></image> -->
<image class="index-guanggao-right-yuyue" @click="yuedao('企业')" src="../../static/yuyue.png" mode="widthFix"></image>
</view>
</view>
@ -1670,7 +1672,7 @@
margin-left: 4rpx;
}
.localName{
width: 100px;
width: 540rpx;
margin-left: 4rpx;
font-weight: bold;
color: #333333;
@ -1684,7 +1686,7 @@
border-top: 1px solid;
border-right: 1px solid;
width: 7px;
height: 7px;
height: 8px;
border-color: #999;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
@ -1750,7 +1752,7 @@
}
.index-line{
width: 100%;
display: flex;
/* display: flex; */
flex-direction: row;
justify-content: space-between;
align-items: center;
@ -1783,6 +1785,7 @@
display: flex;
align-items: center;
margin-top: 4rpx;
justify-content: flex-end;
}
.locate-line{
/*padding-left: 25rpx;*/
@ -2358,11 +2361,11 @@
}
.index-guanggao-pintuan{
width: 340.28rpx;
width: 400.28rpx;
height: 100%;
}
.index-guanggao-right{
width: 360.28rpx;
width: 400.28rpx;
height: 100%;
display: flex;
flex-direction: column;
@ -2382,7 +2385,7 @@
display: flex;
flex-direction: row;
justify-content: space-between;
height: 426.39rpx;
/* height: 426.39rpx; */
}
.index-project{
display: flex;

12
pages/my/index.vue
View File

@ -22,9 +22,9 @@
</view>
<view class="my-head-texa">
<span>{{phone}}</span>
<span style="font-size: 30rpx;font-weight: bold; padding: 0 10rpx;">·</span>
<span>ID:{{invitationCode}}</span>
<!-- <span>{{phone}}</span>
<span style="font-size: 30rpx;font-weight: bold; padding: 0 10rpx;">·</span> -->
<span>邀请码:{{invitationCode}}</span>
</view>
</view>
<view v-else class="text-xl" @click="goLogin('/pages/public/login')">
@ -60,7 +60,7 @@
</view>
<view class="my-head-mian-bottom-list">
<image src="../../static/my-jifen.png" mode="" @click="qidai()"></image>
<span class="my-head-mian-bottom-list-text">积分兑换</span>
<span class="my-head-mian-bottom-list-text">盛安豆钱包</span>
</view>
</view>
</view>
@ -203,10 +203,10 @@
<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
<span class="my-use-list-text">我是代理商</span>
</view> -->
<view class="my-use-list" @click="useToUrl('/pages/my/myteam')">
<!-- <view class="my-use-list" @click="useToUrl('/pages/my/myteam')">
<image style="padding: 3rpx;" src="../../static/my-gong-9.png" mode=""></image>
<span class="my-use-list-text">我的团队</span>
</view>
</view> -->
<view class="my-use-list" @click="useToUrl('/my/feedback/index')">
<image style="padding: 3rpx;" src="../../static/shezhi4.png" mode=""></image>
<span class="my-use-list-text">我要投诉</span>

4
pages/my/index1.vue
View File

@ -94,12 +94,12 @@
<view class=" padding-tb" @click="goNavOrder(2)">
<image src="../../static/images/my/order6.png" style="width: 60upx;height: 60upx;" mode="">
</image>
<view class="text-df" style="line-height: 50upx;">待确认</view>
<view class="text-df" style="line-height: 50upx;">待接单</view>
</view>
<view class=" padding-tb" @click="goNavOrder(2)">
<image src="../../static/images/my/order2.png" style="width: 60upx;height: 60upx;" mode="">
</image>
<view class="text-df" style="line-height: 50upx;">待服务</view>
<view class="text-df" style="line-height: 50upx;">已接单</view>
</view>
<view class=" padding-tb" @click="goNavOrder(6)">
<image src="../../static/images/my/order4.png" style="width: 60upx;height: 60upx;" mode="">

24
pages/my/invitationUser.vue
View File

@ -123,20 +123,21 @@
backgroundImage: '',
tuiguang: '',
tuiguang1: '',
tuiguangLink: '',
url: ''
};
},
onLoad() {
this.getBackImageList();
this.getUserInfo();
this.$Request.getT('/app/common/type/116').then(res => {
if (res.code === 0) {
if (res.data && res.data.value) {
this.tuiguang = res.data.value;
this.tuiguang1 = res.data.value;
}
}
});
// this.$Request.getT('/app/common/type/116').then(res => {
// if (res.code === 0) {
// if (res.data && res.data.value) {
// this.tuiguang = res.data.value;
// this.tuiguang1 = res.data.value;
// }
// }
// });
//检测书否开启APP微信分享
this.$Request.getT('/app/common/type/136').then(res => {
if (res.code === 0) {
@ -187,6 +188,9 @@
this.$Request.getT('/app/banner/selectBannerList?state=-1&classify=5').then(res => {
if (res.code === 0) {
this.backgroundImage = res.data[0].imageUrl;
this.tuiguang = res.data[0].describes;
this.tuiguang1 = res.data[0].describes;
this.tuiguangLink = res.data[0].url;
}
});
this.make();
@ -260,14 +264,14 @@
let relationId = this.invitationCode;
uni.showModal({
title: '文案推广',
content: this.tuiguang1 + '\n' + this.$queue.publicYuMingApp(),
content: this.tuiguang1 + '\n' + this.tuiguangLink,
showCancel: true,
cancelText: '关闭',
confirmText: '一键复制',
success: res => {
if (res.confirm) {
uni.setClipboardData({
data: this.tuiguang1 + '\n' + this.$queue.publicYuMingApp(),
data: this.tuiguang1 + '\n' + this.tuiguangLink,
success: function() {
console.log('success');
that.$queue.showToast('复制成功');

8
pages/my/orderDetailsList.vue
View File

@ -44,7 +44,7 @@
<view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-a">待支付</span></view>
<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-b">待服务</span></view>
class="status-button-b">已接单</span></view>
<view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-c">待评价</span></view>
<view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span
@ -54,11 +54,11 @@
<view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-f">服务中</span></view>
<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-h">技师出发</span></view>
class="status-button-h">已出发</span></view>
<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-i">技师到达</span></view>
class="status-button-i">已到达</span></view>
<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-g">待确认</span></view>
class="status-button-g">待接单</span></view>
<view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-h">待补单</span></view>
</view>

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

@ -20,14 +20,14 @@
<view class="margin-left-xs ">{{item.artificerName}}</view>
</view>
<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待支付</span></view>
<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>已接单</span></view>
<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>已出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>已到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待接单</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
@ -85,7 +85,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -132,7 +132,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(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)">
@ -166,7 +166,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -183,7 +183,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -200,7 +200,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns xianshi">
@ -216,7 +216,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="TuiPopup(type,2,item)">
取消订单
订单退款
</u-button>
<u-button v-if="item.packageType=='104'||item.packageType=='105'||item.packageType=='106'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="taocanDaiBd('/my/order/payModifyTcMyDaiB?ordersId='+item.ordersId,item)" class="btns xianshi">
@ -324,7 +324,7 @@
Surl:'../../static/order_icon/order_icon2.png',
status: '1'
}, {
name: '待服务',
name: '已接单',
Aurl:'../../static/order_icon/order_icon3-3.png',
Surl:'../../static/order_icon/order_icon3.png',
status: '2'
@ -334,12 +334,12 @@
Surl:'../../static/order_icon/order_icon4.png',
status: '10'
},{
name: '技师出发',
name: '已出发',
Aurl:'../../static/order_icon/order_icon10-10.png',
Surl:'../../static/order_icon/order_icon10.png',
status: '7'
}, {
name: '技师到达',
name: '已到达',
Aurl:'../../static/order_icon/order_icon5-5.png',
Surl:'../../static/order_icon/order_icon5.png',
status: '8'
@ -675,18 +675,18 @@
this.page = 1
this.getOrderList()
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
@ -915,7 +915,7 @@
/deep/.btnsH{
background: #fff !important;
// border: 1px solid #d7d7d7 !important;
color: #d7d7d7 !important;
color: #019C88 !important;
width: 145rpx !important;
height: 47rpx !important;
line-height: 47px !important;

45
pages/order/index.vue
View File

@ -20,14 +20,15 @@
<view class="margin-left-xs ">{{item.artificerName}}</view>
</view>
<view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">已接单</span></view>
<view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
<view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
<view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
<view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">已出发</span></view>
<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">已到达</span></view>
<view v-if="item.status ==9&&!item.refusalContent"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待接单</span></view>
<view v-if="item.status ==9&&item.refusalContent"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-j">拒单审核</span></view>
<view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
@ -91,14 +92,13 @@
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns">
去支付
</u-button>
</view>
<view class="showBtn" v-if="item.status ==2">
<u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -176,7 +176,7 @@
</view>
<view v-if="item.cancelBtnShow == 'true'"
@click="cancelOrder(item)" class="gengduoBtn">
取消订单
订单退款
</view>
<view @click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" class="gengduoBtn">
去投诉
@ -206,7 +206,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -223,7 +223,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -240,7 +240,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns xianshi">
@ -256,7 +256,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
取消订单
订单退款
</u-button>
<u-button v-if="item.packageType=='104'||item.packageType=='105'||item.packageType=='106'||item.packageType=='111'||item.packageType=='112'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns xianshi">
@ -271,7 +271,6 @@
联系客服
</u-button>
</view>
</view>
</view>
</view>
@ -365,7 +364,7 @@
Surl:'../../static/order_icon/order_icon2.png',
status: '1'
}, {
name: '待服务',
name: '已接单',
Aurl:'../../static/order_icon/order_icon3-3.png',
Surl:'../../static/order_icon/order_icon3.png',
status: '2'
@ -375,12 +374,12 @@
Surl:'../../static/order_icon/order_icon4.png',
status: '10'
},{
name: '技师出发',
name: '已出发',
Aurl:'../../static/order_icon/order_icon10-10.png',
Surl:'../../static/order_icon/order_icon10.png',
status: '7'
}, {
name: '技师到达',
name: '已到达',
Aurl:'../../static/order_icon/order_icon5-5.png',
Surl:'../../static/order_icon/order_icon5.png',
status: '8'
@ -758,7 +757,7 @@
this.page = 1
this.getOrderList()
},
cancelOrders(data){//取消订单
cancelOrders(data){//订单退款
let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
@ -773,20 +772,20 @@
}
})
},
// 取消订单待确认
// 订单退款待接单
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
//订单退款扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
content: '是否确认订单退款？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
@ -1039,7 +1038,7 @@
/deep/.btnsH{
background: #fff !important;
// border: 1px solid #d7d7d7 !important;
color: #d7d7d7 !important;
color: #019C88 !important;
width: 164rpx !important;
height: 47rpx !important;
line-height: 47px !important;
@ -1180,7 +1179,7 @@
}
.status-button-g{
font-weight: bold;
color: #e04f3c;
color: #43b943;
}
.status-button-h{
font-weight: bold;
@ -1190,9 +1189,9 @@
font-weight: bold;
color: #002ea4;
}
.status-button-g{
.status-button-j{
font-weight: bold;
color: #43b943;
color: #e04f3c;
}
.status-num{
margin-right: 15rpx;

24
pages/order/index1.vue
View File

@ -15,12 +15,12 @@
<view class="margin-left-xs ">{{item.artificerName}}</view>
</view>
<view class="text-green" v-if="item.status ==1">待付款</view>
<view class="text-green" v-if="item.status ==2">待服务</view>
<view class="text-green" v-if="item.status ==2">已接单</view>
<view class="text-green" v-if="item.status ==3">待评价</view>
<view class="text-green" v-if="item.status ==5">已完成</view>
<view class="text-green" v-if="item.status ==6">服务中</view>
<view class="text-green" v-if="item.status ==7">技师出发</view>
<view class="text-green" v-if="item.status ==8">技师到达</view>
<view class="text-green" v-if="item.status ==7">已出发</view>
<view class="text-green" v-if="item.status ==8">已到达</view>
<view class="text-green" v-if="item.status ==4" style="color: #333333;">已取消</view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
@ -52,9 +52,13 @@
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
<view class="flex text-right">
<u-button
v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
v-if="item.status == 1 && yhqxSel != '否'"
:custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">取消订单</u-button>
<u-button
v-if="(item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
:custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">订单退款</u-button>
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" style="background: linear-gradient(to right, #223845, #00a85b);">去支付</u-button>
<u-button v-if="item.status == 2" :custom-style="customStyle1" shape="circle" :plain="true"
@ -99,13 +103,13 @@
name: '待支付',
status: '1'
}, {
name: '待服务',
name: '已接单',
status: '2'
}, {
name: '技师出发',
name: '已出发',
status: '7'
}, {
name: '技师到达',
name: '已到达',
status: '8'
}, {
name: '服务中',
@ -232,18 +236,18 @@
this.page = 1
this.getOrderList()
},
// 取消订单
// 订单退款
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {

8
pages/therapist/therapist.vue
View File

@ -60,19 +60,23 @@
</view>
<view class="therapist-mian-top">
<view class="therap-pin">
<span>评论</span>
<span class="therapist-mian-view-text">
{{ item.commentCount ? item.commentCount : 0 }}
</span>
</view>
<view class="therap-pin">
<span>收藏</span>
<span class="therapist-mian-view-text">
{{ item.collectCount ? item.collectCount : 0 }}
</span>
</view>
<view class="therap-pin">
<span>订单数</span>
<span class="therapist-mian-view-text">
{{ item.artificerSales ? item.artificerSales : 0 }}
</span>
</view>
</view>
<view class="flex thera-lin thera-bottom">
<view class="flex align-center" v-if="item.distance">