diff --git a/pages/welcome-page/welcome-page.vue b/pages/welcome-page/welcome-page.vue
index 2b69e62..30ea176 100644
--- a/pages/welcome-page/welcome-page.vue
+++ b/pages/welcome-page/welcome-page.vue
@@ -60,7 +60,7 @@
 				}
 				this.$requst.post('user/login',params).then(res => {
 					uni.hideToast();
-					if(res.data.nickname!=''){
+					if(res.data.is_active){
 						this.$toolAll.tools.showToast('已授权');
 						let dataObj = res.data;
 						uni.setStorageSync('token',dataObj.token);
diff --git a/pagesA/community/opinion-handle/opinion-handle.vue b/pagesA/community/opinion-handle/opinion-handle.vue
index b19d95b..c372160 100644
--- a/pagesA/community/opinion-handle/opinion-handle.vue
+++ b/pagesA/community/opinion-handle/opinion-handle.vue
@@ -6,7 +6,7 @@
 					<view @tap="switchEv(0)" class="pad-sx20 disjcac radius20" :style="switchIndex==0?'background-color:#39d091;color:#FFFFFF;':''" style="width: 288rpx;">待办理</view>
 					<view @tap="switchEv(1)" class="pad-sx20 disjcac radius20" :style="switchIndex==1?'background-color:#39d091;color:#FFFFFF;':''" style="width: 288rpx;">已办理</view>
 				</view>
-				<view class="mar-s20 radius20 fon24 bacf posir" v-for="(item,index) in communityList" :key="index">
+				<view @tap="handleEv(item.id)" class="mar-s20 radius20 fon24 bacf posir" v-for="(item,index) in communityList" :key="index">
 					<view class="pad-sx20 pad-zy50 status-box" :style="{backgroundColor:['#f8bf00','#39d091'][switchIndex]}">{{['待办理','已办理'][switchIndex]}}</view>
 					<view class="pad20 bbot line-h46 pad-x40">
 						<view class="fon30">{{item.coding}}</view>
@@ -15,22 +15,32 @@
 						<view class="">反馈问题：{{item.description}}</view>
 					</view>
 					<view class="dis fon30 disjcac" v-if="switchIndex==0">
-						<view @tap="handleEv(item.id)" class="pad-sx30 disac">
+						<view @tap.stop="handleEv(item.id)" class="pad-sx30 disac">
 							<image class="mar-y20" src="/static/icon/icon-handle.png" mode="" style="width: 34rpx;height: 34rpx;"></image>
 							立即办理
 						</view>
 					</view>
 				</view>
+				<view class="" v-if="total==communityList.length && total">
+					<pitera textStr="到底啦o(╥﹏╥)o"></pitera>
+				</view>
 			</view>
 		</statusContainer>
+		<view class="" v-if="!total">
+			<nothing-page content="暂无数据"></nothing-page>
+		</view>
 	</view>
 </template>
 
 <script>
 	import statusContainer from '@/components/containers/status-container.vue';
+	import nothingPage from '@/components/nothing/nothing-page.vue';
+	import pitera from '@/components/nothing/pitera.vue';
 	export default {
 		components:{
-			statusContainer
+			statusContainer,
+			nothingPage,
+			pitera
 		},
 		data() {
 			return {
@@ -82,6 +92,9 @@
 				this.$requst.get('opinion/community-list',params).then(res => {
 					if(res.code==0){
 						this.total = res.data.total;
+						if(this.page==1){
+							this.communityList = [];
+						}
 						let communityArr = [];
 						res.data.list.forEach(item=>{
 							let obj = {
diff --git a/pagesA/detail/detail.vue b/pagesA/detail/detail.vue
index 3a9a1f0..d11ebfc 100644
--- a/pagesA/detail/detail.vue
+++ b/pagesA/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view class="pad-zy20 fon24" v-if="loading">
+	<view v-if="loading">
+		<view class="pad-zy20 fon24">
 			<view class="disjbac fon30 bbot pad-sx30">
 				<view class="colb bold flexs">序号</view>
 				<view class="col9">{{detail.coding}}</view>
@@ -67,30 +67,32 @@
 					<view class="col9 pad-sx30">{{detail.opinion_operate.operated_at || ''}}</view>
 					<view class="disjb bbot pad-x30">
 						<view class="">调查情况</view>
-						<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_desc || ''}}</view>
+						<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_desc || '无'}}</view>
 					</view>
 					<view class="disjb bbot pad-sx30">
 						<view class="">处理结果</view>
-						<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_result || ''}}</view>
+						<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_result || '无'}}</view>
 					</view>
 				</view>
 				<view class="disac pad-zy20 pad-x30 pad-s40">
 					<view class="cricle-box"></view>
 					<view class="fon36 mar-z20 bold">群众反馈</view>
 				</view>
-				<view class="pad-zy20 fon30" style="background-color: #f5f5f5;">
-					<view class="col9 pad-sx30">2021年7月19日 21：30</view>
-					<view class="disjb bbot pad-x30">
-						<view class="">反馈意见（不满意）</view>
-						<view class="col9 tright" style="max-width: 50%;">等了好久了还没有上门 处理！</view>
+				<view class="" v-if="detail.opinion_feedback">
+					<view class="pad-zy20 fon30" style="background-color: #f5f5f5;" v-for="(item,index) in detail.opinion_feedback.list" :key="index">
+						<view class="col9 pad-sx30">{{item.create_time}}</view>
+						<view class="disjb bbot pad-x30">
+							<view class="">反馈意见（{{['不满意','满意'][item.satisfied]}}）</view>
+							<view class="col9 tright" style="max-width: 50%;">{{item.content}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="disjcac pad-sx50" v-if="ifManager==0">
+		<view class="disjcac pad-sx50" v-if="ifManager==0 && detail.state_text!='已办理'">
 			<view class="disjcac enter-btn" style="margin: 0;" @tap="handleEv(detail.id)">立即办理</view>
 		</view>
-		<view class="disjcac pad-sx50" v-if="ifManager==1">
+		<view class="disjcac pad-sx50" v-if="ifManager==1 && detail.state_text!='待办理'">
 			<view class="disjcac enter-btn" style="margin: 0;background-color: #f71200;border-color: #f71200;" @tap="reexamineEv">督办复审</view>
 		</view>
 	</view>
diff --git a/pagesA/feedback/feedback.vue b/pagesA/feedback/feedback.vue
index a96052a..3980208 100644
--- a/pagesA/feedback/feedback.vue
+++ b/pagesA/feedback/feedback.vue
@@ -8,11 +8,11 @@
 			<view class="col9 pad-sx30">{{detail.opinion_operate.operated_at || ''}}</view>
 			<view class="disjb bbot pad-x30">
 				<view class="">调查情况</view>
-				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_desc || ''}}</view>
+				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_desc || '无'}}</view>
 			</view>
 			<view class="disjb bbot pad-sx30">
 				<view class="">处理结果</view>
-				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_result || ''}}</view>
+				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_result || '无'}}</view>
 			</view>
 		</view>
 		<view class="disac pad-zy20 pad-sx30">
