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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 

# Conflicts:
#	pages/my/index.vue
This commit is contained in:
1378012178@qq.com 2025-02-08 16:42:36 +08:00
parent 004efb5469 96d12206ed
commit 8b04e2471c
42 changed files with 648 additions and 658 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); this.$queue.setData('glsNum', res.data.value);
} }
}); });
//用户是否可以取消订单 377 //用户是否可以订单退款 377
this.$Request.get('/app/common/type/377').then(res => { this.$Request.get('/app/common/type/377').then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$queue.setData('yhqxSel', res.data.value); this.$queue.setData('yhqxSel', res.data.value);
@ -402,7 +402,7 @@
this.$queue.setData('msTimeDate', res.data.value); this.$queue.setData('msTimeDate', res.data.value);
} }
}); });
// 取消订单扣除百分比 419 // 订单退款扣除百分比 419
this.$Request.get('/app/common/type/419').then(res => { this.$Request.get('/app/common/type/419').then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$queue.setData('closeKC', res.data.value); this.$queue.setData('closeKC', res.data.value);

12
common/config.js
View File

@ -1,16 +1,16 @@
// const ROOTPATH3 = "wss://192.168.2.222:8187/wss/chatSocket/"; const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/";
// const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; const ROOTPATH = "http://192.168.2.22:8187/sqx_fast";
// const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast";
// const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/"; // const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/";
// const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast"; // const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast";
// const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast"; // const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast";
//生产环境 //生产环境
const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换 // const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换
const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换 // const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换
const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换 // const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换
//上传地址 //上传地址
const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';

391
my/order/pay.vue
View File

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

14
my/order/payCLDetail.vue
View File

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

22
my/order/payJaZ.vue
View File

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

4
my/order/payModify.vue
View File

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

6
my/order/payModifyCi.vue
View File

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

6
my/order/payModifyDd.vue
View File

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

14
my/order/payModifyDzhifu.vue
View File

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

6
my/order/payModifyJsDetail.vue
View File

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

6
my/order/payModifyLiao.vue
View File

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

6
my/order/payModifyMs.vue
View File

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

6
my/order/payModifyQy.vue
View File

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

6
my/order/payModifyTc.vue
View File

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

4
my/order/payModifyTcMy.vue
View File

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

16
my/order/payModifyTcMyDaiB.vue
View File

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

12
my/order/payShengji.vue
View File

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

6
my/order/payYouHui.vue
View File

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

16
my/order/payding.vue
View File

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

6
my/order/paydingCi.vue
View File

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

16
my/order/paydingDd.vue
View File

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

6
my/order/paydingLiao.vue
View File

@ -906,18 +906,18 @@
} }
}); });
}, },
// 取消订单 // 订单退款
cancelOrder(e) { cancelOrder(e) {
let contentName = ''; let contentName = '';
let closeKC = this.$queue.getData('closeKC'); let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) { if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2); let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！'; contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
} }
let that = this let that = this
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否确认取消订单？' + contentName, content: '是否确认订单退款？' + contentName,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
let data = { 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"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" <!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
> >
取消订单 订单退款
</u-button> --> </u-button> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付 class="dingshi">立即支付
@ -970,7 +970,7 @@
} }
}); });
}, },
// 取消订单 // 订单退款
cancelOrder(e) { cancelOrder(e) {
let that = this let that = this
let data = { let data = {
@ -978,7 +978,7 @@
} }
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否确认取消订单？', content: '是否确认订单退款？',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
let data = { 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"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" <!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
> >
取消订单 订单退款
</u-button> --> </u-button> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付 class="dingshi">立即支付
@ -970,7 +970,7 @@
} }
}); });
}, },
// 取消订单 // 订单退款
cancelOrder(e) { cancelOrder(e) {
let that = this let that = this
let data = { let data = {
@ -978,7 +978,7 @@
} }
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否确认取消订单？', content: '是否确认订单退款？',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
let data = { let data = {

14
my/order/paydingTCX.vue
View File

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

296
my/order/paydingXiuGai.vue
View File

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

2
my/takeOrder/index.vue
View File

@ -180,7 +180,7 @@
this.goods = []; // 置空列表,显示加载进度条 this.goods = []; // 置空列表,显示加载进度条
this.mescroll.resetUpScroll() this.mescroll.resetUpScroll()
}, },
// 取消订单 // 订单退款
cancelOrder(e, status) { cancelOrder(e, status) {
let that = this let that = this
let content = '' 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"> <!-- <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" <u-button @click="cancelOrder(order)" shape="circle" class="margin-right-sm " :custom-style="customStyle"
:hair-line="false">取消订单 :hair-line="false">订单退款
</u-button> </u-button>
<u-button @click="pay" class="margin-right-sm " shape="circle" :custom-style="customStyle2" <u-button @click="pay" class="margin-right-sm " shape="circle" :custom-style="customStyle2"
:hair-line="false">立即支付 :hair-line="false">立即支付
@ -231,7 +231,7 @@
} }
}) })
}, },
// 取消订单 // 订单退款
cancelOrder(e, status) { cancelOrder(e, status) {
let that = this let that = this
let content = '' let content = ''
@ -296,7 +296,7 @@
}) })
}, },
// 取消订单 // 订单退款
// cancelOrder(e) { // cancelOrder(e) {
// let data = { // let data = {
// id: e.ordersId, // 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 v-if="state === 2 && isRefund != 2 && isExpress != 2" class='view_button' @tap='gorefund(list)'>退款
</view> </view>
<view v-if="state === 4" class='view_button' @tap='gopinglun(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' <view v-if="state === 1" style="color: #05C25C;border: 1px solid #05C25C;" class='view_button'
@tap='goPay(list)'>去支付</view> @tap='goPay(list)'>去支付</view>
</view> </view>
@ -341,7 +341,7 @@
} }
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '确定要取消订单并退款吗？', content: '确定要订单退款并退款吗？',
showCancel: true, showCancel: true,
cancelText: '取消', cancelText: '取消',
confirmText: '确认', confirmText: '确认',

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

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

