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

打包

This commit is contained in:
Mr.jiang 2024-06-25 09:47:53 +08:00
parent 0d5dc4dded
commit 05c4e9d23f
10 changed files with 2242 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
my/order/pay.vue
View File

@ -49,10 +49,10 @@
</view> </view>
</view> </view>
<view class="jz_btn" <!-- <view class="jz_btn"
v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6" v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"> @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
加钟/补价</view> 加钟/补价</view> -->
</view> </view>
</view> </view>
</view> </view>
@ -256,7 +256,7 @@
class="dingshi"> class="dingshi">
去投诉 去投诉
</u-button> </u-button>
<u-button v-if="order.status == 9&&order.refusalContent!=''&&order.refusalContent!=null" :custom-style="customStyle2" <u-button v-if="order.status == 9&&order.refusalContent!=null" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="toggleQ('center',order)" @click="toggleQ('center',order)"
class="dingshi"> class="dingshi">
@ -268,7 +268,7 @@
class="dingshi"> class="dingshi">
立即预约 立即预约
</u-button> </u-button>
<u-button v-if="order.status != 4&&order.status != 1&&order.status != 10&&order.status != 3&&order.status == 9&&order.status != 5" :custom-style="customStyle2" <u-button v-if="order.btnShow == 'true'&&order.status==2||order.status==6||order.status==7||order.status==8||order.status == 9&&order.refusalContent==null" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
class="dingshi"> class="dingshi">
@ -303,22 +303,25 @@
</view> </view>
<view class="showBtn-view" v-show="btnShow"> <view class="showBtn-view" v-show="btnShow">
<u-button <u-button
v-if="order.status == 6"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns"> class="btns">
充值 充值
</u-button> </u-button>
<u-button <u-button
v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns"> class="btns">
加钟 加钟
</u-button> </u-button>
<u-button <u-button
v-if="order.status == 6"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" @tap="saveJZS(order.artificerId)"
class="btns"> class="btns">
改价 升级项目
</u-button> </u-button>
</view> </view>
</view> </view>
@ -326,8 +329,9 @@
</view> </view>
</view> </view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable"> <u-popup v-model="showorder" mode="bottom" :closeable="closeable">
<scroll-view scroll-y="true" style="width: 750rpx;height: 500rpx;"> <scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
<view class="list_item" v-for="(item,index) in orderList" :key="index"> <view class="list_item" v-for="(item,index) in orderList" :key="index">
<image :src="item.massageImg"></image> <image :src="item.massageImg"></image>
<view class="listitem_rightview"> <view class="listitem_rightview">
@ -349,6 +353,41 @@
</view> </view>
</scroll-view> </scroll-view>
</u-popup> </u-popup>
<!-- 升级 -->
<u-popup v-model="showorderS" mode="bottom" :closeable="closeable">
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
<view class="xiangmu-cont">
<view class="xiangmu-cont-top">
<view class="xiangmu-cont-top-title">
{{item.title}}
</view>
<view class="xiangmu-cont-top-time">
<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
</view>
</view>
<view class="xiangmu-about">
{{item.jianjie}}
</view>
<view class="xiangmu-foot">
<view class="xiangmu-foot-left">
<view class="xiangmu-foot-left-shiji">
<span>￥</span>
<span>{{item.price}}</span>
<span>/元套</span>
</view>
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
</view>
<view class="xiadan" @click="goOrder(item)">
确认升级
</view>
</view>
</view>
</view>
</scroll-view>
</u-popup>
<!-- 支付方式 --> <!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable"> <u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay"> <view class="popup_pay">
@ -433,10 +472,11 @@
export default { export default {
data() { data() {
return { return {
tordersId: '', ordersId: '',
tpayMoney: '', tpayMoney: '',
paySel: 0, paySel: 0,
showorder: false, showorder: false,
showorderS: false,
orderList: [], orderList: [],
loading: true, loading: true,
customStyle: { customStyle: {
@ -484,7 +524,8 @@
tiqianData:'', tiqianData:'',
type:'center', type:'center',
earlyFinishReason:'', earlyFinishReason:'',
qurenJd:[] qurenJd:[],
artificerlist:[]
} }
}, },
onLoad(e) { onLoad(e) {
@ -542,6 +583,78 @@
// #endif // #endif
}, },
methods: { methods: {
saveJZS(artificerId) {//升级查询技师项目
let data = {
artificerId: artificerId,
status: 0
}
let that = this;
this.$queue.showLoading('查询中...')
that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
if (res.code == 0) {
if (res.data && res.data.length > 0) {
that.artificerlist = res.data
// for (let i = 0; i < that.artificerlist.length; i++) {
// if (that.artificerlist[i].labels) {
// that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
// }
// }
uni.hideLoading();
that.showorderS = true;
} else {
uni.hideLoading();
that.$queue.showToast('暂无可升级项目');
}
} else {
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
saveJZ(classifyId) {
let data = {
parentId: classifyId,
page: 1,
limit: 50,
status: 1
}
let that = this;
this.$queue.showLoading('查询中...')
that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
if (res.code == 0) {
if (res.data.list && res.data.list.length > 0) {
that.orderList = res.data.list
for (let i = 0; i < that.orderList.length; i++) {
if (that.orderList[i].labels) {
that.orderList[i].labels = that.orderList[i].labels.split(",");
}
}
uni.hideLoading();
that.showorder = true;
} else {
uni.hideLoading();
that.$queue.showToast('暂无可加钟项目');
}
} else {
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
getTimeStampWithoutSeconds(date) {
// 将日期转换为标准的UTC时间
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
// 返回不含秒的时间戳
return utcDate.getTime();
},
getOrder() { getOrder() {
let data = { let data = {
ordersId: this.ordersId ordersId: this.ordersId
@ -550,7 +663,18 @@
if (res.code == 0) { if (res.code == 0) {
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
this.order = res.data this.order = res.data;
var date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time=parseInt(new Date(this.order.serveTime).getTime())
if(time-timestamp>twoTime){
this.$set(this.order, 'btnShow', 'true')
}else{
this.$set(this.order, 'btnShow', 'false')
}
console.log("sadasdsa0",this.order)
let aliphone = this.$queue.getData('aliphone'); let aliphone = this.$queue.getData('aliphone');
if (aliphone === '是' && this.order.artificer) { if (aliphone === '是' && this.order.artificer) {
this.ysPhone(this.order.phone, this.order.artificer.phone); this.ysPhone(this.order.phone, this.order.artificer.phone);
@ -738,31 +862,29 @@
}); });
}, },
goOrder(item) { goOrder(item) {
console.log("item=====>",item)
console.log("order=====>",this.order)
let that = this let that = this
let payMoney = that.isVip ? item.memberPrice : item.price;
let data = { let data = {
parentId: that.order.ordersId, classifyId:item.classifyId,
artificerId: that.order.artificerId, ordersId:that.order.ordersId,
ordersMassageList: [{ ordersMassageList:[
massageId: item.massageTypeId, {massageId: item.massageTypeId,num: 1},
num: 1, ],
}], massageTypeId:item.massageTypeId,
price: payMoney, userPackageDetailId:item.userPackageDetailId,
couponId: '',
payMoney: payMoney,
userId: uni.getStorageSync('userId'),
} }
that.$Request.postJson("/app/artificer/insertOrders", data).then(res => { that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
that.showorder = false that.showorder = false
if (res.code == 0) { if (res.code == 0) {
that.tordersId = res.data.ordersId; that.ordersId = res.data.ordersId;
that.tpayMoney = payMoney; that.tpayMoney = res.data.payMoney;
that.showpay = true; that.showpay = true;
that.paySel = 1; that.paySel = 1;
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
payJZ() { payJZ() {
@ -776,7 +898,7 @@
that.$queue.showLoading('支付中...') that.$queue.showLoading('支付中...')
// console.log('用户点击确定'); // console.log('用户点击确定');
that.$Request.post("/app/artificer/payOrders", { that.$Request.post("/app/artificer/payOrders", {
ordersId: that.tordersId, ordersId: that.ordersId,
}).then(ret => { }).then(ret => {
uni.hideLoading(); uni.hideLoading();
if (ret.code == 0) { if (ret.code == 0) {
@ -801,7 +923,7 @@
} else if (that.openWay == 2) { //微信支付 } else if (that.openWay == 2) { //微信支付
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
let data = { let data = {
ordersId: that.tordersId, ordersId: that.ordersId,
type: 3 type: 3
} }
that.$Request.post('/app/wxPay/payOrder', data).then(ret => { that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
@ -845,7 +967,7 @@
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.tordersId, ordersId: that.ordersId,
type: 2 type: 2
} }
that.$Request.post('/app/wxPay/payOrder', data).then(rea => { that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
@ -861,7 +983,7 @@
}); });
} else { } else {
let data = { let data = {
ordersId: that.tordersId, ordersId: that.ordersId,
type: 4 type: 4
} }
that.$Request.post('/app/wxPay/payOrder', data).then(rea => { that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
@ -899,7 +1021,7 @@
} else if (that.openWay == 3) { //支付宝支付 } else if (that.openWay == 3) { //支付宝支付
// #ifdef H5 // #ifdef H5
let data = { let data = {
ordersId: that.tordersId, ordersId: that.ordersId,
type: 2 type: 2
} }
that.$Request.post('/app/aliPay/payOrder', data).then( that.$Request.post('/app/aliPay/payOrder', data).then(
@ -914,7 +1036,7 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.tordersId, ordersId: that.ordersId,
type: 1 type: 1
} }
that.$Request.post('/app/aliPay/payOrder', data).then( that.$Request.post('/app/aliPay/payOrder', data).then(
@ -926,37 +1048,7 @@
} }
}, },
saveJZ(classifyId) {
let data = {
parentId: classifyId,
page: 1,
limit: 50,
status: 1
}
let that = this;
this.$queue.showLoading('查询中...')
that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
if (res.code == 0) {
if (res.data.list && res.data.list.length > 0) {
that.orderList = res.data.list
for (let i = 0; i < that.orderList.length; i++) {
if (that.orderList[i].labels) {
that.orderList[i].labels = that.orderList[i].labels.split(",");
}
}
uni.hideLoading();
that.showorder = true;
} else {
uni.hideLoading();
that.$queue.showToast('暂无可加钟项目');
}
} else {
uni.hideLoading();
that.$queue.showToast(res.msg);
}
})
},
//支付选择 //支付选择
selectWay: function(item) { selectWay: function(item) {
this.openWay = item.id; this.openWay = item.id;
@ -1397,6 +1489,114 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.u-drawer{
z-index:11 !important;
}
.xiangmu-cont-top-left{
font-weight: normal;
font-size: 21rpx;
color: #049E89;
margin-top: 1px;
}
.xiangmu-cont-top-time{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.xiadan{
width: 122rpx;
height: 48rpx;
line-height: 48rpx;
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
border-radius: 24rpx;
text-align: center;
font-weight: bold;
font-size: 24rpx;
color: #FFFFFF;
}
.xiangmu-foot-left{
display: flex;
flex-direction: row;
align-items: flex-end;
}
.xiangmu-foot-left-shiji span{
color: #F95900;
}
.xiangmu-foot-left-shiji span:nth-child(1){
font-size: 25rpx;
}
.xiangmu-foot-left-shiji span:nth-child(2){
font-weight: bold;
font-size:36.81rpx;
}
.xiangmu-foot-left-shiji span:nth-child(3){
font-size: 25rpx;
}
.xiangmu-foot-left-dazhe{
font-weight: bold;
font-size: 31rpx;
color: #848484;
text-decoration-line: line-through;
margin-left:5px;
}
.xiangmu-foot{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.xiangmu-about{
width: 100%;
text-align: left;
font-weight: 400;
font-size: 22rpx;
color: #848484;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis;
margin: 5px 0px;
}
.xiangmu-cont-top-title{
font-weight: bold;
font-size: 33rpx;
color: #333333;
}
.xiangmu-cont-top{
width: 100%;
display: flex;
flex-direction: column;
}
.xiangmu-cont{
width: 55%;
display: flex;
flex-direction: column;
align-items: center;
}
.xiangmu-img{
width: 285rpx;
height: 218rpx;
background: #9F9F9F;
border-radius: 14rpx;
}
.xiangmu{
width: 95%;
height: 263rpx;
background: #FFFFFF;
border-radius: 21rpx;
margin: 0px auto 10px auto;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 10px;
}
.popup-mian-btn span:nth-child(1){ .popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970); background: linear-gradient(90deg, #FE912E, #FF9970);
} }
@ -1745,7 +1945,7 @@
.item_btn { .item_btn {
width: 140upx; width: 140upx;
height: 56upx; height: 56upx;
background: linear-gradient(to right, #223845, #00a85b); background-color: #019C88;
border-radius: 16upx; border-radius: 16upx;
text-align: center; text-align: center;
line-height: 56upx; line-height: 56upx;

4
my/order/payModify.vue
View File

@ -392,8 +392,8 @@
key: 'taocanDd', key: 'taocanDd',
data: '支付', data: '支付',
success: function () { success: function () {
uni.switchTab({ uni.navigateTo({
url: '/pages/therapist/therapist' url: '/pages/therapist/therapistDingdan'
}) })
} }
}); });

27
my/order/payModifyDzhifu.vue
View File

@ -42,7 +42,7 @@
服务时间 服务时间
</view> </view>
<view class="fuwu-time-view" @change="changeLog"> <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker> <uni-datetime-picker :start-date="startDate" :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<!-- <span>{{order.serveTime}}</span> --> <!-- <span>{{order.serveTime}}</span> -->
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image> <image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> </view>
@ -249,7 +249,9 @@
ordersId:'', ordersId:'',
userPackageDetailId:'', userPackageDetailId:'',
dingdanData:'', dingdanData:'',
huixian:[] huixian:[],
// 设置今天之后的日期为可选的开始日期
startDate: this.getTomorrowDate()
} }
}, },
onLoad(e) { onLoad(e) {
@ -312,6 +314,23 @@
// #endif // #endif
}, },
methods: { methods: {
// 获取明天的日期字符串
getTomorrowDate() {
const now = new Date();
const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
return this.formatDate(tomorrow);
},
// 将日期对象格式化为YYYY-MM-DD字符串
formatDate(date) {
const year = date.getFullYear();
const month = this.padStart(date.getMonth() + 1);
const day = this.padStart(date.getDate());
return `${year}-${month}-${day}`;
},
// 补齐日期字符串，确保月份和日期为两位数
padStart(num) {
return num < 10 ? '0' + num : num;
},
openpay() {//验证 openpay() {//验证
if(this.single=='2024-06-19'){ if(this.single=='2024-06-19'){
uni.showToast({ uni.showToast({
@ -383,8 +402,8 @@
key: 'taocanDd', key: 'taocanDd',
data: '待支付', data: '待支付',
success: function () { success: function () {
uni.switchTab({ uni.navigateTo({
url: '/pages/therapist/therapist' url: '/pages/therapist/therapistDingdan'
}) })
} }
}); });

149
my/wallet/index.vue
View File

@ -25,7 +25,7 @@
<view class="padding-lr padding-bottom"> <view class="padding-lr padding-bottom">
<view class="chongzhi"> <view class="chongzhi">
<span class="yu-e">余额充值</span> <span class="yu-e">余额充值</span>
<span @click="toggle('center')">为TA充值</span> <span v-if="artificerId.artificerId=='my'" @click="goNavtherapist('/pages/therapist/therapistDingdan')">为TA充值</span>
</view> </view>
<view class="flex justify-between flex-wrap" v-if="wallet.length > 0"> <view class="flex justify-between flex-wrap" v-if="wallet.length > 0">
<view v-for="(item,index) in wallet" :key='index' class="padding-sm radius" <view v-for="(item,index) in wallet" :key='index' class="padding-sm radius"
@ -52,6 +52,7 @@
<view style="font-size: 30upx;margin-left: 20upx;">{{item.text}} <view style="font-size: 30upx;margin-left: 20upx;">{{item.text}}
</view> </view>
</view> </view>
<radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'> <radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'>
<label class="tui-radio"> <label class="tui-radio">
<radio color="#096f4b" :checked="openWay === item.id ? true : false" /> <radio color="#096f4b" :checked="openWay === item.id ? true : false" />
@ -89,11 +90,10 @@
<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view> <view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗师</view> <view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗师</view>
</view> --> </view> -->
<view <view style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;"> <view class="btn" @click="pay" style="background: linear-gradient(to right, #00a85b, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;">
<view class="btn" @click="pay" 确定充值
style="background: linear-gradient(to right, #00a85b, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;"> </view>
确定充值</view>
</view> </view>
</view> </view>
<view v-if="title_color==2 && isAgency == 1"> <view v-if="title_color==2 && isAgency == 1">
@ -215,7 +215,7 @@
<uni-popup ref="popup" background-color="#fff" @change="change"> <uni-popup ref="popup" background-color="#fff" @change="change">
<view class="popup-content"> <view class="popup-content">
<view class="popup-head"> <view class="popup-head">
<span>改价单</span> <span>为TA充值</span>
<span @click="closePopup(type)">x</span> <span @click="closePopup(type)">x</span>
</view> </view>
<view class="popup-mian"> <view class="popup-mian">
@ -234,72 +234,32 @@
</view> </view>
</view> --> </view> -->
<view class="chong"> <view class="chong">
<view class="chong-list"> <checkbox-group @change="checkboxChange">
<view class="chong-list-left"> <view class="chong-list">
<radio value="" class="chong-list-radio"/> <view class="chong-list-left">
<image src="../../static/jinggao.png" mode=""></image> <label class="tui-radio">
</view> <checkbox :checked="checkbox" activeBackgroundColor="#096f4b" color="#096f4b" :value="1"/>
<view class="chong-list-right"> </label>
<view class="chong-title"> <image src="../../static/jinggao.png" mode=""></image>
<span>王丽楠</span>
<image src="../../static/xinren.png" mode=""></image>
</view> </view>
<view class="chong-bottom"> <view class="chong-list-right">
<view class="chong-bottom-ding"> <view class="chong-title">
<image src="../../static/orderDetail/dingwei.png" mode=""></image> <span>王丽楠</span>
<span>0.8km</span> <image src="../../static/xinren.png" mode=""></image>
</view> </view>
<view class="chong-bottom-cheng"> <view class="chong-bottom">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"> <view class="chong-bottom-ding">
<span>春城有约</span> <image src="../../static/orderDetail/dingwei.png" mode=""></image>
<span>0.8km</span>
</view>
<view class="chong-bottom-cheng">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
<span>春城有约</span>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </checkbox-group>
<view class="chong-list">
<view class="chong-list-left">
<radio value="" class="chong-list-radio"/>
<image src="../../static/jinggao.png" mode=""></image>
</view>
<view class="chong-list-right">
<view class="chong-title">
<span>王丽楠</span>
<image src="../../static/xinren.png" mode=""></image>
</view>
<view class="chong-bottom">
<view class="chong-bottom-ding">
<image src="../../static/orderDetail/dingwei.png" mode=""></image>
<span>0.8km</span>
</view>
<view class="chong-bottom-cheng">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
<span>春城有约</span>
</view>
</view>
</view>
</view>
<view class="chong-list">
<view class="chong-list-left">
<radio value="" class="chong-list-radio"/>
<image src="../../static/jinggao.png" mode=""></image>
</view>
<view class="chong-list-right">
<view class="chong-title">
<span>王丽楠</span>
<image src="../../static/xinren.png" mode=""></image>
</view>
<view class="chong-bottom">
<view class="chong-bottom-ding">
<image src="../../static/orderDetail/dingwei.png" mode=""></image>
<span>0.8km</span>
</view>
<view class="chong-bottom-cheng">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
<span>春城有约</span>
</view>
</view>
</view>
</view>
</view> </view>
<view class="popup-mian-btn"> <view class="popup-mian-btn">
<span @click="closePopup(type)"> <span @click="closePopup(type)">
@ -321,6 +281,7 @@
export default { export default {
data() { data() {
return { return {
checkbox:false,
type:'center', type:'center',
jsczSel: '否', jsczSel: '否',
tgCheck: '否', tgCheck: '否',
@ -374,10 +335,16 @@
renzheng: 0, renzheng: 0,
sp: 0, sp: 0,
txMsg: '', txMsg: '',
nameTxt:'' nameTxt:'',
couponId:'',
artificerId:''
} }
}, },
onLoad(d) { onLoad(d) {
this.artificerId=d;
if(this.artificerId.artificerId==undefined){
this.artificerId=this.$queue.getData('getJishi')
}
if (d.tabIndex) { if (d.tabIndex) {
this.tabIndex = d.tabIndex; this.tabIndex = d.tabIndex;
this.title_color = 2; this.title_color = 2;
@ -427,6 +394,10 @@
}, },
methods: { methods: {
checkboxChange(e){//选择优惠卷
this.couponId=e.detail.value.join(",");
},
getMoneyList() { getMoneyList() {
this.$Request.get("/app/payClassify/selectPayClassifyList").then(res => { this.$Request.get("/app/payClassify/selectPayClassifyList").then(res => {
if (res.code == 0) { if (res.code == 0) {
@ -572,7 +543,19 @@
cut(e) { cut(e) {
this.title_color = e this.title_color = e
}, },
goNavtherapist(url){
uni.setStorage({
key: 'taocanDd',
data: '充值',
success: function () {
uni.navigateTo({
url: url
})
}
});
},
goNav(url) { goNav(url) {
uni.navigateTo({ uni.navigateTo({
url url
}) })
@ -698,18 +681,23 @@
let data = { let data = {
payClassifyId: this.thisSelect.payClassifyId, payClassifyId: this.thisSelect.payClassifyId,
type: 2, type: 2,
userId: uni.getStorageSync('userId') userId: uni.getStorageSync('userId'),
artificerId:this.artificerId.artificerId
} }
this.$Request.post('/app/aliPay/payOrderMoney', data).then( this.$Request.post('/app/aliPay/payOrderMoney', data).then(
res => { res => {
if (res.code === 0) { if (res.code == 0) {
uni.showToast({
title: '支付成功!'
});
const div = document.createElement('div') const div = document.createElement('div')
div.innerHTML = res.data //此处form就是后台返回接收到的数据 div.innerHTML = res.data //此处form就是后台返回接收到的数据
document.body.appendChild(div) document.body.appendChild(div)
document.forms[0].submit() document.forms[0].submit()
setTimeout(d => {
uni.navigateBack(1) // setTimeout(d => {
}, 1000); // uni.navigateBack(1)
// }, 1000);
} else { } else {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -897,6 +885,15 @@
</script> </script>
<style scoped> <style scoped>
/deep/uni-checkbox .uni-checkbox-input{
width: 26px;
height: 26px;
border-radius: 50%;
}
.checkbox-data{
padding: 0px 11px;
margin: 15px 0px;
}
.chong-list:last-child{ .chong-list:last-child{
border: 0px !important; border: 0px !important;
} }
@ -958,11 +955,11 @@
height: 76rpx; height: 76rpx;
} }
/deep/uni-radio .uni-radio-input{ /deep/uni-radio .uni-radio-input{
width: 29.86rpx; /* width: 29.86rpx;
height: 29.86rpx; height: 29.86rpx;
margin: -3px 0px 0px -20px; margin: -3px 0px 0px -20px;
background-color: rgba(4, 159, 137, 1) !important; background-color: rgba(4, 159, 137, 1) !important;
border-color: rgba(4, 159, 137, 1) !important; border-color: rgba(4, 159, 137, 1) !important; */
} }
.chong-list-radio{ .chong-list-radio{
margin-right: 5px; margin-right: 5px;

6
my/wallet/index1.vue
View File

@ -279,7 +279,7 @@
ylTxSel: '否', ylTxSel: '否',
tabIndex: 0, tabIndex: 0,
bankCard: '', bankCard: '',
openWay: 2, openWay: 1,
wallet: [], wallet: [],
moneyNum: null, moneyNum: null,
thisSelect: {}, thisSelect: {},
@ -324,9 +324,9 @@
this.openLists = [{ this.openLists = [{
image: '../../static/share/icon_weixin.png', image: '../../static/share/icon_weixin.png',
text: '微信', text: '微信',
id: 2 id: 1
}]; }];
this.openWay = 2; this.openWay = 1;
// #endif // #endif
}, },

9
pages.json
View File

@ -173,6 +173,15 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "pages/therapist/therapistDingdan",
"style": {
"navigationBarTitleText": "技师列表",
"navigationBarBackgroundColor": "#096f4b",
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
}
},
{ {
"path": "pages/my/historyMy", "path": "pages/my/historyMy",
"style": { "style": {

2
pages/my/index.vue
View File

@ -437,7 +437,7 @@
chonghi(link){//我的钱包 chonghi(link){//我的钱包
if(link=='充值'){ if(link=='充值'){
uni.navigateTo({ uni.navigateTo({
url:'/my/wallet/index' url:'/my/wallet/index?artificerId='+'my'
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({

99
pages/order/index.vue
View File

@ -59,8 +59,8 @@
<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" style="flex-direction: column;width: 100%;"> <view class="flex text-right" style="flex-direction: column;width: 100%;">
<view class="showBtn" :style="{'justify-content':item.status != 6?'flex-end':'space-between'}"> <view class="showBtn" :style="{'justify-content':item.status != 6||item.status==1?'flex-end':'space-between'}">
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6">更多</view> <view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">更多</view>
<view class="showBtn-view"> <view class="showBtn-view">
<u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true" <u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
@ -70,7 +70,7 @@
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)"> @click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
待评价 待评价
</u-button> </u-button>
<u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true" <u-button v-if="item.status == 9&&item.refusalContent==null" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns"> @click="toggleQ('center',item)" class="btns">
拒单确认 拒单确认
</u-button> </u-button>
@ -78,43 +78,45 @@
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
去支付 去支付
</u-button> </u-button>
<u-button
v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'" <u-button v-if="item.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&item.refusalContent==null" :custom-style="customStyle1" shape="circle" :plain="true"
:custom-style="customStyle" shape="circle" :plain="true" @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
class="btns"
@click="cancelOrder(item)">
取消订单
</u-button>
<u-button v-if="item.status != 4&&item.status != 1&&item.status != 10&&item.status != 3&&item.status != 9&&item.status != 5" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModify?ordersId='+item.ordersId,item)" class="btns">
修改订单 修改订单
</u-button> </u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle" class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
@click="cancel(item)"> 去投诉
充值
</u-button> </u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="cancel(item)"> @click="goNav('/my/order/pay?ordersId='+item.ordersId)">
加钟 升级项目
</u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="toggle('center',item)">
提前结束
</u-button> </u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true" <u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH"> @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH">
联系客服 联系客服
</u-button> </u-button>
<u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle" class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
去投诉
</u-button>
</view> </view>
</view> </view>
<view class="hideBtn" v-show="btnShow==index" style="justify-content: end;"> <view class="hideBtn" v-show="btnShow==index" style="justify-content: end;">
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button
@click="cancel(item)"> v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
改价 :custom-style="customStyle" shape="circle" :plain="true"
class="btns"
@click="cancelOrder(item)">
取消订单
</u-button> </u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="toggle('center',item)"> @click="goNav('/my/wallet/index?ordersId='+item.ordersId+'&artificerId='+item.artificerId)">
提前结束 充值
</u-button> </u-button>
<u-button v-if="item.addNum < item.ordersMassageList[0].massageType.addNum && item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
加钟
</u-button>
</view> </view>
</view> </view>
</view> </view>
@ -280,7 +282,8 @@
// height: '54rpx', // height: '54rpx',
// margin: "0 0 0 20rpx" // margin: "0 0 0 20rpx"
// } // }
earlyFinishReason:'' earlyFinishReason:'',
} }
}, },
onLoad() { onLoad() {
@ -448,6 +451,18 @@
} }
return status; return status;
}, },
getTimeStampWithoutSeconds(date) {
// 将日期转换为标准的UTC时间
var utcDate = new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
0);
// 返回不含秒的时间戳
return utcDate.getTime();
},
//获取列表数据 //获取列表数据
getOrderList() { getOrderList() {
let curTab = this.tabs[this.tabIndex].status let curTab = this.tabs[this.tabIndex].status
@ -460,28 +475,20 @@
this.$Request.get('/app/artificer/selectOrdersList', data).then(res => { this.$Request.get('/app/artificer/selectOrdersList', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
uni.hideLoading(); uni.hideLoading();
console.log(res)
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表 if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
this.goods = [...this.goods, ...res.data.list]; //追加新数据 this.goods = [...this.goods, ...res.data.list]; //追加新数据
// this.goods.forEach(ret => { var date = new Date(); // 当前日期和时间
// switch (ret.status) { var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
// case '1': const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
// ret.statusName = '待付款' var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
// break; for(var i=0;i<this.goods.length;i++){
// case '2': var time=parseInt(new Date(this.goods[i].serveTime).getTime())
// ret.statusName = '进行中' if(time-timestamp>twoTime){
// break; this.$set(this.goods[i], 'btnShow', 'true')
// case '3': }else{
// ret.statusName = '已评价' this.$set(this.goods[i], 'btnShow', 'false')
// break; }
// case '4': }
// ret.statusName = '已取消'
// break;
// case '5':
// ret.statusName = '已完成'
// break;
// }
// })
} }
}).catch(() => { }).catch(() => {

25
pages/therapist/therapist.vue
View File

@ -351,7 +351,6 @@ import permision from "@/components/permission.js";
that.massageTypeId = e.massageTypeId that.massageTypeId = e.massageTypeId
// that.getLocation();//低精度，快就完事了 // that.getLocation();//低精度，快就完事了
// that.getLocation(true);//高精度，慢慢查询 // that.getLocation(true);//高精度，慢慢查询
that.getTypeList(); that.getTypeList();
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
@ -410,12 +409,7 @@ import permision from "@/components/permission.js";
that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市' that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
that.getTpCount(); that.getTpCount();
that.getTpMy(); that.getTpMy();
uni.getStorage({
key: 'taocanDd',
success: (res) => {
that.dataIndex = res.data;
}
});
that.token = uni.getStorageSync('token') that.token = uni.getStorageSync('token')
// if (uni.getStorageSync('token')) { // if (uni.getStorageSync('token')) {
if (that.latitude && that.longitude) { if (that.latitude && that.longitude) {
@ -463,7 +457,6 @@ import permision from "@/components/permission.js";
methods: { methods: {
// 跳转订单 // 跳转订单
goOrder(e) { goOrder(e) {
if(this.dataIndex!='支付'&&this.dataIndex!='待支付'){
console.log('授权', uni.getStorageSync('sendMsg')) console.log('授权', uni.getStorageSync('sendMsg'))
if (uni.getStorageSync('sendMsg')) { if (uni.getStorageSync('sendMsg')) {
console.log('授权+1') console.log('授权+1')
@ -491,22 +484,6 @@ import permision from "@/components/permission.js";
url: '/pages/public/login' url: '/pages/public/login'
}); });
} }
}else{
if(this.dataIndex=='待支付'){
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/order/payModifyDzhifu'
})
}else{
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/order/payModify'
})
}
}
}, },
switch1Change: function (e) {//地图和列表切换 switch1Change: function (e) {//地图和列表切换
var num= Number(e) var num= Number(e)

1813
pages/therapist/therapistDingdan.vue Normal file
View File

File diff suppressed because it is too large Load Diff