diff --git a/common/config.js b/common/config.js
index 316c71b..e41b22f 100644
--- a/common/config.js
+++ b/common/config.js
@@ -2,13 +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://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";
@@ -53,8 +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://1.92.152.160/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 2db34c1..01f4957 100644
--- a/common/queue.js
+++ b/common/queue.js
@@ -20,16 +20,16 @@ module.exports = {
publicYuMing() {
// return 'https://admin.sjajk.com'//生产需替换
// 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://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://1.92.152.160'
- 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 d6dbf3b..f216c02 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -202,17 +202,17 @@
- 订单费用：
+ 订单费用：
￥{{order.price}}
- 出行费用：
+ 出行费用：
￥{{order.taxiMoney}}
- 优惠券：
+ 优惠券：
-￥{{order.couponMoney}}
-
@@ -231,163 +231,161 @@
-
-
-
-
-
-
+
+
取消订单
- 立即支付
-
-
- 去投诉
-
-
- 拒单详情
-
-
- 立即预约
-
-
修改订单
-
- 去评价
+ 立即支付
联系客服
-
-
-
- 更多
-
- 联系客服
-
- 提前结束
-
-
- 充值
-
-
- 修改订单
-
-
-
-
-
-
- 加钟
-
-
- 服务升级
-
-
+
+
+ 取消订单
+
+
+ 修改订单
+
+
+ 联系客服
+
+
+
+ 去评价
+
+
+ 去投诉
+
+ 联系客服
+
+
+ 联系客服
+
+
+ 联系客服
+
+
+ 更多
+
+ 取消订单
+
+
+ 充值
+
+
+ 加钟
+
+
+ 联系客服
+
+ 服务升级
+
+
+ 去投诉
+
+
+ 提前结束
+
-
+
+
+
+ 取消订单
+
+
+ 修改订单
+
+ 联系客服
+
+
+
+ 取消订单
+
+
+ 修改订单
+
+ 联系客服
+
+
+
+ 取消订单
+
+
+ 拒单详情
+
+ 联系客服
+
+
+
+ 立即预约
+
+ 联系客服
@@ -594,7 +592,8 @@
artificerlist:[],
tordersId:'',
jiazhong:'',
- shengji:''
+ shengji:'',
+ gengBtnShow:false,
}
},
onLoad(e) {
@@ -651,6 +650,32 @@
// #endif
},
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) {//升级查询技师项目
let data = {
artificerId: artificerId,
@@ -962,33 +987,7 @@
// 返回不含秒的时间戳
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){//提前结束 关闭弹出框
this.type = type
this.$refs.popupQ.close(type);
@@ -1094,7 +1093,7 @@
},
gengBtn(){
- this.btnShow=!this.btnShow
+ this.gengBtnShow=!this.gengBtnShow
},
goChat() {
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
@@ -1802,6 +1801,7 @@
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
}
+
.showBtn-mian{
width: 100%;
display: flex;
@@ -1823,10 +1823,17 @@
position: absolute;
background-color: #f2f2f2;
padding: 10px;
- margin-bottom: 50px;
+ margin-bottom: 230px;
left:0
}
- .showBtn,.hideBtn{
+ .showBtn{
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .hideBtn{
width: 100%;
display: flex;
flex-direction: row;
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 12e22ab..a11363f 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -374,52 +374,11 @@
-->
-
- 取消订单
-
- 立即支付
-
-
- 去投诉
-
-
- 拒单详情
-
-
- 立即预约
-
-
- 修改订单
-
-
- 去评价
-
- 联系客服
-
-
+
+
-
- 联系客服
+ 更多
-
-
-
-
+ @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+ class="dingshi">
+ 去投诉
+
+
+ 去评价
+
+ 联系客服
@@ -1669,6 +1622,10 @@