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 @@
-
+
+
+
@@ -147,14 +149,14 @@
上一条
-
+
确认有效
确认无效
-
+
无效
-
+
确认有效
@@ -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'
});
}
}