twt vor 1 Monat
Ursprung
Commit
cd69611136
5 geänderte Dateien mit 33 neuen und 8 gelöschten Zeilen
  1. 3 0
      App.vue
  2. 23 4
      pages/inquiry.vue
  3. 1 1
      pages/login.vue
  4. 1 1
      pages/mine.vue
  5. 5 2
      pages/qunfa.vue

+ 3 - 0
App.vue

@@ -57,4 +57,7 @@ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
   color: #D02129 !important;
 }
 /*  #endif  */
+.uni-tabbar-border{
+	height: 1rpx !important;
+}
 </style>

+ 23 - 4
pages/inquiry.vue

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

+ 1 - 1
pages/login.vue

@@ -172,7 +172,7 @@
 		  var android = /android/.test(userAgent)
 		  if (ios) {
 			 if ( true) {//!standalone&& !safari
-			   window.webkit.messageHandlers.goMyNav.saveWebState(1)
+			   window.webkit.messageHandlers.saveWebState.postMessage(1)
 			 }
 		  } else if (android) {
 		  	  window.android.saveWebState(1)

+ 1 - 1
pages/mine.vue

@@ -111,7 +111,7 @@
 		var android = /android/.test(userAgent)
 		if (ios) {
 					 if ( true) {//!standalone&& !safari
-					   window.webkit.messageHandlers.goMyNav.saveWebState(2)
+					   window.webkit.messageHandlers.saveWebState.postMessage(2)
 					 }
 		} else if (android) {
 			  window.android.saveWebState(2)

+ 5 - 2
pages/qunfa.vue

@@ -56,7 +56,7 @@
             <view class="message-item-content" :class="{'self' : message.senderId ===  currentUser.id}">
               <view class="avatar">
                <!-- <image :src="message.senderId === currentUser.id? currentUser.avatar : friend.avatar"></image> -->
-                <image src="/static/img/touxiang.png"></image>
+                <image src="/static/img/yonghu.png"></image>
 			  </view>
 
               <view class="content" @click.right="showActionPopup(message)" @longpress="showActionPopup(message)">
@@ -109,7 +109,7 @@
                       </view>
                     </view>
                   </view>
-				  <view v-if="message.type === 'car'" class="text-content" @click="gocar">
+				  <view v-if="message.type === 'car'" class="text-content catMbox" @click="gocar">
 					  <view class="mVin">{{message.payload.vin}}</view>
 					   <view class="mcar">{{message.payload.carModel}}</view>
 				  </view>
@@ -1117,4 +1117,7 @@
   	width: 100vw;
   	background: #fff;
   }
+  .catMbox{
+	  background: #95EC69 !important;
+  }
 </style>