From 8717c36fe42dbc8cd28b50c142b136f89a641fe5 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 26 Apr 2022 18:32:52 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  262 +++++--
 pages.json                          |    9 +
 pages/center/prohibited/details.vue | 1082 +++++++++++++++++++++++++++
 pages/center/prohibited/index.vue   |  487 +++++++-----
 pages/mine/details2.vue             |   31 +-
 static/images/img/ban.png           |  Bin 0 -> 3078 bytes
 static/images/img/hand.png          |  Bin 0 -> 2415 bytes
 static/images/img/hit.png           |  Bin 0 -> 6735 bytes
 static/images/img/low_power.png     |  Bin 0 -> 794 bytes
 static/images/img/message.png       |  Bin 0 -> 2566 bytes
 static/images/img/note.png          |  Bin 0 -> 2225 bytes
 static/images/img/people.png        |  Bin 0 -> 3291 bytes
 static/images/img/percent.png       |  Bin 0 -> 1688 bytes
 static/images/img/power.png         |  Bin 0 -> 1688 bytes
 static/images/img/power1.png        |  Bin 0 -> 829 bytes
 static/images/img/time.png          |  Bin 0 -> 2654 bytes
 static/images/img/view.png          |  Bin 0 -> 3379 bytes
 static/images/img/voice.png         |  Bin 0 -> 2379 bytes
 18 files changed, 1596 insertions(+), 275 deletions(-)
 create mode 100644 pages/center/prohibited/details.vue
 create mode 100644 static/images/img/ban.png
 create mode 100644 static/images/img/hand.png
 create mode 100644 static/images/img/hit.png
 create mode 100644 static/images/img/low_power.png
 create mode 100644 static/images/img/message.png
 create mode 100644 static/images/img/note.png
 create mode 100644 static/images/img/people.png
 create mode 100644 static/images/img/percent.png
 create mode 100644 static/images/img/power.png
 create mode 100644 static/images/img/power1.png
 create mode 100644 static/images/img/time.png
 create mode 100644 static/images/img/view.png
 create mode 100644 static/images/img/voice.png

diff --git a/App.vue b/App.vue
index e9f3865..45dd650 100644
--- a/App.vue
+++ b/App.vue
@@ -1,12 +1,99 @@
-<template>
-	<view>
-	</view>
-</template>
 <script>
