From da050a7ee950e3305cfdc9c489d23fd3c0d800dd Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Tue, 2 Jul 2024 16:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=89=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/config.js | 16 ++++++++--------
common/queue.js | 8 ++++----
pages/my/cureOderDrtail.vue | 2 +-
pages/therapist/orderDetail.vue | 6 ++++--
pages/therapist/therapist.vue | 3 ---
pages/therapist/therapistDingdan.vue | 3 ---
uview-ui/libs/request/index.js | 4 ++--
7 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/common/config.js b/common/config.js
index e41b22f..316c71b 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 01f4957..2db34c1 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/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index a70e959..45c7130 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -189,7 +189,7 @@
}
that.$Request.get('/app/massage/packageDetail/getAppPackageDetail',data).then(res => {
if (res.code == 0) {
- that.getList=res.data;
+ that.getList=res.dat;
that.backgroundImageUrl=that.getList.massageImg
that.labels=res.data.labels.split(',')
}
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 4f1ea5d..f3bf727 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -141,7 +141,7 @@
- 下单
+ 预约
@@ -540,12 +540,14 @@
})
} else {
var data={
- massageTypeId:massageTypeId,
+ massageTypeId:massageTypeId.massageTypeId,
tripWay:this.order.tripWay,
artificerId:this.order.artificerId,
artificerName:this.order.artificerName
}
+ this.$queue.setData('youhui','');
this.$queue.setData('getJishi',data)
+ this.$queue.setData('xiangmu',massageTypeId)
uni.navigateTo({
url: "/my/order/payModify"
})
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 6e013c2..7c084c8 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -49,9 +49,6 @@
-
- {{item.technicianTypeName}}
-
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 0e8665c..f2046c1 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -49,9 +49,6 @@
-
- {{item.technicianTypeName}}
-
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index ae97323..29654ae 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -102,8 +102,8 @@ class Request {
constructor() {
this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
- // baseUrl: 'http://192.168.2.222:8187/',
- baseUrl: 'http://1.92.152.160/', // 请求的根域名
+ 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/',
// 默认的请求头