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] =?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;
 					}