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

Compare commits

base: yangjun:40dbfd52e4de633ed60ba2cc6d648500dcfc2968
Branches Tags
yangjun:master
...
compare: yangjun:89b00753dd7624b9edee843adeec3f040567aea9
Branches Tags
yangjun:master

3 Commits
40dbfd52e4 ... 89b00753dd

Author SHA1 Message Date
Mr.jiang 89b00753dd Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-03 18:03:25 +08:00
Mr.jiang f5c86a0d9a 解决冲突 2024-07-03 18:03:15 +08:00
Mr.jiang 17b76ee4d6 订单 2024-07-03 17:58:22 +08:00
7 changed files with 275 additions and 291 deletions
Show Stats Expand all files Collapse all files

16
common/config.js
View File

@ -2,13 +2,13 @@
// const ROOTPATH1 = "http://120.46.52.165/sqx_fast"; // const ROOTPATH1 = "http://120.46.52.165/sqx_fast";
// const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/"; // const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/";
const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/"; // const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/";
const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; // const ROOTPATH = "http://192.168.2.222:8187/sqx_fast";
const ROOTPATH1 = "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 ROOTPATH3 = "wss://1.92.152.160/wss/websocket/";
// const ROOTPATH = "http://1.92.152.160/sqx_fast"; const ROOTPATH = "http://1.92.152.160/sqx_fast";
// const ROOTPATH1 = "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 ROOTPATH3 = "wss://47.75.182.93:8090/wss/websocket/";
// const ROOTPATH = "http://47.75.182.93:8090/sqx_fast"; // const ROOTPATH = "http://47.75.182.93:8090/sqx_fast";
@ -53,8 +53,8 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
//ws基础连接地址 //ws基础连接地址
// const WS_BASE_PATH = 'ws://47.75.182.93:8090/sqx_fast/'; // 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://1.92.152.160/sqx_fast/';
// const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/'; // const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/';
// const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换 // const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换

8
common/queue.js
View File

