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

# Conflicts:
#	utils/domain.js

pages.json

@@ -487,9 +487,9 @@
 					"path": "prohibited/details",
 					"style": {
 						"navigationBarTitleText": "违禁详情",
-						"navigationBarBackgroundColor": "#038EF5",
-						"navigationBarTextStyle": "white",
-						"enablePullDownRefresh": true
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
 					}
 				},
 				{

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;

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: 55
+					},{
+						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, // 违禁状态
 					}
 				};

utils/domain.js

@@ -1,12 +1,12 @@
 // 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.210:8080/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'; // 刘敏