diff --git a/pagesA/manager/examine-list/examine-list.vue b/pagesA/manager/examine-list/examine-list.vue
index da61c39..07d16c7 100644
--- a/pagesA/manager/examine-list/examine-list.vue
+++ b/pagesA/manager/examine-list/examine-list.vue
@@ -30,16 +30,26 @@
 						</view>
 					</view>
 				</view>
+				<view class="" v-if="total==reviewedList.length && total">
+					<pitera textStr="到底啦o(╥﹏╥)o"></pitera>
+				</view>
 			</view>
 		</statusContainer>
+		<view class="" v-if="!total">
+			<nothing-page content="暂无数据"></nothing-page>
+		</view>
 	</view>
 </template>
 
 <script>
 	import statusContainer from '@/components/containers/status-container.vue';
+	import nothingPage from '@/components/nothing/nothing-page.vue';
+	import pitera from '@/components/nothing/pitera.vue';
 	export default {
 		components:{
-			statusContainer
+			statusContainer,
+			nothingPage,
+			pitera
 		},
 		data() {
 			return {
@@ -72,7 +82,7 @@
 					this.switchIndex = index;
 					// 重置数据
 					this.reviewedList= [];
-					this.page = 0;
+					this.page = 1;
 					// 查询列表
 					this.getListEv();
 				}
@@ -89,6 +99,9 @@
 				}
 				this.$requst.post('administrator/reviewedList',params).then(res => {
 					if(res.code==0){
+						if(this.page==1){
+							this.reviewedList = [];
+						}
 						this.total = res.data.total;
 						let reviewedArr = [];
 						res.data.list.forEach(item=>{
diff --git a/pagesA/my-opinion-list/my-opinion-list.vue b/pagesA/my-opinion-list/my-opinion-list.vue
index 3864766..2d5d423 100644
--- a/pagesA/my-opinion-list/my-opinion-list.vue
+++ b/pagesA/my-opinion-list/my-opinion-list.vue
@@ -58,7 +58,7 @@
 				newtop:uni.getSystemInfoSync().statusBarHeight,
 				dataList:[],
 				page:1,
-				size:4,
+				size:20,
 				state:0,
 				total:0
 			}