From 21236ed8560fc2c80fe777ff872ed9bce455cec4 Mon Sep 17 00:00:00 2001 From: ChuShiZ Date: Fri, 6 Sep 2024 09:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderCard/OrderCard.vue | 5 +++ components/tabBar/tabBar.vue | 15 +++++-- pages/login/login.vue | 10 ++--- pages/rescue/rescue.vue | 47 ++++++++++++--------- static/icons/homeOrderCard/dhjl.png | Bin 1000 -> 1413 bytes static/icons/homeOrderCard/dqc.png | Bin 1338 -> 1205 bytes static/icons/homeOrderCard/dqc.svg | 19 +++++++++ static/icons/homeOrderCard/dzf.png | Bin 591 -> 620 bytes static/icons/homeOrderCard/jyz.png | Bin 1147 -> 988 bytes static/icons/homeOrderCard/yjsj.png | Bin 1457 -> 1530 bytes static/icons/homeOrderCard/yjsj.svg | 18 ++++++++ static/icons/homeOrderCard/ywc.png | Bin 994 -> 1149 bytes static/icons/homeTopMenu/icon_clean.png | Bin 1642 -> 1919 bytes static/icons/homeTopMenu/icon_fitment.png | Bin 1693 -> 2220 bytes static/icons/homeTopMenu/icon_maintain.png | Bin 1164 -> 1453 bytes static/icons/homeTopMenu/icon_tenement.png | Bin 1395 -> 1731 bytes static/icons/tabbar/car.png | Bin 875 -> 997 bytes static/icons/tabbar/car.svg | 16 +++++++ static/icons/tabbar/home-checked.png | Bin 826 -> 835 bytes static/icons/tabbar/home-checked.svg | 14 ++++++ static/icons/tabbar/my-checked.png | Bin 1149 -> 1533 bytes static/icons/tabbar/my.png | Bin 1182 -> 1487 bytes static/icons/tabbar/my.svg | 16 +++++++ static/msgV.mp3 | Bin 0 -> 87025 bytes static/my/4cccl@2x.png | Bin 1836 -> 1836 bytes static/my/bz21@2x.png | Bin 1614 -> 1615 bytes static/my/jyll@2x.png | Bin 1310 -> 1308 bytes static/my/payment.png | Bin 1187 -> 1187 bytes utils/tebBarSocket.js | 2 +- 29 files changed, 131 insertions(+), 31 deletions(-) create mode 100644 static/icons/homeOrderCard/dqc.svg create mode 100644 static/icons/homeOrderCard/yjsj.svg create mode 100644 static/icons/tabbar/car.svg create mode 100644 static/icons/tabbar/home-checked.svg create mode 100644 static/icons/tabbar/my.svg create mode 100644 static/msgV.mp3 diff --git a/components/orderCard/OrderCard.vue b/components/orderCard/OrderCard.vue index c992102..ba1ca0e 100644 --- a/components/orderCard/OrderCard.vue +++ b/components/orderCard/OrderCard.vue @@ -17,7 +17,12 @@ {{orderData.distance / 1000 || 0}}KM   + + + + + {{orderData.needTime || 0}}分钟 到达 diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 4c4e7e7..9174323 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -53,7 +53,9 @@ getToken } from '@/utils/auth' const innerAudioContext = uni.createInnerAudioContext(); + // #ifdef APP || H5 const jyJPush = uni.requireNativePlugin('JY-JPush'); + // #endif export default { data() { return { @@ -97,7 +99,7 @@ // #endif if (!this.nowPageInterval) { this.nowPageInterval = setInterval(() => { - console.log('this.$msgSocket: ',this.$msgSocket); + // console.log('this.$msgSocket: ',this.$msgSocket); this.msgSocket = this.$msgSocket }, 3000); } @@ -122,8 +124,13 @@ methods: { dianyidain() { - console.log('执行了,dianyidain'); - innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3'; +console.log('执行了,dianyidain'); + // #ifdef APP-PLUS + innerAudioContext.src = '../../static/msgV.mp3'; + // #endif + // #ifndef APP-PLUS + innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3'; + // #endif // 设置播放次数和计数器 const playCount = 5; let currentCount = 0; @@ -153,7 +160,7 @@ if (this.msgSocket) { console.log('消息回调启动成功') this.msgSocket.onMessage(res => { - console.log("发出提示音"); + console.log("发出提示音", res); this.getbottom(); this.dianyidain() }) diff --git a/pages/login/login.vue b/pages/login/login.vue index 0f4dca3..edc3a5b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -190,7 +190,7 @@ success: () => { console.log(1); uni.request({ - url: that.baseUrl + "/wxLoginRescue", + url: that.baseUrl + "/rescue/wxLoginRescue", method: "POST", data: { code: res.code, @@ -201,20 +201,20 @@ }, success: (rex) => { console.log('wxLoginRescue返回', rex) - if (rex.data.code == 200) { + if (rex.data.code == 0) { if (that.loginStatus) { clearInterval(that.loginStatus) } // uni.setStorageSync('App-Token', rex.atoken); - setToken(rex.data.token) - console.log('rex.token:', rex.data.token); + setToken(rex.data.data.accessToken) + console.log('rex.token:', rex.data.data.accessToken); if (that.returnUrl) { uni.navigateBack() } else { // this.userinfo() // uni.setStorageSync('App-Token', rex.token); - setToken(rex.data.token) + setToken(rex.data.data.accessToken) that.userinfo() console.log('成功'); diff --git a/pages/rescue/rescue.vue b/pages/rescue/rescue.vue index 1f6bb27..6ca34b4 100644 --- a/pages/rescue/rescue.vue +++ b/pages/rescue/rescue.vue @@ -21,7 +21,7 @@ - + @@ -35,7 +35,7 @@ 我的订单 - + 待评价 @@ -52,7 +52,12 @@ {{dqcNum }} - + + + + + + 待取车 @@ -141,7 +146,7 @@ --> 救援推荐 - + 历史订单 @@ -226,14 +231,14 @@