21
pages/index/index.vue
View File

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

126
pages/my/channelMerchants/myMerchants.vue
View File

@ -60,59 +60,39 @@
<view class="view-top"> <view class="view-top">
<view class="view-top-left"> <view class="view-top-left">
</view> </view>
<view class="view-top-right" @click="showModal"> <view class="view-top-right">
<image src="../../../static/map2.png" mode=""></image> <image src="../../../static/map2.png" mode=""></image>
<span>渠道码</span> <span>渠道码</span>
</view> </view>
</view> </view>
<view class="liebiao"> <view class="liebiao">
<view v-if="codeList.length" class="flex text-center flex-wrap list-view"> <view v-if="listData.codeList.length" class="flex text-center flex-wrap list-view-code">
<view class="margin-bottom-sm radius touxiang-left"> <view class="margin-bottom-sm radius touxiang-left">
<view class="flex align-center touxiang-left-view" v-for="(item, index) in codeList" :key='index' @click="goOrder(item)"> <view class="touxiang-left-view" v-for="(item, index) in listData.codeList" :key='index'>
<view class="touxiang-left-content">
<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
<image class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
<image class="touxiang-frame" :src="item.technicianType=='3'?'../../../static/vip/grade1-1.gif':item.technicianType=='4'?'../../../static/vip/grade2-1.gif':'../../../static/vip/grade3-1.gif'"></image>
</view>
<view class="list-right"> <view class="list-right">
<view class="flex align-center" style="justify-content: start;"> <view class="flex align-center" style="justify-content: start;">
<view class="flex align-center list-right-top"> <view class="flex align-center list-right-top">
<view class="list-right-top-view"> <view class="list-right-top-view">
<view class="flex"> <view class="flex">
<span class="list-right-top-name">{{ item.artificerName }}</span> <span class="list-right-top-name">名称：{{ item.name }}</span>
<!-- <span class="label-word">{{ item.artificerClassifyList[0].classifyName }}</span> -->
</view> </view>
<view class="keyuyue keyuyue-lan" v-if="item.status == 1"> <view class="keyuyue keyuyue-lan">
<view class="flex"> <view class="flex">
<view class="timea-fu">可服务</view> <view class="timea-fu">地址：{{ item.address }}</view>
<view class="timea-time">{{item.time}}</view>
</view>
</view>
<view class="keyuyue keyuyue-hui" v-else>
<view class="flex">
<view class="timea-hui">休息中</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="touxiang-left-content">
<!-- <empty v-if="codeList.length == 0"></empty> --> <image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.codeImage ? item.codeImage : '../../../static/logo.png'" mode="aspectFill"></image>
</view> </view>
</view> </view>
<tki-qrcode ref="qrcode" :val="url" :size="200" background="#fff" foreground="#000" pdground="#000"
:onval="true" :loadMake="true" @result="qrR" :show="false"></tki-qrcode>
<view class="cu-modal" :class="modalName == 'Image' ? 'show' : ''" @tap="hideModal">
<view class="cu-dialog" v-if="backgroundImage && erweimapath && haibaoShow" @tap="hideModal">
<view class="bg-img">
<wm-poster @success="posterSuccess" :imgSrc="backgroundImage" :Referrer="'我的邀请码:'+invitationCode"
:QrSrc="erweimapath" :Title="tuiguang" :LineType="false"></wm-poster>
</view> </view>
</view> </view>
<empty v-if="listData.codeList.length == 0"></empty>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -139,16 +119,14 @@
erweimapath: '', erweimapath: '',
invitationCode: '', invitationCode: '',
tuiguang: '', tuiguang: '',
codeList: [],
} }
}, },
onLoad() { onLoad() {
this.avatar = uni.getStorageSync('avatar') this.avatar = uni.getStorageSync('avatar')
this.getData(); this.getData();
this.getBackImageList();
this.getUserInfo(); this.getUserInfo();
this.getlist(); // this.getlist();
this.tabNavSon(); // this.tabNavSon();
this.$Request.getT('/app/common/type/116').then(res => { this.$Request.getT('/app/common/type/116').then(res => {
if (res.code === 0) { if (res.code === 0) {
if (res.data && res.data.value) { if (res.data && res.data.value) {
@ -251,15 +229,6 @@
} }
}) })
}, },
changeClickSon(item){
var index = []
for(var i=0;i<item.detail.data.length;i++){
index.push(item.detail.data[i].value)
}
this.classifyId = index.join(",")
this.artificerName='';
this.page=1;
},
changeClick(index,item){ changeClick(index,item){
this.artificerName=''; this.artificerName='';
this.technicianType=item.id; this.technicianType=item.id;
@ -290,8 +259,7 @@
} }
}); });
} else { } else {
this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this this.url = this.$queue.publicYuMingApp() + '/?blQdsCode=' + this.invitationCode;
.invitationCode+"&flag=3";
} }
} }
}); });
@ -300,57 +268,13 @@
} }
}); });
}, },
getBackImageList() {
this.$Request.get("/app/commission/jjr/poster").then(res => {
uni.hideLoading();
if (res.code == 0) {
this.backgroundImage = res.data.artificerImage;
}
console.log("res.data--->", this.backgroundImage);
});
// this.make();
},
make() {
uQRCode.make({
canvasId: 'default_PosterCanvasId',
componentInstance: this,
text: this.url,
size: 68,
margin: 4,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
correctLevel: uQRCode.errorCorrectLevel.H,
success: res => {
console.log(res)
}
})
},
hideModal() {
this.modalName = null;
},
qrR(path) {
this.erweimapath = path;
},
posterSuccess(haibaoImg) {
this.haibaoImg = haibaoImg;
this.modalName = 'Image';
},
showModal() {
if (!this.haibaoImg) {
this.haibaoShow = true;
this.$queue.showLoading('海报生成中...');
} else {
this.modalName = 'Image';
}
},
goNav(link){ goNav(link){
uni.navigateTo({ uni.navigateTo({
url:link+'?navName='+'经纪人' url:link+'?navName='+'渠道商'
}) })
}, },
getData(){ getData(){
this.$Request.get("/app/commission/jjr/myJjr").then(res => { this.$Request.get("/app/commission/qds/myQds").then(res => {
console.log("res.data--->", res.data); console.log("res.data--->", res.data);
if (res.code == 0) { if (res.code == 0) {
this.listData=res.data this.listData=res.data
@ -468,6 +392,12 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.list-view-code{
width:100%;
display: flex;
flex-direction: column;
align-items: center;
}
.mian-list{ .mian-list{
width:100%; width:100%;
display: flex; display: flex;
@ -624,8 +554,20 @@
} }
.liebiao{ .liebiao{
//height: 100vh; //height: 100vh;
margin-top: 85px; margin-top: 25px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.touxiang-left-content{
margin-bottom: 15px;
}
.touxiang-left-content-img{
width : 320px;
height: 320px;
}
.list-right-top-name{
font-size: 16px;
font-weight: 600;
color: #333;
}
</style> </style>

40
pages/my/index.vue
View File

@ -22,9 +22,9 @@
</view> </view>
<view class="my-head-texa"> <view class="my-head-texa">
<span>{{phone}}</span> <!-- <span>{{phone}}</span>
<span style="font-size: 30rpx;font-weight: bold; padding: 0 10rpx;">·</span> <span style="font-size: 30rpx;font-weight: bold; padding: 0 10rpx;">·</span> -->
<span>ID:{{invitationCode}}</span> <span>邀请码:{{invitationCode}}</span>
</view> </view>
</view> </view>
<view v-else class="text-xl" @click="goLogin('/pages/public/login')"> <view v-else class="text-xl" @click="goLogin('/pages/public/login')">
@ -60,7 +60,7 @@
</view> </view>
<view class="my-head-mian-bottom-list"> <view class="my-head-mian-bottom-list">
<image src="../../static/my-jifen.png" mode="" @click="qidai()"></image> <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> </view>
</view> </view>
@ -163,38 +163,38 @@
<image style="padding: 3rpx;" src="../../static/my-gong-4.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-4.png" mode=""></image>
<span class="my-use-list-text">城市合伙人</span> <span class="my-use-list-text">城市合伙人</span>
</view> </view>
<!-- <view class="my-use-list" v-if="blIsJjr=='0'" @click="useToUrl('/pages/my/applyBroker/index')"> <view class="my-use-list" v-if="blIsJjr=='0'" @click="useToUrl('/pages/my/applyBroker/index')">
<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
<span class="my-use-list-text">申请经纪人</span> <span class="my-use-list-text">申请经纪人</span>
</view> </view>
<view class="my-use-list" v-if="blIsJjr=='1'" @click="useToUrl('/pages/my/applyBroker/myBroker')"> <view class="my-use-list" v-if="blIsJjr=='1'" @click="useToUrl('/pages/my/applyBroker/myBroker')">
<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
<span class="my-use-list-text">我是经纪人</span> <span class="my-use-list-text">我是经纪人</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsYwy=='0'" @click="useToUrl('/pages/my/applySalesperson/index')"> <view class="my-use-list" v-if="blIsYwy=='0'" @click="useToUrl('/pages/my/applySalesperson/index')">
<image style="padding: 3rpx;" src="../../static/my-gong-14.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-14.png" mode=""></image>
<span class="my-use-list-text">申请业务员</span> <span class="my-use-list-text">申请业务员</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsYwy=='1'" @click="useToUrl('/pages/my/applySalesperson/mySalesperson')"> <view class="my-use-list" v-if="blIsYwy=='1'" @click="useToUrl('/pages/my/applySalesperson/mySalesperson')">
<image style="padding: 3rpx;" src="../../static/my-gong-13.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-13.png" mode=""></image>
<span class="my-use-list-text">我是业务员</span> <span class="my-use-list-text">我是业务员</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsFxy=='0'" @click="useToUrl('/pages/my/applyDistributor/index')"> <view class="my-use-list" v-if="blIsFxy=='0'" @click="useToUrl('/pages/my/applyDistributor/index')">
<image style="padding: 3rpx;" src="../../static/my-gong-15.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-15.png" mode=""></image>
<span class="my-use-list-text">申请分销员</span> <span class="my-use-list-text">申请分销员</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsFxy=='1'" @click="useToUrl('/pages/my/applyDistributor/myDistributor')"> <view class="my-use-list" v-if="blIsFxy=='1'" @click="useToUrl('/pages/my/applyDistributor/myDistributor')">
<image style="padding: 3rpx;" src="../../static/my-gong-16.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-16.png" mode=""></image>
<span class="my-use-list-text">我是分销员</span> <span class="my-use-list-text">我是分销员</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsQds=='0'" @click="useToUrl('/pages/my/channelMerchants/index')"> <view class="my-use-list" v-if="blIsQds=='0'" @click="useToUrl('/pages/my/channelMerchants/index')">
<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
<span class="my-use-list-text">申请渠道商</span> <span class="my-use-list-text">申请渠道商</span>
</view> --> </view>
<!-- <view class="my-use-list" v-if="blIsQds=='1'" @click="useToUrl('/pages/my/channelMerchants/myMerchants')"> <view class="my-use-list" v-if="blIsQds=='1'" @click="useToUrl('/pages/my/channelMerchants/myMerchants')">
<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
<span class="my-use-list-text">我是渠道商</span> <span class="my-use-list-text">我是渠道商</span>
</view> --> </view>
<!-- <view class="my-use-list" @click="useToUrl('/pages/my/joinUs/index')"> <!-- <view class="my-use-list" @click="useToUrl('/pages/my/joinUs/index')">
<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
<span class="my-use-list-text">招商加盟</span> <span class="my-use-list-text">招商加盟</span>
@ -203,10 +203,10 @@
<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
<span class="my-use-list-text">我是代理商</span> <span class="my-use-list-text">我是代理商</span>
</view> --> </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> <image style="padding: 3rpx;" src="../../static/my-gong-9.png" mode=""></image>
<span class="my-use-list-text">我的团队</span> <span class="my-use-list-text">我的团队</span>
</view> </view> -->
<view class="my-use-list" @click="useToUrl('/my/feedback/feedbackMenu')"> <view class="my-use-list" @click="useToUrl('/my/feedback/feedbackMenu')">
<image style="padding: 3rpx;" src="../../static/shezhi4.png" mode=""></image> <image style="padding: 3rpx;" src="../../static/shezhi4.png" mode=""></image>
<span class="my-use-list-text">我要投诉</span> <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)"> <view class=" padding-tb" @click="goNavOrder(2)">
<image src="../../static/images/my/order6.png" style="width: 60upx;height: 60upx;" mode=""> <image src="../../static/images/my/order6.png" style="width: 60upx;height: 60upx;" mode="">
</image> </image>
<view class="text-df" style="line-height: 50upx;">待确认</view> <view class="text-df" style="line-height: 50upx;">待接单</view>
</view> </view>
<view class=" padding-tb" @click="goNavOrder(2)"> <view class=" padding-tb" @click="goNavOrder(2)">
<image src="../../static/images/my/order2.png" style="width: 60upx;height: 60upx;" mode=""> <image src="../../static/images/my/order2.png" style="width: 60upx;height: 60upx;" mode="">
</image> </image>
<view class="text-df" style="line-height: 50upx;">待服务</view> <view class="text-df" style="line-height: 50upx;">已接单</view>
</view> </view>
<view class=" padding-tb" @click="goNavOrder(6)"> <view class=" padding-tb" @click="goNavOrder(6)">
<image src="../../static/images/my/order4.png" style="width: 60upx;height: 60upx;" mode=""> <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: '', backgroundImage: '',
tuiguang: '', tuiguang: '',
tuiguang1: '', tuiguang1: '',
tuiguangLink: '',
url: '' url: ''
}; };
}, },
onLoad() { onLoad() {
this.getBackImageList(); this.getBackImageList();
this.getUserInfo(); this.getUserInfo();
this.$Request.getT('/app/common/type/116').then(res => { // this.$Request.getT('/app/common/type/116').then(res => {
if (res.code === 0) { // if (res.code === 0) {
if (res.data && res.data.value) { // if (res.data && res.data.value) {
this.tuiguang = res.data.value; // this.tuiguang = res.data.value;
this.tuiguang1 = res.data.value; // this.tuiguang1 = res.data.value;
} // }
} // }
}); // });
//检测书否开启APP微信分享 //检测书否开启APP微信分享
this.$Request.getT('/app/common/type/136').then(res => { this.$Request.getT('/app/common/type/136').then(res => {
if (res.code === 0) { if (res.code === 0) {
@ -187,6 +188,9 @@
this.$Request.getT('/app/banner/selectBannerList?state=-1&classify=5').then(res => { this.$Request.getT('/app/banner/selectBannerList?state=-1&classify=5').then(res => {
if (res.code === 0) { if (res.code === 0) {
this.backgroundImage = res.data[0].imageUrl; 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(); this.make();
@ -260,14 +264,14 @@
let relationId = this.invitationCode; let relationId = this.invitationCode;
uni.showModal({ uni.showModal({
title: '文案推广', title: '文案推广',
content: this.tuiguang1 + '\n' + this.$queue.publicYuMingApp(), content: this.tuiguang1 + '\n' + this.tuiguangLink,
showCancel: true, showCancel: true,
cancelText: '关闭', cancelText: '关闭',
confirmText: '一键复制', confirmText: '一键复制',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
uni.setClipboardData({ uni.setClipboardData({
data: this.tuiguang1 + '\n' + this.$queue.publicYuMingApp(), data: this.tuiguang1 + '\n' + this.tuiguangLink,
success: function() { success: function() {
console.log('success'); console.log('success');
that.$queue.showToast('复制成功'); 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 <view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-a">待支付</span></view> class="status-button-a">待支付</span></view>
<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span <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 <view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-c">待评价</span></view> class="status-button-c">待评价</span></view>
<view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span <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 <view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-f">服务中</span></view> class="status-button-f">服务中</span></view>
<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span <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 <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 <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 <view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-h">待补单</span></view> class="status-button-h">待补单</span></view>
</view> </view>

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

@ -20,14 +20,14 @@
<view class="margin-left-xs ">{{item.artificerName}}</view> <view class="margin-left-xs ">{{item.artificerName}}</view>
</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 ==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 ==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 ==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 ==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 ==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 ==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 ==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 ==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="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> --> <!-- <view class="u-tips-color">{{item.createTime}}</view> -->
@ -85,7 +85,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -132,7 +132,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)"> @click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
@ -166,7 +166,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -183,7 +183,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -200,7 +200,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true" <u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns xianshi"> @click="toggleQ('center',item)" class="btns xianshi">
@ -216,7 +216,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="TuiPopup(type,2,item)"> @click="TuiPopup(type,2,item)">
取消订单 订单退款
</u-button> </u-button>
<u-button v-if="item.packageType=='104'||item.packageType=='105'||item.packageType=='106'" :custom-style="customStyle1" shape="circle" :plain="true" <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"> @click="taocanDaiBd('/my/order/payModifyTcMyDaiB?ordersId='+item.ordersId,item)" class="btns xianshi">
@ -324,7 +324,7 @@
Surl:'../../static/order_icon/order_icon2.png', Surl:'../../static/order_icon/order_icon2.png',
status: '1' status: '1'
}, { }, {
name: '待服务', name: '已接单',
Aurl:'../../static/order_icon/order_icon3-3.png', Aurl:'../../static/order_icon/order_icon3-3.png',
Surl:'../../static/order_icon/order_icon3.png', Surl:'../../static/order_icon/order_icon3.png',
status: '2' status: '2'
@ -334,12 +334,12 @@
Surl:'../../static/order_icon/order_icon4.png', Surl:'../../static/order_icon/order_icon4.png',
status: '10' status: '10'
},{ },{
name: '技师出发', name: '已出发',
Aurl:'../../static/order_icon/order_icon10-10.png', Aurl:'../../static/order_icon/order_icon10-10.png',
Surl:'../../static/order_icon/order_icon10.png', Surl:'../../static/order_icon/order_icon10.png',
status: '7' status: '7'
}, { }, {
name: '技师到达', name: '已到达',
Aurl:'../../static/order_icon/order_icon5-5.png', Aurl:'../../static/order_icon/order_icon5-5.png',
Surl:'../../static/order_icon/order_icon5.png', Surl:'../../static/order_icon/order_icon5.png',
status: '8' status: '8'
@ -675,18 +675,18 @@
this.page = 1 this.page = 1
this.getOrderList() this.getOrderList()
}, },
// 取消订单 // 订单退款
cancelOrder(e) { cancelOrder(e) {
let contentName = ''; let contentName = '';
let closeKC = this.$queue.getData('closeKC'); let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) { if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2); let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！'; contentName = '订单退款将扣除' + money + '元的手续费，并且车费将全部扣除！';
} }
let that = this let that = this
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否确认取消订单？' + contentName, content: '是否确认订单退款？' + contentName,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
let data = { let data = {
@ -915,7 +915,7 @@
/deep/.btnsH{ /deep/.btnsH{
background: #fff !important; background: #fff !important;
// border: 1px solid #d7d7d7 !important; // border: 1px solid #d7d7d7 !important;
color: #d7d7d7 !important; color: #019C88 !important;
width: 145rpx !important; width: 145rpx !important;
height: 47rpx !important; height: 47rpx !important;
line-height: 47px !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 class="margin-left-xs ">{{item.artificerName}}</view>
</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 ==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 ==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 ==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 ==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 ==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 ==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 ==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 ==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 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 class="u-tips-color">{{item.createTime}}</view> -->
</view> </view>
@ -91,14 +92,13 @@
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns"> @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns">
去支付 去支付
</u-button> </u-button>
</view> </view>
<view class="showBtn" v-if="item.status ==2"> <view class="showBtn" v-if="item.status ==2">
<u-button v-if="item.cancelBtnShow == 'true'" <u-button v-if="item.cancelBtnShow == 'true'"
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -176,7 +176,7 @@
</view> </view>
<view v-if="item.cancelBtnShow == 'true'" <view v-if="item.cancelBtnShow == 'true'"
@click="cancelOrder(item)" class="gengduoBtn"> @click="cancelOrder(item)" class="gengduoBtn">
取消订单 订单退款
</view> </view>
<view @click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" class="gengduoBtn"> <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" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -223,7 +223,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@ -240,7 +240,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </u-button>
<u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true" <u-button v-if="item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns xianshi"> @click="toggleQ('center',item)" class="btns xianshi">
@ -256,7 +256,7 @@
:custom-style="customStyle" shape="circle" :plain="true" :custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi" class="btns xianshi"
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 订单退款
</u-button> </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" <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"> @click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns xianshi">
@ -271,7 +271,6 @@
联系客服 联系客服
</u-button> </u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -365,7 +364,7 @@
Surl:'../../static/order_icon/order_icon2.png', Surl:'../../static/order_icon/order_icon2.png',
status: '1' status: '1'
}, { }, {
name: '待服务', name: '已接单',
Aurl:'../../static/order_icon/order_icon3-3.png', Aurl:'../../static/order_icon/order_icon3-3.png',
Surl:'../../static/order_icon/order_icon3.png', Surl:'../../static/order_icon/order_icon3.png',
status: '2' status: '2'
@ -375,12 +374,12 @@
Surl:'../../static/order_icon/order_icon4.png', Surl:'../../static/order_icon/order_icon4.png',
status: '10' status: '10'
},{ },{
name: '技师出发', name: '已出发',
Aurl:'../../static/order_icon/order_icon10-10.png', Aurl:'../../static/order_icon/order_icon10-10.png',
Surl:'../../static/order_icon/order_icon10.png', Surl:'../../static/order_icon/order_icon10.png',
status: '7' status: '7'
}, { }, {
name: '技师到达', name: '已到达',
Aurl:'../../static/order_icon/order_icon5-5.png', Aurl:'../../static/order_icon/order_icon5-5.png',
Surl:'../../static/order_icon/order_icon5.png', Surl:'../../static/order_icon/order_icon5.png',
status: '8' status: '8'
@ -758,7 +757,7 @@
this.page = 1 this.page = 1
this.getOrderList() this.getOrderList()
}, },
cancelOrders(data){//取消订单 cancelOrders(data){//订单退款
let that = this let that = this
that.$Request.post('/app/artificer/deleteOrders', data).then(res => { that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading(); uni.hideLoading();
@ -773,20 +772,20 @@
} }
}) })
}, },
// 取消订单待确认 // 订单退款待接单
cancelOrder(e) { cancelOrder(e) {
let that = this let that = this
let data = { let data = {
ordersId: e.ordersId ordersId: e.ordersId
} }
//取消订单扣费 //订单退款扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => { that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading(); uni.hideLoading();
if (resa.code == 0) { if (resa.code == 0) {
that.page = 1; that.page = 1;
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否确认取消订单？' + resa.data, content: '是否确认订单退款？' + resa.data,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.cancelOrders(data) that.cancelOrders(data)
@ -1039,7 +1038,7 @@
/deep/.btnsH{ /deep/.btnsH{
background: #fff !important; background: #fff !important;
// border: 1px solid #d7d7d7 !important; // border: 1px solid #d7d7d7 !important;
color: #d7d7d7 !important; color: #019C88 !important;
width: 164rpx !important; width: 164rpx !important;
height: 47rpx !important; height: 47rpx !important;
line-height: 47px !important; line-height: 47px !important;
@ -1180,7 +1179,7 @@
} }
.status-button-g{ .status-button-g{
font-weight: bold; font-weight: bold;
color: #e04f3c; color: #43b943;
} }
.status-button-h{ .status-button-h{
font-weight: bold; font-weight: bold;
@ -1190,9 +1189,9 @@
font-weight: bold; font-weight: bold;
color: #002ea4; color: #002ea4;
} }
.status-button-g{ .status-button-j{
font-weight: bold; font-weight: bold;
color: #43b943; color: #e04f3c;
} }
.status-num{ .status-num{
margin-right: 15rpx; margin-right: 15rpx;

24
pages/order/index1.vue
View File

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

8
pages/therapist/therapist.vue
View File

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

27
pages/videoCircle/index.vue
View File

@ -52,6 +52,15 @@
<view class="userInfo"> <view class="userInfo">
<!-- 1.头像 --> <!-- 1.头像 -->
<image @click="tozuozhe(list)" class="userAvatar" :src="list.artificerImg" mode="aspectFill"></image> <image @click="tozuozhe(list)" class="userAvatar" :src="list.artificerImg" mode="aspectFill"></image>
<!-- 2.上线或者下单 -->
<view v-if="list.onLine == 1" class="comment list-view" @click="tozuozhe(list)" style="opacity: 0.9; margin-top: 17px;">
<image src="@/static/img/index/lijiyuyue.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">预约</text>
</view>
<view v-if="list.onLine == 2" class="comment list-view" @click="shangxian(list)" style="opacity: 0.9; margin-top: 17px;">
<image src="@/static/img/index/qingtashangxian.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">上线</text>
</view>
<!-- 2.点赞 --> <!-- 2.点赞 -->
<view class="list-view" @click="cLike(list.sfdz);" style="opacity: 0.9; margin-top: 17px;"> <view class="list-view" @click="cLike(list.sfdz);" style="opacity: 0.9; margin-top: 17px;">
<image v-if="list.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image> <image v-if="list.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
@ -324,6 +333,24 @@
this.$refs.pinglun.open('bottom'); this.$refs.pinglun.open('bottom');
this.getPingL(this.videoID); this.getPingL(this.videoID);
}, },
shangxian(item){//请TA上线
var data={
userId: item.createBy,
byUserId: uni.getStorageSync('userId'),
}
this.$Request.post("/app/message/insertUpMessage", data).then(res => {
if (res.code == 0) {
uni.showToast({
title: '提醒成功！'
})
}else{
uni.showToast({
icon:'error',
title: '提醒失败！'
})
}
});
},
getPingL(shipinquanId){//获取评论列表 getPingL(shipinquanId){//获取评论列表
var data={ var data={
page: this.page, page: this.page,