add master

 body {
 body {
     background: #f5f5f5;
     background: #f5f5f5;
 }
 }
-
 .bad-network {
 .bad-network {
     line-height: 38px;
     line-height: 38px;
     background-color: #7c858b;
     background-color: #7c858b;

@@ -163,6 +163,11 @@ body {
 	text-align: center;
 	text-align: center;
 	background: #569df6;
 	background: #569df6;
 }
 }
+.title .exitBtn{
+	position: absolute;
+	right:10px;
+	cursor: pointer;
+}
 #cloudMsgContainer .title{
 #cloudMsgContainer .title{
 	height: 90px;
 	height: 90px;
 	line-height: 90px;
 	line-height: 90px;

@@ -107,7 +107,6 @@ var SDKBridge = function (ctr, data) {
       switch (error.code) {
       switch (error.code) {
         // 账号或者密码错误, 请跳转到登录页面并提示错误
         // 账号或者密码错误, 请跳转到登录页面并提示错误
         case 302:
         case 302:
-          alert(error.message);
           delCookie('uid');
           delCookie('uid');
           delCookie('sdktoken');
           delCookie('sdktoken');
           delCookie('nickName');
           delCookie('nickName');

@@ -1552,8 +1552,7 @@ fn.playRing = function (name, count, done) {
     function doPlay(url, playDone) {
     function doPlay(url, playDone) {
         var audio = document.getElementById('dididi')
         var audio = document.getElementById('dididi')
         function onEnded() {
         function onEnded() {
-            console.log('onEnded')
-            this.playRingInstance.cancel = null;
+            //this.playRingInstance.cancel = null;
             audio = null;
             audio = null;
             playDone();
             playDone();
         }
         }

-$(function() {
-	if(readCookie('accountList')) {
-		var accountList = JSON.parse(readCookie('accountList'))
-		//判断如果是老板登录 则显示客服列表
-		if(readCookie('flag') == 1) {
-			var oDiv = $("<div id='selectWrap'></div>")
-			var oSpan = $("<span class='selectTitle'>客服列表</span>")
-			var oSelect = $("<select id='changeAccount'></select>")
-			for(var i = 0; i < accountList.length; i++) {
-				oSelect.append("<option value='" + accountList[i].token + "' uid='" + accountList[i].accid + "'>" + accountList[i].name + "</option>");
-			}
-			oDiv.prepend(oSelect)
-			oDiv.prepend(oSpan)			
-			$("body").prepend(oDiv)
-			if(readCookie('currentSelect')) {
-				var uid = readCookie('currentSelect')
-				oSelect.find("option[uid='" + uid + "']").attr("selected", true);
-			}
-			oSelect.change(function() {
-				setCookie('currentSelect', oSelect.find("option:checked").attr("uid"));
-				YX.fn.doLogout()
-				setCookie('uid', oSelect.find("option:checked").attr("uid"));
-				setCookie('sdktoken', oSelect.val())
-				setTimeout(function() {
-					window.location.reload()
-				}, 500)
+$(function () {
+	// if(readCookie('accountList')) {
+	// 	var accountList = JSON.parse(readCookie('accountList'))
+	// 	//判断如果是老板登录 则显示客服列表
+	// 	if(readCookie('flag') == 1) {
+	// 		var oDiv = $("<div id='selectWrap'></div>")
+	// 		var oSpan = $("<span class='selectTitle'>客服列表</span>")
+	// 		var oSelect = $("<select id='changeAccount'></select>")
+	// 		for(var i = 0; i < accountList.length; i++) {
+	// 			oSelect.append("<option value='" + accountList[i].token + "' uid='" + accountList[i].accid + "'>" + accountList[i].name + "</option>");
+	// 		}
+	// 		oDiv.prepend(oSelect)
+	// 		oDiv.prepend(oSpan)			
+	// 		$("body").prepend(oDiv)
+	// 		if(readCookie('currentSelect')) {
+	// 			var uid = readCookie('currentSelect')
+	// 			oSelect.find("option[uid='" + uid + "']").attr("selected", true);
+	// 		}
+	// 		oSelect.change(function() {
+	// 			setCookie('currentSelect', oSelect.find("option:checked").attr("uid"));
+	// 			YX.fn.doLogout()
+	// 			setCookie('uid', oSelect.find("option:checked").attr("uid"));
+	// 			setCookie('sdktoken', oSelect.val())
+	// 			setTimeout(function() {
+	// 				window.location.reload()
+	// 			}, 500)
+	// 		})
+	// 	}
+	// }
+	let exitBtn = $("#exitBtn")
+	exitBtn.click(function () {
+		delCookie('uid');
+		delCookie('sdktoken');
+		delCookie('nickName');
+		delCookie('avatar')
+		delCookie('flag')
+		window.location.href = "../im/login.html"
 	})
 	})
-		}
-
-	}
 })
 })

-var typeArr = ['未知','冻品','关注事项','素+','仓储']
+var typeArr = ['未知','冻品','关注事项','素+订单','素+仓储']
 var appUI = {
 var appUI = {
     /**
     /**
      * 当前会话聊天面板UI
      * 当前会话聊天面板UI
@@ -56,9 +56,10 @@ var appUI = {
      * 通用消息内容UI
      * 通用消息内容UI
      */
      */
     makeChatContent: function (message, user) {
     makeChatContent: function (message, user) {
+        var msgStr = ''
         if(message && message.custom){
         if(message && message.custom){
-            var msgStr ='<div>(来自：'+typeArr[JSON.parse(message.custom).imProType]+')</div>'
-        }
+             msgStr ='<div>(来自于：'+typeArr[JSON.parse(message.custom).imProType]+')</div>'
+        }else msgStr = ''
         var msgHtml;
         var msgHtml;
         //通知类消息
         //通知类消息
         if (message.attach && message.attach.type && (message.attach.netcallType === undefined || (message.attach.type !== "netcallBill" && message.attach.type !== "netcallMiss"))) {
         if (message.attach && message.attach.type && (message.attach.netcallType === undefined || (message.attach.type !== "netcallBill" && message.attach.type !== "netcallMiss"))) {

@@ -32,6 +32,7 @@
 					<div class="hide loading" id="loading"></div>
 					<div class="hide loading" id="loading"></div>
 					<div class="title">
 					<div class="title">
 						<span>对客服说列表</span>
 						<span>对客服说列表</span>
+						<span class="exitBtn" id="exitBtn">退出</span>
 					</div>
 					</div>
 					<div class="m-devices hide">正在使用云信web版</div>
 					<div class="m-devices hide">正在使用云信web版</div>
 					<div class="panel" id="switchPanel">
 					<div class="panel" id="switchPanel">
@@ -590,7 +591,6 @@
 		<script src="js/module/personCard.js"></script>
 		<script src="js/module/personCard.js"></script>
 		<script src="js/module/session.js"></script>
 		<script src="js/module/session.js"></script>
 		<script src="js/module/friend.js"></script>
 		<script src="js/module/friend.js"></script>
-
 		<script src="js/module/team.js"></script>
 		<script src="js/module/team.js"></script>
 		<script src="js/module/dialog_team.js"></script>
 		<script src="js/module/dialog_team.js"></script>
 		<script src="js/module/cloudMsg.js"></script>
 		<script src="js/module/cloudMsg.js"></script>
@@ -601,6 +601,7 @@
 		<script src="js/module/dialog_call_method.js"></script>
 		<script src="js/module/dialog_call_method.js"></script>
 		<script src="js/main.js?v=2"></script>
 		<script src="js/main.js?v=2"></script>
 		<script src="../3rd/vue.min.js"></script>
 		<script src="../3rd/vue.min.js"></script>
+		<script src="js/talk.js"></script> 
 		<script id="whiteboard-template" type="text/x-template">
 		<script id="whiteboard-template" type="text/x-template">
 			<div v-show="display" class="function-box whiteboard">
 			<div v-show="display" class="function-box whiteboard">
 				<div v-if="banner.length" class="whiteboard-banner">
 				<div v-if="banner.length" class="whiteboard-banner">
@@ -676,7 +677,7 @@
 				<div class="dialogs"></div>
 				<div class="dialogs"></div>
 			</div>
 			</div>
 		</script>
 		</script>
-		<!-- <script src="js/talk.js"></script> -->
+	
 	</body>
 	</body>
 
 
 </html>
 </html>

-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8">
-	<title>Document</title>
-	<script>location.href="./im/login.html"</script>
-</head>
-<body>
-	
-</body>
-</html>

-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8">
-	<title>Document</title>
-	<script>location.href="./im/index.html"</script>
-</head>
-<body>
-	
-</body>
-</html>