@ -20,16 +20,16 @@ module.exports = {
publicYuMing() { publicYuMing() {
// return 'https://admin.sjajk.com'//生产需替换 // return 'https://admin.sjajk.com'//生产需替换
// return 'http://120.46.52.165'1.92.152.160 // return 'http://120.46.52.165'1.92.152.160
return 'http://192.168.2.222:8187' // return 'http://192.168.2.222:8187'
// return 'http://1.92.152.160' return 'http://1.92.152.160'
// return 'http://47.75.182.93:8090:8187' // return 'http://47.75.182.93:8090:8187'
}, },
//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
publicYuMingApp() { publicYuMingApp() {
// return 'https://wx.sjajk.com'//生产需替换 // return 'https://wx.sjajk.com'//生产需替换
// return 'http://120.46.52.165' // return 'http://120.46.52.165'
// return 'http://1.92.152.160' return 'http://1.92.152.160'
return 'http://192.168.2.222:8187' // return 'http://192.168.2.222:8187'
// return 'http://47.75.182.93:8090:8187' // return 'http://47.75.182.93:8090:8187'
}, },
logout() { logout() {

367
my/order/pay.vue
View File

@ -202,11 +202,23 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<<<<<<< .mine
<view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text
style="font-size: 26rpx; font-weight: bold;">{{order.price}}</text></view>
=======
<view class="add-con-title">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text>{{order.price}}</text></view> <view class="add-con-cont">￥<text>{{order.price}}</text></view>
>>>>>>> .theirs
</view> </view>
<<<<<<< .mine
<view class="flex justify-between add-lin">
<view class="add-con-title">出行费用：</view>
=======
<view> <view>
<view class="add-con-title">出行费用：</view> <view class="add-con-title">出行费用：</view>
>>>>>>> .theirs
<view class="add-con-cont">￥<text <view class="add-con-cont">￥<text
>{{order.taxiMoney}}</text></view> >{{order.taxiMoney}}</text></view>
</view> </view>
@ -230,163 +242,161 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="pay-ding feiuong">
<view class="fei-title">费用明细</view>
<view class="fei-view">
<view class="fei-view-list">
<span>服务费用</span>
<span>￥268</span>
</view>
<view class="fei-view-list">
<span>出行费用</span>
<span>￥{{order.taxiMoney}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span style="color: #FF3939;">-￥2</span>
</view>
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 29rpx;">￥286</span>
</view>
</view>
</view> -->
</view> </view>
<view class="showBtn" v-if="order.status ==1">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<!-- <view class="bg padding radius margin-top-sm">
<view class="text-lg text-bold">
服务信息
</view>
<view class="margin-right-xs">
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务时间</view>
<view class="">
<text>{{order.serveTime}}</text>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务地点</view>
<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="">
{{order.address}}
<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
</view>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">联系方式</view>
<view class="" @click="bindphone(order.phone)">
{{order.phone}}
<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></image>
</view>
</view>
<view class="flex justify-between margin-top-lg" v-if="order.remark">
<view style="width: 170rpx;">备注内容</view>
<view class="flex">
<view class="">
{{order.remark}}
</view>
</view>
</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 &&
order.status != 4 &&
order.status != 5&&
order.status != 10"
>
取消订单 取消订单
</u-button> </u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button
v-if="order.status == 1" v-if="order.btnShow == 'true'"
class="dingshi">立即支付
</u-button>
<u-button v-if="order.status == 6|| order.status == 3" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
去投诉
</u-button>
<u-button v-if="order.status == 9&&order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="toggleQ('center',order)"
class="dingshi">
拒单详情
</u-button>
<u-button v-if="order.status == 10" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi">
立即预约
</u-button>
<u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent"
:custom-style="customStyle2" :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">
修改订单 修改订单
</u-button> </u-button>
<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true" <u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)" class="dingshi">立即支付
class="dingshi">
去评价
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="dingshi">联系客服</u-button>
</view> </view>
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="showBtn" v-if="order.status ==2">
<view class="showBtn-mian"> <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<view class="showBtn"> 取消订单
<view class="gengduo" @click.stop="gengBtn">更多</view> </u-button>
<view class="show-btn-lin"> <u-button
<u-button shape="circle" :plain="true" @click="goChat" v-if="order.btnShow == 'true'"
class="btns">联系客服</u-button> :custom-style="customStyle2"
<u-button shape="circle" :plain="true"
v-if="order.status == 6" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
shape="circle" :plain="true" class="dingshi">
@click="toggle('center',order)" 修改订单
class="btns"> </u-button>
提前结束
</u-button> <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
<u-button class="dingshi">联系客服</u-button>
v-if="order.status == 6" </view>
shape="circle" :plain="true" <view class="showBtn" v-if="order.status ==3">
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)" <u-button :custom-style="customStyle2" shape="circle" :plain="true"
class="btns"> @click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
充值 class="dingshi">
</u-button> 去评价
<u-button </u-button>
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent" :custom-style="customStyle1" <u-button :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns"> class="dingshi">
修改订单 去投诉
</u-button> </u-button>
</view> <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
</view> class="dingshi">联系客服</u-button>
<view class="showBtn-view" v-show="btnShow"> </view>
<view class="showBtn" v-if="order.status ==4">
<u-button <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
v-if="order.addNum ==null && order.status == 6" class="dingshi">联系客服</u-button>
shape="circle" :plain="true" </view>
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" <view class="showBtn" v-if="order.status ==5">
class="btns"> <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
加钟 class="dingshi">联系客服</u-button>
</u-button> </view>
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null" <view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
shape="circle" :plain="true" <view class="gengduo" @click.stop="gengBtn">更多</view>
@tap="saveJZS(order.artificerId)" <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
class="btns"> >
服务升级 取消订单
</u-button> </u-button>
</view> <u-button
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
充值
</u-button>
<u-button
v-if="order.addNum ==null"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns">
加钟
</u-button>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
服务升级
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
去投诉
</u-button>
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
提前结束
</u-button>
</view> </view>
</view>
<view class="showBtn" v-if="order.status ==7">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
<u-button
v-if="order.btnShow == 'true'"
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi">
修改订单
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==8">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
<u-button
v-if="order.btnShow == 'true'"
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi">
修改订单
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==9">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
<u-button v-if="order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="toggleQ('center',order)"
class="dingshi">
拒单详情
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==10">
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi">
立即预约
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view> </view>
</view> </view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@ -593,7 +603,8 @@
artificerlist:[], artificerlist:[],
tordersId:'', tordersId:'',
jiazhong:'', jiazhong:'',
shengji:'' shengji:'',
gengBtnShow:false,
} }
}, },
onLoad(e) { onLoad(e) {
@ -650,6 +661,32 @@
// #endif // #endif
}, },
methods: { methods: {
getOrder() {
let data = {
ordersId: this.ordersId
}
this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
if (res.code == 0) {
this.loading = false
uni.hideLoading()
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')
}
let aliphone = this.$queue.getData('aliphone');
if (aliphone === '是' && this.order.artificer) {
this.ysPhone(this.order.phone, this.order.artificer.phone);
}
}
})
},
saveJZS(artificerId) {//升级查询技师项目 saveJZS(artificerId) {//升级查询技师项目
let data = { let data = {
artificerId: artificerId, artificerId: artificerId,
@ -961,33 +998,7 @@
// 返回不含秒的时间戳 // 返回不含秒的时间戳
return utcDate.getTime(); return utcDate.getTime();
}, },
getOrder() {
let data = {
ordersId: this.ordersId
}
this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
if (res.code == 0) {
this.loading = false
uni.hideLoading()
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');
if (aliphone === '是' && this.order.artificer) {
this.ysPhone(this.order.phone, this.order.artificer.phone);
}
}
})
},
closePopupQ(type){//提前结束 关闭弹出框 closePopupQ(type){//提前结束 关闭弹出框
this.type = type this.type = type
this.$refs.popupQ.close(type); this.$refs.popupQ.close(type);
@ -1093,7 +1104,7 @@
}, },
gengBtn(){ gengBtn(){
this.btnShow=!this.btnShow this.gengBtnShow=!this.gengBtnShow
}, },
goChat() { goChat() {
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
@ -1801,6 +1812,7 @@
/deep/.u-size-default{ /deep/.u-size-default{
margin: 5px 0px 0px 0px; margin: 5px 0px 0px 0px;
} }
.showBtn-mian{ .showBtn-mian{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1822,10 +1834,17 @@
position: absolute; position: absolute;
background-color: #f2f2f2; background-color: #f2f2f2;
padding: 10px; padding: 10px;
margin-bottom: 50px; margin-bottom: 230px;
left:0 left:0
} }
.showBtn,.hideBtn{ .showBtn{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.hideBtn{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

92
my/order/payJaZ.vue
View File

@ -374,52 +374,11 @@
</view> </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" <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
class="dingshi">立即支付
</u-button>
<u-button v-if="order.status == 5|| order.status == 3" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
去投诉
</u-button>
<u-button v-if="order.status == 9&&order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="toggleQ('center',order)"
class="dingshi">
拒单详情
</u-button>
<u-button v-if="order.status == 10" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi">
立即预约
</u-button>
<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"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
class="dingshi">
修改订单
</u-button>
<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="dingshi">
去评价
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center">
<view class="showBtn-mian"> <view class="showBtn-mian">
<view class="showBtn"> <view class="showBtn">
<!-- <view class="gengduo" @click.stop="gengBtn">更多</view> --> <view class="gengduo" @click.stop="gengBtn">更多</view>
<u-button shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
<u-button <u-button
shape="circle" :plain="true" shape="circle" :plain="true"
@click="toggle('center',order)" @click="toggle('center',order)"
@ -439,26 +398,20 @@
充值 充值
</u-button> </u-button>
</view> </view>
<view class="showBtn-view" v-show="btnShow"> <view v-if="btnShow==true" class="flex padding-top-sm padding-bottom-sm align-center">
<!-- <u-button <u-button :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns"> class="dingshi">
充值 去投诉
</u-button> --> </u-button>
<!-- <u-button <u-button :custom-style="customStyle2" shape="circle" :plain="true"
v-if="order.addNum==null && order.status == 6" @click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
shape="circle" :plain="true" class="dingshi">
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" 去评价
class="btns"> </u-button>
加钟 <u-button shape="circle" :plain="true" @click="goChat"
</u-button> --> class="btns">联系客服</u-button>
<!-- <u-button v-if="order.oldOrdersId==null && order.status == 6"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
升级项目
</u-button> -->
</view> </view>
</view> </view>
@ -1669,6 +1622,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dingshi,.btns{
width: 0px !important;
padding: 0px 42px !important;
}
/deep/.padding-bottom{ /deep/.padding-bottom{
padding-bottom: 50px; padding-bottom: 50px;
} }
@ -1875,7 +1832,14 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.showBtn,.hideBtn{ .showBtn{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.hideBtn{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

8
my/order/payShengji.vue
View File

@ -375,12 +375,12 @@
</view> </view>
</view> --> </view> -->
<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="dingshi">联系客服</u-button>
</view> </view>
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<view class="showBtn-mian"> <view class="showBtn-mian">
<view class="showBtn"> <view class="showBtn">
<view class="gengduo" @click.stop="gengBtn">更多</view> <view class="gengduo" @click.stop="gengBtn">更多</view>
@ -1627,6 +1627,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dingshi,.btns{
width: 0px !important;
padding: 0px 42px !important;
}
/deep/.padding-bottom{ /deep/.padding-bottom{
padding-bottom: 50px; padding-bottom: 50px;
} }

71
pages/order/index.vue
View File

@ -99,10 +99,11 @@
</view> </view>
<view class="showBtn" v-if="item.status ==3"> <view class="showBtn" v-if="item.status ==3">
<u-button :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true" <u-button :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)"> @click="goNav('/my/order/feedback?artificerId='+item.artificerId,item)">
待评价 待评价
</u-button> </u-button>
<u-button :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" > <u-button :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true"
@click="goNav('/my/order/complain?id='+item.ordersId,item)" >
去投诉 去投诉
</u-button> </u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true" <u-button :custom-style="customStyle1" shape="circle" :plain="true"
@ -427,6 +428,36 @@
} }
}, },
methods: { methods: {
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
console.log("oldOrdersId=======",item)
if(item.oldOrdersId){//如果有订单有升级 那就去升级订单详情
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+item.ordersId
})
}else if(item.addNum){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId
})
}else if(item.addNum&&item.oldOrdersId){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId
})
}else if(text=='修改'){
uni.navigateTo({
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
})
}else if(item.packageType=='104'||item.packageType=='105'||item.packageType=='106'){
uni.navigateTo({
url:'/my/order/paydingTCX?ordersId='+item.ordersId
})
}else{
uni.navigateTo({
url:url
})
}
},
timeToMilliseconds(timeStr) { timeToMilliseconds(timeStr) {
// 分割时分为数组 // 分割时分为数组
let parts = timeStr.split(':'); let parts = timeStr.split(':');
@ -478,41 +509,7 @@
}); });
}, },
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
console.log("oldOrdersId=======",item)
// if(item.isSupplement=='1'){
// uni.navigateTo({
// url:url
// })
// }
if(item.oldOrdersId){//如果有订单有升级 那就去升级订单详情
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+item.ordersId
})
}else if(item.addNum){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId
})
}else if(item.addNum&&item.oldOrdersId){
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId
})
}else if(text=='修改'){
uni.navigateTo({
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
})
}else if(item.packageType=='104'||item.packageType=='105'||item.packageType=='106'){
uni.navigateTo({
url:'/my/order/paydingTCX?ordersId='+item.ordersId
})
}else{
uni.navigateTo({
url:url
})
}
},
gengBtn(index){//更多按钮 gengBtn(index){//更多按钮
// console.log("inex=====",index) // console.log("inex=====",index)
this.gengNum=index; this.gengNum=index;

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://192.168.2.222:8187/', // baseUrl: 'http://192.168.2.222:8187/',
// baseUrl: 'http://1.92.152.160/', // 请求的根域名 baseUrl: 'http://1.92.152.160/', // 请求的根域名
// baseUrl: 'http://120.46.52.165/', // 请求的根域名 // baseUrl: 'http://120.46.52.165/', // 请求的根域名
// baseUrl: 'http://47.75.182.93:8090/', // baseUrl: 'http://47.75.182.93:8090/',
// 默认的请求头 // 默认的请求头