diff --git a/common/config.js b/common/config.js index 3950d6c..e41b22f 100644 --- a/common/config.js +++ b/common/config.js @@ -2,9 +2,13 @@ // const ROOTPATH1 = "http://120.46.52.165/sqx_fast"; // const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/"; -const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/"; -const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; -const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; +// const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/"; +// const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; +// const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; + +const ROOTPATH3 = "wss://1.92.152.160/wss/websocket/"; +const ROOTPATH = "http://1.92.152.160/sqx_fast"; +const ROOTPATH1 = "http://1.92.152.160/sqx_fast"; // const ROOTPATH3 = "wss://47.75.182.93:8090/wss/websocket/"; // const ROOTPATH = "http://47.75.182.93:8090/sqx_fast"; @@ -49,7 +53,8 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6'; //ws基础连接地址 // const WS_BASE_PATH = 'ws://47.75.182.93:8090/sqx_fast/'; -const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/'; +// const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/'; +const WS_BASE_PATH = 'ws://1.92.152.160/sqx_fast/'; // const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/'; // const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换 diff --git a/common/queue.js b/common/queue.js index a420c58..01f4957 100644 --- a/common/queue.js +++ b/common/queue.js @@ -19,15 +19,17 @@ module.exports = { //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMing() { // return 'https://admin.sjajk.com'//生产需替换 - // return 'http://120.46.52.165' - return 'http://192.168.2.222:8187' + // return 'http://120.46.52.165'1.92.152.160 + // return 'http://192.168.2.222:8187' + return 'http://1.92.152.160' // return 'http://47.75.182.93:8090:8187' }, //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMingApp() { // return 'https://wx.sjajk.com'//生产需替换 // return 'http://120.46.52.165' - return 'http://192.168.2.222:8187' + return 'http://1.92.152.160' + // return 'http://192.168.2.222:8187' // return 'http://47.75.182.93:8090:8187' }, logout() { diff --git a/my/order/pay.vue b/my/order/pay.vue index dd3c1f1..0a2d784 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -293,7 +293,6 @@ --> - + + + + 服务项目 + + + + + + + + {{order.ordersMassageList[0].userPackageDetail.title}} + + + 待支付 + 待服务 + 已完成 + 服务中 + 技师出发 + 技师到达 + 待评价 + 已取消 + 待确认 + 待补单 + + + + + + + {{order.ordersMassageList[0].userPackageDetail.duration}}分钟 + + + + + + ￥ + {{order.ordersMassageList[0].userPackageDetail.packagePrice}} + + + + + + + + + + + + + + 下单人 + + {{order.userName}} + + + + 联系方式 + + {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} + + + + 服务地址 + {{order.address}} + + + + + + + + + + + {{order.artificer.artificerName}} + + + + {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + + + + + + {{order.artificer.ordersCount}} + + 健康技师 + + + + + + 订单信息 + + + + 订单编号 + + {{order.ordersNo}} + + + + + + 预约时间 + {{order.serveTime}} + + + 下单时间 + {{order.createTime}} + + + 开始服务时间 + {{order.startTime}} + + + 结束服务时间 + {{order.endTimes}} + + + 预估结束时间 + {{order.endTime}} + + + + + 订单费用 + + + + {{order.packageType=='105'?'次卡':'疗程'}}名称 + {{order.ordersMassageList[0].userPackageDetail.mainTitle}} + + + 项目名称 + {{order.ordersMassageList[0].userPackageDetail.title}} + + + 服务时长 + {{order.ordersMassageList[0].userPackageDetail.duration}}分钟 + + + 项目价格 + ￥{{order.ordersMassageList[0].userPackageDetail.packagePrice}} + + + 会员折扣 + {{order.vipRate}}% + + + + 小计： + + + + ￥{{order.massageMoney}} + + + + + + + 出行费用 + + + + 出行方式 + 公交 + 出租 + 免费 + + + 全程距离 + {{order.km}}km + + + 出行费用 + ￥{{order.taxiMoney}} + + + + 优惠券信息 + + + + 优惠券 + -￥{{order.couponMoney}} + - + + + + 费用明细 + + + + 订单费用： + ￥{{order.ordersMassageList[0].userPackageDetail.packagePrice}} + + + 出行费用： + ￥{{order.taxiMoney}} + + + 优惠券： + + -￥{{order.couponMoney}} + - + + + 合计： + ￥ + + {{order.payMoney}} + + + + + + 温馨提示：费用随会员等级及技师等级不同而上下浮动 + + + + + + + + + + + 取消订单 + + 立即支付 + + + 去投诉 + + + 拒单详情 + + + 立即预约 + + + 修改订单 + + + 去评价 + + 联系客服 + + + + + 更多 + + 联系客服 + + 提前结束 + + + 充值 + + + 修改订单 + + + + + + + 加钟 + + + 服务升级 + + + + + + + + + + + + + + + {{item.title}} + 已售{{item.sales}} + + + {{items}} + + + + ￥ + {{item.price}} + / + {{item.duration}}分钟 + + + 确认加钟 + + + + + + + + + + + + + + {{item.title}} + + + 服务时长：{{item.duration}}分钟 + 已售：{{item.sales}} + + + + {{item.jianjie}} + + + + + ￥ + {{item.price}} + /元套 + + {{item.oldPrice}} + + + 确认升级 + + + + + + + + + + + + + + + + {{item.text}} + + + + + + + + 确认支付 + + + + + + + + + 请输入提前结束的原因 + x + + + + + + 取消 + + + 确定 + + + + + + + + + + + + + 确认拒单 + x + + + + {{qurenJd.refusalContent}} + + + + 同意 + + + 全额退款 + + + + + + + + + + + + + \ No newline at end of file diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue index c1f88bd..89e6968 100644 --- a/my/order/payModifyCi.vue +++ b/my/order/payModifyCi.vue @@ -3,7 +3,7 @@ - 服务项目 + 项目次卡 ￥ {{orderXm.price}} + @@ -53,10 +54,7 @@ ￥ - {{item.price}} - - - ￥{{item.oldPrice}} + {{item.packagePrice}} 服务时长:{{item.duration}}分钟 diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue index e0fb418..491a5cd 100644 --- a/my/order/payModifyLiao.vue +++ b/my/order/payModifyLiao.vue @@ -3,7 +3,7 @@ - 服务项目 + 服务疗程 ￥ - {{item.price}} - - - ￥{{item.oldPrice}} + {{item.packagePrice}} + 服务时长:{{item.duration}}分钟 diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index 4243bf0..2b9e067 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -52,10 +52,7 @@ ￥ - {{item.price}} - - - ￥{{item.oldPrice}} + {{item.packagePrice}} 服务时长:{{item.duration}}分钟 diff --git a/my/vip/index.vue b/my/vip/index.vue index 68dfe4b..c8b985d 100644 --- a/my/vip/index.vue +++ b/my/vip/index.vue @@ -34,7 +34,7 @@ - 专享{{vrateStr}}折 + 专享{{rateStr}}折 @@ -157,6 +157,7 @@ id: 3 }] // #endif + this.getVipList() this.getvipEndTime(); this.getMemberList() this.getMoney() @@ -171,16 +172,22 @@ } }, methods: { + select(e) { + this.selNum = e.id; + this.price = e.money; + this.vipData.rateStr=e.rateStr; + this.rateStr=e.rateStr; + console.log("rateStr",e) + }, selectWay: function(id) { this.openWay = id; }, getvipEndTime() { this.$Request.get("/app/UserVip/selectUserVip").then(res => { if (res.code == 0) { - var data= res.data.endTime + var data= res.data.endTime||{} this.timeVipEnd = data.slice(0,16); this.getVipList(res.data.vipNameType) - } }); }, @@ -192,14 +199,20 @@ if (res.code == 0) { that.vipList = res.data; // that.rateStr=that.vipList[0].rateStr; - for(var i=0;i { if (res.code == 0) { uni.showToast({ - title:res.msg + title:'抢购成功！' }) }else{ uni.showToast({ diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue index 51cdf7a..e8f1c87 100644 --- a/pages/my/cikarDrtail.vue +++ b/pages/my/cikarDrtail.vue @@ -25,10 +25,14 @@ ￥ {{mainData.price}} - 元/{{mainData.serviceCount}}次 + /{{serviceCount}}次 + /{{mainData.serviceCount}}次 - - ￥{{mainData.oldPrice}}元/ + + ￥{{mainData.oldPrice}}/{{serviceCount}}次 + + + ￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次 @@ -77,10 +81,10 @@ - - SCIENTIFIC WAIST - 科学护腰，不上脊椎 - 让您的腰不在盲目呵护!避免二次伤害! + + + {{item}} + @@ -168,7 +172,8 @@ paySel: 0, tpayMoney: '', mainId:'', - serviceCount:'' + serviceCount:'', + labels:[] } }, computed: { @@ -219,9 +224,11 @@ }, methods:{ detail(item){//详情 + console.log("item=====>",item) if(item.usedQuantity){ + item.id=this.mainData.id uni.navigateTo({ - url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡' + url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'次卡' }) }else{ uni.showToast({ @@ -659,7 +666,9 @@ that.mainData=res.mainData; that.contentImg=that.mainData.contentImg.split(","); that.detailData=res.detailData.list; - that.backgroundImageUrl=that.mainData.packageImg + that.backgroundImageUrl=that.mainData.packageImg; + that.serviceCount=that.detailData[0].serviceCount; + that.labels=that.mainData.labels.split(','); } }) }else{ @@ -673,8 +682,9 @@ that.mainData=res.data.mainData; that.contentImg=that.mainData.contentImg.split(","); that.detailData=res.data.detailData; - that.mainId=that.mainData.id - that.backgroundImageUrl=that.mainData.packageImg + that.mainId=that.mainData.id; + that.backgroundImageUrl=that.mainData.packageImg; + that.labels=that.mainData.labels.split(','); } }) } @@ -685,6 +695,18 @@ }