|
@@ -13,7 +13,7 @@
|
|
|
<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
|
|
|
<view style="height: 44px;"></view>
|
|
|
<scroll-view class="conversations" scroll-y="true">
|
|
|
- <view @click="setClipboardData">token:{{token}}</view>
|
|
|
+ <!-- <view @click="setClipboardData">token:{{token}}</view> -->
|
|
|
<view>
|
|
|
<!-- <video src="https://66-goesay.oss-accelerate.aliyuncs.com/goeasy-im-dmsIMTest/3369051043664274_uni-video.mp4" id="videoPlayer"
|
|
|
></video> -->
|
|
@@ -140,9 +140,12 @@
|
|
|
console.log('GoEasy connect successfully.')
|
|
|
},
|
|
|
onFailed: (error) => {
|
|
|
+ uni.hideLoading();
|
|
|
+ this.imLoginUrl()
|
|
|
console.log('Failed to connect GoEasy, code:' + error.code + ',error:' + error.content);
|
|
|
},
|
|
|
onProgress: (attempts) => {
|
|
|
+ uni.hideLoading();
|
|
|
console.log('GoEasy is connecting', attempts);
|
|
|
}
|
|
|
});
|
|
@@ -174,7 +177,23 @@
|
|
|
this.$http('imSys/imLoginUrl', {
|
|
|
token:this.token,
|
|
|
},'POST').then(res => {
|
|
|
- // console.log(res)
|
|
|
+ //console.log(res)
|
|
|
+ if(res.code!=0){
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: res.msg,
|
|
|
+ showCancel:false,
|
|
|
+ success: function (res) {
|
|
|
+ if (res.confirm) {
|
|
|
+ console.log('用户点击确定');
|
|
|
+ } else if (res.cancel) {
|
|
|
+ console.log('用户点击取消');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ return false
|
|
|
+ }
|
|
|
var users={
|
|
|
userId:res.data.userId,
|
|
|
name:res.data.users.name,
|
|
@@ -222,7 +241,7 @@
|
|
|
var android = /android/.test(userAgent)
|
|
|
if (ios) {
|
|
|
if ( true) {//!standalone&& !safari
|
|
|
- window.webkit.messageHandlers.goMyNav.vinScan(null)
|
|
|
+ window.webkit.messageHandlers.vinScan.postMessage(null)
|
|
|
}
|
|
|
} else if (android) {
|
|
|
window.android.vinScan()
|
|
@@ -356,7 +375,7 @@
|
|
|
var android = /android/.test(userAgent)
|
|
|
if (ios) {
|
|
|
if ( true) {//!standalone&& !safari
|
|
|
- window.webkit.messageHandlers.shopApp.postMessage()
|
|
|
+ window.webkit.messageHandlers.privateChatWeb.postMessage(url)
|
|
|
}
|
|
|
} else if (android) {
|
|
|
window.android.privateChatWeb(url)
|