Merge branch 'wj' of http://git.2weisou.com/liumin/NewZkgj into wj

pages/center/prohibited/details.vue

@@ -77,23 +77,25 @@
 
 		<view class="bottombox">
 			<!-- 播放块 -->
-			<view class="bottomhead">
-				<view class="audio-play" @tap="changePlayState">
-					<image class="image" mode="widthFix"
-						:src="audioPlay ? 'https://qufang.oss-cn-beijing.aliyuncs.com/upload/icon/xcx/jjycrm/pause.png' : 'https://qufang.oss-cn-beijing.aliyuncs.com/upload/icon/xcx/jjycrm/play.png'">
-					</image>
-				</view>
-				<view class="audio-slider">
-					<view class="audio-time">
-						<text>{{currentTimeStr}}</text>
+			<template v-if="current == 1">
+				<view class="bottomhead">
+					<view class="audio-play" @tap="changePlayState">
+						<image class="image" mode="widthFix"
+							:src="audioPlay ? 'https://qufang.oss-cn-beijing.aliyuncs.com/upload/icon/xcx/jjycrm/pause.png' : 'https://qufang.oss-cn-beijing.aliyuncs.com/upload/icon/xcx/jjycrm/play.png'">
+						</image>
 					</view>
-					<slider class="slider" min="0" :max="sliderMax" @change="sliderChangeComplate" block-size="14"
-						:value="sliderValue" activeColor="blue"></slider>
-					<view class="audio-time">
-						<text>{{timeStr}}</text>
+					<view class="audio-slider">
+						<view class="audio-time">
+							<text>{{currentTimeStr}}</text>
+						</view>
+						<slider class="slider" min="0" :max="sliderMax" @change="sliderChangeComplate" block-size="14"
+							:value="sliderValue" activeColor="blue"></slider>
+						<view class="audio-time">
+							<text>{{timeStr}}</text>
+						</view>
 					</view>
 				</view>
-			</view>
+			</template>
 
 			<template v-if="userlistobj.invalidViolatedCause">
 				<view class="bottomtips">
@@ -237,9 +239,7 @@
 					})
 					return
 				}
-				this.$u.debounce(() => {
-					this.setViolated(2)
-				})
+				this.setViolated(2)
 			},
 
 			// 下一条
@@ -263,7 +263,7 @@
 			// 获取违禁话术详情
 			keyWordsMatching(params) {
 				this.$u.post('/customer/findbynum', params).then(res => {
-					this.customerId = res.result[0].id;
+					this.customerId = res.results[0].id;
 					uni.setStorageSync('nextPageObj', JSON.stringify(this.nextPageObj))
 					this.prohibitedMatch()
 				}).catch(e => {
@@ -430,7 +430,6 @@
 							this.sliderMax = this.getTime(res[0].recordDuration)
 							this.timeStr = this.getTime(res[0].recordDuration)
 							this.date = res[0].receptionTime;
-
 							this.getCorpusAnalysis(info);
 							this.creatAudio()
 						} else {
@@ -439,7 +438,6 @@
 							this.sliderMax = this.getTime(res[0].recordDuration)
 							this.timeStr = this.getTime(res[0].recordDuration)
 							this.date = res[0].receptionTime;
-
 							this.getCorpusAnalysis(info);
 							this.creatAudio()
 						}
@@ -505,8 +503,7 @@
 						})
 						this.newluyinList = jsonInfo;
 						this.dialogList.push(jsonInfo[this.textindex]);
-						var itc = parseInt(info.bg / 1000)
-						this.adasdasdasd(itc)
+						this.adasdasdasd(info)
 					}
 				})
 			},
@@ -549,13 +546,17 @@
 
 			//搜索跳转
 			adasdasdasd(e) {
-				const currTimeStr = this.formatTime(e)
+				const currTimeStr = this.formatTime(parseInt(e.bg/1000))
 				this.currentTimeStr = currTimeStr
-				this.innerAudioContext.seek(e);
+				this.innerAudioContext.seek(parseInt(e.bg/1000));
 				if (uni.getStorageSync('entrance') == 1) {
 					return
 				} else {
-					this.innerAudioContext.play();
+					if (this.current == 1) {
+						this.innerAudioContext.play();
+					} else {
+						this.scrollId = "dialog" + this.csdFileindex + "text" + e.bg
+					}
 				}
 			},
 
@@ -661,12 +662,7 @@
 			//录音实例
 			creatAudio() {
 				this.innerAudioContext = uni.createInnerAudioContext();
-				if (uni.getStorageSync('entrance') == 1) {
-					this.innerAudioContext.autoplay = false;
-				} else {
-					this.innerAudioContext.autoplay = true;
-				}
-
+				this.innerAudioContext.autoplay = false;
 				this.innerAudioContext.src = this.recordPath;
 				this.innerAudioContext.title = '音频';
 				this.onPlay()

pages/center/prohibited/index.vue

@@ -107,7 +107,7 @@
 						id: 5,
 					},
 					{
-						title: '昨天',
+						title: '今天',
 						id: 0,
 					},
 					{