4 İşlemeler 2553f9c575 ... f66e6b0bf8

Yazar SHA1 Mesaj Tarih
  blade f66e6b0bf8 update 6 yıl önce
  blade e1a1cccdb4 update 6 yıl önce
  blade d371748f3b update 6 yıl önce
  blade a2c5c0290c update 6 yıl önce

+ 1 - 1
chat/config/index.js

@@ -11,7 +11,7 @@ module.exports = {
     assetsPublicPath: '/',
     // proxyTable: {
     //   '/api': {
-    //     target:'http://kfadmin.bocai186.com',  // 线上地址
+    //     target:'http://manage.281570.com',  // 线上地址
     //     // target:'http://192.168.2.187:8090',  // 本地地址
     //     changeOrigin: false,
     //     pathRewrite: {

+ 2 - 2
chat/index.html

@@ -12,8 +12,8 @@
 	<meta name="viewport"
 		  content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=no,width=device-width,initial-scale=1.0"/>
 	<!-- <script src="//unpkg.com/vue-ydui/dist/ydui.flexible.js"></script> -->
-	<link rel ="shortcut icon" type="image/x-icon" href="static/logo.gif">
-	<title>大博集团智能客服系统</title>
+	<!--<link rel ="shortcut icon" type="image/x-icon" href="static/logo.gif"> -->
+	<title>智能客服系统</title>
 </head>
 <body>
 <div id="app"></div>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 249 - 555
chat/package-lock.json


+ 1 - 0
chat/package.json

@@ -10,6 +10,7 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "auto-textarea": "^1.4.0",
     "axios": "^0.19.0",
     "vue": "^2.5.2",
     "vue-ydui": "^1.2.6"

+ 1 - 1
chat/src/api/https.js

@@ -3,7 +3,7 @@ import $qs from 'qs';
 // 请求超时时间
 axios.defaults.timeout = 10000
 // 线上
-let Base = 'http://kfadmin.bocai186.com'
+let Base = 'http://manage.281570.com'
 // 开发
 //let Base = 'http://sports.5gogo.com'
 function headerUrl (url) {

+ 44 - 9
chat/src/components/index.vue

@@ -359,14 +359,18 @@
 			<!-- 底部输入框 -->
 			<div class="footer row wrap" id='input_box'>
 				<!-- @keydown="inputNumFun()" -->
-				<textarea 
+				 <!-- <textarea  
 						id="textarea"
 						v-model.trim="text_info"
 						placeholder="请输入你的问题:"
 						maxlength="450"
 						@keyup ='keyup_maxlength()'
+						 :style="{height:iboxheight}" 
+					
 				>
-				</textarea>
+				</textarea>  -->
+
+				 <autoTextarea placeholder="" lineHeight="30px" border="false" fontSize="18px" />
 
 				<div class="send row item-center" style="border-bottom:.01rem solid #ddd">
 					<img
@@ -478,12 +482,13 @@
 	import frce from "./frce.js";
 	import defaultImgs from "./../assets/timg.jpg"
 	import headPortrait from "./../assets/headPortrait.png"
-
+	import autoTextarea from 'auto-textarea'
 	export default {
 		name: "service",
 		// 模板注册
 		components: {
-			knowledgeLibrary
+			knowledgeLibrary,
+			autoTextarea
 		},
 		data() {
 			return {
@@ -503,13 +508,14 @@
 				problem: [],//机器人问题
 				welcome: [],//欢迎语
 				advertisement: '', //广告
-				img_http: 'http://kfadmin.bocai186.com',//图片路径域
+				img_http: 'http://manage.281570.com',//图片路径域
 				//img_http:'http://192.168.2.186:8090',//图片路径域
 
 				robot: [],//和机器人聊天临时数据
 				chat: [],//人工会话
 				error_num: 1001,//机器人回答超出能力之外编号
 				isConnection: true,//人工分组列表开关
+				ibox_height:'auto',
 				//客服信息
 				service_info: {
 					avatar: headPortrait,
@@ -587,7 +593,7 @@
 				let sock_ip = ''; // 线上
 				// let sock_ip = 'ws://192.168.2.187:9101';  // 本地
 
-				this.websock = new WebSocket("ws://kfadmin.bocai186.com:9101?apiToken=" + apiToken);
+				this.websock = new WebSocket("ws://ky.281570.com:9101?apiToken=" + apiToken);
 				//数据返回
 				this.websock.onmessage = this.socket_message;
 				//数据发送
@@ -1049,6 +1055,17 @@
 				});
 				this.automaticRolling();
 			},
+			checkSetType(){
+				let u = navigator.userAgent, app = navigator.appVersion;
+					let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
+					let isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+					if (isAndroid) {
+						return 'android';
+					}
+					if (isIOS) {
+				    return 'ios';
+					}
+			},
 
 			/*******************************************/
 			//转人工
@@ -1062,7 +1079,8 @@
 							'uid': this.user_info.id,
 							'name': this.user_info.name,
 							'avatar': this.user_info.avatar,
-							'group': this.group
+							'group': this.group,
+							'settype':this.checkSetType()
 						}
 					}
 					this.socket_send(JSON.stringify(data));
@@ -1267,8 +1285,20 @@
 			},
 			/***********************************/
 			keyup_maxlength(){
-				//console.log(this.text_info.length);
+				let ct=this.text_info;
+				let leng=ct.replace(/[^\x00-\xff]/g,"aa").length;
+				let len=Math.ceil(leng/25);
+				if(leng>12){
+					len=len+1;
+				}
+				if(len >0){
+					this.ibox_height=(len)*27;
+				
+					this.ibox_height=this.ibox_height+'px';
+
+				}
 			},
