diff --git a/App.vue b/App.vue
index ad8a472..ad488e0 100644
--- a/App.vue
+++ b/App.vue
@@ -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);
diff --git a/my/order/pay.vue b/my/order/pay.vue
index ad488e2..5a429a5 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -22,14 +22,15 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
+ 拒单审核
待补单
@@ -384,7 +385,7 @@
- 取消订单
+ 订单退款
@@ -444,7 +445,7 @@
v-if="order.cancelBtnShow == 'true'"
:custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns"
:hair-line="true">
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
{
- 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;
diff --git a/my/order/payCLDetail.vue b/my/order/payCLDetail.vue
index 25fc29a..c953e9b 100644
--- a/my/order/payCLDetail.vue
+++ b/my/order/payCLDetail.vue
@@ -19,14 +19,14 @@
@@ -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 = {
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 89f17b2..dbc98f1 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -22,14 +22,14 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -526,7 +526,7 @@
class="btns">
去评价
- 联系客服
+ 联系客服
@@ -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;
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 6e03f80..96465a7 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -1296,12 +1296,12 @@
}
});
},
- // 取消订单
+ // 订单退款
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
- content: '是否确认取消订单？' + contentName,
+ content: '是否确认订单退款？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue
index 7d99f3a..fa3fa03 100644
--- a/my/order/payModifyCi.vue
+++ b/my/order/payModifyCi.vue
@@ -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 = {
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index 3783f3c..43cf9c1 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -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 = {
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index ed1c993..6ec682f 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -16,14 +16,14 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -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 = {
diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue
index 94b103f..e19dd42 100644
--- a/my/order/payModifyJsDetail.vue
+++ b/my/order/payModifyJsDetail.vue
@@ -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 = {
diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue
index 02916e9..251d473 100644
--- a/my/order/payModifyLiao.vue
+++ b/my/order/payModifyLiao.vue
@@ -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 = {
diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue
index 5337b90..49d85d8 100644
--- a/my/order/payModifyMs.vue
+++ b/my/order/payModifyMs.vue
@@ -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 = {
diff --git a/my/order/payModifyQy.vue b/my/order/payModifyQy.vue
index 89068f8..725c1cf 100644
--- a/my/order/payModifyQy.vue
+++ b/my/order/payModifyQy.vue
@@ -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 = {
diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue
index f9ecc6b..e12b09f 100644
--- a/my/order/payModifyTc.vue
+++ b/my/order/payModifyTc.vue
@@ -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 = {
diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 662e174..28cf48d 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -1325,12 +1325,12 @@
}
});
},
- // 取消订单
+ // 订单退款
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
- content: '是否确认取消订单？',
+ content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 85cfac5..46238fb 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -23,14 +23,14 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -293,7 +293,7 @@
取消订单
+ >订单退款
立即支付
@@ -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)
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index d9e98d0..58aef91 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -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;
diff --git a/my/order/payYouHui.vue b/my/order/payYouHui.vue
index bda14aa..5c491bc 100644
--- a/my/order/payYouHui.vue
+++ b/my/order/payYouHui.vue
@@ -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 = {
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 5a9d903..2979f7c 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -22,14 +22,14 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -255,7 +255,7 @@
取消订单
+ v-if="(order.status != 3 && order.status != 4 && order.status != 5) && yhqxSel != '否' && order.cancelBtnShow == 'true'">订单退款
{
uni.hideLoading();
@@ -1360,13 +1360,13 @@
}
})
},
- // 取消订单待确认
+ // 订单退款待接单
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
- content: '是否确认取消订单？',
+ content: '是否确认订单退款？',
success: function(res) {
if (res.confirm) {
let data = {
diff --git a/my/order/paydingCi.vue b/my/order/paydingCi.vue
index dcd3716..a088481 100644
--- a/my/order/paydingCi.vue
+++ b/my/order/paydingCi.vue
@@ -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 = {
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
index bd56f6b..2938b1e 100644
--- a/my/order/paydingDd.vue
+++ b/my/order/paydingDd.vue
@@ -20,14 +20,14 @@
待付款...
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -232,7 +232,7 @@
取消订单
+ v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">订单退款
立即支付
@@ -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 = {
diff --git a/my/order/paydingPt.vue b/my/order/paydingPt.vue
index 6ddaf41..f536e61 100644
--- a/my/order/paydingPt.vue
+++ b/my/order/paydingPt.vue
@@ -78,7 +78,7 @@
立即支付
@@ -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 = {
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 0dea368..80a26e0 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -20,14 +20,14 @@
待支付
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -219,7 +219,7 @@
order.status != 4 &&
order.status != 5 && order.cancelBtnShow == 'true'
"
- class="btns">取消订单
+ class="btns">订单退款
立即支付
@@ -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 = {
diff --git a/my/order/paydingXiuGai.vue b/my/order/paydingXiuGai.vue
index fdcc1a9..b2597c5 100644
--- a/my/order/paydingXiuGai.vue
+++ b/my/order/paydingXiuGai.vue
@@ -20,14 +20,14 @@
待付款...
- 待服务
+ 已接单
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
待评价
已取消
- 待确认
+ 待接单
待补单
@@ -275,7 +275,7 @@
取消订单
+ v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">订单退款
{
- 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 = {
diff --git a/my/takeOrder/index.vue b/my/takeOrder/index.vue
index 373e65c..72eb7d6 100644
--- a/my/takeOrder/index.vue
+++ b/my/takeOrder/index.vue
@@ -180,7 +180,7 @@
this.goods = []; // 置空列表,显示加载进度条
this.mescroll.resetUpScroll()
},
- // 取消订单
+ // 订单退款
cancelOrder(e, status) {
let that = this
let content = ''
diff --git a/my/takeOrder/takeDetail.vue b/my/takeOrder/takeDetail.vue
index 6a96dfe..77fd5b5 100644
--- a/my/takeOrder/takeDetail.vue
+++ b/my/takeOrder/takeDetail.vue
@@ -103,7 +103,7 @@
+
去支付
@@ -341,7 +341,7 @@
}
uni.showModal({
title: '温馨提示',
- content: '确定要取消订单并退款吗？',
+ content: '确定要订单退款并退款吗？',
showCancel: true,
cancelText: '取消',
confirmText: '确认',
diff --git a/package/pages/zysc/my/myList.vue b/package/pages/zysc/my/myList.vue
index e468f83..ff10e10 100644
--- a/package/pages/zysc/my/myList.vue
+++ b/package/pages/zysc/my/myList.vue
@@ -65,7 +65,7 @@
删除订单
提醒发货
-
+
去支付
diff --git a/pages/index/index.vue b/pages/index/index.vue
index efc3d47..457c445 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,8 +14,9 @@
- {{ city }}
-
+ {{ city }}
+
+
@@ -123,9 +124,10 @@
-
+
+
-
+
@@ -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;
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 69da7d5..42876b6 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -22,9 +22,9 @@
- {{phone}}
- ·
- ID:{{invitationCode}}
+
+ 邀请码:{{invitationCode}}
@@ -60,7 +60,7 @@
- 积分兑换
+ 盛安豆钱包
@@ -203,10 +203,10 @@
我是代理商
-->
-
+
我要投诉
diff --git a/pages/my/index1.vue b/pages/my/index1.vue
index a48de22..2032205 100644
--- a/pages/my/index1.vue
+++ b/pages/my/index1.vue
@@ -94,12 +94,12 @@
- 待确认
+ 待接单
- 待服务
+ 已接单
diff --git a/pages/my/invitationUser.vue b/pages/my/invitationUser.vue
index 4d75b12..e0a4dd5 100644
--- a/pages/my/invitationUser.vue
+++ b/pages/my/invitationUser.vue
@@ -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('复制成功');
diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue
index 1c38e7c..d143eb0 100644
--- a/pages/my/orderDetailsList.vue
+++ b/pages/my/orderDetailsList.vue
@@ -44,7 +44,7 @@
{{item.ordersNo}}待支付
{{item.ordersNo}}待服务
+ class="status-button-b">已接单
{{item.ordersNo}}待评价
{{item.ordersNo}}{{item.ordersNo}}服务中
{{item.ordersNo}}技师出发
+ class="status-button-h">已出发
{{item.ordersNo}}技师到达
+ class="status-button-i">已到达
{{item.ordersNo}}待确认
+ class="status-button-g">待接单
{{item.ordersNo}}待补单
diff --git a/pages/order/index - 副本.vue b/pages/order/index - 副本.vue
index bf6e07e..aaf8911 100644
--- a/pages/order/index - 副本.vue
+++ b/pages/order/index - 副本.vue
@@ -20,14 +20,14 @@
{{item.artificerName}}
{{item.ordersNo}}待支付
- {{item.ordersNo}}待服务
+ {{item.ordersNo}}已接单
{{item.ordersNo}}待评价
{{item.ordersNo}}已取消
{{item.ordersNo}}已完成
{{item.ordersNo}}服务中
- {{item.ordersNo}}技师出发
- {{item.ordersNo}}技师到达
- {{item.ordersNo}}待确认
+ {{item.ordersNo}}已出发
+ {{item.ordersNo}}已到达
+ {{item.ordersNo}}待接单
{{item.ordersNo}}待补单
@@ -85,7 +85,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
@@ -166,7 +166,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
@@ -216,7 +216,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="TuiPopup(type,2,item)">
- 取消订单
+ 订单退款
@@ -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;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index d38af8a..a52e1ac 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -20,14 +20,15 @@
{{item.artificerName}}
{{item.ordersNo}}待支付
- {{item.ordersNo}}待服务
+ {{item.ordersNo}}已接单
{{item.ordersNo}}待评价
{{item.ordersNo}}已取消
{{item.ordersNo}}已完成
{{item.ordersNo}}服务中
- {{item.ordersNo}}技师出发
- {{item.ordersNo}}技师到达
- {{item.ordersNo}}待确认
+ {{item.ordersNo}}已出发
+ {{item.ordersNo}}已到达
+ {{item.ordersNo}}待接单
+ {{item.ordersNo}}拒单审核
{{item.ordersNo}}待补单
@@ -91,14 +92,13 @@
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns">
去支付
-
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
去投诉
@@ -206,7 +206,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
- 取消订单
+ 订单退款
@@ -256,7 +256,7 @@
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="cancelOrder(item)">
- 取消订单
+ 订单退款
@@ -271,7 +271,6 @@
联系客服
-
@@ -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;
diff --git a/pages/order/index1.vue b/pages/order/index1.vue
index cbdca37..a1e5d30 100644
--- a/pages/order/index1.vue
+++ b/pages/order/index1.vue
@@ -15,12 +15,12 @@
{{item.artificerName}}
待付款
- 待服务
+ 已接单
待评价
已完成
服务中
- 技师出发
- 技师到达
+ 已出发
+ 已到达
已取消
@@ -52,9 +52,13 @@
取消订单
+ 订单退款
去支付
-
评论
{{ item.commentCount ? item.commentCount : 0 }}
-
收藏
{{ item.collectCount ? item.collectCount : 0 }}
+
+ 订单数
+
+ {{ item.artificerSales ? item.artificerSales : 0 }}
+
+