From cb9cc0fa0a9ba71b6ada8c98d617de00c19a23ff Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Thu, 27 Jun 2024 15:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 6 +++--- common/config.js | 4 ++-- my/order/revenueDetails.vue | 4 ++-- pages/order/index.vue | 13 ++++++++----- uview-ui/libs/request/index.js | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/App.vue b/App.vue index d8fcdba..863e6a2 100644 --- a/App.vue +++ b/App.vue @@ -754,9 +754,9 @@ export default { @import 'components/colorui/icon.css'; @import './static/css/common.css'; @import './static/css/simplepro.css'; -/deep/.uni-scroll-view-content{ - height: 350px !important; - } +// /deep/.uni-scroll-view-content{ +// height: 350px !important; +// } page { background-color: #FFFFFF; color: #343546; diff --git a/common/config.js b/common/config.js index 832a2ce..15d567e 100644 --- a/common/config.js +++ b/common/config.js @@ -4,8 +4,8 @@ //测试环境 const PROT = "http://" // const ROOTHOST = "47.75.182.93:8090"; -// const ROOTHOST = "192.168.2.222:8187"; -const ROOTHOST = "120.46.52.165"; +const ROOTHOST = "192.168.2.222:8187"; +// const ROOTHOST = "120.46.52.165"; // const ROOTHOST = "192.168.0.115:8187"; // const ROOTHOST = "192.168.1.169:8187"; // 后端本地张聪 diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue index b49f2d3..5ad7534 100644 --- a/my/order/revenueDetails.vue +++ b/my/order/revenueDetails.vue @@ -276,11 +276,11 @@ 服务完成 确认接单 - 拒单申请 diff --git a/pages/order/index.vue b/pages/order/index.vue index a3a63ce..0f160be 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -79,7 +79,7 @@ 已完成 --> - 预约时间:{{ item.serveTime }}S + 预约时间:{{ item.serveTime }} 拒单审核中... @@ -549,8 +549,12 @@ this.$Request.getT("/app/artificer/jishiQueren",{ ordersId:ordersId }).then(res => { - if (res.code == 0) { - that.$queue.showToast(res.msg); + if (res.code == 200) { + console.log("asdsad") + uni.showToast({ + title:'已确认接单' + }) + that.upCallback(1) } else { that.$queue.showToast(res.msg); } @@ -749,8 +753,7 @@ // console.log(this.endTime) this.mescroll.resetUpScroll() }, - goNav(e, name) { - console.log(e) + goNav(e,name) { if (this.userId) { uni.navigateTo({ url: e diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index 1d18b84..7cd3e99 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -103,8 +103,8 @@ class Request { this.config = { // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名 - baseUrl: 'http://120.46.52.165/', // 请求的根域名 - // baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 + // baseUrl: 'http://120.46.52.165/', // 请求的根域名 + baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST',