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:
#	index.html
#	pages/index/index.vue
This commit is contained in:
bai 2024-06-27 21:44:17 +08:00
parent 3320e6c210 a8bd46ccd5
commit dc4010dab9
27 changed files with 10520 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -170,7 +170,7 @@
"proxy" : { "proxy" : {
// 可代理多个 // 可代理多个
"/TencentGet" : { "/TencentGet" : {
"target" : "https://apis.map.qq.com/ws/geocoder/v1/", // 腾讯地图逆地址解析 "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析
"changeOrigin" : true, "changeOrigin" : true,
"secure" : false, "secure" : false,
"pathRewrite" : { "pathRewrite" : {
@ -189,7 +189,7 @@
} }
}, },
// "serviceHost" : "http://192.168.2.222:8187/_AMapService" // "serviceHost" : "http://192.168.2.222:8187/_AMapService"
// "serviceHost" : "http://47.75.182.93:8090/_AMapService" // "serviceHost" : "http://120.46.52.165/_AMapService"
"template" : "index.html" "template" : "index.html"
} }
} }

21
my/address/address.vue
View File

@ -18,7 +18,7 @@
</view> </view>
<view style="margin-top: 30rpx;height: 1rpx;background-color: #f7f7f7;margin-bottom: 10upx;"></view> <view style="margin-top: 30rpx;height: 1rpx;background-color: #f7f7f7;margin-bottom: 10upx;"></view>
<view style="display: flex;padding: 0 5upx 0 0;font-size: 26upx;"> <view style="display: flex;padding: 0 5upx 0 0;font-size: 26upx;">
<radio-group name="openWay" style="text-align: left;width: 70%;"> <radio-group name="openWay" style="text-align: left;width: 70%; margin-top:15rpx;">
<label class="tui-radio"> <label class="tui-radio">
<radio :checked="item.isDefault == 1 ? true : false" color="#019c88" :disabled='item.isDefault == 1 ? false : true' <radio :checked="item.isDefault == 1 ? true : false" color="#019c88" :disabled='item.isDefault == 1 ? false : true'
style="transform:scale(0.6);" /> style="transform:scale(0.6);" />
@ -190,14 +190,15 @@
margin-left: 10px; margin-left: 10px;
} }
.delete-view{ .delete-view{
width: 85rpx; width: 120rpx;
text-align: center; text-align: center;
background: #FFFFFF; background: #e5e7eb;
border-radius: 18rpx; border-radius: 30rpx;
border: 1px solid #4D4D4D; border: 1px solid #cdd2db;
font-weight: 400; font-weight: 400;
font-size: 23rpx; font-size: 30rpx;
color: #4D4D4D; color: #666;
padding: 8rpx 10rpx;
} }
.address-list-img{ .address-list-img{
width: 91rpx; width: 91rpx;
@ -231,12 +232,12 @@
.shouhuo{ .shouhuo{
margin: 16rpx 30upx; margin: 16rpx 30upx;
position: fixed; position: fixed;
bottom: -7upx; bottom: -2upx;
width: 92%; width: 92%;
height: 92rpx; height: 80rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx; border-radius: 46rpx;
line-height: 92rpx; line-height: 80rpx;
font-weight: 400; font-weight: 400;
font-size: 36rpx; font-size: 36rpx;
color: #FFFFFF; color: #FFFFFF;

3
my/hongbao/youhuijuan.vue
View File

@ -158,6 +158,9 @@
</script> </script>
<style scoped> <style scoped>
/deep/.page-box{
width: 100%;
}
.youhui-img{ .youhui-img{
width: 111.81rpx; width: 111.81rpx;
height: 111.81rpx; height: 111.81rpx;

77
my/hongbao/youhuijuanList.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view class="page-content">
<!-- <view class="flex align-center justify-between you-nav"> <!-- <view class="flex align-center justify-between you-nav">
<view v-for="(item,index) in tab" :key="index" class="text-center box" <view v-for="(item,index) in tab" :key="index" class="text-center box"
:class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)"> :class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)">
@ -22,18 +22,20 @@
<view class="youhui-view-right"> <view class="youhui-view-right">
<view class="youhui-view-right-top"> <view class="youhui-view-right-top">
<view class="youhui-view-right-title">{{item.couponName}}</view> <view class="youhui-view-right-title">{{item.couponName}}</view>
<view class="youhui-view-right-time">{{item.endDate}}</view> <view class="time-money" style="margin-top: 10px;">
<view class="youhui-view-right-time">{{item.createTime.substring(0,10)}} ~ </view>
<view class="youhui-view-right-time" style="margin-left: 3px;"> {{item.expirationTime.substring(0,10)}}</view>
</view>
</view> </view>
<label class="tui-radio"> <label class="tui-radio">
<checkbox activeBackgroundColor="#029d88" color="#029d88" :value="item.id.toString()" :checked="checkbox"/> <checkbox activeBackgroundColor="#029d88" color="#029d88" :value="item.id.toString()" :checked="checkbox"/>
</label> </label>
<!-- <view class="youhui-view-right-btn" @tap="shiYong()">立即使用</view> -->
</view> </view>
</view> </view>
</checkbox-group> </checkbox-group>
<view @tap="queding()" class="queding">
<span class="que-btn">确定</span>
</view>
<empty v-if="hongbao.length==0"></empty> <empty v-if="hongbao.length==0"></empty>
</view> </view>
</template> </template>
@ -68,18 +70,29 @@
contentrefresh: '正在加载...', contentrefresh: '正在加载...',
contentnomore: '没有更多数据了' contentnomore: '没有更多数据了'
}, },
couponId:'' couponId:'',
content:''
} }
}, },
onLoad() { onLoad(e) {
if(e){
this.content=e.text
}
this.getMyList(); this.getMyList();
}, },
methods: { methods: {
queding(){ queding(){
this.$queue.setData('youhui',this.couponId); this.$queue.setData('youhui',this.couponId);
if(this.content){//返回推荐套餐订单
uni.navigateTo({ uni.navigateTo({
url:'/my/order/payModifyTc'
})
}else{
uni.navigateTo({//返回项目订单
url:'/my/order/payModify' url:'/my/order/payModify'
}) })
}
}, },
checkboxChange(e){ checkboxChange(e){
this.couponId=e.detail.value.join(",") this.couponId=e.detail.value.join(",")
@ -94,14 +107,18 @@
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}); });
this.$Request.getT('/app/coupon/selectCouponUserList?page='+this.page+'&limit='+this.size+'&status=' + this.tabIndex).then(res => { var data={
page:this.page,
limit:this.size,
status:this.tabIndex,
minMoney:this.$queue.getData('minMoney')
}
this.$Request.getT('/app/coupon/selectUserCouponList',data).then(res => {
if (res.code == 0) { if (res.code == 0) {
if (this.page == 1) { if (this.page == 1) {
this.hongbao = []; this.hongbao = [];
} }
res.data.list.forEach(d => { this.hongbao=res.data.list
this.hongbao.push(d);
});
if (res.data.list.length === this.size) { if (res.data.list.length === this.size) {
this.loadingType = 0; this.loadingType = 0;
} else { } else {
@ -135,6 +152,42 @@
</script> </script>
<style scoped> <style scoped>
/deep/.page-box{
width: 100%;
}
.page-content{
width:100%;
position: relative;
display: flex;
flex-direction: column;
align-items: center;
}
.que-btn{
display: inline-block;
width: 90%;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 32px;
border-radius: 28px;
color: #ffffff;
line-height: 32px;
}
.queding{
width: 90%;
height: 32px;
background-color: #fff;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
}
.time-money{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
/deep/uni-checkbox .uni-checkbox-input{ /deep/uni-checkbox .uni-checkbox-input{
border-radius: 50%; border-radius: 50%;
} }

45
my/order/pay.vue
View File

@ -172,11 +172,13 @@
</view> </view>
</view> </view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">合计：</view> <view style="color: #333;font-size: 26rpx;">合计：</view>
<view class="" style="color: #F93731;">￥<text <view class="" style="color: #F93731;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view> style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="pay-ding feiuong"> <!-- <view class="pay-ding feiuong">
@ -256,11 +258,11 @@
class="dingshi"> class="dingshi">
去投诉 去投诉
</u-button> </u-button>
<u-button v-if="order.status == 9&&order.refusalContent==null" :custom-style="customStyle2" <u-button v-if="order.status == 9&&order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="toggleQ('center',order)" @click="toggleQ('center',order)"
class="dingshi"> class="dingshi">
拒单确认 拒单详情
</u-button> </u-button>
<u-button v-if="order.status == 10" :custom-style="customStyle2" <u-button v-if="order.status == 10" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@ -347,7 +349,7 @@
<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text <view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text> v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
/<text style="font-weight: 500;font-size: 24upx; ">{{item.duration}}分钟</text></view> /<text style="font-weight: 500;font-size: 24upx; ">{{item.duration}}分钟</text></view>
<view class="item_btn" @click="goOrder(item)">确认加钟</view> <view class="item_btn" @click="goOrderJ(item)">确认加钟</view>
</view> </view>
</view> </view>
</view> </view>
@ -529,10 +531,9 @@
} }
}, },
onLoad(e) { onLoad(e) {
uni.showLoading({ // uni.showLoading({
title: '加载中......', // title: '加载中......',
// })
})
// setTimeout(() => { // setTimeout(() => {
// // this.loading = false; // // this.loading = false;
// }, 2000) // }, 2000)
@ -543,7 +544,7 @@
}) })
} }
this.ordersId = e.ordersId this.ordersId = e.ordersId
// this.getOrder() this.getOrder()
}, },
onShow() { onShow() {
this.yhqxSel = this.$queue.getData("yhqxSel"); this.yhqxSel = this.$queue.getData("yhqxSel");
@ -866,9 +867,33 @@
} }
}); });
}, },
goOrderJ(item) {
let that = this
let data = {
classifyId:item.classifyId,
ordersId:that.order.ordersId,
ordersMassageList:[
{massageId: item.massageTypeId,num: 1},
],
massageTypeId:item.massageTypeId,
userPackageDetailId:item.userPackageDetailId,
}
that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
that.showorder = false
if (res.code == 0) {
that.ordersId = res.data.ordersId;
that.tpayMoney = res.data.payMoney;
that.showpay = true;
that.paySel = 1;
} else {
that.$queue.showToast(res.msg)
}
});
},
goOrder(item) { goOrder(item) {
console.log("item=====>",item)
console.log("order=====>",this.order)
let that = this let that = this
let data = { let data = {
classifyId:item.classifyId, classifyId:item.classifyId,

177
my/order/payModify.vue
View File

@ -2,6 +2,36 @@
<view class="content"> <view class="content">
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title" style="">服务项目</view>
<view class="flex">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="head-bottom margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="money-pay">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{orderXm.price}}</span>
</view>
<view>
<uni-number-box :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="ske-padding margin-top-sm header-view"> <view class="ske-padding margin-top-sm header-view">
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
@ -9,7 +39,7 @@
<view class="header-view-text">联系人</view> <view class="header-view-text">联系人</view>
<view class="header-view-data"> <view class="header-view-data">
<text>{{name}}</text> <text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">选择</text> <text class="xuanzhe" @click="getAddressList()">修改</text>
</view> </view>
</view> </view>
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between margin-top-lg">
@ -89,60 +119,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <checkbox-group @change="checkboxChange">
<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
<view class="youhui-view-left">
<view class="youhui-view-left-yuan">
<span class="youhui-view-left-num">{{itemY.money}}</span>
<span class="youhui-view-left-text">元</span>
</view>
<view class="youhui-view-left-bottom">
满{{itemY.minMoney}}元可用
</view>
</view>
<view class="youhui-view-right">
<view class="youhui-view-right-top">
<view class="youhui-view-right-title">{{itemY.couponName}}</view>
<view class="youhui-view-right-time">{{itemY.endDate}}</view>
</view>
<label class="tui-radio">
<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
</label>
</view>
</view>
</checkbox-group> -->
<!-- <view class="head-top">
<view class="head-top-view">
<image class="head-top-view-img" src="../../static/yuyue.png" mode=""></image>
<view class="head-top-view-right">
<view class="head-top-title">
<span>专业足疗+背部精油调理[90分钟]</span>
<image class="head-top-view-right-img" src="../../static/shezhi-jiantou.png" mode=""></image>
</view>
<view class="head-top-title-bottom">
<view class="qian-left">
<span>￥</span>
<span>268</span>
</view>
<view class="qian-right">
<span>X</span>
<span>8</span>
</view>
</view>
</view>
</view>
<view class="head-mian">
<span>平台优惠券</span>
<view class="qian-right">
<span>￥</span>
<span>8</span>
</view>
</view>
<view class="head-foot">
<span>合计</span>
<span>￥{{order.sumMoney}}</span>
</view>
</view> -->
<view class="margin-top-xl pay-ding"> <view class="margin-top-xl pay-ding">
<view class="d-title">备注</view> <view class="d-title">备注</view>
<view class="list-pay"> <view class="list-pay">
@ -152,7 +128,7 @@
</view> </view>
</view> </view>
<view class="margin-top-xl pay-ding"> <!-- <view class="margin-top-xl pay-ding">
<view class="d-title" style="margin-bottom: 5px;">服务保障</view> <view class="d-title" style="margin-bottom: 5px;">服务保障</view>
<view class="list-pay"> <view class="list-pay">
<view class="list-pay-text"> <view class="list-pay-text">
@ -171,12 +147,12 @@
<view class="checkbox-data"> <view class="checkbox-data">
<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox> <uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
</view> </view>
</view> </view> -->
</view> </view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">立即预约</view> <view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
</view> </view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> --> <!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@ -236,7 +212,7 @@
<u-popup v-model="isTrue" mode="bottom"> <u-popup v-model="isTrue" mode="bottom">
<view> <view>
<scroll-view scroll-y="true"> <scroll-view scroll-y="true">
<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="classifyId" <its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="orderXm.classifyId"
@getTime="TimeData"> @getTime="TimeData">
</its-calendar> </its-calendar>
</scroll-view> </scroll-view>
@ -326,7 +302,9 @@
textareaData:'', textareaData:'',
ordersId:'', ordersId:'',
userPackageDetailId:'', userPackageDetailId:'',
couponDataList:'' couponDataList:'',
orderXm:[],
number:1,
} }
}, },
onLoad(e) { onLoad(e) {
@ -343,15 +321,13 @@
let fullDate = `${month}-${days}` let fullDate = `${month}-${days}`
let Time = year + '-' + fullDate let Time = year + '-' + fullDate
this.yearsDate = Time; this.yearsDate = Time;
var classifyId=this.$queue.getData('classifyId')
this.classifyId = classifyId;
this.getMsTime(Time); this.getMsTime(Time);
this.jishiName=this.$queue.getData('getJishi'); this.jishiName=this.$queue.getData('getJishi');
this.couponId=this.$queue.getData('youhui'); this.couponId=this.$queue.getData('youhui');
if(this.couponId){ if(this.couponId){
this.youhuiF(this.couponId) this.youhuiF(this.couponId)
} }
this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
this.ordersId = this.$queue.getData('ordersId'); this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId'); this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui() this.youhui()
@ -397,6 +373,9 @@
// #endif // #endif
}, },
methods: { methods: {
changeValue(value){
this.number=value
},
// 时间段数据 // 时间段数据
TimeData(e) { TimeData(e) {
var date = new Date(); var date = new Date();
@ -446,7 +425,12 @@
}) })
}, },
openpay() {//验证 openpay() {//验证
if(this.single=='2024-06-19'){ // else if(this.radio1!='0'){
// uni.showToast({
// title:'请同意服务保障！'
// })
// }
if(this.startTime==''){
uni.showToast({ uni.showToast({
title:'请选择服务时间！' title:'请选择服务时间！'
}) })
@ -454,12 +438,8 @@
uni.showToast({ uni.showToast({
title:'请选择理疗师！' title:'请选择理疗师！'
}) })
}else if(this.radio1!='0'){
uni.showToast({
title:'请同意服务保障！'
})
}else{ }else{
this.showpay = true; // this.showpay = true;
this.goOrder() this.goOrder()
} }
@ -682,9 +662,9 @@
longitude:that.longitude, longitude:that.longitude,
latitude:that.latitude, latitude:that.latitude,
serveTime:that.startTime, serveTime:that.startTime,
remarks:that.textareaData, remark:that.textareaData,
ordersMassageList:[ ordersMassageList:[
{massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: 1}, {massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: that.number},
] ]
} }
that.$Request.postJson("/app/artificer/insertOrders", data).then(res => { that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
@ -692,9 +672,11 @@
if (res.code == 0) { if (res.code == 0) {
that.ordersId = res.data.ordersId; that.ordersId = res.data.ordersId;
that.tpayMoney = res.data.payMoney; that.tpayMoney = res.data.payMoney;
that.showpay = true; // that.showpay = true;
that.paySel = 1; that.paySel = 1;
uni.navigateTo({
url:'/my/order/payding?ordersId='+ res.data.ordersId
})
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
@ -1024,7 +1006,6 @@
this.payJZ(); this.payJZ();
return; return;
} }
console.log("ordersId000000000",this.ordersId)
if (that.openWay == 1) { //零钱支付 if (that.openWay == 1) { //零钱支付
uni.showModal({ uni.showModal({
title: '付款提示', title: '付款提示',
@ -1343,6 +1324,53 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.head-bottom{
width: 68%;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.money-pay-jia{
font-weight: 400;
font-size: 25rpx;
color: #666666;
text-decoration-line: line-through;
margin-left: 5px;
}
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold;
}
.money-pay-zhen{
display: flex;
flex-direction: row;
align-items: center;
}
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.head-top{
background-color: #ffffff;
border-radius: 24rpx;
padding: 29rpx;
}
.pay-title{
font-weight: bold;
font-size: 28rpx;
color: #333333;
margin-bottom: 5px;
}
.view-more{ .view-more{
display:inline-block; display:inline-block;
border-top:1px solid; border-top:1px solid;
@ -1361,6 +1389,7 @@
padding: 5rpx 30rpx 36rpx 30rpx; padding: 5rpx 30rpx 36rpx 30rpx;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 !important; color: #F95900 !important;
font-weight: bold !important; font-weight: bold !important;

1985
my/order/payModifyDd.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2018
my/order/payModifyTc.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1956
my/order/payding.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1956
my/order/paydingDd.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1820
my/order/paydingTc.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2
my/vip/index.vue
View File

@ -161,7 +161,7 @@
this.getIsVip() this.getIsVip()
this.vipData=this.$queue.getData('isVIP') this.vipData=this.$queue.getData('isVIP')
console.log("isVIP------------------->",this.vipData) console.log("isVIP------------------->",this.vipData)
if(this.vipData.isVip=='1'){ if(this.vipData=='1'){
this.vipShow=true; this.vipShow=true;
}else{ }else{
this.vipData=[] this.vipData=[]

41
pages.json
View File

@ -429,6 +429,7 @@
"navigationBarTitleText": "注册" "navigationBarTitleText": "注册"
} }
}, },
// #ifdef H5 // #ifdef H5
{ {
"path": "pages/order/index", "path": "pages/order/index",
@ -454,7 +455,7 @@
"path": "pages/therapist/therapist", "path": "pages/therapist/therapist",
"style": { "style": {
"navigationBarTitleText": "理疗师", "navigationBarTitleText": "理疗师",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"app-plus": { "app-plus": {
"titleNView": false "titleNView": false
} }
@ -466,7 +467,7 @@
"path": "pages/therapist/therapist", "path": "pages/therapist/therapist",
"style": { "style": {
"navigationBarTitleText": "理疗师", "navigationBarTitleText": "理疗师",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"app-plus": { "app-plus": {
"titleNView": false "titleNView": false
} }
@ -484,7 +485,7 @@
"path": "pages/therapist/orderDetail", "path": "pages/therapist/orderDetail",
"style": { "style": {
"navigationBarTitleText": "理疗师详情", "navigationBarTitleText": "理疗师详情",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"app-plus": { "app-plus": {
"titleNView": false "titleNView": false
} }
@ -510,6 +511,30 @@
"titleNView": false "titleNView": false
} }
} }
}, {
"path": "order/paydingDd",
"style": {
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false
}
},{
"path": "order/payModifyDd",
"style": {
"navigationBarTitleText": "订单页面详情",
"enablePullDownRefresh": false
}
},{
"path": "order/paydingTc",
"style": {
"navigationBarTitleText": "套餐订单详情",
"enablePullDownRefresh": false
}
}, {
"path": "order/payModifyTc",
"style": {
"navigationBarTitleText": "套餐订单",
"enablePullDownRefresh": false
}
}, { }, {
"path": "order/payModifyDzhifu", "path": "order/payModifyDzhifu",
"style": { "style": {
@ -702,6 +727,16 @@
} }
} }
}, },
{
"path": "order/payding",
"style": {
"navigationBarTitleText": "项目订单详情",
"navigationStyle": "custom",
"app-plus": {
"titleNView": false
}
}
},
{ {
"path": "order/payModify", "path": "order/payModify",
"style": { "style": {

21
pages/index/index.vue
View File

@ -5,6 +5,9 @@
<view class="index-top-left font-size-34">盛安到家</view> <view class="index-top-left font-size-34">盛安到家</view>
<view class="index-top-left font-size-34" style="display: none;">-{{latitude}}-{{longitude}}-</view> <view class="index-top-left font-size-34" style="display: none;">-{{latitude}}-{{longitude}}-</view>
<view class="index-top-mian"> <view class="index-top-mian">
--{{latitude}}--
--{{longitude}}--
--{{cuowu}}--
<view class="index-top-mian-text"> <view class="index-top-mian-text">
<image style="margin-top: 4px;" src="../../static/index-nav-1.png" mode=""></image> <image style="margin-top: 4px;" src="../../static/index-nav-1.png" mode=""></image>
<span>实名认证</span> <span>实名认证</span>
@ -324,6 +327,7 @@
txAppKey: '', txAppKey: '',
tpSel: 0, tpSel: 0,
tpCount: 0, tpCount: 0,
cuowu:''
} }
}, },
onShareAppMessage(res) { //发送给朋友 onShareAppMessage(res) { //发送给朋友
@ -423,7 +427,8 @@
// #endif // #endif
}, },
fail: function(e) { fail: function(e) {
console.log("获取定位返回的错误！", e) this.cuowu=e
console.log("获取信息失败，请重试！",e)
// #ifdef APP-PLUS // #ifdef APP-PLUS
that.checkPermission(); that.checkPermission();
// #endif // #endif
@ -445,7 +450,7 @@
} }
// #endif // #endif
this.city = uni.getStorageSync('city') this.city = uni.getStorageSync('city')
console.log(this.city) this.getIsVip()
this.getKTCityList(); this.getKTCityList();
this.getHomeArtificerList(); this.getHomeArtificerList();
this.latitude = uni.getStorageSync('latitude') this.latitude = uni.getStorageSync('latitude')
@ -485,6 +490,18 @@
// } // }
}, },
methods: { methods: {
getIsVip() {
this.$Request.get("/app/UserVip/selectUserVip").then(res => {
if (res.code == 0) {
// this.isVip = res.data
if(res.data==undefined){
this.$queue.setData('isVIP','0')
}else{
this.$queue.setData('isVIP','1')
}
}
});
},
goChat() { goChat() {
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
let kefuPhone = this.$queue.getData('kefuPhone'); let kefuPhone = this.$queue.getData('kefuPhone');

64
pages/my/cureOderDrtail.vue
View File

@ -38,6 +38,23 @@
</view> </view>
</view> </view>
<view class="header-bottom-foot"> <view class="header-bottom-foot">
<view class="header-bottom-foot-cont">
<view class="header-fubz">保障</view>
<view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
<span>未服务全额退款</span>
</view>
<view class="header-bottom-foot-view" style="margin: 0px 7px;">
<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
<span>不满意重做</span>
</view>
<view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span>
</view>
</view>
</view>
<!--<view class="header-bottom-foot">
<view class="header-bottom-foot-title">服务保障</view> <view class="header-bottom-foot-title">服务保障</view>
<view class="header-bottom-foot-cont"> <view class="header-bottom-foot-cont">
<view class="header-bottom-foot-view"> <view class="header-bottom-foot-view">
@ -53,7 +70,7 @@
<span>最快30分钟上门</span> <span>最快30分钟上门</span>
</view> </view>
</view> </view>
</view> </view>-->
</view> </view>
</view> </view>
<view class="detail-foot"> <view class="detail-foot">
@ -170,17 +187,21 @@
} }
</script> </script>
<style scoped> <style scoped>
.header-fubz{
font-size: 26rpx;
color: #029c88;
font-weight: bold;
}
.header-bottom-title-liao{ .header-bottom-title-liao{
display: inline-block; display: inline-block;
padding: 0 7px; padding: 3px 7px;
height: 16px; height: 16px;
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;
background: linear-gradient(-90deg, #FF6F48, #FF9E69); background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px; border-radius: 7px;
margin-left: 5px; margin-left: 5px;
font-weight: bold; font-size: 11px;
font-size: 8px;
border-top-left-radius: 20px; border-top-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
color: #fff; color: #fff;
@ -239,8 +260,7 @@
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: bold; font-size: 26rpx;
font-size: 22rpx;
} }
.header-bottom-title-bottom span{ .header-bottom-title-bottom span{
font-weight: bold; font-weight: bold;
@ -287,14 +307,14 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
margin-bottom: 10px; margin-bottom: 15px;
} }
.detail-foot{ .detail-foot{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 15px 0px; padding: 5rpx 0rpx;
} }
.tese span:nth-child(1){ .tese span:nth-child(1){
@ -346,6 +366,7 @@
background-color: #fff; background-color: #fff;
border-radius: 21rpx; border-radius: 21rpx;
padding: 15px; padding: 15px;
margin-bottom: 10px;
} }
.jianjie{ .jianjie{
font-weight: 400; font-weight: 400;
@ -378,16 +399,16 @@
height: 29.86rpx; height: 29.86rpx;
} }
.header-bottom-foot-view-img1{ .header-bottom-foot-view-img1{
width: 22.92rpx; width: 30rpx;
height: 17.36rpx; height: 30rpx;
} }
.header-bottom-foot-view-img2{ .header-bottom-foot-view-img2{
width: 16.67rpx; width: 23rpx;
height: 16.67rpx; height: 23rpx;
} }
.header-bottom-foot-view-img3{ .header-bottom-foot-view-img3{
width: 15.97rpx; width: 26rpx;
height: 18.06rpx; height: 26rpx;
} }
.header-bottom-foot-view image{ .header-bottom-foot-view image{
margin-right: 3px; margin-right: 3px;
@ -397,14 +418,14 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 0 5px; padding: 1px 8px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
background-color: rgba(8, 162, 138, 0.1); background-color: rgba(230, 246, 243, 1);
border-radius: 8px; border-radius: 15px;
font-weight: 400; font-weight: 400;
font-size: 8px; font-size: 10px;
color: #029D88; color: #029c88;
} }
.header-bottom-foot-title{ .header-bottom-foot-title{
width:100%; width:100%;
@ -428,9 +449,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top: 26rpx;
} }
.header-bottom-money-jia{ .header-bottom-money-jia{
font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
line-height: 37rpx; line-height: 37rpx;
@ -444,7 +465,7 @@
font-size: 25rpx; font-size: 25rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:36.81rpx; font-size:45.81rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
@ -503,6 +524,7 @@
padding: 15px; padding: 15px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 20rpx;
} }
.header-top image{ .header-top image{
width: 706.25rpx; width: 706.25rpx;

2
pages/my/fuwuDateil.vue
View File

@ -129,7 +129,7 @@
this.$queue.setData('ordersId',this.dataList.id); this.$queue.setData('ordersId',this.dataList.id);
this.$queue.setData('daibudan',''); this.$queue.setData('daibudan','');
this.$queue.setData('youhui',''); this.$queue.setData('youhui','');
this.$queue.setData('classifyId',item.classifyId) this.$queue.setData('xiangmu',item)
uni.navigateTo({ uni.navigateTo({
url:'/my/order/payModify?ordersId='+this.dataList.id url:'/my/order/payModify?ordersId='+this.dataList.id
}) })

13
pages/my/index.vue
View File

@ -131,7 +131,8 @@
{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'}, {urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'},
{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'}, {urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'},
], ],
token:'' token:'',
vipData:[]
} }
}, },
onLoad(e) { onLoad(e) {
@ -152,6 +153,8 @@
this.getAmount() this.getAmount()
this.getIsVip() this.getIsVip()
} else { } else {
this.isShop = 0; this.isShop = 0;
this.isAgency = 0; this.isAgency = 0;
@ -428,10 +431,14 @@
}, },
getIsVip() { getIsVip() {
this.$Request.get("/app/UserVip/isUserVip").then(res => { this.$Request.get("/app/UserVip/selectUserVip").then(res => {
if (res.code == 0) { if (res.code == 0) {
this.isVip = res.data this.isVip = res.data
this.$queue.setData('isVIP',this.isVip) if(this.isVip==undefined){
this.$queue.setData('isVIP','0')
}else{
this.$queue.setData('isVIP','1')
}
} }
}); });
}, },

4
pages/my/indextaociliaoList.vue
View File

@ -40,7 +40,7 @@
<span>{{item.oldPrice}}</span> <span>{{item.oldPrice}}</span>
</view> </view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 购买
</view> </view>
</view> </view>
</view> </view>
@ -396,7 +396,7 @@
} }
.service-head-top-left span{ .service-head-top-left span{
font-weight: bold; font-weight: bold;
font-size: 36rpx; font-size: 34rpx;
color: #171717; color: #171717;
} }
.service-head-top-left{ .service-head-top-left{

99
pages/my/serviceOderDrtail.vue
View File

@ -42,15 +42,15 @@
<view class="header-bottom-foot-title">服务保障</view> <view class="header-bottom-foot-title">服务保障</view>
<view class="header-bottom-foot-view"> <view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image> <image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
<span>持证上岗</span> <span>实名认证</span>
</view> </view>
<view class="header-bottom-foot-view" style="margin: 0px 7px;"> <view class="header-bottom-foot-view" style="margin: 0px 7px;">
<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image> <image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
<span>收费透明</span> <span>资质认证</span>
</view> </view>
<view class="header-bottom-foot-view"> <view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image> <image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>爽约包赔</span> <span>平台担保</span>
</view> </view>
</view> </view>
</view> </view>
@ -87,7 +87,7 @@
</view> </view>
</view> </view>
</view> </view>
<checkbox-group @change="checkboxChange" v-if="serviData.name=='index' && serviData.isCanCoupon=='1'"> <!-- <checkbox-group @change="checkboxChange" v-if="serviData.name=='index' && serviData.isCanCoupon=='1'">
<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id"> <view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
<view class="youhui-view-left"> <view class="youhui-view-left">
<view class="youhui-view-left-yuan"> <view class="youhui-view-left-yuan">
@ -108,9 +108,9 @@
</label> </label>
</view> </view>
</view> </view>
</checkbox-group> </checkbox-group> -->
<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay"> <view class="detail-btn" v-if="serviData.name=='index'" @click="openpay(mainData)">
立即预约 立即购买
</view> </view>
<!-- 支付方式 --> <!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable"> <u-popup v-model="showpay" mode="bottom" :closeable="closeable">
@ -257,9 +257,16 @@
}); });
}, },
openpay() { openpay(item) {
this.goOrder() this.$queue.setData('mainData',item)
this.showpay = true this.$queue.setData('detailData',this.detailData)
this.$queue.setData('xiangmu',item)
this.$queue.setData('youhui','');
uni.navigateTo({
url:'/my/order/payModifyTc?ordersId='+item.id
})
// this.goOrder()
// this.showpay = true
}, },
//支付选择 //支付选择
selectWay: function(item) { selectWay: function(item) {
@ -763,16 +770,15 @@
line-height: 80rpx; line-height: 80rpx;
} }
.detail-btn{ .detail-btn{
width:95%; width: 90%;
height: 92rpx;
line-height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
font-weight: 400; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
font-size: 42rpx; height:80rpx;
color: #FFFFFF; border-radius: 80rpx;
color: #ffffff;
line-height: 80rpx;
font-size: 38rpx;
} }
.header-top image{ .header-top image{
width: 706.25rpx; width: 706.25rpx;
@ -808,7 +814,7 @@
} }
.detail-foot-nav-text{ .detail-foot-nav-text{
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 34rpx;
color: #000000; color: #000000;
} }
.detail-foot-nav{ .detail-foot-nav{
@ -824,7 +830,7 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 13px;
color: #FFFFFF; color: #FFFFFF;
text-align: right; text-align: right;
line-height: 32px; line-height: 32px;
@ -859,12 +865,11 @@
.tese span:nth-child(1){ .tese span:nth-child(1){
font-weight: bold; font-weight: bold;
font-size: 22rpx; font-size: 28rpx;
color: #333333; color: #666;
} }
.tese span:nth-child(2){ .tese span:nth-child(2){
font-weight: 400; font-size: 28rpx;
font-size: 22rpx;
color: #8D9194; color: #8D9194;
} }
.tese{ .tese{
@ -874,6 +879,7 @@
-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */ -webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-top: 8px;
} }
.detail-foot-list-top span:nth-child(1){ .detail-foot-list-top span:nth-child(1){
font-weight: bold; font-weight: bold;
@ -893,9 +899,8 @@
margin: 0px 25px 0px 5px; margin: 0px 25px 0px 5px;
} }
.detail-foot-list-top span:nth-child(3){ .detail-foot-list-top span:nth-child(3){
font-weight: 400; font-size: 30rpx;
font-size: 22rpx; color: #029d88;
color: #777777;
} }
.detail-foot-mian{ .detail-foot-mian{
@ -904,10 +909,11 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 8px;
} }
.jianjie{ .jianjie{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 28rpx;
color: #8D9194; color: #8D9194;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
@ -920,32 +926,30 @@
} }
.header-bottom-mian-title{ .header-bottom-mian-title{
width: 100%; width: 100%;
display: flex; margin-bottom: 3px;
flex-direction: row;
align-items: center;
margin-bottom: 6px;
} }
.header-bottom-mian-title span{ .header-bottom-mian-title span{
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 28rpx;
color: #20AB95; color: #20AB95;
margin-left: 5px; margin-left: 5px;
padding: 20rpx 0;
} }
.header-bottom-mian-title image{ .header-bottom-mian-title image{
width: 30.56rpx; width: 30.56rpx;
height: 29.86rpx; height: 29.86rpx;
} }
.header-bottom-foot-view-img1{ .header-bottom-foot-view-img1{
width: 22.92rpx; width: 30rpx;
height: 17.36rpx; height: 30rpx;
} }
.header-bottom-foot-view-img2{ .header-bottom-foot-view-img2{
width: 16.67rpx; width: 28rpx;
height: 16.67rpx; height: 28rpx;
} }
.header-bottom-foot-view-img3{ .header-bottom-foot-view-img3{
width: 15.97rpx; width: 30rpx;
height: 18.06rpx; height: 30rpx;
} }
.header-bottom-foot-view image{ .header-bottom-foot-view image{
margin-right: 3px; margin-right: 3px;
@ -955,13 +959,13 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 69px; width: 80px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
background-color: rgba(8, 162, 138, 0.1); background-color: rgba(8, 162, 138, 0.1);
border-radius: 8px; border-radius: 8px;
font-weight: 400; font-weight: 400;
font-size: 8px; font-size: 11px;
color: #029D88; color: #029D88;
} }
.header-bottom-foot-title{ .header-bottom-foot-title{
@ -970,8 +974,8 @@
line-height: 22px; line-height: 22px;
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
font-size: 23rpx; font-size: 30rpx;
color: #08A28A; color: #029d88;
} }
.header-bottom-foot{ .header-bottom-foot{
width: 100%; width: 100%;
@ -980,7 +984,6 @@
align-items: center; align-items: center;
} }
.header-bottom-money-jia{ .header-bottom-money-jia{
font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
line-height: 37rpx; line-height: 37rpx;
@ -994,7 +997,7 @@
font-size: 25rpx; font-size: 25rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:36.81rpx; font-size:40rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
@ -1011,7 +1014,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
margin-top:5px; margin-top:8px;
} }
.header-bottom-money{ .header-bottom-money{
width: 100%; width: 100%;
@ -1021,7 +1024,7 @@
} }
.header-bottom-title-num span{ .header-bottom-title-num span{
font-weight: bold; font-weight: bold;
font-size: 25rpx; font-size: 30rpx;
} }
.header-bottom-title-num span:nth-child(1){ .header-bottom-title-num span:nth-child(1){
color: #08A28A; color: #08A28A;
@ -1050,7 +1053,7 @@
.header-bottom{ .header-bottom{
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
padding: 15px; padding: 15px 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }

33
pages/order/index.vue
View File

@ -19,16 +19,17 @@
</image> </image>
<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>202312061140172215</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>202312061140172215</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>202312061140172215</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" style="color: #333333;">已取消</view> <view class="text-green" v-if="item.status ==4" style="color: #333333;"><span>{{item.ordersNo}}</span><span>已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>202312061140172215</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>202312061140172215</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>202312061140172215</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>202312061140172215</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>202312061140172215</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>202312061140172215</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 == 11"><span>{{item.ordersNo}}</span><span>临时挂单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> --> <!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view> </view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view> <view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
@ -63,23 +64,23 @@
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">更多</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/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
立即预约 立即预约
</u-button> </u-button>
<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@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==null" :custom-style="customStyle1" shape="circle" :plain="true" <u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="toggleQ('center',item)" class="btns"> @click="toggleQ('center',item)" class="btns">
拒单确认 拒单详情
</u-button> </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/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.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" <u-button v-if="item.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&!item.refusalContent" :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">
修改订单 修改订单
</u-button> </u-button>
@ -313,7 +314,7 @@
}, },
methods: { methods: {
goNav(url,item) { goNav(url,item) {
this.$queue.setData('daibudan',item); this.$queue.setData('xiangmu',item);
uni.navigateTo({ uni.navigateTo({
url:url url:url
}) })
@ -344,6 +345,7 @@
uni.showToast({ uni.showToast({
title:'操作完成！' title:'操作完成！'
}) })
this.getOrderList()
this.$refs.popupQ.close(typeTxte); this.$refs.popupQ.close(typeTxte);
}else{ }else{
uni.showToast({ uni.showToast({
@ -387,6 +389,7 @@
uni.showToast({ uni.showToast({
title:'操作完成！' title:'操作完成！'
}) })
that.getOrderList()
that.$refs.popup.close(type); that.$refs.popup.close(type);
}else{ }else{
console.log('shibai：' + longitude); console.log('shibai：' + longitude);

10
pages/therapist/therapist.vue
View File

@ -1221,10 +1221,10 @@ import permision from "@/components/permission.js";
this.page = this.page + 1; this.page = this.page + 1;
this.getlist() this.getlist()
}, },
// onPullDownRefresh: function() { onPullDownRefresh: function() {
// this.page = 1; this.page = 1;
// this.getlist() this.getlist()
// }, },
} }
</script> </script>
@ -1517,7 +1517,7 @@ import permision from "@/components/permission.js";
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
overflow: auto; // overflow: auto;
} }
/deep/.u-content{ /deep/.u-content{
border-radius: 30px !important; border-radius: 30px !important;

2
pages/therapist/therapistDingdan.vue
View File

@ -1524,7 +1524,7 @@
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
overflow: auto; // overflow: auto;
} }
/deep/.u-content{ /deep/.u-content{
border-radius: 30px !important; border-radius: 30px !important;

39
uni_modules/uni-number-box/changelog.md Normal file
View File

@ -0,0 +1,39 @@
## 1.2.8（2024-04-26）
- 修复 在vue2下H5黑边的bug
## 1.2.7（2024-04-26）
- 修复 在vue2手动输入后失焦导致清空数值的严重bug
## 1.2.6（2024-02-22）
- 新增 设置宽度属性width(单位：px)
## 1.2.5（2024-02-21）
- 修复 step步长小于1时，键盘类型为number的bug
## 1.2.4（2024-02-02）
- 修复 加减号垂直位置偏移样式问题
## 1.2.3（2023-05-23）
- 更新示例工程
## 1.2.2（2023-05-08）
- 修复 change 事件执行顺序错误的问题
## 1.2.1（2021-11-22）
- 修复 vue3中某些scss变量无法找到的问题
## 1.2.0（2021-11-19）
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
## 1.1.2（2021-11-09）
- 新增 提供组件设计资源，组件样式调整
## 1.1.1（2021-07-30）
- 优化 vue3下事件警告的问题
## 1.1.0（2021-07-13）
- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.0.7（2021-05-12）
- 新增 组件示例地址
## 1.0.6（2021-04-20）
- 修复 uni-number-box 浮点数运算不精确的 bug
- 修复 uni-number-box change 事件触发不正确的 bug
- 新增 uni-number-box v-model 双向绑定
## 1.0.5（2021-02-05）
- 调整为uni_modules目录规范
## 1.0.7（2021-02-05）
- 调整为uni_modules目录规范
- 新增 支持 v-model
- 新增 支持 focus、blur 事件
- 新增 支持 PC 端

232
uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue Normal file
View File

@ -0,0 +1,232 @@
<template>
<view class="uni-numbox">
<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
:style="{color}">-</text>
</view>
<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value"
:type="step<1?'digit':'number'" v-model="inputValue" :style="{background, color, width:widthWithPx}" />
<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }"
:style="{color}">+</text>
</view>
</view>
</template>
<script>
/**
* NumberBox 数字输入框
* @description 带加减按钮的数字输入框
* @tutorial https://ext.dcloud.net.cn/plugin?id=31
* @property {Number} value 输入框当前值
* @property {Number} min 最小值
* @property {Number} max 最大值
* @property {Number} step 每次点击改变的间隔大小
* @property {String} background 背景色
* @property {String} color 字体颜色（前景色）
* @property {Number} width 输入框宽度(单位:px)
* @property {Boolean} disabled = [true|false] 是否为禁用状态
* @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
* @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
* @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
*/
export default {
name: "UniNumberBox",
emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
props: {
value: {
type: [Number, String],
default: 1
},
modelValue: {
type: [Number, String],
default: 1
},
min: {
type: Number,
default: 0
},
max: {
type: Number,
default: 100
},
step: {
type: Number,
default: 1
},
background: {
type: String,
default: '#f5f5f5'
},
color: {
type: String,
default: '#333'
},
disabled: {
type: Boolean,
default: false
},
width: {
type: Number,
default: 40,
}
},
data() {
return {
inputValue: 0
};
},
watch: {
value(val) {
this.inputValue = +val;
},
modelValue(val) {
this.inputValue = +val;
}
},
computed: {
widthWithPx() {
return this.width + 'px';
}
},
created() {
if (this.value === 1) {
this.inputValue = +this.modelValue;
}
if (this.modelValue === 1) {
this.inputValue = +this.value;
}
},
methods: {
_calcValue(type) {
if (this.disabled) {
return;
}
const scale = this._getDecimalScale();
let value = this.inputValue * scale;
let step = this.step * scale;
if (type === "minus") {
value -= step;
if (value < (this.min * scale)) {
return;
}
if (value > (this.max * scale)) {
value = this.max * scale
}
}
if (type === "plus") {
value += step;
if (value > (this.max * scale)) {
return;
}
if (value < (this.min * scale)) {
value = this.min * scale
}
}
this.inputValue = (value / scale).toFixed(String(scale).length - 1);
// TODO vue2 兼容
this.$emit("input", +this.inputValue);
// TODO vue3 兼容
this.$emit("update:modelValue", +this.inputValue);
this.$emit("change", +this.inputValue);
},
_getDecimalScale() {
let scale = 1;
// 浮点型
if (~~this.step !== this.step) {
scale = Math.pow(10, String(this.step).split(".")[1].length);
}
return scale;
},
_onBlur(event) {
this.$emit('blur', event)
let value = event.detail.value;
if (isNaN(value)) {
this.inputValue = this.value;
return;
}
value = +value;
if (value > this.max) {
value = this.max;
} else if (value < this.min) {
value = this.min;
}
const scale = this._getDecimalScale();
this.inputValue = value.toFixed(String(scale).length - 1);
this.$emit("input", +this.inputValue);
this.$emit("update:modelValue", +this.inputValue);
this.$emit("change", +this.inputValue);
},
_onFocus(event) {
this.$emit('focus', event)
}
}
};
</script>
<style lang="scss">
$box-height: 26px;
$bg: #f5f5f5;
$br: 2px;
$color: #333;
.uni-numbox {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
}
.uni-numbox-btns {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
align-items: center;
justify-content: center;
padding: 0 8px;
background-color: $bg;
/* #ifdef H5 */
cursor: pointer;
/* #endif */
}
.uni-numbox__value {
margin: 0 2px;
background-color: $bg;
width: 40px;
height: $box-height;
text-align: center;
font-size: 14px;
border-width: 0;
color: $color;
}
.uni-numbox__minus {
border-top-left-radius: $br;
border-bottom-left-radius: $br;
}
.uni-numbox__plus {
border-top-right-radius: $br;
border-bottom-right-radius: $br;
}
.uni-numbox--text {
// fix nvue
line-height: 20px;
margin-bottom: 2px;
font-size: 20px;
font-weight: 300;
color: $color;
}
.uni-numbox .uni-numbox--disabled {
color: #c0c0c0 !important;
/* #ifdef H5 */
cursor: not-allowed;
/* #endif */
}
</style>

83
uni_modules/uni-number-box/package.json Normal file
View File

@ -0,0 +1,83 @@
{
"id": "uni-number-box",
"displayName": "uni-number-box 数字输入框",
"version": "1.2.8",
"description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
"keywords": [
"uni-ui",
"uniui",
"数字输入框"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
"type": "component-vue"
},
"uni_modules": {
"dependencies": ["uni-scss"],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y",
"alipay": "n"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}

13
uni_modules/uni-number-box/readme.md Normal file
View File

@ -0,0 +1,13 @@
## NumberBox 数字输入框
> **组件名：uni-number-box**
> 代码块： `uNumberBox`
带加减按钮的数字输入框。
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839

4
uview-ui/libs/request/index.js
View File

@ -102,8 +102,8 @@ class Request {
constructor() { constructor() {
this.config = { this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://120.46.52.165/', // 请求的根域名 baseUrl: 'http://120.46.52.165/', // 请求的根域名
baseUrl: 'http://192.168.2.222:8187/', // baseUrl: 'http://192.168.2.222:8187/',
// baseUrl: 'http://47.75.182.93:8090/', // baseUrl: 'http://47.75.182.93:8090/',
// 默认的请求头 // 默认的请求头
header: {}, header: {},