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