优化

match/activityManage/activityManage.css

@@ -40,7 +40,24 @@ page{
 	font-size: 30rpx;
 	margin-left: 46rpx;
 }
-
+.filter{
+	padding: 0  0 0 30rpx;
+	text-align: center;
+	font-size: 28rpx;
+	color: #999999;
+	line-height: 41rpx;
+}
+.filter-item-icon{
+	margin-left: 15rpx;
+	width: 22rpx;
+	height: 13rpx;
+}
+.filter-item{
+	justify-content: center;
+}
+.f-active{
+	color: var(--main);
+}
 
 .title{
 	line-height: 50rpx;

match/activityManage/activityManage.vue

@@ -7,6 +7,16 @@
 					<input @confirm="searchFn" confirm-type="search" @input="searchFn" v-model="searchVal" class="fflex"
 						placeholder="请输入关键词" />
 				</view>
+				<view class="filter ddflex">
+					<view class="fflex">
+						<picker mode="selector" :range="rangeList" range-key="label" v-model="rangeIndex" @change="rangeChange">
+							<view class="filter-item fflex ddflex f-active" style="text-align: right;justify-content: flex-end;">
+								<text style="max-width: 150rpx;" class="tover">{{rangeList[rangeIndex].label}}</text>
+								<image class="filter-item-icon" src="../../static/images/down.png"></image>
+							</view>
+						</picker>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view style="height: 150rpx;"></view>
@@ -63,7 +73,31 @@
 				searchVal:'',
 				total:0,
 				saleNo:null,
-				pcId:null
+				pcId:null,
+				
+				rangeIndex:0,
+				rangeList:[{
+					label:'全部',
+					value:-1
+				},{
+					label:'审核中',
+					value:0
+				},{
+					label:'审核失败',
+					value:6
+				},{
+					label:'报名中',
+					value:2
+				},{
+					label:'报名结束',
+					value:3
+				},{
+					label:'活动中',
+					value:4
+				},{
+					label:'活动结束',
+					value:5
+				}]
 			}
 		},
 		async onLoad(opt) {
@@ -93,6 +127,8 @@
 				}else{
 					form.search = ''
 				}
+				form.state = this.rangeList[this.rangeIndex].value
+				if(form.state==-1) delete form.state
 				uni.showLoading();
 				req.getRequest(
 					'/api/match/page',
@@ -122,6 +158,12 @@
 				date = new Date(date.replace(/-/g, '/'))
 				return util.formatTime(date).t3
 			},
+			rangeChange(e){
+				this.rangeIndex = e.detail.value
+				this.page = 1;
+				this.isLoad = true;
+				this.getPageList(true);
+			}
 		},
 		mounted() {
 			

match/matchList/matchList.vue

@@ -75,7 +75,7 @@
 								</view>
 							</view>
 							<!-- 0待审核 6 审核失败 -->
-							<view class="act-btn" v-if="item.state==0" @click.stop="review(item,index)">审核</view>
+							<view class="act-btn" @click.stop="review(item,index)">审核</view>
 						</view>
 					</view>
 				</view>
@@ -181,9 +181,13 @@
 				})
 			},
 			toActivity(item){
-				uni.navigateTo({
-					url: '/match/activityDetail/activityDetail?id=' + item.id
-				});
+				if(item.type==2){
+					req.msg("pac活动暂不支持预览，详情请到国寿活动中查看")
+				}else{
+					uni.navigateTo({
+						url: '/match/activityDetail/activityDetail?id=' + item.id
+					});
+				}
 			},
 			// 分页查询
 			getDataList() {