+			
 
 			/*******************************************/
 			//手机弹窗处理
@@ -1483,6 +1513,9 @@
 		computed: {
 			inputmsg() {
 				return this.text_info;
+			},
+			iboxheight(){
+				return this.ibox_height;
 			}
 		},
 		// 监听
@@ -2036,7 +2069,9 @@
 		text-align: right;
 		display: block;
 	}
-
+	#main{
+		/* margin-bottom: .3rem; */
+	}
 	/*
 	*留言知识库
 	 */

+ 1 - 1
chat/src/components/knowledgeLibrary.vue

@@ -231,7 +231,7 @@
 				pages: 1,
 				imgs: [],
 				imgss: [],
-				url: 'http://kfadmin.bocai186.com', // 域名地址
+				url: 'http://manage.281570.com', // 域名地址
 				// url: 'http://192.168.2.187:8090', // 域名地址
 				fileList: [],
 				filesImg: '',

+ 3 - 0
package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

+ 1 - 1
pc_chat/config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target:'http://kfadmin.bocai186.com',  // 后台访问地址
+        target:'http://manage.281570.com',  // 后台访问地址
         // target:'http://192.168.2.187:8090',  // 后台访问地址
         changeOrigin: true,
         pathRewrite: {

+ 2 - 2
pc_chat/index.html

@@ -5,8 +5,8 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<!-- 外部链接图片加载 -->
 	<meta name="referrer" content="no-referrer"/>
-	<link rel ="shortcut icon" type="image/x-icon" href="static/logo.gif">
-	<title>大博集团智能客服系统</title>
+	<!-- <link rel ="shortcut icon" type="image/x-icon" href="static/logo.gif">-->
+	<title>智能客服系统</title>
 </head>
 <body>
 <div id="app"></div>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 244 - 244
pc_chat/package-lock.json


+ 1 - 1
pc_chat/src/api/http.js

@@ -4,7 +4,7 @@ import qs from 'qs'  // 序列化字符串
 // 请求超时时间
 axios.defaults.timeout = 10000
 // 线上
-let Base = 'http://kfadmin.bocai186.com'
+let Base = 'http://manage.281570.com'
 // 开发
 // let Base = ''
 function headerUrl(url) {

+ 4 - 3
pc_chat/src/components/chat.vue

@@ -602,7 +602,7 @@
 				userConversation: {}, //用户当前会话
 				machineAndAtl: 10, //默认为机器人,100为人工
 				satisfaction: 1, //评价满意度,1为满意,2为一般,3为不满意
-				url: 'http://kfadmin.bocai186.com', // 域名地址
+				url: 'http://manage.281570.com', // 域名地址
 				// url: 'http://192.168.2.187:8090', // 域名地址
 				user_info: '', // 用户信息
 				// 人工客服信息
@@ -1197,7 +1197,7 @@
 			initWebSocket() {
 				let _this = this;
 				let apiToken = this.$md5.hex_md5('customer-service' + window.location.origin);
-				this.websock = new WebSocket('ws://kfadmin.bocai186.com:9101?apiToken=' + apiToken);
+				this.websock = new WebSocket('ws://ky.281570.com:9101?apiToken=' + apiToken);
 				// this.websock = new WebSocket('ws://192.168.2.187:9101?apiToken=' + apiToken);
 				this.websock.debug = true;
 				// 数据接收
@@ -1697,7 +1697,8 @@
 						'uid': this.user_info.id,
 						'name': this.user_info.name,
 						'avatar': this.user_info.avatar,
-						'group': this.group
+						'group': this.group,
+						'settype':'pc'
 					}
 				}
 				this.websock.send(JSON.stringify(data));

+ 1 - 1
pc_chat/src/components/ledgeBase.vue

@@ -125,7 +125,7 @@
 				imgss: [],
 				showimgs:false,
 				showimgss:false,
-				url: 'http://kfadmin.bocai186.com', // 域名地址
+				url: 'http://manage.281570.com', // 域名地址
 				// url: 'http://192.168.2.187:8090', // 域名地址
 				pages: 1,
 				optionCont: "",

Dosya farkı çok büyük olduğundan ihmal edildi
+ 244 - 244
service/package-lock.json


+ 1 - 1
service/src/App.vue

@@ -28,7 +28,7 @@
 			initWebSocket(apiToken) {
 				// 书写接口信息
 				// http://stadmin.bocai108.com/
-				const wsuri = "ws://kfadmin.bocai186.com:9101?apiToken=" + apiToken;//www.service.com 线上
+				const wsuri = "ws://ky.281570.com:9101?apiToken=" + apiToken;//www.service.com 线上
 				// const wsuri = "ws://192.168.2.187:9101?apiToken=" + apiToken;//www.service.com //192.168.2.186 本地
 				// 创建websocket实例
 				Vue.prototype.$websocket = new WebSocket(wsuri);

+ 1 - 1
service/src/api/http.js

@@ -4,7 +4,7 @@ import qs from 'qs'  // 序列化字符串
 // 请求超时时间
 axios.defaults.timeout = 10000
 // 线上
-let Base = 'http://kfadmin.bocai186.com'
+let Base = 'http://manage.281570.com'
 // 开发
 //let Base = 'http://sports.5gogo.com'
 function headerUrl (url) {

+ 1 - 1
service/src/components/hader.vue

@@ -161,7 +161,7 @@
 				user_info: '',//
 				userID:null,
 				unreadNum:null, // 未读数量
-				img_http:'http://kfadmin.bocai186.com',//图片路径域
+				img_http:'http://manage.281570.com',//图片路径域
 				innerDrawer:false,//会话总览抽屉开关
 				// img_http: 'http://192.168.2.187:8090',//图片路径域
 				dataTree: [],

+ 1 - 1
service/src/components/historicalRecord.vue

@@ -132,7 +132,7 @@ export default {
             alarm:'',//评价谢谢
             account:'',//用户信息
             // imgsrc:'http://192.168.2.186:8090'
-            imgsrc:'http://kfadmin.bocai186.com',//图片路径域 
+            imgsrc:'http://manage.281570.com',//图片路径域 
             isShowBt:false,//显示加载按钮
             currentPage:'',//当前页数
         }

+ 1 - 1
service/src/components/leftNav.vue

@@ -32,7 +32,7 @@
 				megnum: 0,
 				showMeg: false,
 				logo: '',
-				img_http: 'http://kfadmin.bocai186.com',//图片路径域
+				img_http: 'http://manage.281570.com',//图片路径域
 				// img_http: 'http://192.168.2.187:8090',//图片路径域
 				titleActive: "TheCurrentSession",
 				data: [

+ 2 - 2
service/src/pages/LeaveMessage.vue

@@ -118,7 +118,7 @@
 										</el-col>
 										<el-col>
 											<el-upload style="margin:10px;"
-													action="http://kfadmin.bocai186.com/index/upload/uploadImg"
+													action="http://manage.281570.com/index/upload/uploadImg"
 													:before-upload="beforeAvatarUpload"
 													:on-change='uploadChange'
 													:on-success='uploadSuccess'
@@ -238,7 +238,7 @@
 				dialogImageUrl: '',
 				userInfo: [], //用户信息
 				getUserItem: [],
-				img_http: 'http://kfadmin.bocai186.com',//图片路径域
+				img_http: 'http://manage.281570.com',//图片路径域
 				// img_http: 'http://192.168.2.187:8090',//图片路径域
 				fileList:[],
 				imgUrl:'',

+ 20 - 9
service/src/pages/TheCurrentSession.vue

@@ -251,6 +251,7 @@
 						<p @dblclick="get_ip_Info" class="get_ip" :data-clipboard-text="terminal_IP.ip">
 							IP地址:{{terminal_IP.ip}}</p>
 						<p>来源终端:{{terminal_IP.system}}</p>
+						<p>来源地区:{{terminal_IP.source}}</p>
 					</div>
 
 					<div style="color:#666;font-weight:bold;font-size:14px; margin-top:30px;">用户信息</div>
@@ -350,7 +351,7 @@
 				lineUp: [],//排队列表
 				conversationId: '',//会话工单
 				session_user_info: {},//当前会话用户信息
-				img_http: 'http://kfadmin.bocai186.com',//图片路径域
+				img_http: 'http://manage.281570.com',//图片路径域
 				// img_http: 'http://192.168.2.187:8090',//图片路径域
 				fit: 'scale-down',//图片渲染样式
 				is_eva_btn: true,//
@@ -645,6 +646,11 @@
 				//console.log(12313);
 				this.websocketsend(JSON.stringify({"type": "getkfonlines"}))
 			},
+			getPlatformCN(name){
+				let platforms={'android':'安卓','ios':'苹果','pc':'电脑'};
+				
+				return platforms[name];
+			},
 
 			/*****************切换用户会话对象******************/
 			chooseDialogue(type, index) {
@@ -659,15 +665,17 @@
 						order_id = this.sessionList[index].id;
 						this.$set(this.sessionList[index], 'num', 0);
 						this.terminal_IP = {
-							system: this.sessionList[index].system + '-' + this.sessionList[index].browse,
-							ip: this.sessionList[index].ip
+							system: this.getPlatformCN(this.sessionList[index].system) + '-' + this.sessionList[index].browse,
+							ip: this.sessionList[index].ip,
+							source:this.sessionList[index].ipinfo
 						}
 					} else if (type == 2) {
 						data = this.offlineList[index].data;
 						order_id = this.offlineList[index].id;
 						this.terminal_IP = {
-							system: this.offlineList[index].system + '-' + this.offlineList[index].browse,
-							ip: this.offlineList[index].ip
+							system: this.getPlatformCN(this.offlineList[index].system) + '-' + this.offlineList[index].browse,
+							ip: this.offlineList[index].ip,
+							source:this.offlineList[index].ipinfo
 						}
 					}
 					this.$store.dispatch("SET_CURRENT", data);//当前会话数据
@@ -1134,8 +1142,10 @@
 					} else {
 						if (List) {
 							this.terminal_IP = {
-								system: List.system + '-' + List.browse,
-								ip: List.ip
+								system: this.getPlatformCN(List.system) + '-' + List.browse,
+								ip: List.ip,
+								source:List.ipinfo
+
 							}
 						} else {
 							this.terminal_IP = {}
@@ -1145,8 +1155,9 @@
 					let List = this.offlineList[this.dataIndex];
 					if (List) {
 						this.terminal_IP = {
-							system: List.system + '-' + List.browse,
-							ip: List.ip
+							system: this.getPlatformCN(List.system) + '-' + List.browse,
+								ip: List.ip,
+								source:List.ipinfo
 						}
 					} else {
 						this.terminal_IP = {}

+ 1 - 1
service/src/pages/login.vue

@@ -57,7 +57,7 @@
 				logo: '',
 				verifySystem:"",
 				verifySystemId:"",
-				img_http:'http://kfadmin.bocai186.com',//图片路径域
+				img_http:'http://manage.281570.com',//图片路径域
 				// img_http: 'http://192.168.2.187:8090',//图片路径域
 			}
 		},

Dosya farkı çok büyük olduğundan ihmal edildi
+ 242 - 242
service_exe/package-lock.json


+ 1 - 1
service_exe/package.json

@@ -49,7 +49,7 @@
     "linux": {
       "icon": "build/icons/icon.png"
     },
-    "extraResources":  {
+    "extraResources": {
       "from": "build/icons/",
       "to": "./"
     }

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor