Merge branch 'master' into yun

pages/center/Piabodata/Customerportrait/Detailsofthesearch.vue

@@ -68,10 +68,13 @@
 				Semanticword: '',
 				qujian: true,
 				from: '', // 来源
+				tipsFncName: '', // 提醒页面变更的值
 			};
 		},
 		onLoad(options) {
 			this.customerId = options.customerId;
+			if (options.UpDateEvent) this.tipsFncName = options.UpDateEvent
+			console.log(options)
 			this.statistical()
 		},
 		methods: {
@@ -165,16 +168,14 @@
 				item.id = id;
 				item.index = index;
 
-				let pages = getCurrentPages() //获取当前页面栈的信息
-				let prevPage = pages[pages.length - 2] //获取上一个页面
-				prevPage.setData({ //把需要回传的值保存到上一个页面
-				 info: item
-				});
-				uni.$emit('Receivedetailabout', item)
-				
-				wx.navigateBack({ //然后返回上一个页面
-					delta: 1
-				})
+				// let pages = getCurrentPages() //获取当前页面栈的信息
+				// let prevPage = pages[pages.length - 2] //获取上一个页面
+				// prevPage.setData({ //把需要回传的值保存到上一个页面
+				//  info: item
+				// });
+				console.log('我在这里打印了', item)
+				uni.$emit(this.tipsFncName, item)
+				uni.navigateBack()
 			}
 		},
 	}

pages/center/Piabodata/Customerportrait/Receivedetailabout.vue

@@ -469,6 +469,10 @@
 		},
 
 		onLoad(options) {
+			uni.$on('Receivedetailabouts', info => {
+				console.log('我监听收到了', info)
+				this.init(info, 'seek')
+			})
 			this.customerId = options.customerId;
 			this.$zaudio.autoPlay = true
 
@@ -482,10 +486,10 @@
 				console.log('我是强制暂停或关闭小程序音频浮窗触发的')
 			})
 			this.$zaudio.on('seek', this.ACTION, (time) => {
+				console.log('seek', time)
 				this.sliderChangeComplate(this.TIMEEVENT(time))
 			})
 			this.$zaudio.on('playing', this.ACTION, (obj) => {
-				console.log(this.TIMEEVENT(obj.current))
 				this.duration = obj.duration
 				this.TimeUpdate(this.TIMEEVENT(obj.current))
 			})
@@ -495,15 +499,13 @@
 			})
 
 			this.$zaudio.on('ended', this.ACTION, e => {
+				console.log('ended')
 				this.$zaudio.stop()
 				this.init({
 					bg: 0,
 					customerId: this.customerId
 				})
 			})
-			uni.$on('Receivedetailabout', info => {
-				this.init(info, 'Receivedetailabout')
-			})
 		},
 
 		onShow() {
@@ -544,11 +546,14 @@
 
 		// 销毁实例
 		onUnload() {
+			uni.$off('Receivedetailabouts')
 			this.info = {}
 			//卸载不需要的业务和获取播放状态的业务,提高页面性能
 			this.$zaudio.off('seek', this.ACTION);
 			this.$zaudio.off('stop', this.ACTION);
 			this.$zaudio.off('playing', this.ACTION);
+			this.$zaudio.off('error', this.ACTION);
+			this.$zaudio.off('ended', this.ACTION);
 		},
 		methods: {
 			SPEAKERSTYLE(index) {
@@ -590,7 +595,7 @@
 				//进搜索页面
 				uni.navigateTo({
 					url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item +
-						"&skpl=" + "2" + "&UpDateEvent=Receivedetailabout"
+						"&skpl=" + "2" + "&UpDateEvent=Receivedetailabouts"
 				})
 			},
 			recordclick(i) {
@@ -621,13 +626,13 @@
 			guanjiancishifo() {
 				uni.navigateTo({
 					url: '/pages/center/Piabodata/Customerportrait/Detailsofthesearch?customerId=' + this
-						.customerId + '&from=Receivedetailabout'
+						.customerId + '&from=Receivedetailabouts' + "&UpDateEvent=Receivedetailabouts"
 				})
 			},
 			tosearch() {
 				uni.navigateTo({
 					url: '/pages/center/Piabodata/Customerportrait/Detailsofthesearch?customerId=' + this
-						.customerId + '&from=Receivedetailabout'
+						.customerId + '&from=Receivedetailabouts' + "&UpDateEvent=Receivedetailabouts"
 				})
 			},
 			//标签选择
@@ -836,7 +841,7 @@
 						}
 						this.datetiem = res[0].receptionTime;
 						this.Alladdtodigest = res[0].status;
-						this.zyAudio()
+						if (type != 'seek') this.zyAudio()
 						this.getCorpusAnalysis(info)
 					}
 				})
@@ -1195,7 +1200,7 @@
 					this.Pinspeak = false
 					uni.navigateTo({
 						url: '/pages/mine/ScoringPlaylist?customerId=' + this.customerId + "&id=" + item
-							.keywordsId + "&type=" + 1 + "&UpDateEvent=Receivedetailabout"
+							.keywordsId + "&type=" + 1 + "&UpDateEvent=Receivedetailabouts"
 					})
 				}
 			},
@@ -1379,7 +1384,7 @@
 					this.Pinspeak = false
 					uni.navigateTo({
 						url: '/pages/mine/ScoringPlaylist?customerId=' + this.customerId + "&id=" + item
-							.marketingId + "&type=0" + "&UpDateEvent=Receivedetailabout"
+							.marketingId + "&type=0" + "&UpDateEvent=Receivedetailabouts"
 					})
 				}
 			},
@@ -1533,7 +1538,6 @@
 
 			// 跳转指定位置播放
 			stepPlay(t) {
-				console.log(this.$zaudio)
 				this.$zaudio.seek(t)
 				if (this.$zaudio.paused) {
 					this.$zaudio.operate()

pages/learning/ScoringPlaylist.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="translation">
 		<view style="width: 690rpx;margin: 0 auto;margin-top: 10rpx;">
-			
 			<view style="width: 100%;border-bottom: 1px solid #E0E0E0;display: flex;padding-bottom: 10rpx;margin-top: 40rpx;"
 			v-for="(item,index) in listarr" :key='index' @click="toaidoinfo(item.Content,item.corpusId,item.index)">
 				<view style="width: 26rpx;height: 36rpx;margin-top: 4rpx;">
@@ -24,11 +23,16 @@
 				customerId:'',
 				listarr:[],
 				id:'',
+				tipsFncName: '', // 提醒页面变更的值
+				from: '', // 标记需要刷新的来源
 			};
 		},
 		onLoad: function(options) {
 			this.customerId = options.customerId;
 			this.id=options.id;
+			
+			if (options.UpDateEvent) this.tipsFncName = options.UpDateEvent
+			if (options.from) this.from = options.from
 			this.searchinfo()
 		},
 		methods: {
@@ -79,6 +83,12 @@
 				this.$u.post("/corpus/findByPage", parames).then(res => {
 					if(res[0].merge==0){
 						let newobj = res[0];
+						if (this.tipsFncName) {
+							uni.$emit(this.tipsFncName, d[0])
+							uni.$emit('newobjStatus', newobj.status)
+							uni.navigateBack()
+							return
+						}
 						uni.navigateTo({
 							url: `/pages/main/details2?customerId=${newobj.customerId}&status=${newobj.status}&itemobj=${JSON.stringify(d[0])}&stateisshow=${'2'}`
 						})

pages/mine/details2.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="box">
+	<view class="box" @click="cancelBeast">
 		<view class="headbox">
 			<!-- 顶部时间 -->
 			<view class="headboxhead">
@@ -113,7 +113,6 @@
 				</view>
 			</view>
 		</view>
-
 		<!-- 标记 -->
 		<view class="zhezhao" v-if="biojiisshow" @tap="unmarktap()"></view>
 		<view class="bounced" v-if="biojiisshow">
@@ -786,6 +785,7 @@
 				this.roletiaoshu = dialog;
 				this.roleindexrow = this.dialogList[this.csdFileindex].message[this.roletiaoshu].speaker - 1;
 			},
+
 			roletab() {
 				// let itso=this.dialogList[this.csdFileindex].message[this.roletiaoshu];
 				let itso = Object.assign({}, this.dialogList[this.csdFileindex].message[this.roletiaoshu]);
@@ -798,11 +798,8 @@
 				}).then(res => {
 					this.dialogList[this.csdFileindex].message[this.roletiaoshu].speaker = this.roleindexrow + 1
 					this.roleisshaw = false;
-					this.dialogList.forEach(res => {
-						res.message.forEach(asd => {
-							asd.isshow = false;
-						})
-					})
+
+					this.cancelBeast()
 					uni.showToast({
 						title: '修改成功',
 						duration: 2000
@@ -1123,6 +1120,7 @@
 				this.biojiisshow = false;
 				this.roleindexbiaoji = this.dshfkjsdkksodofydwfkhwdfkjh;
 				this.roleisshaw = false
+				this.cancelBeast()
 			},
 			//确认标记
 			Confirmthetag() {
@@ -1452,6 +1450,8 @@
 					}
 				});
 			},
+
+
 			//标签选择
 			tapbiaoqianclisck(index) {
 				this.biaoqianindex = index;
@@ -1462,17 +1462,16 @@
 				var that = this;
 				uni.setClipboardData({
 					data: that.thewrongword,
-					success: function() {
-						that.dialogList.forEach(res => {
-							res.message.forEach(asd => {
-								asd.isshow = false;
-							})
-						})
-						that.$forceUpdate();
+					success: () => {
+						this.cancelBeast()
+						this.$forceUpdate();
 						console.log('success');
 					}
 				});
-			}, //确认加入常错词
+			},
+
+
+			//确认加入常错词
 			Confirmtheexit() {
 				if (this.reswrongword.length > 8 || this.thewrongword.length > 8) {
 					this.$refs.uToast.show({
@@ -1505,11 +1504,7 @@
 								let sas = this.textItself.replace(this.thewrongword, this.reswrongword)
 								this.dialogList[this.argtextindex1].message[this.argtextindex2].onebest = sas
 
-								this.dialogList.forEach(res => {
-									res.message.forEach(asd => {
-										asd.isshow = false;
-									})
-								})
+								this.cancelBeast()
 								this.$u.post("/corpus/addCorrectWord", parames).then(data => {
 									this.thewrongword = "";
 									this.reswrongword = "";
@@ -1537,11 +1532,7 @@
 			//取消加入常错词
 			Cancelout() {
 				this.isshow2 = false;
-				this.dialogList.forEach(res => {
-					res.message.forEach(asd => {
-						asd.isshow = false;
-					})
-				})
+				this.cancelBeast()
 			},
 			//加入长错词
 			Oftenthewrongword() {
@@ -1571,68 +1562,66 @@
 			// 取消加精
 			Cancelout2() {
 				this.isshow3 = false;
-				this.dialogList.forEach(res => {
-					res.message.forEach(asd => {
-						asd.isshow = false;
-					})
-				})
+				this.cancelBeast()
 			},
 			// 确认加精
 			Confirmtheexit2() {
-				if (this.biaoqianid) {
-					this.biaoqianid = this.biaoqianid
-				} else {
-					this.biaoqianid = 0
-				}
-				this.isshow3 = false;
-				this.dialogList.forEach(res => {
-					res.message.forEach(asd => {
-						asd.isshow = false;
-					})
-				})
 				let objdata = {
-					"itemId": this.buildingID,
-					"carId": this.customerId, //客户id
-					"startTime": this.changanitem.bg, //开始时间
-					"startFile": this.duihuawenjianid, //对话所在录音文件id
-					"endTime": this.changanitem.ed, //结束时间
-					"marketingId": this.biaoqianid, //对应一级父id
-					"jjTransfer": this.changanitem.onebest, //选中对话
-					"status": 1
+					itemId: this.buildingID,
+					carId: this.customerId, //客户id
+					startFile: this.duihuawenjianid, //对话所在录音文件id
+					marketingId: this.biaoqianid || 0, //对应一级父id
+					status: 1,
+
+					toDigestList: [], // 加精多选的内容
+					// jjTransfer: this.changanitem.onebest, //选中对话
+					// endTime: this.changanitem.ed, //结束时间
+					// startTime: this.changanitem.bg, //开始时间
 				}
-				uni.request({
-					url: config.service.addATD,
-					method: "POST",
-					header: {
-						'content-type': 'application/json',
-						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
-					},
-					data: objdata,
-					success: (data) => {
-						if (data.data.code == 10000) {
-							uni.showToast({
-								title: '加精成功',
-								duration: 2000
-							});
-						} else {
-							uni.showToast({
-								title: data.data.message,
-								duration: 2000
-							});
-						}
+
+				this.dialogList.forEach(items => {
+					if (items.message && items.message.length > 0) {
+						items.message.forEach(item => {
+							if (item.checked) {
+								objdata.toDigestList.push({
+									jjTransfer: item.onebest,
+									startTime: item.bg,
+									endTime: item.ed,
+								})
+							}
+						})
 					}
 				})
+
+				this.isshow3 = false;
+				this.$u.post(config.service.addATD, objdata).then(res => {
+					console.log(res)
+					if (res) {
+						uni.showToast({
+							title: '加精成功',
+							duration: 2000
+						});
+					} else {
+						uni.showToast({
+							title: '加精失败',
+							duration: 2000
+						});
+					}
+					this.cancelAllAdd()
+				}).catch(e => {
+					uni.showToast({
+						title: '网络异常，请稍候重试~',
+						duration: 2000
+					});
+					this.cancelAllAdd()
+				})
 			},
 			//长按对话
 			changanxiaoguo(item, index, i) {
 				this.messagelisy = [];
 				this.changanitem = {};
 				this.duihuawenjianid = "",
-					this.dialogList.forEach(res => {
-						res.message.forEach(asd => {
-							asd.isshow = false;
-						})
-					})
+					this.cancelBeast()
 				this.changanitem = item;
 				this.duihuawenjianid = this.luyinList[this.csdFileindex].id;
 				this.dialogList[i].message[index].isshow = !this.dialogList[i].message[index].isshow;
@@ -1872,11 +1861,7 @@
 			},
 			//长按点击播放
 			clickbofang(dialog, item) {
-				this.dialogList.forEach(res => {
-					res.message.forEach(asd => {
-						asd.isshow = false;
-					})
-				})
+				this.cancelBeast()
 				this.$forceUpdate()
 				let platetime = item.bg;
 				let newtime = item.bg / 1000;

pages/mine/reception/consultant.vue

@@ -63,7 +63,7 @@
 				chosedAgentId: '',
 				textcdhSKJ: '',
 				show: false,
-				content: '东临碣石，以观沧海',
+				content: '',
 				confirmtext: '1', //确认文字
 				canceltext: '2', //取消文字
 				daitiReceptionobj: {},
@@ -74,11 +74,62 @@
 			this.LOADING = true
 			this.customerId = option.id;
 		},
-		onShow() {
+		async onShow() {
 			this.buildingID = uni.getStorageSync('buildingID').id;
-			this.getFreeList();
+			await this.iniPage()
 		},
 		methods: {
+			change(e) {
+				console.log(e)
+				this.keywords = ''
+				this.listCurrent = Number(e)
+				this.getFreeList();
+			},
+			
+			// 
+			searchFunc() {
+				
+			},
+			
+			async iniPage() {
+				// await this.getAllDeptName()
+				await this.getFreeList();
+			},
+			// 获取顾问列表
+			async getAllDeptName() {
+				try {
+					let res = await this.$u.get(`/zkAgentPool/getAllDeptName?itemId=${this.buildingID}`)
+					console.log(res)
+					if (res&&res.length>0) {
+						res.unshift({
+							id: '',
+							deptName: '全部'
+						})
+						this.list = res
+					}
+				} catch(e) {
+					console.log(e)
+				}
+			},
+			
+			// 获取空闲顾问
+			async getFreeList() {
+				try {
+					// deptId 部门id
+					// name 顾问名称
+					let res = await this.$u.get(`/zkAgentPool/freeList?itemId=${this.buildingID}&name=${this.keywords||''}&deptId=${this.list[this.listCurrent].id || ''}`)
+					if (res.length == 0) {
+						this.freeList = []
+					} else {
+						this.freeList = res;
+						this.textcdhSKJ = res[0].name
+					}
+					this.LOADING = false
+				}catch (e) {
+					this.LOADING = false
+				}
+			},
+			
 			//取消
 			confirmA() {
 				if (this.daitiReceptionobj.assign != null) {
@@ -171,7 +222,7 @@
 					this.LOADING = false
 				})
 			},
-			radioChange: function(evt) {
+			radioChange(evt) {
 				this.chosedAgentId = '';
 				this.chosedAgentId = evt.detail.value;
 			},

uview-ui/libs/request/index.js

@@ -67,7 +67,7 @@ class Request {
 						if(response.errMsg) {
 							uni.showModal({
 								title: response.errMsg,
-                cancelColor:"#999999",
+								cancelColor:"#999999",
 							});
 						}
 						reject(response)