修改

components/tradeActivity/index.vue

@@ -22,84 +22,93 @@
 	}
 
 	.tradeName {
-		width:100%;
+		width: 100%;
 		display: flex;
 		justify-content: space-between;
 	}
-	.Activity_Name{
+
+	.Activity_Name {
 		font-weight: bold;
 		font-size: 30rpx;
-		width:400rpx;
+		width: 400rpx;
 		color: #1F1F1F;
 		padding-right: 10rpx;
 	}
+
 	.Activity_Time {
 		color: #999999;
 		font-size: 25rpx;
 	}
-	.trade_Btn{
+
+	.trade_Btn {
 		position: fixed;
-		width:100%;
-		bottom:35rpx;
+		width: 100%;
+		bottom: 35rpx;
 		left: 0;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	.tradeActive{
+
+	.tradeActive {
 		background-color: #F6F6F6;
-		width:100%;
+		width: 100%;
 		position: fixed;
 		top: 0;
 		/* top: 65px; */
 		left: 0;
 		overflow: auto;
-		flex:1;
+		flex: 1;
 		padding: 30rpx;
 	}
-	.tradeTop{
+
+	.tradeTop {
 		display: flex;
-		font-size:30rpx;
-		margin-bottom:20px;
+		font-size: 30rpx;
+		margin:20px 0 5px 0;
 	}
-	.Top_LEFT{
+
+	.Top_LEFT {
 		display: inline-block;
-		width:10rpx;
-		height:30rpx;
+		width: 10rpx;
+		height: 30rpx;
 		background-color: #ff4544;
-		margin:3px 7px 0 0;
+		margin: 3px 7px 0 0;
 	}
 </style>
 <template>
 	<!-- <view class="trade-activity" :style="{height:!isShowSign?'0':'calc(100vh  - '+pagePaddingBottom+')'}" :class="{'tradeActive':isShowSign}"> -->
 	<view class="trade-activity" :style="{height:!isShowSign?'0':'calc(100vh)'}" :class="{'tradeActive':isShowSign}">
 		<template v-if="isShowSign">
-			<view class="tradeTop" style="margin-top:23%;">
-				<text class="Top_LEFT"></text>
-				请选择你要报名的活动
-			</view>
-			<view class="trade_List" v-for="(item, index) in tradeData">
-				<view class="tradeImgDiv">
-					<image :src="item.CoverImg" style="width:100%;height:100%" mode="aspectFill"></image>
+			<view style="width:100%;margin-top:25%"></view>
+			<template v-for="(item, index) in tradeData">
+				<view class="tradeTop" v-if="item.GroupName">
+					<text class="Top_LEFT"></text>{{item.GroupName}}
 				</view>
-				<view>
-					<view class="tradeName">
-						<view class="Activity_Name">{{item.ActivityName}}</view>
-						<view>
-							<u-checkbox-group>
-								<u-checkbox v-model="item.IsCheck" :disabled="item.IsDefault"></u-checkbox>
-							</u-checkbox-group>
-						</view>
+				<view v-if="item.DateStr" style="font-size:26rpx;margin:0 0 20px 10px;color:gray;">{{item.DateStr}}</view>
+				<view class="trade_List" v-for="subItem in item.DataList">
+					<view class="tradeImgDiv">
+						<image :src="subItem.CoverImg" style="width:100%;height:100%" mode="aspectFill"></image>
 					</view>
-					<view class="Activity_Time" style="margin-top:20rpx;">
-						活动时间：{{item.StartTime}}
+					<view>
+						<view class="tradeName">
+							<view class="Activity_Name">{{subItem.ActivityName}}</view>
+							<view>
+								<u-checkbox-group>
+									<u-checkbox v-model="subItem.IsCheck" :disabled="subItem.IsDefault"></u-checkbox>
+								</u-checkbox-group>
+							</view>
+						</view>
+						<view class="Activity_Time" style="margin-top:20rpx;">
+							活动时间：{{subItem.StartTime}}
+						</view>
 					</view>
 				</view>
-			</view>
+			</template>
 			<view style="width:100%;height:100rpx;"></view>
 		</template>
 		<view class="trade_Btn">
-			<u-button size="80"  :ripple="true" v-if="!isShowSign" :custom-style="{
+			<u-button size="80" :ripple="true" v-if="!isShowSign" :custom-style="{
 				  backgroundColor: mc,
 				  height: '80rpx',
 				  color: '#FFF',
@@ -108,7 +117,7 @@
 				  width: '60vw',
 				  border:'none'
 				}" @click="isShowSign=true">立即报名</u-button>
-			<u-button size="80"  :ripple="true" v-if="isShowSign" :custom-style="{
+			<u-button size="80" :ripple="true" v-if="isShowSign" :custom-style="{
 				  backgroundColor: mc,
 				  height: '80rpx',
 				  color: '#FFF',
@@ -123,43 +132,46 @@
 
 <script>
 	export default {
-		props: ["dataObj",'pagePaddingBottom'],
+		props: ["dataObj", 'pagePaddingBottom'],
 		data() {
 			return {
 				mc: '',
 				tradeData: this.dataObj,
 				Ids: '',
-				isShowSign:false
+				isShowSign: false
 			}
 		},
 		mounted() {
 			this.mc = this.$uiConfig.mainColor;
+			console.log(this.dataObj, 'dataObj');
 		},
-		created() {
-		},
-		onShow() {
-		},
+		created() {},
+		onShow() {},
 		methods: {
-			getShow(){
-				this.isShowSign=false;
+			getShow() {
+				this.isShowSign = false;
 			},
 			//跳转报名
 			goSignUp() {
-				if(this.isShowSign){
-					let MyArray=[];
-					this.tradeData.forEach(x=>{
-						if(x.IsCheck){
-							MyArray.push(x.Id);	
-						}
-					})
-					if(MyArray.length==0){
+				if (this.isShowSign) {
+					let MyArray = [];
+					if(this.tradeData&&this.tradeData.length>0){
+						this.tradeData.forEach(x => {
+							x.DataList.forEach(y=>{
+								if(y.IsCheck){
+									MyArray.push(y.Id);
+								}
+							})
+						})
+					}
+					if (MyArray.length == 0) {
 						uni.showToast({
-						  title: '请选择活动',
-						  icon: 'none'
+							title: '请选择活动',
+							icon: 'none'
 						})
 						return
 					}
-					this.Ids = MyArray.toString();				
+					this.Ids = MyArray.toString();
 					uni.navigateTo({
 						url: "/pages/kotra/activeSignUp?Id=" + this.Ids
 					});