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

订单

This commit is contained in:
Mr.jiang 2024-07-02 15:25:43 +08:00
parent 06f813662a
commit 79e51ea04d
17 changed files with 2479 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/config.js
View File

@ -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/';//生产需替换

8
common/queue.js
View File

@ -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() {

2
my/order/pay.vue
View File

@ -293,7 +293,6 @@
</view>
</view>
</view> -->
<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
v-if="order.status != 3 &&
@ -1039,7 +1038,6 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
uni.getLocation({
type: 'wgs84',
success: function (resa) {

2244
my/order/payCLDetail.vue Normal file
View File

File diff suppressed because it is too large Load Diff

8
my/order/payModifyCi.vue
View File

@ -3,7 +3,7 @@
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title" style="">服务项目</view>
<view class="pay-title" style="">项目次卡</view>
<view class="flex">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.packageImg"
@ -23,6 +23,7 @@
<span>￥</span>
<span>{{orderXm.price}}</span>
</view>
<view>
<uni-number-box :width='27' :min="1" @change="changeValue" />
</view>
@ -53,10 +54,7 @@
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{item.price}}</span>
</view>
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
￥{{item.oldPrice}}
<span>{{item.packagePrice}}</span>
</view>
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
</view>

8
my/order/payModifyLiao.vue
View File

@ -3,7 +3,7 @@
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title" style="">服务项目</view>
<view class="pay-title" style="">服务疗程</view>
<view class="flex">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.packageImg"
@ -53,11 +53,9 @@
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{item.price}}</span>
</view>
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
￥{{item.oldPrice}}
<span>{{item.packagePrice}}</span>
</view>
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
</view>
<view class="tese">

5
my/order/payModifyTc.vue
View File

@ -52,10 +52,7 @@
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{item.price}}</span>
</view>
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
￥{{item.oldPrice}}
<span>{{item.packagePrice}}</span>
</view>
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
</view>

43
my/vip/index.vue
View File

@ -34,7 +34,7 @@
<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
<view class="quanyi_listitem">
<image src="../../static/vip/zuanshi.png"></image>
<view class="listitem_name">专享{{vrateStr}}折</view>
<view class="listitem_name">专享{{rateStr}}折</view>
</view>
<view class="quanyi_listitem">
<image src="../../static/vip/wangguan.png"></image>
@ -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<res.data.length;i++){
if(vipNameType==res.data[i].vipNameType){
that.rateStr=res.data[i].rateStr
that.selNum = res.data[i].id
that.price = res.data[i].money
}
}
// for(var i=0;i<res.data.length;i++){
// if(vipNameType==res.data[i].vipNameType){
// that.rateStr=res.data[i].rateStr
// that.selNum = res.data[i].id
// that.price = res.data[i].money
// }
// }
that.rateStr=res.data[0].rateStr
that.selNum = res.data[0].id
that.price = res.data[0].money
// for(var i=0;i<res.data.length;i++){
// that.selNum = res.data[i].id
// that.price = res.data[i].money
// }
}
})
},
@ -231,15 +244,11 @@
}
});
},
select(e) {
this.selNum = e.id;
this.price = e.money;
this.vipData.rateStr=e.rateStr
},
pay() {
this.getMoney()
this.showpay = false;
this.$queue.showLoading('支付中...')
// this.$queue.showLoading('支付中...')
let that = this;
let data = {
id: this.selNum,

9
pages.json
View File

@ -511,6 +511,15 @@
"titleNView": false
}
}
},{
"path": "order/payCLDetail",
"style": {
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false
}
}
},{
"path": "order/paydingTCX",
"style": {

2
pages/index/index.vue
View File

@ -660,7 +660,7 @@
that.$Request.get('/app/coupon/insertNewUserCoupon').then(res => {
if (res.code == 0) {
uni.showToast({
title:res.msg
title:'抢购成功！'
})
}else{
uni.showToast({

56
pages/my/cikarDrtail.vue
View File

@ -25,10 +25,14 @@
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{mainData.price}}</span>
<span>元/{{mainData.serviceCount}}次</span>
<span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
<span v-else>/{{mainData.serviceCount}}次</span>
</view>
<view class="header-bottom-money-jia">
￥{{mainData.oldPrice}}元/
<view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{serviceCount}}次
</view>
<view v-else class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
</view>
</view>
</view>
@ -77,10 +81,10 @@
</view>
<view class="detail-foot-mian detail-pad">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
<view class="detail-foot-mian-txet">
<span>SCIENTIFIC WAIST</span>
<span>科学护腰，不上脊椎</span>
<span>让您的腰不在盲目呵护!避免二次伤害!</span>
<view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span>
</view>
</view>
</view>
</view>
@ -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 @@
}
</script>
<style scoped>
.lab-view{
width:100%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
}
.detail-foot-mian-txet{
width: 50%;
margin-top: 20px;
text-align: center;
}
/deep/uni-checkbox .uni-checkbox-input{
width: 26px;
height: 26px;
@ -974,18 +996,12 @@
font-weight: bold;
margin-bottom:3px;
}
.detail-foot-mian-txet span:nth-child(3){
.detail-foot-mian-txetList{
color: #777777;
font-size: 14px;
font-weight: bold;
}
.detail-foot-mian-txet{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20px;
}
.detail-foot-mian-img{
width: 100%;
height:auto;

25
pages/my/cureOderDrtail.vue
View File

@ -111,10 +111,10 @@
</view>
<view class="detail-foot-mian">
<image class="detail-foot-mian-img" :src="getList.contentImg" mode="widthFix"></image>
<view class="detail-foot-mian-txet">
<span>SCIENTIFIC WAIST</span>
<span>科学护腰，不上脊椎</span>
<span>让您的腰不在盲目呵护!避免二次伤害!</span>
<view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span>
</view>
</view>
</view>
</view>
@ -132,7 +132,8 @@
isVIP:false,
// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
backgroundImageUrl: '',
nameText:''
nameText:'',
labels:[]
}
},
computed: {
@ -190,6 +191,7 @@
if (res.code == 0) {
that.getList=res.data;
that.backgroundImageUrl=that.getList.massageImg
that.labels=res.data.labels.split(',')
}
})
},
@ -206,6 +208,7 @@
if (res.code == 0) {
that.getList=res.data;
that.backgroundImageUrl=that.getList.massageImg
that.labels=res.data.labels.split(',')
}
})
},
@ -213,6 +216,18 @@
}
</script>
<style scoped>
.lab-view{
width:100%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
}
.detail-foot-mian-txet{
width: 50%;
margin-top: 20px;
text-align: center;
}
.header-fubz{
font-size: 26rpx;
color: #029c88;

65
pages/my/fuwuliaochengDetail.vue
View File

@ -25,9 +25,13 @@
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{mainData.price}}</span>
<span>/{{mainData.serviceCount}}次</span>
<span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
<span v-else>/{{mainData.serviceCount}}次</span>
</view>
<view class="header-bottom-money-jia" style="text-decoration: line-through;">
<view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{serviceCount}}次
</view>
<view v-else class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
</view>
</view>
@ -82,10 +86,10 @@
</view>
<view class="detail-foot-mian">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
<view class="detail-foot-mian-txet">
<span>SCIENTIFIC WAIST</span>
<span>科学护腰，不上脊椎</span>
<span>让您的腰不在盲目呵护!避免二次伤害!</span>
<view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span>
</view>
</view>
</view>
</view>
@ -175,7 +179,9 @@
tpayMoney: '',
page:1,
limit:10,
mainId:''
mainId:'',
serviceCount:'',
labels:[]
}
},
computed: {
@ -227,10 +233,10 @@
},
methods:{
details(item){//详情
console.log("item.usedQuantity",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({
@ -595,12 +601,14 @@
}
},
openpay(item) {//立即预约
item.packagePrice=this.detailData[0].packagePrice;
item.massageImg=this.detailData[0].massageImg;
this.$queue.setData('mainData',item)
this.$queue.setData('detailData',this.detailData)
this.$queue.setData('xiangmu',item)
this.$queue.setData('youhui','');
uni.navigateTo({
url:'/my/order/payModifyTcMy?ordersId='+item.id
url:'/my/order/payModifyLiao?ordersId='+item.id
})
// this.goOrder()
// this.showpay = true
@ -652,14 +660,7 @@
});
},
detail(item){//详情
this.$queue.setData('daibudan','');
if(item=='0'){
// uni.navigateTo({
// url:'/my/order/payModify'
// })
}
},
getData(){
var that=this;
@ -675,6 +676,9 @@
that.detailData=res.detailData.list;
that.backgroundImageUrl=res.mainData.packageImg
that.contentImg=res.mainData.contentImg.split(",");
that.liaoTime=that.detailData[0].intervalDaysStr;
that.serviceCount=that.detailData[0].serviceCount;
that.labels=that.mainData.labels.split(',')
}
})
}else{
@ -690,7 +694,8 @@
that.contentImg=that.mainData.contentImg.split(",");
that.mainId=that.mainData.id
that.liaoTime=res.data.detailData[0].intervalDaysStr;
that.backgroundImageUrl=that.mainData.packageImg
that.backgroundImageUrl=that.mainData.packageImg;
that.labels=that.mainData.labels.split(',')
}
})
}
@ -699,6 +704,18 @@
}
</script>
<style scoped>
.lab-view{
width:100%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
}
.detail-foot-mian-txet{
width: 50%;
margin-top: 20px;
text-align: center;
}
/deep/uni-checkbox .uni-checkbox-input{
width: 26px;
height: 26px;
@ -971,18 +988,12 @@
font-weight: bold;
margin-bottom:3px;
}
.detail-foot-mian-txet span:nth-child(3){
.detail-foot-mian-txetList{
color: #777777;
font-size: 14px;
font-weight: bold;
}
.detail-foot-mian-txet{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20px;
}
.detail-foot-mian-img{
width: 100%;
height:auto;

8
pages/my/indextaociliaoList.vue
View File

@ -36,12 +36,12 @@
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<span>元/套</span>
<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text> {{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
<span>￥</span>
<span>{{item.oldPrice}}</span>
<span>{{item.oldPrice}}<text v-if="item.type!='104'">/{{item.serviceCount}}次</text></span>
</view>
<view class="item-view-bottom-btn">
购买
查看
</view>
</view>
</view>
@ -72,7 +72,7 @@
limit:10,
titleNmae:'',
classifyId:'',
getName:''
getName:'',
}
},
onLoad(e){

130
pages/my/orderDetailsList.vue
View File

@ -18,35 +18,49 @@
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<view class="item-img">
<image :src="item.massageImg" mode=""></image>
<view class="flex justify-between">
<view class="flex align-center profile-img">
<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
</image>
<view class="margin-left-xs ">{{item.artificerName}}</view>
</view>
<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待支付</span></view>
<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
<view class="item-view">
<view class="item-view-title">
<span class="item-view-title-text">{{item.title}}</span>
<span class="header-bottom-title-liao">
{{item.typeName}}
</span>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class=" u-flex u-p-t-30">
<view class="u-m-r-10">
<u-avatar
:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
mode="square" size="100" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;">
</u-avatar>
</view>
<!-- <view class="item-view-xiangmu">
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
</view> -->
<view class="item-view-jianjie">
{{item.content}}
</view>
<view class="item-view-bottom">
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<span>/元套</span>
<span>{{item.oldPrice}}</span>
<view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;">
<view class=" text-lg "
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.ordersMassageList[0].userPackageDetail.title}}
</view>
</view>
<view class="item-view-bottom-btn">
查看
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
预约时间：{{item.serveTime}}
</view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.ordersMassageList[0].userPackageDetail.packagePrice}}</text>
</view>
</view>
</view>
</view>
</view>
</template>
</t-refresh>
@ -112,48 +126,40 @@
}
},
getData(){
this.$Request.get("/app/collect/massage/findPage", {
userId: this.myId,
classify:'2',
this.$Request.get("/app/artificer/selectAppOrdersList", {
page:this.page,
limit:this.limit,
title:this.searchValue
title:this.searchValue,
userPackageId:this.previousPage.id
}).then(res => {
if (res.code == 0) {
if (res.data) {
if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
this.dataList = [...this.dataList, ...res.data.records]; //追加新数据
this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
uni.stopPullDownRefresh()
}
}
});
},
backImg(){//返回上一页
uni.reLaunch({
url:'/pages/my/index'
})
if(this.previousPage=='次卡'){
uni.reLaunch({
url:'/pages/my/cikarDrtail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
})
}else{
uni.reLaunch({
url:'/pages/my/fuwuliaochengDetail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
})
}
},
clear(res) {
this.getData()
},
itemClick(item) {
if(item.typeName=='项目'){
uni.navigateTo({
url:'/pages/my/fuwuDateil?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
})
}else if(item.typeName=='套餐'){
uni.navigateTo({
url:'/pages/my/serviceOderDrtail?id='+item.projectId+'&limit='+10+'&page='+1+'&name='+'index'
})
}else if(item.typeName=='次卡'){
uni.navigateTo({
url:'/pages/my/cikarDrtail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
})
}else if(item.typeName=='疗程'){
uni.navigateTo({
url:'/pages/my/fuwuliaochengDetail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
})
}
uni.navigateTo({
url:'/my/order/payCLDetail?ordersId='+item.ordersId
})
}
}
@ -161,6 +167,24 @@
</script>
<style scoped>
/deep/.justify-between{
align-items: center;
}
.ding-view{
position: relative;
}
.text-green span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
color: #7D7D7D;
margin-right: 10px;
}
.text-green span:nth-child(2){
font-weight: 400;
font-size: 25rpx;
color: #7D7D7D;
margin-right: 10px;
}
.header-bottom-title-liao{
display: inline-block;
padding: 0 7px;
@ -321,16 +345,14 @@
height: 100%;
}
.item {
width: 100%;
width: 95%;
display: flex;
flex-direction: row;
justify-content: space-between;
flex-direction: column;
height: 140px;
background: #FFFFFF;
border-radius: 21rpx;
margin-top:20px;
align-items: center;
padding: 0px 5px;
margin: 20px auto 0px auto;
}
.item-detail {

3
pages/order/index.vue
View File

@ -421,6 +421,7 @@
accomplishLatitude:latitude,
earlyFinishReason: that.earlyFinishReason,
}
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
@ -433,7 +434,7 @@
console.log('shibai：' + latitude);
uni.showToast({
icon:'error',
title:'操作失败！'
title:res.msg
})
}

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

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