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 @@
-
+