+	import Vue from 'vue'
 	//app.js
 	var config = require("./config");
 	export default {
-		onLaunch: function(options) {
+		onLaunch(options) {
+			uni.getSystemInfo({
+				success: function(e) {
+					console.log(e, 'adjsakljdklasjdklsakjdslakjd')
+					// #ifdef MP-WEIXIN
+					Vue.prototype.StatusBar = e.statusBarHeight;
+					let custom = wx.getMenuButtonBoundingClientRect();
+					Vue.prototype.Custom = custom;
+					Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
+					Vue.prototype.windowHeight = e.safeArea.height
+					// #endif
+					Vue.mixin({
+						data() {
+							return {
+								StatusBar: Vue.prototype.StatusBar,
+								CustomBar: Vue.prototype.CustomBar,
+								windowHeight: Vue.prototype.windowHeight
+							};
+						},
+
+						methods: {
+							// 时分秒转换为秒
+							TIMEEVENT(e) {
+								var time = e;
+								var len = time.split(':')
+								if (len.length == 3) {
+									var hour = time.split(':')[0];
+									var min = time.split(':')[1];
+									var sec = time.split(':')[2];
+									return Number(hour * 3600) + Number(min * 60) + Number(sec);
+								}
+								if (len.length == 2) {
+									var min = time.split(':')[0];
+									var sec = time.split(':')[1];
+									return Number(min * 60) + Number(sec);
+								}
+								if (len.length == 1) {
+									var sec = time.split(':')[0];
+									return Number(sec);
+								}
+							},
+
+							// 目前使用页面为录音页面
+							SPEAKERSTYLE(index) {
+								let obj = {
+									color: '',
+								}
+								switch (index) {
+									case 1:
+										obj.color = '#60CBEC';
+										break;
+									case 2:
+										obj.color = '#EC8B47';
+										break;
+									case 3:
+										obj.color = '#4F861E';
+										break;
+									case 5:
+										obj.color = '#4980C8';
+										break;
+									case 6:
+										obj.color = '#60CBEC';
+										break;
+									case 7:
+										obj.color = '#EC8B47';
+										break;
+									case 8:
+										obj.color = '#4F861E';
+										break;
+									default:
+										obj.color = '#9F61C8';
+										break;
+								}
+								return obj
+							},
+						},
+
+						filters: {
+							// ASCII码转换 大写字母A是65 演讲人是从1开始所以num+64
+							toCapital(num) {
+								let str = ''
+								if (num) {
+									str = String.fromCharCode(num + 64)
+								}
+								return str
+							}
+						}
+					});
+				}
+			});
+
 			if (wx.canIUse('getUpdateManager')) {
 				const updateManager = wx.getUpdateManager()
 				updateManager.onCheckForUpdate(function(res) {
@@ -49,70 +136,73 @@
 			this.$u.get("/user/getMenu").then(data => {
 				uni.setStorageSync("weapp_session_Menu_data", data)
 			})
-			
-			
+
+
 			wx.setInnerAudioOption({
 				obeyMuteSwitch: false
-			});	
+			});
 		},
 		onShow(options) {
 			const token = uni.getStorageSync("weapp_session_login_data")
 			if (typeof token.token != "string") {
 				console.log("没有")
 				return
-			}else{
+			} else {
 				this.infoscoket()
 			}
 		},
 		onHide() {},
 		methods: {
-			infoscoket(){
-				let pushon=uni.getStorageSync('weapp_session_userInfo_data').loginName
+
+			infoscoket() {
+				let pushon = uni.getStorageSync('weapp_session_userInfo_data').loginName
 				uni.connectSocket({
-				  url: 'wss://hfju.com/ws?uid='+pushon+'_applets',
-				  header: {
-					  "content-type": "application/json",
-					  'Access-Token': uni.getStorageSync('weapp_session_login_data').token
-				  }
+					url: 'wss://hfju.com/ws?uid=' + pushon + '_applets',
+					header: {
+						"content-type": "application/json",
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					}
 				});
-				uni.onSocketOpen(function (res) {
-				  console.log('WebSocket连接已打开！');
+				uni.onSocketOpen(function(res) {
+					console.log('WebSocket连接已打开！');
 				});
-				uni.onSocketError(function (res) {
-				  console.log('WebSocket连接打开失败，请检查！');
+				uni.onSocketError(function(res) {
+					console.log('WebSocket连接打开失败，请检查！');
 				});
-				uni.onSocketMessage(function (res) {
-					  console.log('收到服务器内容：' + res.data);
-					  let cedata=JSON.stringify(res);
-					  let data=JSON.parse(cedata);
-					  let zdata=JSON.parse(data.data) 
-					  if(zdata.to=="recCmd"){
-						   uni.$emit('update',{msg:'页面更新'})
-						  return
-					  }
-					  uni.showModal({
-					      title: '提示',
-					      content: zdata.to+'的设备电量过低请检查！',
-						  cancelText: "取消", // 取消按钮的文字  
-						  confirmText: "查看", // 确认按钮文字  
-					      success: function (res) {
-					          if (res.confirm) {
-					              console.log('用户点击确定');
-								  uni.navigateTo({
-								  	url: `/pages/main/toviewtherecording/index?jump=`+"jump"
-								  })
-								  
-					          } else if (res.cancel) {
-					              console.log('用户点击取消');
-					          }
-					      }
-					  });
+				uni.onSocketMessage(function(res) {
+					console.log('收到服务器内容：' + res.data);
+					let cedata = JSON.stringify(res);
+					let data = JSON.parse(cedata);
+					let zdata = JSON.parse(data.data)
+					if (zdata.to == "recCmd") {
+						uni.$emit('update', {
+							msg: '页面更新'
+						})
+						return
+					}
+					uni.showModal({
+						title: '提示',
+						content: zdata.to + '的设备电量过低请检查！',
+						cancelText: "取消", // 取消按钮的文字  
+						confirmText: "查看", // 确认按钮文字  
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: `/pages/main/toviewtherecording/index?jump=` + "jump"
+								})
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
 				});
 			},
-			Closewebsocke(){
+			Closewebsocke() {
 				uni.closeSocket();
-				uni.onSocketClose(function (res) {
-				  console.log('WebSocket 已关闭！');
+				uni.onSocketClose(function(res) {
+					console.log('WebSocket 已关闭！');
 				});
 			},
 		}
@@ -124,17 +214,20 @@
 </style>
 <style lang="scss">
 	@import "uview-ui/index.scss";
+
 	/*每个页面公共css */
 	//图表样式等
-	.single{
+	.single {
 		width: 100%;
 		background: #FFFFFF;
-		.title{
+
+		.title {
 			width: 100%;
 			height: 90rpx;
 			border-bottom: 1rpx solid #E0E0E0;
 			display: flex;
-			.title1{
+
+			.title1 {
 				flex: 2;
 				font-size: 30rpx;
 				font-weight: 600;
@@ -142,28 +235,33 @@
 				line-height: 90rpx;
 				text-indent: 30rpx;
 			}
-			.title3{
+
+			.title3 {
 				flex: 3;
 				height: 90rpx;
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
-				.title3-box{
+
+				.title3-box {
 					display: flex;
 					align-items: center;
 					width: 25%;
 					justify-content: center;
-					.activecltab{
+
+					.activecltab {
 						border-bottom: 2px solid #2671E2;
 					}
 				}
 			}
-			.title2{
+
+			.title2 {
 				flex: 3;
 				height: 90rpx;
 				display: flex;
 				align-items: center;
-				.title2-che{
+
+				.title2-che {
 					width: 178rpx;
 					height: 48rpx;
 					background: #FFFFFF;
@@ -176,7 +274,8 @@
 					text-indent: 12rpx;
 					margin-left: 35rpx;
 					position: relative;
-					.righttochoose{
+
+					.righttochoose {
 						width: 18rpx;
 						height: 24rpx;
 						position: absolute;
@@ -186,15 +285,18 @@
 				}
 			}
 		}
-		.swiper-box{
+
+		.swiper-box {
 			width: 97%;
 			margin: 0 auto;
 		}
-		.hejibox{
+
+		.hejibox {
 			width: 100%;
 			height: 80rpx;
 			display: flex;
-			.heji{
+
+			.heji {
 				width: 50%;
 				height: 100%;
 				font-size: 28rpx;
@@ -204,7 +306,8 @@
 				text-indent: 30rpx;
 			}
 		}
-		.danwei{
+
+		.danwei {
 			width: 100%;
 			height: 40rpx;
 			font-size: 24rpx;
@@ -213,31 +316,37 @@
 			line-height: 40rpx;
 			text-indent: 30rpx;
 		}
-		.uchaserbox{
+
+		.uchaserbox {
 			width: 95%;
 			height: 470rpx;
 		}
-		.jindu{
+
+		.jindu {
 			width: 100%;
 			height: 300rpx;
-			.jindu-box{
-				width: 100%; 
+
+			.jindu-box {
+				width: 100%;
 				padding-left: 30rpx;
 				padding-right: 30rpx;
-				.jindu-boxche{
+
+				.jindu-boxche {
 					width: 100%;
 					height: 46rpx;
 					display: flex;
 					align-items: center;
 					height: 50rpx;
-					.jindu-name{
+
+					.jindu-name {
 						width: 120rpx;
-						font-size: 28rpx; 
+						font-size: 28rpx;
 						color: #666666;
 					}
-					.jindu-zxl{
+
+					.jindu-zxl {
 						width: 120rpx;
-						font-size: 26rpx; 
+						font-size: 26rpx;
 						margin-left: 16rpx;
 						color: #666666;
 						text-align: center;
@@ -246,6 +355,7 @@
 			}
 		}
 	}
+
 	//时间切换的样式
 	.boxtittab {
 		width: 100;
@@ -254,7 +364,7 @@
 		border: 1px solid #E0E0E0;
 		display: flex;
 		align-items: center;
-	
+
 		.tabbox {
 			flex: 1;
 			height: 100%;
@@ -264,40 +374,46 @@
 			font-size: 28rpx;
 			display: flex;
 			justify-content: center;
-	
+
 			.activecllasscet {
 				width: 96rpx;
 				border-bottom: 2px solid #2671E2;
 			}
 		}
 	}
+
 	//多个格子的样式
 	.boxzonglan {
 		width: 100%;
 		min-height: 496rpx;
 		background: #FFFFFF;
 		padding: 30rpx 30rpx 30rpx 30rpx;
+
 		.zonglantit {
 			font-size: 30rpx;
 			color: #333333;
 			font-family: PingFangSC-Semibold, PingFang SC;
 			font-weight: 600;
 		}
+
 		.zonglanbox {
 			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
 			margin-top: 24rpx;
+
 			.grid {
 				width: 50%;
 				height: 128rpx;
 				border: 1px solid #E0E0E0;
+
 				.audonum {
 					color: #666666;
 					text-indent: 40rpx;
 					font-size: 26rpx;
 					margin-top: 20rpx;
 				}
+
 				.num {
 					color: #333333;
 					text-indent: 40rpx;
diff --git a/pages.json b/pages.json
index 81b63a3..a4fb3fa 100644
--- a/pages.json
+++ b/pages.json
@@ -483,6 +483,15 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "prohibited/details",
+					"style": {
+						"navigationBarTitleText": "违禁详情",
+						"navigationBarBackgroundColor": "#038EF5",
+						"navigationBarTextStyle": "white",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "consumer/index",
 					"style": {
diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
new file mode 100644
index 0000000..5dbb853
--- /dev/null
+++ b/pages/center/prohibited/details.vue
@@ -0,0 +1,1082 @@
+<template>
+	<view class="details">
+		<!-- 头部违禁信息 -->
+		<view class="header">
+			<view class="h-box">
+				<view class="h-b-top">
+					<text class="name">{{ userlistobj.agentName || '' }}</text>
+					<view class="status">
+						<text class="item">有效</text>
+						<text class="item" style="margin: 0 .5em;">|</text>
+						<text class="item">待处理</text>
+					</view>
+				</view>
+				<!-- 详细信息 -->
+				<view class="h-b-btm">
+					<view class="item">
+						<image class="item-imgs" src="@/static/images/img/time.png" mode=""></image>
+						{{ userlistobj.endTime1 || '' }}
+					</view>
+					<view class="item">
+						<image class="item-imgs" src="@/static/images/img/voice.png" mode=""></image>
+						{{ userlistobj.mm || '' }}m
+					</view>
+					<view class="item hit">
+						<image class="item-imgs" src="@/static/images/img/hit.png" mode=""></image>
+						2
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- tab选择框 -->
+		<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
+			@change="change"></u-tabs>
+
+		<template v-if="current == 1">
+			<!-- 音频 -->
+			<view class="audio">
+				<!-- 标记顾问 -->
+				<view class="headboxbott">
+					<view class="headovfu">
+						<u-tabs-swiper ref="tabs" font-size="30" :bold="true" swiper-width="600" :current="roleindex"
+							@change="tapspagek()" inactive-color="#b1b1b1" active-color="#008ef2" :list="tablist"
+							:is-scroll="true">
+						</u-tabs-swiper>
+					</view>
+					<view v-if="permissions.bjgw" class="headpade">
+						<view class="biaoji" @tap="tagtap()">标记</view>
+					</view>
+				</view>
+			</view>
+		</template>
+
+
+		<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()" upper-threshold='40px'
+			@scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true" class="zhuti text scroll-Y">
+			<!-- 聊天记录-->
+			<view class="dialog-block" v-for="(dialog,i) in dialogList" :key="i">
+				<view :id="'dialog'+i" class="fileName">录音文件</view>
+				<block v-for="(item,index) in dialog.message" :key="index">
+					<view class="text" :id="'dialog'+csdFileindex+'text'+item.bg"
+						:class="{active: item.bg < playNow &&  item.ed > playNow, reverse: Number(item.speaker) % 2 == 0}"
+						:data-speaker="item.speaker">
+						<view class="avatar">
+							<view :style="[SPEAKERSTYLE(item.speaker)]">
+								<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+								<text v-else>{{ item.speaker | toCapital }}</text>
+							</view>
+						</view>
+						<view class="content">
+							<view v-html="item.onebest"></view>
+						</view>
+					</view>
+				</block>
+			</view>
+		</scroll-view>
+
+
+		<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>
+					</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 class="bottomtips">
+				无效原因：附近人说的
+			</view>
+
+			<view class="botbotmm">
+				<view class="item">上一条</view>
+				<view class="item">确认有效</view>
+				<view class="item" @tap="showTagValid">确认无效</view>
+				<view class="item">下一条</view>
+			</view>
+		</view>
+
+		<!-- 标记顾问 -->
+		<u-popup v-model="biojiisshow" mode="center">
+			<view class="bounced">
+				<view class="jiajinghuatit">标记为顾问</view>
+				<view
+					style="width: 95%;display: flex;flex-wrap: wrap;margin: 0 auto;padding-top: 30rpx;padding-bottom: 30rpx;">
+					<view class="viewclace" :class="roleindexbiaoji == index ? 'bosdttom' : ''"
+						@click="biaojixuanze(index)" v-for="(item,index) in tablist.slice(1,tablist.length)"
+						:key="index">
+						<view>{{item.name}}</view>
+					</view>
+				</view>
+				<view class="bounced3" style="margin-top: 20rpx;">
+					<view class="bounced3-1" @tap="unmarktap">取消</view>
+					<view class="bounced3-2" @tap="Confirmthetag">确认</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- 标记无效原因  border-radius="16" -->
+		<u-popup v-model="tagValidShow" mode="center">
+			<view class="reason">
+				<text class="resaon-title">无效原因</text>
+				<view class="resaon-textbox">
+					<textarea v-model="reasonSrc" placeholder="请输入无效原因" maxlength="60" />
+					<text class="lastlength">{{ reasonSrc.length }}/60</text>
+				</view>	
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	var util = require("@/utils/util.js");
+	var config = require("@/config");
+	export default {
+		data() {
+			return {
+				Aimg: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAACqVBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/f3////9/f39/f3////////9/f3////////////9/f3////9/f39/f3////9/f3////////9/f3////9/f3////////////////9/f39/f3////////9/f39/f3////9/f39/f3////////9/f39/f3////////9/f39/f39/f3////////////////+/v7+/v7////+/v7////+/v7////+/v7+/v7////////+/v7+/v7////+/v7////+/v7////////////////////////////+/v7////+/v7////+/v7+/v7////////////+/v7////+/v7////+/v7+/v7////////+/v7////+/v7////////+/v7////////+/v7////+/v7+/v7+/v7////////+/v7+/v7////+/v7+/v7////+/v7////+/v7////+/v7////+/v7+/v7////+/v7+/v7////+/v7////+/v7////+/v7+/v7////+/v5jdC9iAAAA4nRSTlMAAQIDBAUGBwgLDA0ODxARExQVFhgbHB4fICEiIyQmJygpKy4wMTIzNDY3ODk6Oz0+P0BBQkRGR0lKTE5PUFFTVFVXWFlcXV9gYWJjZWZnaGlqa2xtbm9wcXJzdHV2d3h6e319foGBgoODh4mKiouMjI2QkZKSk5OUlpeYmZmam5ycnZ+foKGio6SmqKmpq6yur7CwsbGytba5uru8wMDBwcLCw8XGx8jJysrLzM7P0dLT1dXW1tfY2drc3N7f4OHh5Obm5+jp6uvs7vDx8vLz8/T09fX29/f4+fn6+vz8/f7+RVDt+wAAA55JREFUGBntwf9/1HMAB/DX7XYbuXWV1cyMoixfugrRGNXytW33pbVdJ83XkiMLSb4LJd/zZUi0SKT5FmGS77HUVaixnHP2+kt8vt3Zbp/3+7P3XR5+8XziP1E4uiYcrh1bjMNi6NzXumnoeX3eSOSrpHUv+zi0ogJ5qd3JLN1XuJGzwqW0sW4oclT0Im19XIqcuNdQ4D0vcnEDhdYgB2f+SbFZUHbEdkrsLYeqFko9CEVH7qJUohxqLqODO6BmLR18XwAVRQfpZDxUnExHjVBRR0eroGIZHX0AFe10tA8qdtNZIRR00VEPVLxLRzuh4jk62gIVy+joSaiI0tECqPDT0blQ4f6RDpI+KHmYDjZBzWQ6aIaibZSK+6BoOqViUOXqoER8BJSdlqJYFDm4h0LveJAD7+cUiFciJ1U/01aiGjk65zfaSF6EnE3azQEO1iAPFZuZZes45MUT3cM+emLFyNfwK3fQ8k1sFA6L0cElTzx9d1OVC/8bNG/gzY+GQaKk461gCQZr8iMHSNZD4nySv6wYj0EYFv2UhqcgcTsN70ePhtzER3+lJe6BxXP9jTctvrl1yS1jkLaNlkTbBR6IlF3dyT78sHh+oqkSlrJe/uOH1jGw4apem2I/1yLtGRo6kRZiP73t57mQxb+Z2dqRdikNtyLtBWb78Cz05bomyQH+KIGljIYaWNxxDtC72ouMgsdpZzosHhqqYDmFdraOQNpttHUfLKU0TITlKtra6IZpCu3tgMVPQx0sG2ivDqaVFDgOppk0LIbJm6C9DTB1UCAMU4SGZ2GqocAumL6jQBtMMRq2wLScAik3dMV/UWB/EQwrafgSpk6KlEJ3LIXOgGE9DQdgqKDQSdBNoNAiGL6i6SjowhSaAt1UCm2CzpOk6QTonqfQJdBdSKGkD5pKWqZCU7iHQtdB10KxWmjOpqUJmtMp9gB091LsIWiCtCyFZiHFXoZuHcW+hiZGy0vQvE2xT6DbTolKAI/R8hmA4SmKdUG3jxIhAG/QkigAZlAi6QJQTJk2AF1MGwXcRRkfgJGU2V8EHzP8wBeUqQQwllKTcCozpuFESk0AMJNSC3AxM8KYT6lpAFootRGLmLEQ6ynVCCBAqcSQ1cy4f8ghSs0HcMzvlKp+lRmvVFMqNQ6aaIoyd3Yy49vllOmuh+H4WZFIpFnTpJmjadTM1oQ1oVAgFNQENA0N9f01BIKh8OzGOU3NkbmXzwuV41/wNztgHKhu7WKTAAAAAElFTkSuQmCC",
+				list: [{
+					name: '违禁话术'
+				}, {
+					name: '音频识别'
+				}],
+				current: 0, // tab下表
+				tablist: [], // 顾问标记列表
+				roleindex: 0, // 选中顾问下标
+
+				luyinList: [], // 录音文件
+				newluyinList: [],
+				dialogList: [], // 录音识别列表渲染数据
+
+				permissions: {}, // 权限菜单
+				biojiisshow: false, // 标记顾问弹窗
+
+				textindex: 0, //下拉  转写文件下标
+				toptextindex: 0, //上拉  转写文件下标
+
+				dshfkjsdkksodofydwfkhwdfkjh: 0, // 顾问的id之类的
+				status: 0, // 状态（不明白是什么状态）
+				speaker: '', // 角色身份
+				customerId: '', // 楼盘id吧（猜）
+				infos: {}, // 音频内容
+				stateisshow: '', // 
+				itemobj: {}, // 本地缓存的音频信息
+				userlistobj: {}, // 获取到的顾问信息
+				csdFileindex: 0, // 当前使用录音转写的下标
+
+				// 录音信息
+				innerAudioContext: null, // 音频对象
+				currentTimeStr: "00:00", //当前进度的时间
+				timeStr: "00:00", //总的时间
+				recordPath: "", // 录音地址
+				audioPlay: false, //当前的播放状态控制
+				sliderValue: 0, //进度条最小值
+				sliderMax: 0, //进度条最大值
+				playNow: 0, // 当前播放时间
+				scrollId: "", // 当前播放滚动到的位置
+				tagValidShow: false, // 标记弹窗
+				reasonSrc: '', // 标记无效的原因
+			}
+		},
+		onLoad(option) {
+			this.status = option.status;
+			this.customerId = option.customerId;
+			this.stateisshow = option.stateisshow;
+			this.itemobj = uni.getStorageSync('searchobj');
+		},
+
+		onShow() {
+			this.permissions = uni.getStorageSync('weapp_session_Menu_data') // 权限
+
+			console.log(this.itemobj, 'askdjalkjdsalkjdkasljdklasjdklasjdlk')
+			this.roleindex = 0;
+			if (this.stateisshow == 2) {
+				this.infos = this.itemobj;
+			} else {
+				var pages = getCurrentPages();
+				var currPage = pages[pages.length - 1]; //当前页面
+				this.infos = currPage.data.info;
+			}
+			this.initAudioFnc()
+			this.gituserlist()
+		},
+
+		methods: {
+			// 展示确认无效原因输入框
+			showTagValid() {
+				this.tagValidShow = true
+			},
+			
+			//获取用户信息
+			gituserlist() {
+				this.$u.get("/matchKeywords/personalReceptionRecord", {
+					customerId: this.customerId
+				}).then(res => {
+					res.endTime1 = res.endTime.substring(0, 19);
+					this.userlistobj = res;
+				})
+			},
+
+			//标记顾问
+			tagtap() {
+				this.biojiisshow = !this.biojiisshow;
+			},
+
+			//取消标记
+			unmarktap() {
+				this.roleindexbiaoji = this.dshfkjsdkksodofydwfkhwdfkjh;
+			},
+
+			//确认标记
+			Confirmthetag() {
+				var num = this.roleindexbiaoji + 1;
+				let params = {
+					id: this.luyinList[this.csdFileindex].id,
+					speaker: num,
+					customerId: this.customerId
+				}
+				this.$u.get(config.service.markConsultant, params).then((data) => {
+					this.biojiisshow = false;
+					this.biaojiyuyi()
+					this.fenjiaoseunfo()
+					uni.showToast({
+						title: '标记成功',
+						duration: 2000
+					});
+				})
+			},
+
+
+			// 切换角色展示
+			tapspagek(index) {
+				this.roleindex = index;
+				this.newluyinList = [];
+				this.fenjiaoseunfo()
+				this.$forceUpdate()
+			},
+
+
+			// 初始化音频以及页面数据
+			init(info) {
+				this.sliderMax = 0; //进度条最大值
+				this.timeStr = "00:00"; //总的时间
+				const parames = {
+					pageNum: 1,
+					pageSize: 100,
+					query: {
+						customerId: this.customerId
+					}
+				}
+				this.$u.post("/corpus/findByPage", parames).then(res => {
+					if (res && res.length) {
+						let alltime = 1 + res[0].recordDuration;
+						this.calibration = res[0].calibration;
+						if (this.calibration == 0) {
+							this.kehuyixiangcenterindex = 0;
+						} else {
+							this.kehuyixiangcenterindex = 1;
+						}
+						this.alltimeStr = this.getTime(alltime)
+						if (info.bg != 0) {
+							this.luyinList = res;
+							this.recordPath = res[0].recordPath
+							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 {
+							this.luyinList = res;
+							this.recordPath = res[0].recordPath
+							this.sliderMax = this.getTime(res[0].recordDuration)
+							this.timeStr = this.getTime(res[0].recordDuration)
+							this.date = res[0].receptionTime;
+
+							this.getCorpusAnalysis(info);
+							this.creatAudio()
+						}
+					}
+				})
+			},
+
+
+			// 获取转义后的对话结果
+			getCorpusAnalysis(info) {
+				this.dialogList = [];
+				this.newluyinList = []
+				uni.request({
+					url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id +
+						"&bg=" + info.bg + "&speaker=" + this.roleindex, //仅为示例，并非真实接口地址。	
+					method: "GET",
+					header: {
+						'content-type': 'application/json',
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (data) => {
+						this.tablist = [];
+						this.roleindexbiaoji = 0;
+						let jsonInfo = JSON.parse(data.data.data.audioContent);
+
+						for (var i = 0; i <= data.data.data.speakerNum; i++) {
+							if (i === 0) {
+								this.tablist.push({
+									name: '全部'
+								})
+							} else {
+								this.tablist.push({
+									name: String.fromCharCode(i + 64)
+								})
+							}
+						}
+						if (data.data.data.speaker == null) {
+							this.dshfkjsdkksodofydwfkhwdfkjh = 0;
+						} else {
+							this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
+								.name + "顾问";
+							this.roleindexbiaoji = data.data.data.speaker - 1;
+							this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
+						}
+
+						this.speaker = data.data.data.speaker;
+						//上拉标记点
+						this.textindex = data.data.data.index;
+						//下拉标记点
+						this.toptextindex = data.data.data.index;
+
+						jsonInfo.forEach(item => {
+							item.message = JSON.parse(item.onebest)
+							item.backindex = this.csdFileindex;
+							if (info.onebest) {
+								item.message.forEach(che => {
+									if (che.onebest == info.onebest) {
+										che.onebest =
+											`<font style='color: red'>${che.onebest}</font>`;
+									}
+								})
+							}
+						})
+						this.newluyinList = jsonInfo;
+						this.dialogList.push(jsonInfo[this.textindex]);
+						var itc = parseInt(info.bg / 1000)
+						this.adasdasdasd(itc)
+						console.log(this.dialogList)
+					}
+				})
+			},
+
+
+			//下一页
+			ltolower() {
+				var lengthcz = this.newluyinList.length - 1;
+				if (this.textindex >= lengthcz) {
+					uni.showToast({
+						title: '到底了',
+						duration: 2000
+					});
+					return
+				} else {
+					this.textindex = this.textindex + 1;
+					this.newluyinList[this.textindex].message.forEach(item => {
+						this.dialogList[0].message.push(item)
+					})
+				}
+			},
+
+			//上一页
+			rolltoupper() {
+				if (this.toptextindex == 0) {
+					return
+				} else {
+					if (this.dialogList[0] == undefined) {
+						return
+					} else {
+						this.toptextindex = this.toptextindex - 1;
+						let reverselist = this.newluyinList[this.toptextindex].message;
+						let runlist = reverselist.reverse();
+						runlist.forEach(item => {
+							this.dialogList[0].message.unshift(item)
+						})
+					}
+				}
+			},
+
+			//搜索跳转
+			adasdasdasd(e) {
+				const currTimeStr = this.formatTime(e)
+				this.currentTimeStr = currTimeStr
+				this.innerAudioContext.seek(e);
+				if (uni.getStorageSync('entrance') == 1) {
+					return
+				} else {
+					this.innerAudioContext.play();
+				}
+			},
+
+
+			//分角色标记刷新
+			fenjiaoseunfo() {
+				var bgcd = this.playNow * 1000;
+				this.newluyinList = [];
+				this.dialogList = [];
+				console.log(this.playNow, '当前播放时长')
+				let obj = {
+					corpusId: this.luyinList[this.csdFileindex].id,
+					bg: bgcd,
+					speaker: this.roleindex
+				}
+				this.$u.get(config.service.getCorpusAnal, obj).then((data) => {
+					this.tablist = [];
+					let jsonInfo = JSON.parse(data.audioContent);
+					for (var i = 0; i <= data.speakerNum; i++) {
+						if (i === 0) {
+							this.tablist.push({
+								name: '全部'
+							})
+						} else {
+							this.tablist.push({
+								name: String.fromCharCode(i + 64)
+							})
+						}
+					}
+
+					if (data.speaker == null) {
+						this.roleindexbiaoji = 0;
+						this.dshfkjsdkksodofydwfkhwdfkjh = 0;
+					} else {
+						this.tablist[data.speaker].name = this.tablist[data.speaker]
+							.name + "顾问";
+						this.roleindexbiaoji = data.speaker - 1;
+						this.dshfkjsdkksodofydwfkhwdfkjh = data.speaker - 1;
+					}
+
+					if (this.roleindex > this.tablist.length - 1) {
+						this.roleindex = this.tablist.length - 1
+						this.fenjiaoseunfo()
+					}
+
+
+					this.speaker = data.speaker;
+					//上拉标记点
+					this.textindex = data.index;
+					//下拉标记点
+					this.toptextindex = data.index;
+
+					jsonInfo.forEach(item => {
+						item.message = JSON.parse(item.onebest)
+						item.backindex = this.csdFileindex
+					})
+
+					this.newluyinList = jsonInfo;
+					if (this.textindex == null) {
+						return
+					} else {
+						this.dialogList.push(jsonInfo[this.textindex]);
+					}
+				})
+			},
+
+			// 选中下标
+			change(index) {
+				console.log(index)
+				this.current = index;
+			},
+
+
+			// 录音暂停播放
+			changePlayState() {
+				if (this.audioPlay == false) {
+					this.innerAudioContext.play();
+				} else {
+					this.innerAudioContext.pause()
+				}
+			},
+
+			// 初始化音频方法
+			initAudioFnc() {
+				this.innerAudioContext = uni.createInnerAudioContext();
+				this.innerAudioContext.autoplay = false;
+				this.innerAudioContext.title = '音频';
+
+				this.onPlay()
+				this.onPause()
+				this.onCanplay()
+				this.onEnded()
+				this.onSeeking()
+				this.onSeeked()
+				this.TimeUpdate()
+				this.init(this.infos)
+			},
+
+
+			//录音实例
+			creatAudio() {
+				this.innerAudioContext = uni.createInnerAudioContext();
+				if (uni.getStorageSync('entrance') == 1) {
+					this.innerAudioContext.autoplay = false;
+				} else {
+					this.innerAudioContext.autoplay = true;
+				}
+
+				this.innerAudioContext.src = this.recordPath;
+				this.innerAudioContext.title = '音频';
+				this.onPlay()
+				this.onPause()
+				this.onCanplay()
+				this.onEnded()
+				this.onSeeking()
+				this.onSeeked()
+				this.TimeUpdate()
+			},
+
+			onPlay() {
+				this.innerAudioContext.onPlay(() => {
+					// 播放监听
+					console.log('播放!');
+					this.audioPlay = true;
+					wx.enableAlertBeforeUnload({
+						message: "是否确认退出详情页面？",
+						success: function(res) {
+							console.log("方法注册成功：", res);
+						},
+						fail: function(errMsg) {
+							console.log("方法注册失败：", errMsg);
+						},
+					});
+				});
+			},
+			onPause() {
+				this.innerAudioContext.onPause(() => {
+					wx.disableAlertBeforeUnload({
+						success: function(res) {
+							console.log(res)
+						},
+						fail: function(e) {
+							console.log(e)
+						}
+					});
+					// 暂停监听
+					console.log('暂停播放!');
+					this.audioPlay = false
+				});
+			},
+			onCanplay() {
+				this.innerAudioContext.onCanplay((callback) => {
+					console.log("缓冲回调", this.innerAudioContext.duration);
+				})
+			},
+			onEnded() {
+				this.innerAudioContext.onEnded(() => {
+					// 结束播放监听
+					console.log('播放结束!');
+					this.audioPlay = false;
+				});
+			},
+			onSeeking() {
+				this.innerAudioContext.onSeeking((res) => {
+					console.log("进行跳转", res);
+				})
+			},
+			onSeeked() {
+				this.innerAudioContext.onSeeked((res) => {
+					console.log("结束跳转", res);
+					this.$forceUpdate()
+				});
+			},
+			TimeUpdate() {
+				this.innerAudioContext.onTimeUpdate(() => {
+					const {
+						currentTime,
+						duration
+					} = this.innerAudioContext;
+					this.playNow = parseInt(currentTime * 1000)
+					if (this.dialogList.length == 0) {
+						return
+					} else {
+						const message = this.dialogList[0].message;
+						for (let i = 0; i < message.length; i++) {
+							if (Number(message[i].bg) < this.playNow && Number(message[i].ed) > this.playNow) {
+								this.scrollId = "dialog" + this.csdFileindex + "text" + message[i].bg;
+								break;
+							}
+						}
+					}
+					const currTimeStr = this.formatTime(currentTime);
+					this.sliderValue = parseInt(currentTime);
+					// 变动的时间
+					this.currentTimeStr = currTimeStr;
+					//进度条最大值
+					this.sliderMax = this.luyinList[this.csdFileindex].recordDuration;
+					this.$forceUpdate()
+				});
+			},
+
+			//音频前进回退
+			sliderChangeComplate(e) {
+				let platetime = e.detail.value * 1000;
+				this.dialogList = []
+				uni.request({
+					url: config.service.fastForward + '?corpusId=' + this.luyinList[this.csdFileindex].id +
+						"&bg=" + platetime, //仅为示例，并非真实接口地址。	
+					method: "GET",
+					header: {
+						'content-type': 'application/json',
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (data) => {
+						this.textindex = data.data.data.index;
+						this.toptextindex = data.data.data.index;
+						if (data.data.data.index > this.newluyinList.length) {
+							this.dialogList.push(this.newluyinList[0])
+						} else {
+							this.dialogList.push(this.newluyinList[data.data.data.index])
+						}
+						const currTimeStr = this.formatTime(e.detail.value)
+						this.currentTimeStr = currTimeStr
+						this.innerAudioContext.seek(e.detail.value);
+						this.innerAudioContext.play();
+					}
+				})
+			},
+
+
+			// 格式化时间
+			getTime(time) {
+				return util.formatSecond(time)
+			},
+
+			// 格式化时间
+			formatTime(num) {
+				//格式化时间格式
+				num = num.toFixed(0);
+				let second = num % 60;
+				if (second < 10) second = '0' + second;
+				let min = Math.floor(num / 60);
+				if (min < 10) min = '0' + min;
+				return min + ":" + second;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.details {
+		width: 100vw;
+		height: calc(100vh - var(--window-top));
+		display: flex;
+		flex-direction: column;
+
+		.header {
+			padding: 20rpx;
+			width: 100%;
+			height: 180rpx;
+			background: #038EF5;
+
+			.h-box {
+				padding: 0 16rpx;
+				width: 100%;
+				height: 100%;
+				background: #fff;
+				border-radius: 16rpx;
+
+				.h-b-top {
+					padding: 20rpx 0;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.name {
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+				}
+
+				.h-b-btm {
+					display: flex;
+					justify-content: space-between;
+
+					.item {
+						flex-shrink: 0;
+						display: flex;
+						align-items: center;
+
+						&.hit {
+							color: #E7483C;
+							font-size: bold;
+						}
+
+						.item-imgs {
+							margin-right: .5em;
+							width: 32rpx;
+							height: 32rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.audio {
+
+			.headboxbott {
+				width: 100%;
+				height: 88rpx;
+				display: flex;
+				align-items: center;
+
+				.headovfu {
+					flex: 1;
+					height: 88rpx;
+					overflow: hidden;
+				}
+
+				.headpade {
+					width: 160rpx;
+					height: 60rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-left: 1px solid #D6D6D6;
+
+					.biaoji {
+						min-width: 120rpx;
+						height: 48rpx;
+						background: #E6625B;
+						border-radius: 24rpx;
+						text-align: center;
+						line-height: 48rpx;
+						color: #FFFFFF;
+						font-size: 26rpx;
+					}
+				}
+			}
+
+		}
+
+		.scroll-Y {
+			flex: 1;
+			overflow: auto;
+			font-size: 36upx;
+			color: #999999;
+			background: #FFFFFF;
+			margin-top: 30upx;
+			flex: 1;
+			overflow-y: scroll;
+			width: 100%;
+
+
+			.dialog-block {
+				margin: 20rpx 0;
+				border-bottom: 1px solid #ccc;
+
+				.fileName {
+					text-align: center;
+					margin: 10rpx auto;
+					width: 115rpx;
+					height: 42rpx;
+					line-height: 42rpx;
+					background: #EFEFEF;
+					border-radius: 4rpx;
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+
+			.text {
+				margin: 50upx 30upx;
+				line-height: 80upx;
+				display: flex;
+				align-items: center;
+
+
+				.avatar {
+					width: 64upx;
+					height: 64upx;
+					line-height: 64upx;
+					text-align: center;
+					font-size: 36rpx;
+					border-radius: 50%;
+					background: #F2F2F2;
+					color: #008EF2;
+
+					image {
+						width: 40upx;
+					}
+				}
+
+				.content {
+					margin-left: 30upx;
+					line-height: 60rpx;
+					text-align: left;
+					padding: 0 5px;
+					background: #2BC805;
+					border-radius: 8upx;
+					max-width: 442rpx;
+					color: #FFFFFF;
+					position: relative;
+
+					.tankuangcss {
+						position: absolute;
+						top: -140rpx;
+						left: -120rpx;
+						width: 308rpx;
+						height: 130rpx;
+						background-color: #333333;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						padding-top: 4rpx;
+						padding-bottom: 4rpx;
+						display: flex;
+						flex-wrap: wrap;
+						border-radius: 15rpx;
+						z-index: 1000;
+					}
+
+					.bottoms {
+						top: unset;
+						bottom: -140rpx;
+					}
+				}
+
+				&.active {
+					.content {
+						color: #FF7538 !important;
+						position: relative;
+					}
+				}
+
+				&.reverse {
+					flex-direction: row-reverse;
+					text-align: right;
+
+					.content {
+						margin-left: 0;
+						margin-right: 30upx;
+						background: #F6F6F6;
+						color: #999999;
+					}
+				}
+			}
+		}
+		
+		.bottombox {
+			width: 100%;
+			min-height: 170rpx;
+			border-top: 1px solid #E0E0E0;
+
+			.bottomhead {
+				width: 100%;
+				height: 81rpx;
+				border-bottom: 1px solid #E0E0E0;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.audio-slider {
+					width: 87%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding-right: 30rpx;
+				}
+
+				.audio-slider .slider {
+					width: 100%;
+					padding: 0px 15rpx;
+					box-sizing: border-box;
+				}
+
+				.audio-time {
+					width: 110rpx;
+					text-align: right;
+					font-size: 26rpx;
+					line-height: 28rpx;
+					color: #70798D;
+					display: flex;
+					justify-content: space-between;
+				}
+
+				.audio-play {
+					width: 48rpx;
+					height: 48rpx;
+					flex-shrink: 0;
+				}
+
+				.audio-play .image {
+					width: 100%;
+					height: 100%;
+					margin-left: 30rpx;
+				}
+			}
+
+			.bottomtips {
+				padding: 0 32rpx;
+				min-height: 70rpx;
+				display: flex;
+				align-items: center;
+				background: #FDEBC6;
+			}
+
+			.botbotmm {
+				width: 100%;
+				height: 88rpx;
+				display: flex;
+				align-items: center;
+
+				.item {
+					flex: 1;
+					height: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border: 1rpx solid #E0E0E0;
+					border-top: none;
+				}
+
+			}
+		}
+
+		.bounced {
+			width: 570rpx;
+			background: #FFFFFF;
+			z-index: 1000;
+			border-radius: 10rpx;
+			position: fixed;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+
+			.headpade {
+				margin-top: 10rpx;
+				padding: 8rpx 8rpx 8rpx 8rpx;
+				background: #108ee9;
+				color: #fff;
+				border-radius: 16rpx;
+			}
+
+			/* 50%为自身尺寸的一半 */
+			.jiajinghuatit {
+				width: 100%;
+				height: 68rpx;
+				font-size: 30rpx;
+				text-align: center;
+				line-height: 68rpx;
+			}
+
+			.jiajinghuaview {
+				padding: 18rpx 18rpx 18rpx 18rpx;
+				display: flex;
+				flex-wrap: wrap;
+
+				.jiajinghuaview1 {
+					padding: 8rpx 8rpx 8rpx 8rpx;
+					font-size: 26rpx;
+					border-radius: 12rpx;
+					border: 1px solid #979797;
+					margin-left: 8rpx;
+				}
+
+				.jighuaview2 {
+					padding: 8rpx 18rpx 8rpx 18rpx;
+					font-size: 26rpx;
+					border-radius: 12rpx;
+					border: 1px solid #979797;
+					margin-left: 20rpx;
+					margin-top: 10rpx;
+					display: flex;
+
+					.view1-text {
+						text-align: center;
+					}
+
+					.view1-img {
+						width: 50rpx;
+					}
+				}
+			}
+
+			.bounced3 {
+				height: 100rpx;
+				width: 100%;
+				margin-top: 40rpx;
+				border-top: 1px solid #dddddd;
+				display: flex;
+			}
+
+			.bounced3-1 {
+				width: 50%;
+				height: 100%;
+				text-align: center;
+				line-height: 100rpx;
+				border-right: 1px solid #dddddd;
+				font-size: 36rpx;
+				color: #999999;
+			}
+
+			.bounced3-2 {
+				width: 50%;
+				height: 100%;
+				text-align: center;
+				line-height: 100rpx;
+				font-size: 36rpx;
+				color: #108ee9;
+			}
+		}
+
+		.reason {
+			padding: 0 32rpx 32rpx;
+			width: 686rpx;
+			min-height: 350rpx;
+			display: flex;
+			flex-direction: column;
+			box-sizing: border-box;
+			
+			.resaon-title {
+				padding: 12rpx 0;
+				flex-shrink: 0;
+				line-height: 32rpx;
+				font-size: 32rpx;
+				box-sizing: border-box;
+			}
+			
+			.resaon-textbox {
+				padding: 12rpx 16rpx 36rpx;
+				position: relative;
+				flex-grow: 1;
+				box-sizing: border-box;
+				border: 1rpx solid #979797;
+				// border-radius: 16rpx;
+				display: flex;
+				
+				textarea {
+					flex-grow: 1;
+					box-sizing: border-box;
+				}
+				
+				.lastlength {
+					position: absolute;
+					right: 32rpx;
+					bottom: 12rpx;
+					font-size: 24rpx;
+					box-sizing: border-box;
+				}
+			}
+		}
+	}
+
+
+	/deep/.u-tab-item {
+		border: 1rpx solid #dedede;
+	}
+</style>
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 3f43ba1..4134f8f 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -1,7 +1,5 @@
 <template>
 	<view class="box">
-		
-		
 		<!-- 选择器 -->
 		<view class="boxtittab">
 			<view class="tabbox" @click="taptimeisshow">
@@ -13,20 +11,26 @@
 			<view class="tabbox" @click="selectshow = true">
 				顾问<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
+			<view class="tabbox" @click="showIdent = true">
+				违禁标识<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+			</view>
 		</view>
 		<view class="count" v-if="recordList.length > 0">
-			筛选结果：<text>{{totalRecords}}  </text>条
+			筛选结果：<text>{{totalRecords}} </text>条
 		</view>
 		<view class="content">
-			<view v-if="recordList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;background: #FFFFFF;">
+			<view v-if="recordList.length==0"
+				style="width: 100%;height: 100%;display: flex;align-items: center;background: #FFFFFF;">
 				<view style="width: 100%;padding-top: 200rpx;">
 					<view style="width: 100%;text-align: center;">
-						<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
+						<image style="width: 220rpx;height: 200rpx;"
+							src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
 					</view>
-					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>	
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>
 				</view>
 			</view>
-			<view  v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index' @click="tapThevisiting(item)">
+			<view v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index'
+				@click="tapThevisiting(item)">
 				<view class="content-first">
 					<view class="left">
 						<!-- <view class="img">{{item.agentName.slice(0,1)}}</view> -->
@@ -42,7 +46,7 @@
 						<view class="cus">客户：{{item.name || '--'}} |</view>
 						<view class="arriveNum">{{item.visitRecord || "--"}}次到访</view>
 					</view>
-					
+
 				</view>
 				<view class="content-last">
 					{{item.createTime}} | {{item.mm || '0'}} min
@@ -50,182 +54,252 @@
 			</view>
 		</view>
 
-		
+
 		<!-- 选择顾问的选择框 -->
 		<u-select v-model="selectshow" :list="freeList" @confirm="actionSelectCallback"></u-select>
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(5)">全部</view>
-			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(0)">今天</view>
+			<block v-for="(data, index) in activeList" :key="index">
+				<view class="timeview" :style="{ color: activeTotal == data.id ? '#2B6EFF' : '#333333' }"
+					@click="tabtimetap(data.id)">{{ data.title }}</view>
+			</block>
+			<!-- 			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(0)">今天</view>
 			<view class="timeview" :style="{ color: activeTotal == 1 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(1)">昨天</view>
 			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(2)">近7天</view>
 			<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(3)">近30天</view>
-			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4)">自定义</view>
+			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4)">自定义</view> -->
 		</u-popup>
 		<u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select>
+		
+		<u-select v-model="showIdent" :list="identList" @confirm="selectIdent"></u-select>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				orderBylist:[
-					{label:'全部',value:'0'},
-					{label:'创建时间倒序',value:'1'},
-					{label:'创建时间正序',value:'2'},
-					{label:'接待时间倒序',value:'3'},
-					{label:'接待时间正序',value:'4'},
+	export default {
+		data() {
+			return {
+				orderBylist: [{
+						label: '全部',
+						value: '0'
+					},
+					{
+						label: '创建时间倒序',
+						value: '1'
+					},
+					{
+						label: '创建时间正序',
+						value: '2'
+					},
+					{
+						label: '接待时间倒序',
+						value: '3'
+					},
+					{
+						label: '接待时间正序',
+						value: '4'
+					},
 				],
 				activeTotal: 5,
-				selectshow:false,
+				activeList: [ // 时间筛选数组
+					{
+						title: '全部',
+						id: 5,
+					},
+					{
+						title: '昨天',
+						id: 0,
+					},
+					{
+						title: '昨天',
+						id: 1,
+					},
+					{
+						title: '近7天',
+						id: 2,
+					},
+					{
+						title: '近30天',
+						id: 3,
+					},
+					{
+						title: '自定义',
+						id: 4,
+					},
+				],
+				showIdent: false, // 显示选择违禁标识列表
+				identList: [ // 违禁标识列表
+					{
+						title: '全部',
+						id: ''
+					},
+					{
+						title: '有效',
+						id: 1
+					},
+					{
+						title: '无效',
+						id: 2
+					},
+				],
+				selectshow: false,
 				totalTimeShow: false,
-				screen:{
-					agentId:'',//顾问id
-					record:'0',
+				screen: {
+					agentId: '', //顾问id
+					record: '0',
 				},
-				freeList:[],//顾问
-				recordList:[],	
-				buildingID:'',
-				nextPage:1,
-				totalRecord:"",
-				staTime:'',
-				endtime:'',
-				isnorefresh:'',
-				activeTotal2:0,
-				timeshow:false,
-				soltishow:false,
-				orderBy:'',
-				userInfo:{},
-				totalRecords:'',
-				isRefresh:false
+				freeList: [], //顾问
+				recordList: [],
+				buildingID: '',
+				nextPage: 1,
+				totalRecord: "",
+				staTime: '',
+				endtime: '',
+				isnorefresh: '',
+				activeTotal2: 0,
+				timeshow: false,
+				soltishow: false,
+				orderBy: '',
+				userInfo: {},
+				totalRecords: '',
+				isRefresh: false
 			}
 		},
 		onLoad(options) {
-			this.isnorefresh=options.refresh;
-			if(options.activeTotal){
-				this.activeTotal=options.activeTotal
+			this.isnorefresh = options.refresh;
+			if (options.activeTotal) {
+				this.activeTotal = options.activeTotal
 			}
-			if(options.staTime){
-				this.staTime=options.staTime;
-				this.endtime=options.endtime;
+			if (options.staTime) {
+				this.staTime = options.staTime;
+				this.endtime = options.endtime;
 			}
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
-			if(this.isnorefresh=='refresh'){
+			if (this.isnorefresh == 'refresh') {
 				this.buildingID = uni.getStorageSync('buildingID').id;
-				this.recordList=[];
-				this.nextPage=1;
+				this.recordList = [];
+				this.nextPage = 1;
 				this.isRefresh = false;
 				this.getMyCustom()
 				this.getFreeList();
-				this.isnorefresh='';
-			}	
+				this.isnorefresh = '';
+			}
 			var pages = getCurrentPages();
-			pages[0].$vm.path='/pages/index/index'
+			pages[0].$vm.path = '/pages/index/index'
 			console.log(pages[0].$vm.path)
 		},
-		onPullDownRefresh(){
-			this.nextPage=1;
+		onPullDownRefresh() {
+			this.nextPage = 1;
 			this.isRefresh = true;
 			this.getMyCustom()
-			setTimeout(function () {
-			    uni.stopPullDownRefresh();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		onReachBottom() {
-			if(this.totalRecord==this.nextPage){
+			if (this.totalRecord == this.nextPage) {
 				uni.showToast({
-					icon:'none',
-				    title: '到底了',
-				    duration: 2000
+					icon: 'none',
+					title: '到底了',
+					duration: 2000
 				});
 				return
-			}else{
-				this.nextPage+=1;
+			} else {
+				this.nextPage += 1;
 				this.isRefresh = false;
 				this.getMyCustom();
 			}
 		},
-		methods:{
-			tapsoltishow(){
-				this.soltishow=true;
+		methods: {
+			tapsoltishow() {
+				this.soltishow = true;
 			},
-			
-			taptimeisshow(){
-				this.timeshow=true;
+
+			taptimeisshow() {
+				this.timeshow = true;
 			},
 			//选择标签
-			selectCallback2(e){
-				this.orderBy=e[0].value;
-				this.nextPage=1;
-				this.recordList=[];
+			selectCallback2(e) {
+				this.orderBy = e[0].value;
+				this.nextPage = 1;
+				this.recordList = [];
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
+			
+			// 选择违禁标识
+			selectIdent(e) {
+				console.log(e)
+			},
+			
 			//时间选择
-			tabtimetap(index){
-				this.timeshow=false;
+			tabtimetap(index) {
+				this.timeshow = false;
 				if (index == 4) {
 					this.totalTimeShow = true;
 				} else {
 					this.activeTotal = index;
-					this.staTime='';
-					this.endtime='';
-					this.nextPage=1;
-					this.recordList=[];
+					this.staTime = '';
+					this.endtime = '';
+					this.nextPage = 1;
+					this.recordList = [];
 					this.isRefresh = false;
 					this.getMyCustom();
 				}
 			},
 			//自定义时间
 			totalTimeChange(e) {
-				this.staTime=e.startDate;
-				this.endtime=e.endDate;
-				this.activeTotal=4;
-				this.nextPage=1;
-				this.recordList=[];
+				this.staTime = e.startDate;
+				this.endtime = e.endDate;
+				this.activeTotal = 4;
+				this.nextPage = 1;
+				this.recordList = [];
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
+
+			// 跳转违禁详情
 			tapThevisiting(item) {
-				if(item.status==0){
+				if (item.status == 0) {
 					uni.showToast({
 						icon: "none",
 						title: "排队中"
 					})
 					return
-				}else{
+				} else {
 					const parames = {
 						pageNum: 1,
 						pageSize: 100,
 						query: {
 							customerId: item.id,
 						}
-					}	
-					this.$u.post("/customer/prohibitedMatch", {customerId:item.id}).then(res => {
-						let newweijin=res[0];
-							newweijin.transferContent=JSON.parse(newweijin.transferContent)	
-						var item={
-							bg:newweijin.transferContent.bg,
-							customerId:newweijin.corpusId,
+					}
+					this.$u.post("/customer/prohibitedMatch", {
+						customerId: item.id
+					}).then(res => {
+						let newweijin = res[0];
+						newweijin.transferContent = JSON.parse(newweijin.transferContent)
+						var item = {
+							bg: newweijin.transferContent.bg,
+							customerId: newweijin.corpusId,
 						}
 						uni.setStorageSync("searchobj", item); //写入缓存
 						this.$u.post("/corpus/findByPage", parames).then(res => {
-							if(res==null){
+							if (res == null) {
 								uni.showToast({
 									icon: "none",
 									title: "暂无音频"
 								})
 								return
-							}else{
+							} else {
 								let newobj = res[0];
-								if(res[0].merge==0){
+								if (res[0].merge == 0) {
 									uni.navigateTo({
-										url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
+										url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
 									})
-								}else{
+								} else {
 									uni.navigateTo({
 										url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
 									})
@@ -234,76 +308,78 @@
 						})
 					})
 				}
-				
+
 			},
-			getMyCustom(){
-				let dateType=0;
-				let orderBy=0;
-				if(this.activeTotal==5){
-					dateType=null;
-				}else if(this.activeTotal==4){
-					dateType=null;
-				}else{
-					dateType=this.activeTotal;
+			getMyCustom() {
+				let dateType = 0;
+				let orderBy = 0;
+				if (this.activeTotal == 5) {
+					dateType = null;
+				} else if (this.activeTotal == 4) {
+					dateType = null;
+				} else {
+					dateType = this.activeTotal;
 				}
-				
-				if(this.orderBy==0){
-					orderBy=null;
-				}else{
-					orderBy=this.orderBy;
+
+				if (this.orderBy == 0) {
+					orderBy = null;
+				} else {
+					orderBy = this.orderBy;
 				}
 				var parames = {
 					pageNum: this.nextPage,
 					pageSize: 10,
 					query: {
-						projectId:this.buildingID,
-						time:1,
-						staTime:this.staTime,
-						endtime:this.endtime,
-						taboo:1,
-						dateType:dateType,
-						orderBy:orderBy
+						projectId: this.buildingID,
+						time: 1,
+						staTime: this.staTime,
+						endtime: this.endtime,
+						taboo: 1,
+						dateType: dateType,
+						orderBy: orderBy
 					}
 				};
-				if(this.screen.agentId){
+				if (this.screen.agentId) {
 					parames.query.agentId = this.screen.agentId
 				}
-				
+
 				this.$u.post("/customer/findbypage", parames).then(data => {
 					var list = data.results || [];
-					if(this.isRefresh){
+					if (this.isRefresh) {
 						this.recordList = list;
-					}else{
+					} else {
 						this.recordList = [...this.recordList, ...list];
 					}
-					this.totalRecord=data.totalPage;
+					this.totalRecord = data.totalPage;
 					this.totalRecords = data.totalRecord;
 				})
 			},
 			//获取顾问列表
 			getFreeList() {
-			  this.$u.post("/cusLvStatistics/selectAllAccountIdByHouseId", { houseId: this.buildingID }).then(res => {
-			    this.freeList = res;
-				 this.freeList.forEach(item => {
-					item.label=item.name;
-					item.value=item.accountId
+				this.$u.post("/cusLvStatistics/selectAllAccountIdByHouseId", {
+					houseId: this.buildingID
+				}).then(res => {
+					this.freeList = res;
+					this.freeList.forEach(item => {
+						item.label = item.name;
+						item.value = item.accountId
+					})
 				})
-			  })
 			},
 			//顾问确认
-			actionSelectCallback(e){
-				this.screen.agentId=e[0].value;
-				this.recordList=[];
-				this.nextPage=1;
-				this.selectshow=false;
+			actionSelectCallback(e) {
+				this.screen.agentId = e[0].value;
+				this.recordList = [];
+				this.nextPage = 1;
+				this.selectshow = false;
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-	
-		
-	
-		
-			
+
+
+
+
+
 		},
 	}
 </script>
@@ -314,6 +390,7 @@
 		height: 100%;
 		background: #F8F8F8;
 	}
+
 	.count {
 		width: 100%;
 		height: 90rpx;
@@ -321,18 +398,20 @@
 		align-items: center;
 		justify-content: center;
 		background-color: #FBE4E4;
-		
+
 		text {
 			color: #F71616;
 		}
 	}
-	.timeview{
+
+	.timeview {
 		height: 80rpx;
 		line-height: 80rpx;
 		width: 100%;
 		text-align: center;
 		border-bottom: 1px solid #F8F8F8;
 	}
+
 	//时间切换的样式
 	.boxtittab {
 		width: 100;
@@ -341,7 +420,7 @@
 		border: 1px solid #E0E0E0;
 		display: flex;
 		align-items: center;
-	
+
 		.tabbox {
 			flex: 1;
 			height: 100%;
@@ -351,61 +430,72 @@
 			font-size: 28rpx;
 		}
 	}
-	.search-box{
+
+	.search-box {
 		width: 100%;
 		height: 102rpx;
 		background: #FFFFFF;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		.search{
+
+		.search {
 			width: 94%;
 			height: 70rpx;
 			display: flex;
 			align-items: center;
 			background: #F8F8F8;
 			border-radius: 33rpx;
-			.search-img{
+
+			.search-img {
 				width: 26rpx;
 				height: 30rpx;
 				margin-left: 20rpx;
-				.search-img1{
+
+				.search-img1 {
 					width: 100%;
 					height: 100%;
 					margin-top: 2rpx;
-				}	
+				}
 			}
-			.search-text{
+
+			.search-text {
 				font-size: 28rpx;
 				font-weight: 400;
 				color: #999999;
-				margin-left:10rpx;
+				margin-left: 10rpx;
 			}
 		}
-		.search-screen{
+
+		.search-screen {
 			width: 40rpx;
 			height: 40rpx;
 			margin-left: 30rpx;
-			.search-screen1{
+
+			.search-screen1 {
 				width: 100%;
 				height: 100%;
 			}
 		}
 	}
-	.content{
-		.content-tips{
+
+	.content {
+		.content-tips {
 			background: #fff;
 			padding: 0 20rpx;
 			box-sizing: border-box;
 			overflow: hidden;
 			margin-top: 20rpx;
-			.content-first{
+
+			.content-first {
 				margin-top: 19rpx;
 				display: flex;
 				justify-content: space-between;
-				.left{
+
+				.left {
 					display: flex;
-					.img{
+
+					.img {
 						width: 52rpx;
 						height: 52rpx;
 						background: #FFFFFF;
@@ -414,13 +504,15 @@
 						text-align: center;
 						line-height: 52rpx;
 					}
-					.name{
+
+					.name {
 						font-weight: 600;
 						color: #333333;
 						// margin-left: 20rpx;
 						margin-top: 11rpx;
 					}
-					.status{
+
+					.status {
 						width: 110rpx;
 						height: 42rpx;
 						background: #FFF9F5;
@@ -434,42 +526,48 @@
 						margin-top: 11rpx;
 					}
 				}
-				.right{
+
+				.right {
 					display: flex;
 					margin-top: 11rpx;
-					.point{
+
+					.point {
 						width: 12rpx;
 						height: 12rpx;
 						background: #2B6EFF;
 						border-radius: 50%;
 						margin-right: 9rpx;
 						margin-top: 16rpx;
-						
+
 					}
 				}
 			}
-			
-			
-			.content-sec{
+
+
+			.content-sec {
 				display: flex;
 				justify-content: space-between;
 				margin-top: 19rpx;
-				.left{
+
+				.left {
 					display: flex;
-					.cus{
+
+					.cus {
 						font-size: 30rpx;
 						font-weight: 400;
 						color: #666666;
 						// line-height: 30rpx;
 					}
-					.arriveNum{
+
+					.arriveNum {
 						font-size: 30rpx;
 						font-weight: 400;
 						// line-height: 30rpx;
 						margin-left: 10rpx;
 					}
 				}
-				.right{
+
+				.right {
 					width: 120rpx;
 					height: 46rpx;
 					background: #F4F8FD;
@@ -480,7 +578,8 @@
 					color: #2671E2;
 				}
 			}
-			.content-last{
+
+			.content-last {
 				// margin: 30rpx 0;
 				font-size: 30rpx;
 				font-weight: 400;
@@ -489,62 +588,72 @@
 				margin-top: 22rpx;
 				margin-bottom: 30rpx;
 			}
-				
+
 		}
 	}
+
 	// 这是弹出层
-	.screen{
+	.screen {
 		// box-sizing: border-box;
 		// padding: 0 30rpx;
-		position:absolute;
-		.screen-counselor{
+		position: absolute;
+
+		.screen-counselor {
 			display: flex;
 			height: 106rpx;
 			// padding: 40rpx 30rpx 36rpx 30rpx;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			border-bottom: 1px solid #EEEEEE;
-			.screen-text{
+
+			.screen-text {
 				margin: 40rpx 0 36rpx 0;
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #333333;
 				line-height: 30rpx;
 			}
-			.screen-sel{
+
+			.screen-sel {
 				display: flex;
 				justify-content: space-between;
 				width: 500rpx;
 				margin-left: 60rpx;
-				.screen-sel-img{
+
+				.screen-sel-img {
 					margin: 40rpx 0 36rpx 0;
 					width: 14rpx;
 					height: 30rpx;
 				}
-				.screen-inp{
+
+				.screen-inp {
 					margin-top: 20rpx;
 				}
 			}
 		}
-		.screen-record{
+
+		.screen-record {
 			height: 192rpx;
 			// width: 100%;
 			overflow: hidden;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			border-bottom: 1px solid #EEEEEE;
-			.screen-record-text{
+
+			.screen-record-text {
 				margin-top: 36rpx;
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #333333;
 				line-height: 30rpx;
 			}
-			.screen-record-tab{
+
+			.screen-record-tab {
 				margin-top: 30rpx;
 				display: flex;
+
 				// justify-content: space-around;
-				.screen-record-chose{
+				.screen-record-chose {
 					width: 156rpx;
 					height: 60rpx;
 					background: #2671E2;
@@ -555,7 +664,8 @@
 					margin-right: 22rpx;
 					color: #FFFFFF;
 				}
-				.screen-record-nochose{
+
+				.screen-record-nochose {
 					width: 156rpx;
 					height: 60rpx;
 					background: #FFFFFF;
@@ -565,14 +675,16 @@
 					line-height: 60rpx;
 					margin-right: 22rpx;
 				}
-				
+
 			}
 		}
-		.screen-foot{
+
+		.screen-foot {
 			width: 100%;
 			height: 100rpx;
 			display: flex;
-			.screen-foot-reset{
+
+			.screen-foot-reset {
 				width: 50%;
 				text-align: center;
 				height: 100rpx;
@@ -581,7 +693,8 @@
 				font-weight: 400;
 				color: #666666;
 			}
-			.screen-foot-sure{
+
+			.screen-foot-sure {
 				width: 50%;
 				text-align: center;
 				line-height: 100rpx;
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 12f8e7f..534e8ad 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -421,7 +421,8 @@
 					</view>
 					<view class="bioqianwayl" v-if="item.isshow==true">
 						<view class="jiangshang" v-for="(chend,i) in item.children" :key='i' v-if="chend.selected==0">
-							{{chend.text}}</view>
+							{{chend.text}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -482,7 +483,7 @@
 	var config = require("../../config");
 	import LongAudio from "@/components/long_audio/long_audio.vue"
 	export default {
-		components:{
+		components: {
 			LongAudio
 		},
 		data() {
@@ -583,7 +584,7 @@
 				roleisshaw: false,
 				roleindexrow: 0,
 				roletiaoshu: 0,
-				infos:null
+				infos: null
 			};
 		},
 		onLoad: function(options) {
@@ -592,11 +593,11 @@
 			this.itemobj = uni.getStorageSync('searchobj');
 			console.log(this.itemobj)
 			this.stateisshow = options.stateisshow;
-			uni.$on("playNows",(val)=>{
-			    this.playNow=val;
+			uni.$on("playNows", (val) => {
+				this.playNow = val;
 			})
-			uni.$on("scrollIds",(val)=>{
-			    this.scrollId=val;
+			uni.$on("scrollIds", (val) => {
+				this.scrollId = val;
 			})
 		},
 		onShow() {
@@ -641,8 +642,8 @@
 			this.init(this.infos)
 
 		},
-		
-		
+
+
 		onUnload() {
 			//暂停
 			this.innerAudioContext.pause()
@@ -1058,7 +1059,7 @@
 							this.roleindexbiaoji = data.data.data.speaker - 1;
 							this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
 						}
-						if (this.roleindex > this.tablist.length - 1) { 
+						if (this.roleindex > this.tablist.length - 1) {
 							this.roleindex = this.tablist.length - 1
 							this.fenjiaoseunfo()
 						}
@@ -1102,10 +1103,10 @@
 					wx.enableAlertBeforeUnload({
 						message: "是否确认退出详情页面？",
 						success: function(res) {
-					 	console.log("方法注册成功：", res);
+							console.log("方法注册成功：", res);
 						},
 						fail: function(errMsg) {
-					  console.log("方法注册失败：", errMsg);
+							console.log("方法注册失败：", errMsg);
 						},
 					});
 				});
@@ -1918,8 +1919,8 @@
 		height: 84rpx;
 		border-bottom: 1px solid #E0E0E0;
 		display: flex;
-	
-	.boxhead1 {
+
+		.boxhead1 {
 			width: 50%;
 			color: #303030;
 			height: 84rpx;
@@ -2183,7 +2184,7 @@
 		left: 50%;
 		top: 50%;
 		transform: translate(-50%, -50%);
-		
+
 		.headpade {
 			margin-top: 10rpx;
 			padding: 8rpx 8rpx 8rpx 8rpx;
diff --git a/static/images/img/ban.png b/static/images/img/ban.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4d95219d13f455ca21278e70b90c12504874f18
GIT binary patch
literal 3078
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
Un>yYHJ^%m!07*qoM6N<$f)!2l2><{9

literal 0
HcmV?d00001

diff --git a/static/images/img/hand.png b/static/images/img/hand.png
new file mode 100644
index 0000000000000000000000000000000000000000..0df1ad5cbcd0cc3357005fd157b00e22c8759f0d
GIT binary patch
literal 2415
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

literal 0
HcmV?d00001

diff --git a/static/images/img/hit.png b/static/images/img/hit.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b2f9f6fe0af980a8d2c16815f2dd8f614c7328f
GIT binary patch
literal 6735
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

literal 0
HcmV?d00001

diff --git a/static/images/img/low_power.png b/static/images/img/low_power.png
new file mode 100644
index 0000000000000000000000000000000000000000..77104bd35d011fd4baccbeb6fba51fe7c0b89db3
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq001li002M;1^@s6VX~DV00001b5ch_0Itp)
z=>Px%)Ja4^RA@u(n!Qg`VHm~Fxot2Yuz>woOf->y!NFb!G1@xlRCQ2C7mdcKlM4*G
zkcc6UZa5e_IB1}v1E&2WOf(EG_m;q7D+yosF}I1NrA2rjUPwsZu6@pVPJg}cn<hQP
zK3+k=ABW%`AVa&^5D+1kJ(1Vxa&>&S`JLXUR#+?e=OU4+MxQ{^PnG9YT6N$cpDO}*
zuL%s`dbV6GX|$@qQY`k?8o?_O+|@1Rn>73Hb9Q#sRNof3c6Bt3_0>m_;39xi1P8ks
zQallOrpsFANkkAvogN|r)Ilr|oa;*_CI>&xFa4Wq29{zm5jKJ+1fGdtU_U`@Yf01z
zPNdF`KIhn2)C?S6@uww{Teg?k_2YE5T)D%raQ=o!^v<sN!MKs$O$LQr1%lkctg!4#
zR2k;|x<LBdt@%0GlYBUQZ1^WjrA^Cg|7#~AT)K8)WOIFEN<=QT9aQiSgM3c5JFvGe
zo%t}gc$h)A?}~4%Xl*s@$kr`zX13yy?D!yu`2k|mVZraX_PP>wffZkkBdmaCByog|
za4CizVFffJi6d-;OEK&SE1(%k9AP6|ieX1s0nJF_2pi#23_HRKXhsr8*a(+m*b!Dh
zGm<#MMz|Eij<5onk;D-;!lf8?gcZ<?B#y8VF2%4Ttbk@DafFR<DTen=IL!M$gmMys
z9>xBylDMS;a0Nh+DOb+44p|7Ci(+?MVOxFT;F)r@t<K;A+a&D>$28+Z2OtYbpVeoX
zSflWl^+RX#5!j2D(V<It$!uz7zT>a|y)3ddvt#`r%=-<29N%`$d`%|22ScB}eLw6P
zLR^?yUa5_2Y(`UpX1i<a)hsL>sR|8HIeI0f<_&NJYGCyEHZxPXy;ZbZY=m*i?rCRX
z$<{H_`NYpH#Cwq*NKeFtskYw+^@4w51@c&c%K%P8Fkto0-D74FzX2>z_=R5LW$TUg
Y7k<Ib=kPnf!2kdN07*qoM6N<$f;`J>00000

literal 0
HcmV?d00001

diff --git a/static/images/img/message.png b/static/images/img/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..478372aab1fcec1d4a25b1b69c7da86f18d4af2c
GIT binary patch
literal 2566
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

literal 0
HcmV?d00001

diff --git a/static/images/img/note.png b/static/images/img/note.png
new file mode 100644
index 0000000000000000000000000000000000000000..e291a7fcb9f4f0e7e2ef47af953488df1bf8649d
GIT binary patch
literal 2225
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

literal 0
HcmV?d00001

diff --git a/static/images/img/people.png b/static/images/img/people.png
new file mode 100644
index 0000000000000000000000000000000000000000..791a26f3ca42fb548d3755bfa6f844332502f6d0
GIT binary patch
literal 3291
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
Z{{=TnM(lr%nZ5u3002ovPDHLkV1iTBH-Z2F

literal 0
HcmV?d00001

diff --git a/static/images/img/percent.png b/static/images/img/percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..beadd03fb33e14741e125cdb128d10ec13a7773c
GIT binary patch
literal 1688
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

literal 0
HcmV?d00001

diff --git a/static/images/img/power.png b/static/images/img/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..beadd03fb33e14741e125cdb128d10ec13a7773c
GIT binary patch
literal 1688
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

literal 0
HcmV?d00001

diff --git a/static/images/img/power1.png b/static/images/img/power1.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd549cb3bfe9f9009659442b252a816fe380c4d3
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq001li002M;1^@s6VX~DV00001b5ch_0Itp)
z=>Px%_en%SRA@u(T1`w7Q4s#VZG-&PM2#UBFB%0C6SeiIoVIAVcmqACM=ubJ5xjtQ
zSA`1+8iF@(crb7@(Ma19T)R#5AR5BOpoVBLR1N~&G24Ws+w#}#R@3<Q+L>?WeVsS+
z=Di`x_;kxKDeM-=p<Q7}fyfVP98ZK}=C1PF2+*ryd-~x8+qP%D=ra&(OPm|@rt8I^
zqtl)?J8fGgz36KiyW-*4lowr340nDWty^ANc`CpyFGfK;uL&LOd2_P&cd7a=hp)UJ
zYFb_2xC23ylw%^;zZD<}O$1u0#`5J!*dnltF({;D04#`Ly1udT$*b1B@0)TthdX65
z@H73P&lU^-5-P_L|8<!GG13-(Fl3N+&S5=mOu)u<|Bd;FNOB?(iQS~0GOq&i(m&`*
zBJmodDPu-}i<LCv7dC-e>Xwm#pwYD<z_-Dmb~|*Yb$*InS-%YK1xG~K@$PZU#zuBb
zfJ^R;%2nzqLkfWc!G@;kv;9kZF;FR)T*g{k|5k{<rNfCxOruju|KaB_9ktA&w5J^Q
z>rYV(`^DsTIErD#Z~+7VUr4lDrfv(KfoOq<r-Oe{)dI5u%!67_GIBqW|9jaCM=fJf
z1V<_ny9B=`&c|HXWjm}pWzr{Rixy2vG7@ujFv?+HLqjp_^nEIZ^MXo+gbIm*9HT-)
zg@g);;(G~IINWzo>a?cL60SU<3Wq8js&J^nv2)L=vV_VKDody=p|XUFfvsLbtFGgS
zrpzw_Y4-KjaubYPOh#fyeZ7I#tw&LaJx<_+Kmxuvo*NCrCynTiM`B4|9rne+5<p72
zf!|kK-~9UYy`rc866}>Ny6yNu)G~jGNQ1kHMFJA&jYkIO{`MGxGcdJmeQW`<V<L#U
zSI$gTjnDv`slFj4hw^F|1A~Sa$*^%FZ_sXTz=qvlIIvXq?kO998Ir>X!ly=@fhpG$
zY=<>`cn#}!3AqfxaUnw$draJ6Ap}-HEI=5qsjVB$&scu|Gpnt?CGga^00000NkvXX
Hu0mjf-MM|d

literal 0
HcmV?d00001

diff --git a/static/images/img/time.png b/static/images/img/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..d966f7aead19637493752873e1322048be7afd90
GIT binary patch
literal 2654
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
M07*qoM6N<$g3B`rVE_OC

literal 0
HcmV?d00001

diff --git a/static/images/img/view.png b/static/images/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9a51fdd3863841335106cb8473571b0ea712e39
GIT binary patch
literal 3379
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
JPDHLkV1jvoTyp>b

literal 0
HcmV?d00001

diff --git a/static/images/img/voice.png b/static/images/img/voice.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a86073f996d68b6e5de5b9b7a8072a84531085a
GIT binary patch
literal 2379
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

literal 0
HcmV?d00001


From d24d21420e1adf4be28e478f82c248165bed974c Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 28 Apr 2022 16:30:19 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9D=E7=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 296 +++++++++++++++++++++-------
 pages/center/prohibited/index.vue   |  39 ++--
 utils/domain.js                     |   3 +-
 3 files changed, 256 insertions(+), 82 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 5dbb853..9eb4ed0 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -6,16 +6,16 @@
 				<view class="h-b-top">
 					<text class="name">{{ userlistobj.agentName || '' }}</text>
 					<view class="status">
-						<text class="item">有效</text>
+						<text class="item">{{ userlistobj.validInvalidName }}</text>
 						<text class="item" style="margin: 0 .5em;">|</text>
-						<text class="item">待处理</text>
+						<text class="item">{{ userlistobj.violatedStatus | ViolatedStatus }}</text>
 					</view>
 				</view>
 				<!-- 详细信息 -->
 				<view class="h-b-btm">
 					<view class="item">
 						<image class="item-imgs" src="@/static/images/img/time.png" mode=""></image>
-						{{ userlistobj.endTime1 || '' }}
+						{{ userlistobj.createTime || '' }}
 					</view>
 					<view class="item">
 						<image class="item-imgs" src="@/static/images/img/voice.png" mode=""></image>
@@ -23,7 +23,7 @@
 					</view>
 					<view class="item hit">
 						<image class="item-imgs" src="@/static/images/img/hit.png" mode=""></image>
-						2
+						{{ userlistobj.violatedFrequency || '0' }}
 					</view>
 				</view>
 			</view>
@@ -95,15 +95,25 @@
 				</view>
 			</view>
 
-			<view class="bottomtips">
-				无效原因：附近人说的
-			</view>
+			<template v-if="userlistobj.invalidViolatedCause">
+				<view class="bottomtips">
+					无效原因：{{ userlistobj.invalidViolatedCause }}
+				</view>
+			</template>
 
 			<view class="botbotmm">
-				<view class="item">上一条</view>
-				<view class="item">确认有效</view>
-				<view class="item" @tap="showTagValid">确认无效</view>
-				<view class="item">下一条</view>
+				<view class="item" @click="preValid">上一条</view>
+				<template v-if="userlistobj.violatedStatus == 0">
+					<view class="item" @click="setViolated(1)">确认有效</view>
+					<view class="item" @tap="showTagValid">确认无效</view>
+				</template>
+				<template v-if="userlistobj.violatedStatus == 1">
+					<view class="item" @tap="showTagValid">无效</view>
+				</template>
+				<template v-if="userlistobj.violatedStatus == 2">
+					<view class="item" @click="setViolated(1)">确认有效</view>
+				</template>
+				<view class="item" @click="nextValid">下一条</view>
 			</view>
 		</view>
 
@@ -133,7 +143,10 @@
 				<view class="resaon-textbox">
 					<textarea v-model="reasonSrc" placeholder="请输入无效原因" maxlength="60" />
 					<text class="lastlength">{{ reasonSrc.length }}/60</text>
-				</view>	
+				</view>
+				<view class="button">
+					<text @click="inputDone">完成</text>
+				</view>
 			</view>
 		</u-popup>
 	</view>
@@ -187,6 +200,8 @@
 				scrollId: "", // 当前播放滚动到的位置
 				tagValidShow: false, // 标记弹窗
 				reasonSrc: '', // 标记无效的原因
+
+				nextPageObj: JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
 			}
 		},
 		onLoad(option) {
@@ -199,7 +214,6 @@
 		onShow() {
 			this.permissions = uni.getStorageSync('weapp_session_Menu_data') // 权限
 
-			console.log(this.itemobj, 'askdjalkjdsalkjdkasljdklasjdklasjdlk')
 			this.roleindex = 0;
 			if (this.stateisshow == 2) {
 				this.infos = this.itemobj;
@@ -213,11 +227,121 @@
 		},
 
 		methods: {
+			// 确认无效标记 setViolatedStatus = 2
+			inputDone() {
+				this.setViolated(2)
+			},
+
+			// 下一条
+			nextValid() {
+				this.nextPageObj.pageSize++
+				this.keyWordsMatching(this.nextPageObj)
+			},
+
+			// 上一条
+			preValid() {
+				if (this.nextPageObj.pageSize == 0) {
+					uni.showToast({
+						title: '没有更早的了~'
+					})
+				} else {
+					this.nextPageObj.pageSize--
+					this.keyWordsMatching(this.nextPageObj)
+				}
+			},
+
+			// 获取违禁话术详情
+			keyWordsMatching(params) {
+				this.$u.post('/customer/findbynum', params).then(res => {
+					this.customerId = res.customerId;
+					uni.setStorageSync('nextPageObj', JSON.stringify(this.nextPageObj))
+					this.prohibitedMatch()
+				}).catch(e => {
+					this.nextPageObj = JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
+						uni.showToast({
+							title: e.message,
+							icon: 'none',
+							duration: 2000
+						})
+				})
+			},
+
+			// 违禁词播放位置
+			prohibitedMatch() {
+				this.$u.post('/customer/prohibitedMatch', {
+					customerId: this.customerId
+				}).then(res => {
+					let newweijin = res[0];
+					newweijin.transferContent = JSON.parse(newweijin.transferContent)
+					var item = {
+						bg: newweijin.transferContent.bg,
+						customerId: newweijin.corpusId,
+					}
+					// 获取是否有转写的音频
+					this.$u.post("/corpus/findByPage", {
+						pageNum: 1,
+						pageSize: 100,
+						query: {
+							customerId: this.customerId,
+						}
+					}).then(res => {
+						if (res == null) {
+							uni.showToast({
+								icon: "none",
+								title: "暂无音频"
+							})
+							return
+						} else {
+							let newobj = res[0];
+							if (res[0].merge == 0) {
+								this.infos = item
+								this.itemobj = item
+								uni.setStorageSync("searchobj", item); //写入缓存
+								this.roleindex = 0;
+								this.initAudioFnc()
+								this.gituserlist()
+							} else {
+								uni.showToast({
+									icon: "none",
+									title: "暂无音频"
+								})
+							}
+						}
+					})
+				})
+			},
+			
+			// 检查是否有录音
+
+			// 设置违禁状态
+			setViolated(status) {
+				let params = {
+					customerId: this.customerId,
+					violatedStatus: status,
+					invalidViolatedCause: this.reasonSrc,
+				}
+				this.$u.post('/customer/setViolatedStatus', params).then(res => {
+					uni.showToast({
+						title: '标记成功',
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.tagValidShow = false
+						this.reasonSrc = ''
+					}, 2000)
+				}).catch(e => {
+					uni.showToast({
+						title: e.message,
+						duration: 2000
+					});
+				})
+			},
+
 			// 展示确认无效原因输入框
 			showTagValid() {
 				this.tagValidShow = true
 			},
-			
+
 			//获取用户信息
 			gituserlist() {
 				this.$u.get("/matchKeywords/personalReceptionRecord", {
@@ -371,7 +495,6 @@
 						this.dialogList.push(jsonInfo[this.textindex]);
 						var itc = parseInt(info.bg / 1000)
 						this.adasdasdasd(itc)
-						console.log(this.dialogList)
 					}
 				})
 			},
@@ -427,62 +550,65 @@
 
 			//分角色标记刷新
 			fenjiaoseunfo() {
-				var bgcd = this.playNow * 1000;
+				var bgcd = this.sliderValue * 1000;
 				this.newluyinList = [];
 				this.dialogList = [];
-				console.log(this.playNow, '当前播放时长')
-				let obj = {
-					corpusId: this.luyinList[this.csdFileindex].id,
-					bg: bgcd,
-					speaker: this.roleindex
-				}
-				this.$u.get(config.service.getCorpusAnal, obj).then((data) => {
-					this.tablist = [];
-					let jsonInfo = JSON.parse(data.audioContent);
-					for (var i = 0; i <= data.speakerNum; i++) {
-						if (i === 0) {
-							this.tablist.push({
-								name: '全部'
-							})
-						} else {
-							this.tablist.push({
-								name: String.fromCharCode(i + 64)
-							})
+				uni.request({
+					url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id +
+						"&bg=" + bgcd + "&speaker=" + this.roleindex, //仅为示例，并非真实接口地址。	
+					method: "GET",
+					header: {
+						'content-type': 'application/json',
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (data) => {
+						this.tablist = [];
+						let jsonInfo = JSON.parse(data.data.data.audioContent);
+						for (var i = 0; i <= data.data.data.speakerNum; i++) {
+							if (i === 0) {
+								this.tablist.push({
+									name: '全部'
+								})
+							} else {
+								this.tablist.push({
+									name: String.fromCharCode(i + 64)
+								})
+							}
 						}
-					}
-
-					if (data.speaker == null) {
-						this.roleindexbiaoji = 0;
-						this.dshfkjsdkksodofydwfkhwdfkjh = 0;
-					} else {
-						this.tablist[data.speaker].name = this.tablist[data.speaker]
-							.name + "顾问";
-						this.roleindexbiaoji = data.speaker - 1;
-						this.dshfkjsdkksodofydwfkhwdfkjh = data.speaker - 1;
-					}
 
-					if (this.roleindex > this.tablist.length - 1) {
-						this.roleindex = this.tablist.length - 1
-						this.fenjiaoseunfo()
-					}
+						if (data.data.data.speaker == null) {
+							this.roleindexbiaoji = 0;
+							this.dshfkjsdkksodofydwfkhwdfkjh = 0;
+						} else {
+							this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
+								.name + "顾问";
+							this.roleindexbiaoji = data.data.data.speaker - 1;
+							this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
+						}
+						if (this.roleindex > this.tablist.length - 1) {
+							this.roleindex = this.tablist.length - 1
+							this.fenjiaoseunfo()
+						}
 
 
-					this.speaker = data.speaker;
-					//上拉标记点
-					this.textindex = data.index;
-					//下拉标记点
-					this.toptextindex = data.index;
+						this.speaker = data.data.data.speaker;
+						//上拉标记点
+						this.textindex = data.data.data.index;
+						//下拉标记点
+						this.toptextindex = data.data.data.index;
 
-					jsonInfo.forEach(item => {
-						item.message = JSON.parse(item.onebest)
-						item.backindex = this.csdFileindex
-					})
+						jsonInfo.forEach(item => {
+							item.message = JSON.parse(item.onebest)
+							item.backindex = this.csdFileindex
+						})
+						console.log(jsonInfo)
 
-					this.newluyinList = jsonInfo;
-					if (this.textindex == null) {
-						return
-					} else {
-						this.dialogList.push(jsonInfo[this.textindex]);
+						this.newluyinList = jsonInfo;
+						if (this.textindex == null) {
+							return
+						} else {
+							this.dialogList.push(jsonInfo[this.textindex]);
+						}
 					}
 				})
 			},
@@ -666,6 +792,24 @@
 				if (min < 10) min = '0' + min;
 				return min + ":" + second;
 			},
+		},
+		filters: {
+			// violatedStatus 
+			ViolatedStatus(status) {
+				let str = '';
+				switch (status) {
+					case 0:
+						str = '待处理'
+						break;
+					case 1:
+						str = '有效违禁'
+						break;
+					case 2:
+						str = '无效违禁'
+						break;
+				}
+				return str
+			},
 		}
 	}
 </script>
@@ -869,7 +1013,7 @@
 				}
 			}
 		}
-		
+
 		.bottombox {
 			width: 100%;
 			min-height: 170rpx;
@@ -1041,15 +1185,15 @@
 			display: flex;
 			flex-direction: column;
 			box-sizing: border-box;
-			
+
 			.resaon-title {
-				padding: 12rpx 0;
+				padding: 24rpx 0;
 				flex-shrink: 0;
 				line-height: 32rpx;
 				font-size: 32rpx;
 				box-sizing: border-box;
 			}
-			
+
 			.resaon-textbox {
 				padding: 12rpx 16rpx 36rpx;
 				position: relative;
@@ -1058,12 +1202,12 @@
 				border: 1rpx solid #979797;
 				// border-radius: 16rpx;
 				display: flex;
-				
+
 				textarea {
 					flex-grow: 1;
 					box-sizing: border-box;
 				}
-				
+
 				.lastlength {
 					position: absolute;
 					right: 32rpx;
@@ -1072,6 +1216,20 @@
 					box-sizing: border-box;
 				}
 			}
+
+			.button {
+				margin-top: 24rpx;
+				width: 100%;
+				display: flex;
+				justify-content: flex-end;
+
+				text {
+					padding: 10rpx 35rpx;
+					color: #fff;
+					background: #008EF2;
+					border-radius: 16rpx;
+				}
+			}
 		}
 	}
 
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 4134f8f..c5805e3 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -30,7 +30,7 @@
 				</view>
 			</view>
 			<view v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index'
-				@click="tapThevisiting(item)">
+				@click="tapThevisiting(item, index)">
 				<view class="content-first">
 					<view class="left">
 						<!-- <view class="img">{{item.agentName.slice(0,1)}}</view> -->
@@ -130,18 +130,19 @@
 				showIdent: false, // 显示选择违禁标识列表
 				identList: [ // 违禁标识列表
 					{
-						title: '全部',
-						id: ''
+						label: '全部',
+						value: 0
 					},
 					{
-						title: '有效',
-						id: 1
+						label: '有效',
+						value: 1
 					},
 					{
-						title: '无效',
-						id: 2
+						label: '无效',
+						value: 2
 					},
 				],
+				violatedStatus: 0, // 违禁状态
 				selectshow: false,
 				totalTimeShow: false,
 				screen: {
@@ -162,7 +163,8 @@
 				orderBy: '',
 				userInfo: {},
 				totalRecords: '',
-				isRefresh: false
+				isRefresh: false,
+				nextPageObj: {}, // 跳转详情页面的参数
 			}
 		},
 		onLoad(options) {
@@ -231,7 +233,11 @@
 			
 			// 选择违禁标识
 			selectIdent(e) {
-				console.log(e)
+				this.violatedStatus = e[0].value
+				this.nextPage = 1;
+				this.recordList = [];
+				this.isRefresh = false;
+				this.getMyCustom();
 			},
 			
 			//时间选择
@@ -261,7 +267,7 @@
 			},
 
 			// 跳转违禁详情
-			tapThevisiting(item) {
+			tapThevisiting(item, index) {
 				if (item.status == 0) {
 					uni.showToast({
 						icon: "none",
@@ -296,8 +302,15 @@
 							} else {
 								let newobj = res[0];
 								if (res[0].merge == 0) {
+									let obj = {
+										pageSize: index,
+										query: {
+											...this.nextPageObj
+										}
+									}
+									uni.setStorageSync('nextPageObj', JSON.stringify(obj))
 									uni.navigateTo({
-										url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
+										url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}`
 									})
 								} else {
 									uni.navigateTo({
@@ -336,7 +349,8 @@
 						endtime: this.endtime,
 						taboo: 1,
 						dateType: dateType,
-						orderBy: orderBy
+						orderBy: orderBy,
+						violatedStatus: this.violatedStatus, // 违禁状态
 					}
 				};
 				if (this.screen.agentId) {
@@ -352,6 +366,7 @@
 					}
 					this.totalRecord = data.totalPage;
 					this.totalRecords = data.totalRecord;
+					this.nextPageObj = parames.query
 				})
 			},
 			//获取顾问列表
diff --git a/utils/domain.js b/utils/domain.js
index 654cf98..4db25da 100644
--- a/utils/domain.js
+++ b/utils/domain.js
@@ -4,7 +4,8 @@
 // const baseUrl = 'http://192.168.31.89:9090/api';// sh
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.92:8080/api';// 测试站
-const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+const baseUrl = 'http://192.168.31.210:8080/api'; // 泽明
 // const baseUrl = 'http://192.168.31.167:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏

From 4cfed08abccad8024042c22a066ace4da359a946 Mon Sep 17 00:00:00 2001
From: happyboy <13466975206@163.com>
Date: Thu, 28 Apr 2022 16:46:09 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/domain.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/domain.js b/utils/domain.js
index 654cf98..5d3f758 100644
--- a/utils/domain.js
+++ b/utils/domain.js
@@ -1,16 +1,17 @@
 // http.js使用域名
-// const baseUrl = 'http://192.168.31.57:8080/autoSR/api';// 本地
+const baseUrl = 'http://127.0.0.1:8080/api';// 本地
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.89:9090/api';// sh
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.92:8080/api';// 测试站
-const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.167:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏
 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
 // const baseUrl = 'https://hfju.com/api'; // 数智正式
 
+
 // config使用域名
 /**192.168.31.167
  * 小程序配置文件

From 9843c8545430e77bbdc65f2c49f1055b38344ef8 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 28 Apr 2022 17:40:36 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 9eb4ed0..4368104 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -229,7 +229,17 @@
 		methods: {
 			// 确认无效标记 setViolatedStatus = 2
 			inputDone() {
-				this.setViolated(2)
+				if (!this.reasonSrc) {
+					uni.showToast({
+						title: '请输入标记无效的原因',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				this.$u.debounce(() => {
+					this.setViolated(2)
+				})
 			},
 
 			// 下一条
@@ -253,7 +263,7 @@
 			// 获取违禁话术详情
 			keyWordsMatching(params) {
 				this.$u.post('/customer/findbynum', params).then(res => {
-					this.customerId = res.customerId;
+					this.customerId = res.result[0].id;
 					uni.setStorageSync('nextPageObj', JSON.stringify(this.nextPageObj))
 					this.prohibitedMatch()
 				}).catch(e => {
@@ -325,6 +335,8 @@
 						title: '标记成功',
 						duration: 2000
 					});
+					this.initAudioFnc()
+					this.gituserlist()
 					setTimeout(() => {
 						this.tagValidShow = false
 						this.reasonSrc = ''

From f4222d992909e1cbfba64c7b92a3f6b2bf20715e Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 2 May 2022 10:15:38 +0800
Subject: [PATCH 05/30] xiugai weijin

---
 pages/center/prohibited/details.vue | 58 ++++++++++++++---------------
 pages/center/prohibited/index.vue   |  2 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 4368104..4307858 100644
--- a/pages/center/prohibited/details.vue
+++ b/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()
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index c5805e3..441da9b 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -107,7 +107,7 @@
 						id: 5,
 					},
 					{
-						title: '昨天',
+						title: '今天',
 						id: 0,
 					},
 					{

From 6342f3bb9d6a9771d74fc695f408e2679c9477ac Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 13:49:32 +0800
Subject: [PATCH 06/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |   6 +-
 pages/center/prohibited/details.vue | 131 ++++++++++++++++++++--------
 utils/domain.js                     |   3 +-
 3 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/pages.json b/pages.json
index a4fb3fa..29353c5 100644
--- a/pages.json
+++ b/pages.json
@@ -487,9 +487,9 @@
 					"path": "prohibited/details",
 					"style": {
 						"navigationBarTitleText": "违禁详情",
-						"navigationBarBackgroundColor": "#038EF5",
-						"navigationBarTextStyle": "white",
-						"enablePullDownRefresh": true
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
 					}
 				},
 				{
diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 4307858..d61ab64 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -6,8 +6,7 @@
 				<view class="h-b-top">
 					<text class="name">{{ userlistobj.agentName || '' }}</text>
 					<view class="status">
-						<text class="item">{{ userlistobj.validInvalidName }}</text>
-						<text class="item" style="margin: 0 .5em;">|</text>
+						<text class="pointer"></text>
 						<text class="item">{{ userlistobj.violatedStatus | ViolatedStatus }}</text>
 					</view>
 				</view>
@@ -31,7 +30,30 @@
 		<!-- tab选择框 -->
 		<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
 			@change="change"></u-tabs>
-
+		<template v-if="current == 0">
+			<view class="words-list">
+				<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()"
+					upper-threshold='40px' @scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true"
+					class="zhuti text scroll-Y">
+					<!-- 聊天记录-->
+					<view class="dialog-block" style="border-bottom: none;">
+						<block v-for="(item,index) in findTabooWordsList" :key="index">
+							<view class="text">
+								<view class="avatar">
+									<view :style="[SPEAKERSTYLE(item.speaker)]">
+										<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+										<text v-else>{{ item.speaker | toCapital }}</text>
+									</view>
+								</view>
+								<view class="content">
+									<view v-html="item.onebest"></view>
+								</view>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+		</template>
 		<template v-if="current == 1">
 			<!-- 音频 -->
 			<view class="audio">
@@ -48,32 +70,30 @@
 					</view>
 				</view>
 			</view>
-		</template>
-
-
-		<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()" upper-threshold='40px'
-			@scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true" class="zhuti text scroll-Y">
-			<!-- 聊天记录-->
-			<view class="dialog-block" v-for="(dialog,i) in dialogList" :key="i">
-				<view :id="'dialog'+i" class="fileName">录音文件</view>
-				<block v-for="(item,index) in dialog.message" :key="index">
-					<view class="text" :id="'dialog'+csdFileindex+'text'+item.bg"
-						:class="{active: item.bg < playNow &&  item.ed > playNow, reverse: Number(item.speaker) % 2 == 0}"
-						:data-speaker="item.speaker">
-						<view class="avatar">
-							<view :style="[SPEAKERSTYLE(item.speaker)]">
-								<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
-								<text v-else>{{ item.speaker | toCapital }}</text>
+			<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()"
+				upper-threshold='40px' @scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true"
+				class="zhuti text scroll-Y">
+				<!-- 聊天记录-->
+				<view class="dialog-block" v-for="(dialog,i) in dialogList" :key="i">
+					<view :id="'dialog'+i" class="fileName">录音文件</view>
+					<block v-for="(item,index) in dialog.message" :key="index">
+						<view class="text" :id="'dialog'+csdFileindex+'text'+item.bg"
+							:class="{active: item.bg < playNow &&  item.ed > playNow, reverse: Number(item.speaker) % 2 == 0}"
+							:data-speaker="item.speaker">
+							<view class="avatar">
+								<view :style="[SPEAKERSTYLE(item.speaker)]">
+									<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+									<text v-else>{{ item.speaker | toCapital }}</text>
+								</view>
+							</view>
+							<view class="content">
+								<view v-html="item.onebest"></view>
 							</view>
 						</view>
-						<view class="content">
-							<view v-html="item.onebest"></view>
-						</view>
-					</view>
-				</block>
-			</view>
-		</scroll-view>
-
+					</block>
+				</view>
+			</scroll-view>
+		</template>
 
 		<view class="bottombox">
 			<!-- 播放块 -->
@@ -96,6 +116,10 @@
 					</view>
 				</view>
 			</template>
+			<!-- 占位 -->
+			<template v-else>
+				<view class="bottomhead" style="border-top: none;"></view>
+			</template>
 
 			<template v-if="userlistobj.invalidViolatedCause">
 				<view class="bottomtips">
@@ -202,7 +226,7 @@
 				scrollId: "", // 当前播放滚动到的位置
 				tagValidShow: false, // 标记弹窗
 				reasonSrc: '', // 标记无效的原因
-
+				findTabooWordsList: [], // 违禁词列表
 				nextPageObj: JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
 			}
 		},
@@ -226,9 +250,25 @@
 			}
 			this.initAudioFnc()
 			this.gituserlist()
+			this.findTabooWords()
 		},
 
 		methods: {
+			// 获取违禁词
+			findTabooWords() {
+				this.$u.get('/customer/findTabooWords', { customerId: this.customerId }).then(res => {
+					let arr = []
+					res.map(item => {
+						if (item.transferContent) {
+							item.transferContents = JSON.parse(item.transferContent)
+							arr.push(item.transferContents)
+						}
+					})
+					this.findTabooWordsList = arr
+					console.log(this.findTabooWordsList, 'findTabooWordsList')
+				})
+			},
+			
 			// 确认无效标记 setViolatedStatus = 2
 			inputDone() {
 				if (!this.reasonSrc) {
@@ -320,7 +360,7 @@
 					})
 				})
 			},
-			
+
 			// 检查是否有录音
 
 			// 设置违禁状态
@@ -546,9 +586,9 @@
 
 			//搜索跳转
 			adasdasdasd(e) {
-				const currTimeStr = this.formatTime(parseInt(e.bg/1000))
+				const currTimeStr = this.formatTime(parseInt(e.bg / 1000))
 				this.currentTimeStr = currTimeStr
-				this.innerAudioContext.seek(parseInt(e.bg/1000));
+				this.innerAudioContext.seek(parseInt(e.bg / 1000));
 				if (uni.getStorageSync('entrance') == 1) {
 					return
 				} else {
@@ -832,8 +872,7 @@
 		.header {
 			padding: 20rpx;
 			width: 100%;
-			height: 180rpx;
-			background: #038EF5;
+			height: 210rpx;
 
 			.h-box {
 				padding: 0 16rpx;
@@ -849,9 +888,23 @@
 					justify-content: space-between;
 
 					.name {
-						font-size: 32rpx;
+						font-size: 30rpx;
 						font-weight: bold;
 					}
+					
+					.status {
+						display: flex;
+						align-items: center;
+						
+						.pointer {
+							margin: 0 .5em;
+							width: 12rpx;
+							height: 12rpx;
+							border-radius: 50%;
+							background: #2671E2;
+						}
+					}
+					
 				}
 
 				.h-b-btm {
@@ -877,7 +930,13 @@
 				}
 			}
 		}
-
+		
+		
+		.words-list {
+			flex-grow: 1;
+			
+		}
+		
 		.audio {
 
 			.headboxbott {
@@ -1025,11 +1084,11 @@
 		.bottombox {
 			width: 100%;
 			min-height: 170rpx;
-			border-top: 1px solid #E0E0E0;
 
 			.bottomhead {
 				width: 100%;
 				height: 81rpx;
+				border-top: 1px solid #E0E0E0;
 				border-bottom: 1px solid #E0E0E0;
 				display: flex;
 				justify-content: space-between;
diff --git a/utils/domain.js b/utils/domain.js
index 4db25da..eac638d 100644
--- a/utils/domain.js
+++ b/utils/domain.js
@@ -4,8 +4,9 @@
 // const baseUrl = 'http://192.168.31.89:9090/api';// sh
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.92:8080/api';// 测试站
+const baseUrl = 'http://127.0.0.1:8080/autoSR/api';// 本地
 // const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
-const baseUrl = 'http://192.168.31.210:8080/api'; // 泽明
+// const baseUrl = 'http://192.168.31.210:8080/api'; // 泽明
 // const baseUrl = 'http://192.168.31.167:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏

From 9b8bfa6adeb8c954a908c1591316e0ffcbcd28fc Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 14:04:55 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BF=9D=E7=A6=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 47 +++++++++----------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 441da9b..a04f281 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -5,15 +5,17 @@
 			<view class="tabbox" @click="taptimeisshow">
 				接待时间<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<view class="tabbox" @click="tapsoltishow">
-				排序<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
-			</view>
 			<view class="tabbox" @click="selectshow = true">
 				顾问<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
+			
+			<view class="tabbox" @click="tapsoltishow">
+				处理状态<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+			</view>
 			<view class="tabbox" @click="showIdent = true">
 				违禁标识<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
+			
 		</view>
 		<view class="count" v-if="recordList.length > 0">
 			筛选结果：<text>{{totalRecords}} </text>条
@@ -63,11 +65,6 @@
 				<view class="timeview" :style="{ color: activeTotal == data.id ? '#2B6EFF' : '#333333' }"
 					@click="tabtimetap(data.id)">{{ data.title }}</view>
 			</block>
-			<!-- 			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(0)">今天</view>
-			<view class="timeview" :style="{ color: activeTotal == 1 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(1)">昨天</view>
-			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(2)">近7天</view>
-			<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(3)">近30天</view>
-			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4)">自定义</view> -->
 		</u-popup>
 		<u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select>
 		
@@ -81,24 +78,14 @@
 			return {
 				orderBylist: [{
 						label: '全部',
-						value: '0'
-					},
-					{
-						label: '创建时间倒序',
-						value: '1'
-					},
-					{
-						label: '创建时间正序',
-						value: '2'
-					},
-					{
-						label: '接待时间倒序',
-						value: '3'
-					},
-					{
-						label: '接待时间正序',
-						value: '4'
-					},
+						value: -1
+					},{
+						label: '待处理',
+						value: 0
+					},{
+						label: '已处理',
+						value: 1
+					}
 				],
 				activeTotal: 5,
 				activeList: [ // 时间筛选数组
@@ -325,7 +312,6 @@
 			},
 			getMyCustom() {
 				let dateType = 0;
-				let orderBy = 0;
 				if (this.activeTotal == 5) {
 					dateType = null;
 				} else if (this.activeTotal == 4) {
@@ -334,11 +320,6 @@
 					dateType = this.activeTotal;
 				}
 
-				if (this.orderBy == 0) {
-					orderBy = null;
-				} else {
-					orderBy = this.orderBy;
-				}
 				var parames = {
 					pageNum: this.nextPage,
 					pageSize: 10,
@@ -349,7 +330,7 @@
 						endtime: this.endtime,
 						taboo: 1,
 						dateType: dateType,
-						orderBy: orderBy,
+						disposeStatus: this.orderBy, // 处理状态
 						violatedStatus: this.violatedStatus, // 违禁状态
 					}
 				};

From 227162ef0e8bd1386d489ed7bd1825c000238fd1 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 14:05:42 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BF=9D=E7=A6=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index a04f281..7431a48 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -78,7 +78,7 @@
 			return {
 				orderBylist: [{
 						label: '全部',
-						value: -1
+						value: 55
 					},{
 						label: '待处理',
 						value: 0

From 5329b65e693005966a18e6b64b6def4710d9459f Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 14:06:23 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BF=9D=E7=A6=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 7431a48..74fa3a2 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -82,7 +82,7 @@
 					},{
 						label: '待处理',
 						value: 0
-					},{
+					},{	
 						label: '已处理',
 						value: 1
 					}

From f6349a6696f149d72e35c776bd5eb86db0f73791 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 14:54:25 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 74fa3a2..02174d2 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -78,7 +78,7 @@
 			return {
 				orderBylist: [{
 						label: '全部',
-						value: 55
+						value: null
 					},{
 						label: '待处理',
 						value: 0

From d3e65c32880b754ad4ad21a088bd2738ceaa7915 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 4 May 2022 15:08:35 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BF=9D=E7=A6=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index d61ab64..f8be83b 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -350,6 +350,7 @@
 								this.roleindex = 0;
 								this.initAudioFnc()
 								this.gituserlist()
+								this.findTabooWords()
 							} else {
 								uni.showToast({
 									icon: "none",

From 5b5ab68025d62e31de4508f5e46bec94bb77446c Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 5 May 2022 17:30:44 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                       |   4 +-
 pages.json                          |   2 +-
 pages/center/prohibited/details.vue | 125 +++++++++++++++++++++++++++-
 pages/center/prohibited/index.vue   |  28 +++++--
 utils/domain.js                     |   4 +-
 5 files changed, 148 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1fa64e0..8003bb7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "去房智控管家",
+    "name" : "数智工牌",
     "appid" : "__UNI__D88F14A",
     "description" : "AI营销助理",
     "versionName" : "1.1.0",
@@ -91,7 +91,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx8f883dca5ecc5510",
+        "appid" : "wxe044603515ff2cb5",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages.json b/pages.json
index 29353c5..358ea3e 100644
--- a/pages.json
+++ b/pages.json
@@ -480,7 +480,7 @@
 						"navigationBarTitleText": "违禁记录",
 						"navigationBarBackgroundColor": "#FFFFFF",
 						"navigationBarTextStyle": "black",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": false
 					}
 				},
 				{
diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index f8be83b..e32a799 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -86,8 +86,18 @@
 									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
 							</view>
-							<view class="content">
-								<view v-html="item.onebest"></view>
+							<view class="contentInfo">
+								<view class="info">
+									<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
+									<text>{{conversionTiame(item.bg/1000)}}</text>
+								</view>
+								<view class="contentMain">
+									<view class="content">
+										<view v-html="item.onebest"></view>
+									</view>
+									<image @click="clickbofang(dialog.backindex,item)" class="play"
+										src="@/static/images/recordingManagement/play.png"></image>
+								</view>
 							</view>
 						</view>
 					</block>
@@ -230,6 +240,13 @@
 				nextPageObj: JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
 			}
 		},
+		computed: {
+			conversionTiame() {
+				return (e) => {
+					return this.getTime(e);
+				}
+			},
+		},
 		onLoad(option) {
 			this.status = option.status;
 			this.customerId = option.customerId;
@@ -252,6 +269,13 @@
 			this.gituserlist()
 			this.findTabooWords()
 		},
+		
+		onUnload() {
+			//暂停
+			this.innerAudioContext.pause()
+			// 销毁
+			this.innerAudioContext.destroy();
+		},
 
 		methods: {
 			// 获取违禁词
@@ -284,6 +308,7 @@
 
 			// 下一条
 			nextValid() {
+				this.innerAudioContext.pause()
 				this.nextPageObj.pageSize++
 				this.keyWordsMatching(this.nextPageObj)
 			},
@@ -295,6 +320,7 @@
 						title: '没有更早的了~'
 					})
 				} else {
+					this.innerAudioContext.pause()
 					this.nextPageObj.pageSize--
 					this.keyWordsMatching(this.nextPageObj)
 				}
@@ -348,6 +374,7 @@
 								this.itemobj = item
 								uni.setStorageSync("searchobj", item); //写入缓存
 								this.roleindex = 0;
+								this.innerAudioContext.destroy()
 								this.initAudioFnc()
 								this.gituserlist()
 								this.findTabooWords()
@@ -361,8 +388,8 @@
 					})
 				})
 			},
+			
 
-			// 检查是否有录音
 
 			// 设置违禁状态
 			setViolated(status) {
@@ -372,6 +399,7 @@
 					invalidViolatedCause: this.reasonSrc,
 				}
 				this.$u.post('/customer/setViolatedStatus', params).then(res => {
+					this.tagValidShow = false
 					uni.showToast({
 						title: '标记成功',
 						duration: 2000
@@ -379,10 +407,10 @@
 					this.initAudioFnc()
 					this.gituserlist()
 					setTimeout(() => {
-						this.tagValidShow = false
 						this.reasonSrc = ''
 					}, 2000)
 				}).catch(e => {
+					this.tagValidShow = false
 					uni.showToast({
 						title: e.message,
 						duration: 2000
@@ -699,6 +727,39 @@
 				this.init(this.infos)
 			},
 
+			//长按点击播放
+			clickbofang(dialog, item) {
+				this.innerAudioContext.pause()
+				this.dialogList.forEach(res => {
+					res.message.forEach(asd => {
+						asd.isshow = false;
+					})
+				})
+				this.$forceUpdate()
+				let platetime = item.bg;
+				let newtime = item.bg / 1000;
+				console.log(newtime, 'newTime')
+				this.dialogList = []
+				uni.request({
+					url: config.service.fastForward + '?corpusId=' + this.luyinList[this.csdFileindex].id +
+						"&bg=" + platetime, //仅为示例，并非真实接口地址。	
+					method: "GET",
+					header: {
+						'content-type': 'application/json',
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (data) => {
+						this.textindex = data.data.data.index;
+						this.toptextindex = data.data.data.index;
+						this.dialogList.push(this.newluyinList[data.data.data.index])
+						const currTimeStr = this.formatTime(newtime)
+						console.log(currTimeStr, 'currTimeStr')
+						this.currentTimeStr = currTimeStr
+						this.innerAudioContext.seek(newtime);
+						this.innerAudioContext.play();
+					}
+				})
+			},
 
 			//录音实例
 			creatAudio() {
@@ -1060,6 +1121,30 @@
 						bottom: -140rpx;
 					}
 				}
+				
+				
+				.contentInfo {
+					.info {
+						color: #ccc;
+						font-size: 18rpx;
+						font-size: 30rpx;
+						padding: 0 28rpx;
+					}
+				}
+				
+				.contentMain {
+					display: flex;
+					
+					.content {
+						margin-left: 0;
+						margin-right: 30upx;
+					}
+					.play {
+						width: 50rpx;
+						height: 50rpx;
+						margin-right: 20rpx;
+					}
+				}
 
 				&.active {
 					.content {
@@ -1078,6 +1163,38 @@
 						background: #F6F6F6;
 						color: #999999;
 					}
+					
+					.contentInfo {
+						.info {
+							color: #ccc;
+							font-size: 18rpx;
+							font-size: 30rpx;
+							padding: 0 28rpx;
+							display: flex;
+							flex-direction: row-reverse;
+								
+							.AudioUserName {
+								margin-left: 10rpx;
+							}
+						}
+					
+						.contentMain {
+							display: flex;
+							flex-direction: row-reverse;
+							align-items: center;
+					
+							.content {
+								margin-left: 0;
+								margin-right: 30upx;
+							}
+					
+							.play {
+								width: 50rpx;
+								height: 50rpx;
+								margin-right: 20rpx;
+							}
+						}
+					}
 				}
 			}
 		}
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 02174d2..dff3090 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -3,17 +3,17 @@
 		<!-- 选择器 -->
 		<view class="boxtittab">
 			<view class="tabbox" @click="taptimeisshow">
-				接待时间<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ timeText }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			<view class="tabbox" @click="selectshow = true">
-				顾问<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ guwenText }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			
 			<view class="tabbox" @click="tapsoltishow">
-				处理状态<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ steyStatus }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			<view class="tabbox" @click="showIdent = true">
-				违禁标识<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ weijinTag }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			
 		</view>
@@ -63,7 +63,7 @@
 		<u-popup v-model="timeshow" mode="bottom">
 			<block v-for="(data, index) in activeList" :key="index">
 				<view class="timeview" :style="{ color: activeTotal == data.id ? '#2B6EFF' : '#333333' }"
-					@click="tabtimetap(data.id)">{{ data.title }}</view>
+					@click="tabtimetap(data.id, data.title)">{{ data.title }}</view>
 			</block>
 		</u-popup>
 		<u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select>
@@ -152,6 +152,14 @@
 				totalRecords: '',
 				isRefresh: false,
 				nextPageObj: {}, // 跳转详情页面的参数
+				
+				
+				// 页面文字展示内容
+				timeText: '接待时间', // 
+				guwenText: '顾问', // 
+				steyStatus: '处理状态', // 
+				weijinTag: '违禁标识', // 违禁标识
+				
 			}
 		},
 		onLoad(options) {
@@ -212,6 +220,7 @@
 			//选择标签
 			selectCallback2(e) {
 				this.orderBy = e[0].value;
+				this.steyStatus = e[0].label;
 				this.nextPage = 1;
 				this.recordList = [];
 				this.isRefresh = false;
@@ -221,6 +230,7 @@
 			// 选择违禁标识
 			selectIdent(e) {
 				this.violatedStatus = e[0].value
+				this.weijinTag = e[0].label
 				this.nextPage = 1;
 				this.recordList = [];
 				this.isRefresh = false;
@@ -228,11 +238,12 @@
 			},
 			
 			//时间选择
-			tabtimetap(index) {
+			tabtimetap(index, title) {
 				this.timeshow = false;
 				if (index == 4) {
 					this.totalTimeShow = true;
 				} else {
+					this.timeText = title
 					this.activeTotal = index;
 					this.staTime = '';
 					this.endtime = '';
@@ -246,6 +257,7 @@
 			totalTimeChange(e) {
 				this.staTime = e.startDate;
 				this.endtime = e.endDate;
+				this.timeText = `${e.startDate}-${e.endDate}`
 				this.activeTotal = 4;
 				this.nextPage = 1;
 				this.recordList = [];
@@ -365,6 +377,7 @@
 			//顾问确认
 			actionSelectCallback(e) {
 				this.screen.agentId = e[0].value;
+				this.guwenText = e[0].label;
 				this.recordList = [];
 				this.nextPage = 1;
 				this.selectshow = false;
@@ -424,6 +437,9 @@
 			line-height: 92rpx;
 			color: #666666;
 			font-size: 28rpx;
+			overflow: hidden;  /* 超出一行文字自动隐藏 */
+			text-overflow: ellipsis;  /*文字隐藏后添加省略号*/
+			white-space: nowrap;   /*强制不换行*/
 		}
 	}
 
diff --git a/utils/domain.js b/utils/domain.js
index eac638d..a20b5b8 100644
--- a/utils/domain.js
+++ b/utils/domain.js
@@ -4,8 +4,8 @@
 // const baseUrl = 'http://192.168.31.89:9090/api';// sh
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.92:8080/api';// 测试站
-const baseUrl = 'http://127.0.0.1:8080/autoSR/api';// 本地
-// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+// const baseUrl = 'http://127.0.0.1:8080/autoSR/api';// 本地
+const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.210:8080/api'; // 泽明
 // const baseUrl = 'http://192.168.31.167:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪

From e6fe15597b1082daac11f71b7951e335456ea459 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 5 May 2022 18:14:45 +0800
Subject: [PATCH 13/30] tijiaoxiugai

---
 pages/center/prohibited/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index dff3090..3872da0 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -147,7 +147,7 @@
 				activeTotal2: 0,
 				timeshow: false,
 				soltishow: false,
-				orderBy: '',
+				orderBy: null,
 				userInfo: {},
 				totalRecords: '',
 				isRefresh: false,
@@ -217,6 +217,7 @@
 			taptimeisshow() {
 				this.timeshow = true;
 			},
+			
 			//选择标签
 			selectCallback2(e) {
 				this.orderBy = e[0].value;

From 727b12a29616d69b09a9491dcb45c06bb2aa18ed Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 5 May 2022 18:21:49 +0800
Subject: [PATCH 14/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=BE=E9=97=AE=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 3872da0..08c1696 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -373,6 +373,10 @@
 						item.label = item.name;
 						item.value = item.accountId
 					})
+					this.freeList.unshift({
+						label: '全部',
+						value: null,
+					})
 				})
 			},
 			//顾问确认

From 1e237e5bf7f7047b51c1b404312b96a9bc63f47e Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 5 May 2022 18:26:30 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=BE=E9=97=AE=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 08c1696..28f636b 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -118,7 +118,7 @@
 				identList: [ // 违禁标识列表
 					{
 						label: '全部',
-						value: 0
+						value: null
 					},
 					{
 						label: '有效',
@@ -129,7 +129,7 @@
 						value: 2
 					},
 				],
-				violatedStatus: 0, // 违禁状态
+				violatedStatus: null, // 违禁状态
 				selectshow: false,
 				totalTimeShow: false,
 				screen: {

From f626b5dd36ab9bbe7eeb9dd0e154b44535eddc5b Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 11:35:41 +0800
Subject: [PATCH 16/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9D=E7=A6=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |   2 +-
 pages/center/prohibited/details.vue |  33 ++++-
 pages/center/prohibited/index.vue   | 198 ++++++++++++++++------------
 3 files changed, 141 insertions(+), 92 deletions(-)

diff --git a/pages.json b/pages.json
index 358ea3e..29353c5 100644
--- a/pages.json
+++ b/pages.json
@@ -480,7 +480,7 @@
 						"navigationBarTitleText": "违禁记录",
 						"navigationBarBackgroundColor": "#FFFFFF",
 						"navigationBarTextStyle": "black",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": true
 					}
 				},
 				{
diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index e32a799..62b0754 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -45,8 +45,19 @@
 										<text v-else>{{ item.speaker | toCapital }}</text>
 									</view>
 								</view>
-								<view class="content">
-									<view v-html="item.onebest"></view>
+								
+								<view class="contentInfo">
+									<view class="info">
+										<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
+										<text>{{conversionTiame(item.bg/1000)}}</text>
+									</view>
+									<view class="contentMain">
+										<view class="content">
+											<view v-html="item.onebest"></view>
+										</view>
+										<image @click="clickbofang(0,item, 'show')" class="play"
+											src="@/static/images/recordingManagement/play.png"></image>
+									</view>
 								</view>
 							</view>
 						</block>
@@ -308,9 +319,16 @@
 
 			// 下一条
 			nextValid() {
-				this.innerAudioContext.pause()
-				this.nextPageObj.pageSize++
-				this.keyWordsMatching(this.nextPageObj)
+				if (this.nextPageObj.pageSize < this.nextPageObj.num) {
+					this.innerAudioContext.pause()
+					this.nextPageObj.pageSize++
+					this.keyWordsMatching(this.nextPageObj)
+				} else {
+					uni.showToast({
+						title: '已经是最后一条了~',
+						icon: 'none'
+					})
+				}
 			},
 
 			// 上一条
@@ -728,7 +746,10 @@
 			},
 
 			//长按点击播放
-			clickbofang(dialog, item) {
+			clickbofang(dialog, item, type) {
+				if (type == 'show') {
+					this.current = 1
+				}
 				this.innerAudioContext.pause()
 				this.dialogList.forEach(res => {
 					res.message.forEach(asd => {
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 28f636b..06eb93b 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -3,19 +3,23 @@
 		<!-- 选择器 -->
 		<view class="boxtittab">
 			<view class="tabbox" @click="taptimeisshow">
-				{{ timeText }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ timeText }}
+				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			<view class="tabbox" @click="selectshow = true">
-				{{ guwenText }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ guwenText }}
+				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			
+
 			<view class="tabbox" @click="tapsoltishow">
-				{{ steyStatus }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ steyStatus }}
+				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			<view class="tabbox" @click="showIdent = true">
-				{{ weijinTag }}<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+				{{ weijinTag }}
+				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			
+
 		</view>
 		<view class="count" v-if="recordList.length > 0">
 			筛选结果：<text>{{totalRecords}} </text>条
@@ -35,23 +39,30 @@
 				@click="tapThevisiting(item, index)">
 				<view class="content-first">
 					<view class="left">
-						<!-- <view class="img">{{item.agentName.slice(0,1)}}</view> -->
+						<view class="img">顾</view>
 						<view class="name">{{item.agentName}}</view>
 						<view class="status" v-if="item.replaceReception==1">代接待</view>
 					</view>
 					<view class="right">
-						<view class=""></view>
+						<view class="">
+							{{ item.violatedStatus | ViolatedStatus }}
+						</view>
 					</view>
 				</view>
-				<view class="content-sec">
-					<view class="left">
-						<view class="cus">客户：{{item.name || '--'}} |</view>
-						<view class="arriveNum">{{item.visitRecord || "--"}}次到访</view>
-					</view>
 
-				</view>
 				<view class="content-last">
-					{{item.createTime}} | {{item.mm || '0'}} min
+					<view class="item">
+						<image src="@/static/images/img/time.png" mode=""></image>
+						<text>{{item.createTime}}</text>
+					</view>
+					<view class="item">
+						<image src="@/static/images/img/voice.png" mode=""></image>
+						<text>{{item.mm || '0'}}</text>
+					</view>
+					<view class="item">
+						<image src="@/static/images/img/hit.png" mode=""></image>
+						<text>{{violatedFrequency || '0'}}</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -67,7 +78,7 @@
 			</block>
 		</u-popup>
 		<u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select>
-		
+
 		<u-select v-model="showIdent" :list="identList" @confirm="selectIdent"></u-select>
 	</view>
 </template>
@@ -77,16 +88,15 @@
 		data() {
 			return {
 				orderBylist: [{
-						label: '全部',
-						value: null
-					},{
-						label: '待处理',
-						value: 0
-					},{	
-						label: '已处理',
-						value: 1
-					}
-				],
+					label: '全部',
+					value: null
+				}, {
+					label: '待处理',
+					value: 0
+				}, {
+					label: '已处理',
+					value: 1
+				}],
 				activeTotal: 5,
 				activeList: [ // 时间筛选数组
 					{
@@ -149,17 +159,17 @@
 				soltishow: false,
 				orderBy: null,
 				userInfo: {},
-				totalRecords: '',
+				totalRecords: '', // 列表全部的条数
 				isRefresh: false,
 				nextPageObj: {}, // 跳转详情页面的参数
-				
-				
+
+
 				// 页面文字展示内容
 				timeText: '接待时间', // 
 				guwenText: '顾问', // 
 				steyStatus: '处理状态', // 
 				weijinTag: '违禁标识', // 违禁标识
-				
+
 			}
 		},
 		onLoad(options) {
@@ -191,6 +201,7 @@
 			this.nextPage = 1;
 			this.isRefresh = true;
 			this.getMyCustom()
+			this.resetRefreshParams()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -210,6 +221,18 @@
 			}
 		},
 		methods: {
+			// 重置参数
+			resetRefreshParams() {
+				this.timeText = '接待时间'
+				this.activeTotal = 5
+				this.guwenText = '顾问'
+				this.screen.agentId = '' // 顾问id
+				this.steyStatus = '处理状态'
+				this.orderBy = null
+				this.weijinTag = '违禁标识'
+				this.violatedStatus = null // 违禁状态
+			},
+
 			tapsoltishow() {
 				this.soltishow = true;
 			},
@@ -217,7 +240,7 @@
 			taptimeisshow() {
 				this.timeshow = true;
 			},
-			
+
 			//选择标签
 			selectCallback2(e) {
 				this.orderBy = e[0].value;
@@ -227,7 +250,7 @@
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-			
+
 			// 选择违禁标识
 			selectIdent(e) {
 				this.violatedStatus = e[0].value
@@ -237,7 +260,7 @@
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-			
+
 			//时间选择
 			tabtimetap(index, title) {
 				this.timeshow = false;
@@ -304,6 +327,7 @@
 								if (res[0].merge == 0) {
 									let obj = {
 										pageSize: index,
+										num: this.totalRecords,
 										query: {
 											...this.nextPageObj
 										}
@@ -323,6 +347,8 @@
 				}
 
 			},
+
+			// 获取围巾列表
 			getMyCustom() {
 				let dateType = 0;
 				if (this.activeTotal == 5) {
@@ -389,19 +415,34 @@
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-
-
-
-
-
 		},
+	
+		
+		filters: {
+			// violatedStatus 
+			ViolatedStatus(status) {
+				let str = '';
+				switch (status) {
+					case 0:
+						str = '待处理'
+						break;
+					case 1:
+						str = '有效违禁'
+						break;
+					case 2:
+						str = '无效违禁'
+						break;
+				}
+				return str
+			},
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.box {
-		width: 100%;
-		height: 100%;
+		width: 100vw;
+		min-height: calc(100vh - var(--window-top));
 		background: #F8F8F8;
 	}
 
@@ -428,6 +469,9 @@
 
 	//时间切换的样式
 	.boxtittab {
+		position: sticky;
+		top: var(--window-top);
+		z-index: 100;
 		width: 100;
 		height: 92rpx;
 		background: #FFFFFF;
@@ -442,9 +486,12 @@
 			line-height: 92rpx;
 			color: #666666;
 			font-size: 28rpx;
-			overflow: hidden;  /* 超出一行文字自动隐藏 */
-			text-overflow: ellipsis;  /*文字隐藏后添加省略号*/
-			white-space: nowrap;   /*强制不换行*/
+			overflow: hidden;
+			/* 超出一行文字自动隐藏 */
+			text-overflow: ellipsis;
+			/*文字隐藏后添加省略号*/
+			white-space: nowrap;
+			/*强制不换行*/
 		}
 	}
 
@@ -498,21 +545,23 @@
 
 	.content {
 		.content-tips {
+			margin: 0 0 20rpx 0;
 			background: #fff;
-			padding: 0 20rpx;
 			box-sizing: border-box;
-			overflow: hidden;
-			margin-top: 20rpx;
+			display: flex;
+			flex-direction: column;
 
 			.content-first {
-				margin-top: 19rpx;
+				padding: 20rpx 30rpx;
 				display: flex;
 				justify-content: space-between;
+				background-color: #EEF4FD;
 
 				.left {
 					display: flex;
 
 					.img {
+						margin-right: 10rpx;
 						width: 52rpx;
 						height: 52rpx;
 						background: #FFFFFF;
@@ -561,51 +610,30 @@
 			}
 
 
-			.content-sec {
+			.content-last {
+				padding: 24rpx 30rpx;
+				font-size: 30rpx;
+				font-weight: 400;
+				color: #666666;
 				display: flex;
 				justify-content: space-between;
-				margin-top: 19rpx;
-
-				.left {
+				
+				.item {
+					flex-shrink: 0;
 					display: flex;
-
-					.cus {
-						font-size: 30rpx;
-						font-weight: 400;
-						color: #666666;
-						// line-height: 30rpx;
+					align-items: center;
+					
+					image {
+						margin-right: 10rpx;
+						width: 32rpx;
+						height: 32rpx;
 					}
-
-					.arriveNum {
-						font-size: 30rpx;
-						font-weight: 400;
-						// line-height: 30rpx;
-						margin-left: 10rpx;
+					
+					text {
+						font-size: 28rpx;
 					}
 				}
-
-				.right {
-					width: 120rpx;
-					height: 46rpx;
-					background: #F4F8FD;
-					border-radius: 6rpx;
-					text-align: center;
-					line-height: 46rpx;
-					font-weight: 400;
-					color: #2671E2;
-				}
 			}
-
-			.content-last {
-				// margin: 30rpx 0;
-				font-size: 30rpx;
-				font-weight: 400;
-				color: #666666;
-				line-height: 30rpx;
-				margin-top: 22rpx;
-				margin-bottom: 30rpx;
-			}
-
 		}
 	}
 

From 56923a7797150a342c4ffb9ab954cbeb3aa04cc5 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 11:55:39 +0800
Subject: [PATCH 17/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 61 +++++++++++++----------------
 pages/center/prohibited/index.vue   |  4 +-
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 62b0754..a0a8953 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -31,39 +31,37 @@
 		<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
 			@change="change"></u-tabs>
 		<template v-if="current == 0">
-			<view class="words-list">
-				<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()"
-					upper-threshold='40px' @scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true"
-					class="zhuti text scroll-Y">
-					<!-- 聊天记录-->
-					<view class="dialog-block" style="border-bottom: none;">
-						<block v-for="(item,index) in findTabooWordsList" :key="index">
-							<view class="text">
-								<view class="avatar">
-									<view :style="[SPEAKERSTYLE(item.speaker)]">
-										<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
-										<text v-else>{{ item.speaker | toCapital }}</text>
-									</view>
+			<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()"
+				upper-threshold='40px' @scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true"
+				class="zhuti text scroll-Y">
+				<!-- 聊天记录-->
+				<view class="dialog-block" style="border-bottom: none;">
+					<block v-for="(item,index) in findTabooWordsList" :key="index">
+						<view class="text">
+							<view class="avatar">
+								<view :style="[SPEAKERSTYLE(item.speaker)]">
+									<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
-								
-								<view class="contentInfo">
-									<view class="info">
-										<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
-										<text>{{conversionTiame(item.bg/1000)}}</text>
-									</view>
-									<view class="contentMain">
-										<view class="content">
-											<view v-html="item.onebest"></view>
-										</view>
-										<image @click="clickbofang(0,item, 'show')" class="play"
-											src="@/static/images/recordingManagement/play.png"></image>
+							</view>
+							
+							<view class="contentInfo">
+								<view class="info">
+									<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
+									<text>{{conversionTiame(item.bg/1000)}}</text>
+								</view>
+								<view class="contentMain">
+									<view class="content">
+										<view v-html="item.onebest"></view>
 									</view>
+									<image @click="clickbofang(0,item, 'show')" class="play"
+										src="@/static/images/recordingManagement/play.png"></image>
 								</view>
 							</view>
-						</block>
-					</view>
-				</scroll-view>
-			</view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
 		</template>
 		<template v-if="current == 1">
 			<!-- 音频 -->
@@ -1015,11 +1013,6 @@
 		}
 		
 		
-		.words-list {
-			flex-grow: 1;
-			
-		}
-		
 		.audio {
 
 			.headboxbott {
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 06eb93b..0e767f9 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -57,11 +57,11 @@
 					</view>
 					<view class="item">
 						<image src="@/static/images/img/voice.png" mode=""></image>
-						<text>{{item.mm || '0'}}</text>
+						<text>{{item.mm || '0'}}min</text>
 					</view>
 					<view class="item">
 						<image src="@/static/images/img/hit.png" mode=""></image>
-						<text>{{violatedFrequency || '0'}}</text>
+						<text>{{item.violatedFrequency || '0'}}</text>
 					</view>
 				</view>
 			</view>

From b5fa477cee15c127215e152cc20b0ff85bcf9b29 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 14:14:18 +0800
Subject: [PATCH 18/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9D=E7=A6=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index a0a8953..51ae834 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -40,7 +40,7 @@
 						<view class="text">
 							<view class="avatar">
 								<view :style="[SPEAKERSTYLE(item.speaker)]">
-									<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+									<image v-if="item.isShow && item.isShow == 0" :src="Aimg" mode="widthFix"></image>
 									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
 							</view>
@@ -135,10 +135,6 @@
 					</view>
 				</view>
 			</template>
-			<!-- 占位 -->
-			<template v-else>
-				<view class="bottomhead" style="border-top: none;"></view>
-			</template>
 
 			<template v-if="userlistobj.invalidViolatedCause">
 				<view class="bottomtips">
@@ -346,6 +342,7 @@
 			keyWordsMatching(params) {
 				this.$u.post('/customer/findbynum', params).then(res => {
 					this.customerId = res.results[0].id;
+					this.current = 0
 					uni.setStorageSync('nextPageObj', JSON.stringify(this.nextPageObj))
 					this.prohibitedMatch()
 				}).catch(e => {
@@ -1057,7 +1054,6 @@
 			color: #999999;
 			background: #FFFFFF;
 			margin-top: 30upx;
-			flex: 1;
 			overflow-y: scroll;
 			width: 100%;
 
@@ -1143,6 +1139,11 @@
 						font-size: 18rpx;
 						font-size: 30rpx;
 						padding: 0 28rpx;
+						
+						
+						.AudioUserName {
+							margin-right: 20rpx;
+						}
 					}
 				}
 				
@@ -1215,7 +1216,7 @@
 
 		.bottombox {
 			width: 100%;
-			min-height: 170rpx;
+			min-height: 88rpx;
 
 			.bottomhead {
 				width: 100%;

From cacedd3d0aa559b25a58d8e4f7ccca920966dcbe Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 14:35:45 +0800
Subject: [PATCH 19/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 78 ++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 51ae834..19ccac6 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -44,7 +44,7 @@
 									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
 							</view>
-							
+
 							<view class="contentInfo">
 								<view class="info">
 									<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
@@ -238,7 +238,9 @@
 				sliderValue: 0, //进度条最小值
 				sliderMax: 0, //进度条最大值
 				playNow: 0, // 当前播放时间
+				audioType: false, // 音频是否自动播放状态
 				scrollId: "", // 当前播放滚动到的位置
+
 				tagValidShow: false, // 标记弹窗
 				reasonSrc: '', // 标记无效的原因
 				findTabooWordsList: [], // 违禁词列表
@@ -274,7 +276,7 @@
 			this.gituserlist()
 			this.findTabooWords()
 		},
-		
+
 		onUnload() {
 			//暂停
 			this.innerAudioContext.pause()
@@ -285,7 +287,9 @@
 		methods: {
 			// 获取违禁词
 			findTabooWords() {
-				this.$u.get('/customer/findTabooWords', { customerId: this.customerId }).then(res => {
+				this.$u.get('/customer/findTabooWords', {
+					customerId: this.customerId
+				}).then(res => {
 					let arr = []
 					res.map(item => {
 						if (item.transferContent) {
@@ -297,7 +301,7 @@
 					console.log(this.findTabooWordsList, 'findTabooWordsList')
 				})
 			},
-			
+
 			// 确认无效标记 setViolatedStatus = 2
 			inputDone() {
 				if (!this.reasonSrc) {
@@ -344,6 +348,7 @@
 					this.customerId = res.results[0].id;
 					this.current = 0
 					uni.setStorageSync('nextPageObj', JSON.stringify(this.nextPageObj))
+					this.resetAudioParams()
 					this.prohibitedMatch()
 				}).catch(e => {
 					this.nextPageObj = JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
@@ -401,7 +406,7 @@
 					})
 				})
 			},
-			
+
 
 
 			// 设置违禁状态
@@ -527,6 +532,17 @@
 				})
 			},
 
+			// 重置进度条
+			resetAudioParams() {
+				this.timeStr = "00:00"; //总的时间
+				this.currentTimeStr = "00:00" //当前进度的时间
+				this.recordPath = "", // 录音地址
+					this.audioPlay = false //当前的播放状态控制
+				this.sliderValue = 0 //进度条最小值
+				this.sliderMax = 0 //进度条最大值
+				this.playNow = 0 // 当前播放时间
+				this.scrollId = "" // 当前播放滚动到的位置
+			},
 
 			// 获取转义后的对话结果
 			getCorpusAnalysis(info) {
@@ -631,14 +647,11 @@
 				const currTimeStr = this.formatTime(parseInt(e.bg / 1000))
 				this.currentTimeStr = currTimeStr
 				this.innerAudioContext.seek(parseInt(e.bg / 1000));
-				if (uni.getStorageSync('entrance') == 1) {
-					return
+				console.log('我在这里哦')
+				if (this.current == 1) {
+					this.innerAudioContext.play();
 				} else {
-					if (this.current == 1) {
-						this.innerAudioContext.play();
-					} else {
-						this.scrollId = "dialog" + this.csdFileindex + "text" + e.bg
-					}
+					this.scrollId = "dialog" + this.csdFileindex + "text" + e.bg
 				}
 			},
 
@@ -725,7 +738,7 @@
 			},
 
 			// 初始化音频方法
-			initAudioFnc() {
+			initAudioFnc(inits) {
 				this.innerAudioContext = uni.createInnerAudioContext();
 				this.innerAudioContext.autoplay = false;
 				this.innerAudioContext.title = '音频';
@@ -744,6 +757,12 @@
 			clickbofang(dialog, item, type) {
 				if (type == 'show') {
 					this.current = 1
+					this.infos = item
+					this.audioType = true
+					this.initAudioFnc()
+					return
+				} else {
+					this.audioType = false
 				}
 				this.innerAudioContext.pause()
 				this.dialogList.forEach(res => {
@@ -969,11 +988,11 @@
 						font-size: 30rpx;
 						font-weight: bold;
 					}
-					
+
 					.status {
 						display: flex;
 						align-items: center;
-						
+
 						.pointer {
 							margin: 0 .5em;
 							width: 12rpx;
@@ -982,7 +1001,7 @@
 							background: #2671E2;
 						}
 					}
-					
+
 				}
 
 				.h-b-btm {
@@ -1008,8 +1027,8 @@
 				}
 			}
 		}
-		
-		
+
+
 		.audio {
 
 			.headboxbott {
@@ -1131,29 +1150,30 @@
 						bottom: -140rpx;
 					}
 				}
-				
-				
+
+
 				.contentInfo {
 					.info {
 						color: #ccc;
 						font-size: 18rpx;
 						font-size: 30rpx;
 						padding: 0 28rpx;
-						
-						
+
+
 						.AudioUserName {
 							margin-right: 20rpx;
 						}
 					}
 				}
-				
+
 				.contentMain {
 					display: flex;
-					
+
 					.content {
 						margin-left: 0;
 						margin-right: 30upx;
 					}
+
 					.play {
 						width: 50rpx;
 						height: 50rpx;
@@ -1178,7 +1198,7 @@
 						background: #F6F6F6;
 						color: #999999;
 					}
-					
+
 					.contentInfo {
 						.info {
 							color: #ccc;
@@ -1187,22 +1207,22 @@
 							padding: 0 28rpx;
 							display: flex;
 							flex-direction: row-reverse;
-								
+
 							.AudioUserName {
 								margin-left: 10rpx;
 							}
 						}
-					
+
 						.contentMain {
 							display: flex;
 							flex-direction: row-reverse;
 							align-items: center;
-					
+
 							.content {
 								margin-left: 0;
 								margin-right: 30upx;
 							}
-					
+
 							.play {
 								width: 50rpx;
 								height: 50rpx;

From 5e3921e80b86b6fd5a81d88e8c66d9bfcfa82793 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 17:07:44 +0800
Subject: [PATCH 20/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 32 +++++++++++++--------
 pages/center/prohibited/index.vue   | 44 ++++++++++++++++-------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 19ccac6..5cbed36 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -28,8 +28,10 @@
 			</view>
 		</view>
 		<!-- tab选择框 -->
-		<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
-			@change="change"></u-tabs>
+		<template v-if="isShowMerge">
+			<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
+				@change="change"></u-tabs>
+		</template>
 		<template v-if="current == 0">
 			<scroll-view :scroll-top="scrollTop" lower-threshold='100px' @scrolltolower="ltolower()"
 				upper-threshold='40px' @scrolltoupper="rolltoupper()" :scroll-into-view="scrollId" scroll-y="true"
@@ -144,15 +146,17 @@
 
 			<view class="botbotmm">
 				<view class="item" @click="preValid">上一条</view>
-				<template v-if="userlistobj.violatedStatus == 0">
-					<view class="item" @click="setViolated(1)">确认有效</view>
-					<view class="item" @tap="showTagValid">确认无效</view>
-				</template>
-				<template v-if="userlistobj.violatedStatus == 1">
-					<view class="item" @tap="showTagValid">无效</view>
-				</template>
-				<template v-if="userlistobj.violatedStatus == 2">
-					<view class="item" @click="setViolated(1)">确认有效</view>
+				<template v-if="isShowMerge">
+					<template v-if="userlistobj.violatedStatus == 0">
+						<view class="item" @click="setViolated(1)">确认有效</view>
+						<view class="item" @tap="showTagValid">确认无效</view>
+					</template>
+					<template v-if="userlistobj.violatedStatus == 1">
+						<view class="item" @tap="showTagValid">无效</view>
+					</template>
+					<template v-if="userlistobj.violatedStatus == 2">
+						<view class="item" @click="setViolated(1)">确认有效</view>
+					</template>
 				</template>
 				<view class="item" @click="nextValid">下一条</view>
 			</view>
@@ -245,6 +249,7 @@
 				reasonSrc: '', // 标记无效的原因
 				findTabooWordsList: [], // 违禁词列表
 				nextPageObj: JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
+				isMerge: 0, // 默认合并
 			}
 		},
 		computed: {
@@ -253,12 +258,17 @@
 					return this.getTime(e);
 				}
 			},
+			// 是否为合并录音
+			isShowMerge() {
+				return this.isMerge == 0 ? true : false
+			}
 		},
 		onLoad(option) {
 			this.status = option.status;
 			this.customerId = option.customerId;
 			this.stateisshow = option.stateisshow;
 			this.itemobj = uni.getStorageSync('searchobj');
+			if (option.isMerge) this.isMerge = option.isMerge
 		},
 
 		onShow() {
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 0e767f9..3050f56 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -324,23 +324,27 @@
 								return
 							} else {
 								let newobj = res[0];
-								if (res[0].merge == 0) {
-									let obj = {
-										pageSize: index,
-										num: this.totalRecords,
-										query: {
-											...this.nextPageObj
-										}
+
+								let obj = {
+									pageSize: index,
+									num: this.totalRecords,
+									query: {
+										...this.nextPageObj
 									}
-									uni.setStorageSync('nextPageObj', JSON.stringify(obj))
-									uni.navigateTo({
-										url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}`
-									})
-								} else {
-									uni.navigateTo({
-										url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
-									})
 								}
+								
+								uni.setStorageSync('nextPageObj', JSON.stringify(obj))
+								uni.navigateTo({
+									url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}&isMerge=${res[0].merge}`
+								})
+								
+								// if (res[0].merge == 0) {
+								// }
+								//  else {
+								// 	uni.navigateTo({
+								// 		url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
+								// 	})
+								// }
 							}
 						})
 					})
@@ -416,8 +420,8 @@
 				this.getMyCustom();
 			},
 		},
-	
-		
+
+
 		filters: {
 			// violatedStatus 
 			ViolatedStatus(status) {
@@ -617,18 +621,18 @@
 				color: #666666;
 				display: flex;
 				justify-content: space-between;
-				
+
 				.item {
 					flex-shrink: 0;
 					display: flex;
 					align-items: center;
-					
+
 					image {
 						margin-right: 10rpx;
 						width: 32rpx;
 						height: 32rpx;
 					}
-					
+
 					text {
 						font-size: 28rpx;
 					}

From 703d7c1185e77ab406e6c822beca3928ae2ec5fa Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 18:21:41 +0800
Subject: [PATCH 21/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 3050f56..010fd37 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -335,7 +335,7 @@
 								
 								uni.setStorageSync('nextPageObj', JSON.stringify(obj))
 								uni.navigateTo({
-									url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}&isMerge=${res[0].merge}`
+									url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index+1}&isMerge=${res[0].merge}`
 								})
 								
 								// if (res[0].merge == 0) {

From 4b2caff8cd7290c59245e4b2f4475a40161fa056 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 18:27:26 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 5cbed36..7bff8a3 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -329,7 +329,7 @@
 			nextValid() {
 				if (this.nextPageObj.pageSize < this.nextPageObj.num) {
 					this.innerAudioContext.pause()
-					this.nextPageObj.pageSize++
+					this.nextPageObj.pageSize = this.nextPageObj.pageSize + 1
 					this.keyWordsMatching(this.nextPageObj)
 				} else {
 					uni.showToast({
@@ -347,7 +347,7 @@
 					})
 				} else {
 					this.innerAudioContext.pause()
-					this.nextPageObj.pageSize--
+					this.nextPageObj.pageSize = this.nextPageObj.pageSize - 1
 					this.keyWordsMatching(this.nextPageObj)
 				}
 			},

From be2dd9729c5875b359889b013435e03206899660 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 18:32:24 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 4 ++--
 pages/center/prohibited/index.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 7bff8a3..5cbed36 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -329,7 +329,7 @@
 			nextValid() {
 				if (this.nextPageObj.pageSize < this.nextPageObj.num) {
 					this.innerAudioContext.pause()
-					this.nextPageObj.pageSize = this.nextPageObj.pageSize + 1
+					this.nextPageObj.pageSize++
 					this.keyWordsMatching(this.nextPageObj)
 				} else {
 					uni.showToast({
@@ -347,7 +347,7 @@
 					})
 				} else {
 					this.innerAudioContext.pause()
-					this.nextPageObj.pageSize = this.nextPageObj.pageSize - 1
+					this.nextPageObj.pageSize--
 					this.keyWordsMatching(this.nextPageObj)
 				}
 			},
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 010fd37..5f781be 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -326,7 +326,7 @@
 								let newobj = res[0];
 
 								let obj = {
-									pageSize: index,
+									pageSize: index+1,
 									num: this.totalRecords,
 									query: {
 										...this.nextPageObj
@@ -335,7 +335,7 @@
 								
 								uni.setStorageSync('nextPageObj', JSON.stringify(obj))
 								uni.navigateTo({
-									url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index+1}&isMerge=${res[0].merge}`
+									url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}&isMerge=${res[0].merge}`
 								})
 								
 								// if (res[0].merge == 0) {

From 7a4eb90a653b99f9658c7de41cede5ac634e21a8 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 18:58:44 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 5cbed36..4f8926a 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -341,7 +341,7 @@
 
 			// 上一条
 			preValid() {
-				if (this.nextPageObj.pageSize == 0) {
+				if (this.nextPageObj.pageSize == 1) {
 					uni.showToast({
 						title: '没有更早的了~'
 					})

From a6925d8172e172eed8dd9e50e79999f36fdfa5dd Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 20:34:22 +0800
Subject: [PATCH 25/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 15 +++++++++------
 pages/center/prohibited/index.vue   |  1 +
 pages/index/index.vue               |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 4f8926a..c5d032b 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -56,8 +56,10 @@
 									<view class="content">
 										<view v-html="item.onebest"></view>
 									</view>
-									<image @click="clickbofang(0,item, 'show')" class="play"
-										src="@/static/images/recordingManagement/play.png"></image>
+									<template v-if="isShowMerge">
+										<image @click="clickbofang(0,item, 'show')" class="play"
+											src="@/static/images/recordingManagement/play.png"></image>
+									</template>
 								</view>
 							</view>
 						</view>
@@ -147,14 +149,14 @@
 			<view class="botbotmm">
 				<view class="item" @click="preValid">上一条</view>
 				<template v-if="isShowMerge">
-					<template v-if="userlistobj.violatedStatus == 0">
+					<template v-if="userlistobj.disposeStatus == 0">
 						<view class="item" @click="setViolated(1)">确认有效</view>
 						<view class="item" @tap="showTagValid">确认无效</view>
 					</template>
-					<template v-if="userlistobj.violatedStatus == 1">
+					<template v-if="userlistobj.disposeStatus == 1">
 						<view class="item" @tap="showTagValid">无效</view>
 					</template>
-					<template v-if="userlistobj.violatedStatus == 2">
+					<template v-if="userlistobj.disposeStatus == 2">
 						<view class="item" @click="setViolated(1)">确认有效</view>
 					</template>
 				</template>
@@ -397,6 +399,7 @@
 							return
 						} else {
 							let newobj = res[0];
+							this.isMerge = res[0].merge
 							if (res[0].merge == 0) {
 								this.infos = item
 								this.itemobj = item
@@ -769,7 +772,7 @@
 					this.current = 1
 					this.infos = item
 					this.audioType = true
-					this.initAudioFnc()
+					this.init(this.infos)
 					return
 				} else {
 					this.audioType = false
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 5f781be..8d2e01a 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -181,6 +181,7 @@
 				this.staTime = options.staTime;
 				this.endtime = options.endtime;
 			}
+			if (options.violatedStatus) this.violatedStatus = options.violatedStatus
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e5093f..bcd2bf2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -648,20 +648,20 @@
 			prohibitedtap(i){
 				if(i==1){
 					uni.navigateTo({
-						url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'0'
+						url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'0'+'&violatedStatus=1'
 					});
 				}else{
 					if(this.zhixingcenterindex==2){
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'2'
+							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'2'+'&violatedStatus=1'
 						});
 					}else if(this.zhixingcenterindex==6){
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'3'
+							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'3'+'&violatedStatus=1'
 						});
 					}else{
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd
+							url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd+'&violatedStatus=1'
 						});
 					}
 				}

From 6eea3c9cc80cb19003a253be13963dd39e23037d Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 20:47:06 +0800
Subject: [PATCH 26/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 19 ++++++++++++++++++-
 pages/center/prohibited/index.vue   | 20 +++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index c5d032b..3c96ac3 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -7,7 +7,7 @@
 					<text class="name">{{ userlistobj.agentName || '' }}</text>
 					<view class="status">
 						<text class="pointer"></text>
-						<text class="item">{{ userlistobj.violatedStatus | ViolatedStatus }}</text>
+						<text class="item">{{ userlistobj.disposeStatus | DisposeStatus }}</text>
 					</view>
 				</view>
 				<!-- 详细信息 -->
@@ -968,6 +968,23 @@
 				}
 				return str
 			},
+			
+			// 处理状态
+			DisposeStatus(status) {
+				let str = '';
+				switch (status) {
+					case 0:
+						str = '待处理'
+						break;
+					case 1:
+						str = '有效违禁'
+						break;
+					case 2:
+						str = '无效违禁'
+						break;
+				}
+				return str
+			},
 		}
 	}
 </script>
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 8d2e01a..01807d8 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -45,7 +45,7 @@
 					</view>
 					<view class="right">
 						<view class="">
-							{{ item.violatedStatus | ViolatedStatus }}
+							{{ item.violatedStatus | ViolatedStatus }}|{{ item.disposeStatus | DisposeStatus }}
 						</view>
 					</view>
 				</view>
@@ -440,6 +440,24 @@
 				}
 				return str
 			},
+			
+			// DisposeStatus
+			DisposeStatus(status) {
+				
+					let str = '';
+					switch (status) {
+						case 0:
+							str = '待处理'
+							break;
+						case 1:
+							str = '有效违禁'
+							break;
+						case 2:
+							str = '无效违禁'
+							break;
+					}
+					return str
+			},
 		}
 	}
 </script>

From e2bf566602142427ff6b5d0eba159aad3f5e1fbc Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 20:49:31 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/index.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 01807d8..80601a1 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -443,20 +443,16 @@
 			
 			// DisposeStatus
 			DisposeStatus(status) {
-				
-					let str = '';
-					switch (status) {
-						case 0:
-							str = '待处理'
-							break;
-						case 1:
-							str = '有效违禁'
-							break;
-						case 2:
-							str = '无效违禁'
-							break;
-					}
-					return str
+				let str = '';
+				switch (status) {
+					case 0:
+						str = '待处理'
+						break;
+					case 1:
+						str = '已处理'
+						break;
+				}
+				return str
 			},
 		}
 	}

From 47ed8200fb6d1a52e37644ff18fbdaea62935022 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 20:53:03 +0800
Subject: [PATCH 28/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 3c96ac3..e0a391e 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -7,7 +7,7 @@
 					<text class="name">{{ userlistobj.agentName || '' }}</text>
 					<view class="status">
 						<text class="pointer"></text>
-						<text class="item">{{ userlistobj.disposeStatus | DisposeStatus }}</text>
+						<text class="item">{{ userlistobj.violatedStatus | ViolatedStatus }}</text>
 					</view>
 				</view>
 				<!-- 详细信息 -->

From 357b3c5468c6dfa427fa7308886b0213f86ed1d6 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 20:58:45 +0800
Subject: [PATCH 29/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index e0a391e..913f7b0 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -149,14 +149,14 @@
 			<view class="botbotmm">
 				<view class="item" @click="preValid">上一条</view>
 				<template v-if="isShowMerge">
-					<template v-if="userlistobj.disposeStatus == 0">
+					<template v-if="userlistobj.disposeStatus == 0 && userlistobj.violatedStatus == 0">
 						<view class="item" @click="setViolated(1)">确认有效</view>
 						<view class="item" @tap="showTagValid">确认无效</view>
 					</template>
-					<template v-if="userlistobj.disposeStatus == 1">
+					<template v-if="userlistobj.disposeStatus == 1 && userlistobj.violatedStatus == 1">
 						<view class="item" @tap="showTagValid">无效</view>
 					</template>
-					<template v-if="userlistobj.disposeStatus == 2">
+					<template v-if="userlistobj.disposeStatus == 1 && userlistobj.violatedStatus == 2">
 						<view class="item" @click="setViolated(1)">确认有效</view>
 					</template>
 				</template>

From 2533f839ada92e557bae9e3abe8b6f2f5d8e8450 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 6 May 2022 21:00:46 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/prohibited/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/center/prohibited/details.vue b/pages/center/prohibited/details.vue
index 913f7b0..68fec9c 100644
--- a/pages/center/prohibited/details.vue
+++ b/pages/center/prohibited/details.vue
@@ -149,7 +149,7 @@
 			<view class="botbotmm">
 				<view class="item" @click="preValid">上一条</view>
 				<template v-if="isShowMerge">
-					<template v-if="userlistobj.disposeStatus == 0 && userlistobj.violatedStatus == 0">
+					<template v-if="userlistobj.disposeStatus == 0">
 						<view class="item" @click="setViolated(1)">确认有效</view>
 						<view class="item" @tap="showTagValid">确认无效</view>
 					</template>