1

pages/school/JIaheactivitydetails.vue

@@ -191,8 +191,9 @@
 					</view> -->
 				</view>
 				<view v-if="detial.IsJoinActivity==0">
-					<view class="btnc" v-if="detial.IsSignUp==1" :style="{background:mainColor}" @click="gosignUp()">立即预约</view>
-					<view class="btnc" v-if="detial.IsSignUp==0">不可预约</view>
+					<view class="btnc" v-if="detial.IsSignUp==1 && (detial.TotalMan- detial.JoinNum)>0" :style="{background:mainColor}" @click="gosignUp()">立即预约</view>
+					<view class="btnc" v-if="detial.IsSignUp==0 || (detial.TotalMan- detial.JoinNum)==0">不可预约</view>
+					
 				</view>
 				<view v-if="detial.IsJoinActivity==1">
 					<view class="btnc" v-if="detial.IsSignUp==1">已报名</view>

pages/school/Jiaheactivity.vue

@@ -154,11 +154,11 @@
 								</view>
 								<view class="details-box" v-for="(x,y) in item.list" :key='y' @click="gourl(x)">
 									<view class="details-box-top-z" v-if="(x.TotalMan-x.JoinNum)>0" :style="{background:mainColor}"></view>
-									<view class="details-box-top-f"  v-if="(x.TotalMan-x.JoinNum)==0" ></view>
+									<view class="details-box-top-f"  v-if="(x.TotalMan-x.JoinNum)<1" ></view>
 									<view class="details-box-t-positions"  v-if="(x.TotalMan-x.JoinNum)>0" :style="{background:mainColor}">
 										<text>{{(x.TotalMan-x.JoinNum)>=6?'可预约':(x.TotalMan-x.JoinNum)<6?'剩余'+(x.TotalMan-x.JoinNum)+'个空位':''}}</text>
 									</view>
-									<view class="details-box-t-positions"  v-if="(x.TotalMan-x.JoinNum)==0" :style="{background:'#40766E'}">
+									<view class="details-box-t-positions"  v-if="(x.TotalMan-x.JoinNum)<1" :style="{background:'#40766E'}">
 										爆满
 									</view>
 									<!-- 内容 -->
@@ -255,7 +255,7 @@
 			return {
 				show:false,
 				current:1,
-				pageTitle: "报名",
+				pageTitle: "活动列表",
 				showAuth: false,
 				u: {},
 				mainColor: "",

pages/school/components/signUpList.vue

@@ -39,8 +39,9 @@
 			  	<u-icon name="phone-o" :size="28" color="#999999" style='margin-right: 5px;margin-left: 10px;' ></u-icon>
 			  	<view>{{x.LinkTel}}</view>
 				<u-icon name="star-o" :size="28" :color="mainColor" style='margin-right: 5px;margin-left: 10px;' ></u-icon>
-				<view v-if="x.Money>0" :style="{color:mainColor}">{{x.Money}}</view>
-				<view v-if="x.Money==0" :style="{color:mainColor}">免费</view>
+				<view v-if="x.Money>0 && x.TotalPoint==0" :style="{color:mainColor}">{{x.Money}}元</view>
+				<view v-if="x.Money==0 && x.TotalPoint>0" :style="{color:mainColor}">{{x.TotalPoint}}点</view>
+				<view v-if="x.Money==0 && x.TotalPoint==0" :style="{color:mainColor}">免费</view>
 			  </view>
 			  <view class="box-Remark">
 				  <view class="box-Remark-top">