qiyuerenshu

pages/activity/book.vue

@@ -31,7 +31,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
-						<text>{{list.form==2?'起约人数':'人数限制'}}：{{(list.form==2?10 : (numberlist.total==0?'不限':numberlist.total))}}</text>
+						<text>{{list.form==2?'起约人数':'人数限制'}}：{{(list.form==2?minTotal : (numberlist.total==0?'不限':numberlist.total))}}</text>
 
 					</view>
 					<view class="activityBox-row flex-row align-center" @click="tothere">
@@ -376,7 +376,7 @@
 				key: 'activityinfo',
 				success(res) {
 					that.list = res.data;
-					that.minTotal = that.list.form == 2 ? 10 : (that.type == 'user' ? 1 : that.list.team_min_count)
+					that.minTotal = that.list.form == 2 ? that.list.team_min_count : (that.type == 'user' ? 1 : that.list.team_min_count)
 					that.maxTotal = that.type == 'user' ? that.list.person_max_count : that.list.team_max_count
 					that.form.total = that.minTotal
 					for (var m of that.list.numbers) {

pages/index/index.vue

@@ -25,12 +25,13 @@
 				</view>
 			</view>
 		</view>
-		<view class="box-footer-banner" v-if="false" @click="togame" style="height: 210rpx; width: 100%;">
+		<!-- <view class="box-footer-banner" @click="togame" style="height: 210rpx; width: 100%;">
+>>>>>>> 4c528022f016c65287f4b9b4e2e6c03b0f508b1c
 			<div style="padding: 0rpx 37rpx;
     box-sizing: border-box;width: 100%;height: 100%;">
 				<image src="../../static/img/gamebutton.png" style="width: 100%;height: 100%;" />
 			</div>
-		</view>
+		</view> -->
 		<view class="box-footer"
 			style="position: fixed;bottom: -60rpx;left: 0;text-align: center;width: 100%;z-index: -1;">
 			<image src="../../static/img/footer_logo.png" class="footer-img"></image>