1

pages/school/JIaheactivitydetails.vue

@@ -15,7 +15,7 @@
 		.details-box-top-f{
 			width: 100%;
 			height: 3px;
-			background: #40766E;
+			background: #e2e2e2;
 		}
 		.details-box-t-positions{
 			height: 40rpx;
@@ -110,18 +110,27 @@
 <template>
 	<view class="Jiaheactivitydetails">
 		<view style="width: 100%;height: 450rpx;" @click="previewImage(detial.CoverImg)">
-			<image :src="detial.CoverImg" style="width: 100%;height: 100%;"></image>
+			<image :src="detial.CoverImg" style="width: 100%;height: 100%;" mode="aspectFill"></image>
 		</view>
 		
 		<view class="box">
-			<view class="details-box-top-z" v-if="(detial.TotalMan- detial.JoinNum)>0" :style="{background:mainColor}"></view>
-			<view class="details-box-top-f"  v-if="(detial.TotalMan- detial.JoinNum)==0" ></view>
-			<view class="details-box-t-positions"  v-if="(detial.TotalMan- detial.JoinNum)>0" :style="{background:mainColor}">
-				<text>{{(detial.TotalMan- detial.JoinNum)>=6?'可预约':(detial.TotalMan- detial.JoinNum)<6?'剩余'+(detial.TotalMan- detial.JoinNum)+'个空位':''}}</text>
+			<view v-if="detial.IsJoinActivity==0">
+				<view class="details-box-top-z" v-if="(detial.TotalMan- detial.JoinNum)>0" :style="{background:mainColor}"></view>
+				<view class="details-box-top-f"  v-if="(detial.TotalMan- detial.JoinNum)==0" ></view>
+				<view class="details-box-t-positions"  v-if="(detial.TotalMan- detial.JoinNum)>0" :style="{background:mainColor}">
+					<text>{{(detial.TotalMan- detial.JoinNum)>=6?'可预约':(detial.TotalMan- detial.JoinNum)<6?'剩余'+(detial.TotalMan- detial.JoinNum)+'个空位':''}}</text>
+				</view>
+				<view class="details-box-t-positions"  v-if="(detial.TotalMan- detial.JoinNum)==0" style="background:#e2e2e2;color: #999999;">
+					爆满
+				</view>
 			</view>
-			<view class="details-box-t-positions"  v-if="(detial.TotalMan- detial.JoinNum)==0" :style="{background:'#40766E'}">
-				爆满
+			<view v-if="detial.IsJoinActivity==1">
+				<view class="details-box-top-f" style="background: #40766E;"   ></view>
+				<view class="details-box-t-positions"   :style="{background:'#40766E'}">
+					已报名
+				</view>
 			</view>
+			
 			<view class="details-b-center">
 				<view class="details-b-center-l">
 					<view style="font-size: 28rpx;color: #999999;font-weight: 500;font-family: PingFang SC;">

pages/school/Jiaheactivity.vue

@@ -63,7 +63,7 @@
 		.details-box-top-f{
 			width: 100%;
 			height: 3px;
-			background: #40766E;
+			background: #e2e2e2;
 		}
 		.details-box-t-positions{
 			height: 40rpx;
@@ -153,14 +153,23 @@
 									{{item.Dateitem}}
 								</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)<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 v-if="x.IsJoinActivity == 0">
+										<view class="details-box-top-z" v-if="(x.TotalMan-x.JoinNum)>0" :style="{background:mainColor}"></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-top-f"  v-if="(x.TotalMan-x.JoinNum)<1" ></view>
+										<view class="details-box-t-positions"  v-if="(x.TotalMan-x.JoinNum)<1" style="background:#e2e2e2;color: #999999;">
+											爆满
+										</view>
 									</view>
-									<view class="details-box-t-positions"  v-if="(x.TotalMan-x.JoinNum)<1" :style="{background:'#40766E'}">
-										爆满
+									<view v-if="x.IsJoinActivity == 1">
+										<view class="details-box-top-f" style="background: #40766E;"   ></view>
+										<view class="details-box-t-positions"   :style="{background:'#40766E'}">
+											已报名
+										</view>
 									</view>
+									
 									<!-- 内容 -->
 									<view class="details-b-center">
 										<view class="details-b-center-l">
@@ -400,18 +409,25 @@
 			},
 			//关闭登录窗口
 			gbAuth() {
-				uni.navigateBack()
+				this.showAuth=false
 			},
 			listType(type){
 				this.current = type;
 				if(type==1){//TODO 暂时不知道接口
 					
 				}else{
-						
-					if (Object.keys(this.$refs).length > 0 && this.$refs.children) { //判断
-						this.$refs.children.getfzuj()
+					this.u = uni.getStorageSync("mall_UserInfo");
+					if (!this.u) {
+						this.u = {
+							nickName: "未登录",
+							avatarUrl: ""
+						};
+						this.showAuth = true;
+					} else {
+						if (Object.keys(this.$refs).length > 0 && this.$refs.children) { //判断
+							this.$refs.children.getfzuj()
+						}
 					}
-					
 				}
 			},
 			select(x){

pages/school/jieheactivityBM.vue

@@ -166,17 +166,19 @@ export default {
     this.addMsg.ActivityId = this.details.Id
    if(this.details.IsFree==1){
 	   this.addMsg.PaymentWay = 6;
-		this.list[0].disabled = true
+		this.list=[{name: '点数支付',Id: 6,disabled:false}]
    }else{
 	   this.addMsg.UnitPrice = this.details.Price;
 	   this.addMsg.UnitPoint = this.details.PointNum;
 	   this.addMsg.Money = this.addMsg.UnitPrice * this.addMsg.PeopleNum;
 	   this.addMsg.TotalPoint = this.addMsg.UnitPoint * this.addMsg.PeopleNum;
 	   if(this.addMsg.UnitPrice==0){
-		   this.list[0].disabled = true
+		   this.addMsg.PaymentWay = 6;
+		   this.list=[{name: '点数支付',Id: 6,disabled:false}]
 	   }
 	   if(this.addMsg.UnitPoint==0){
-	   		this.list[1].disabled = true
+		   this.addMsg.PaymentWay = 1;
+			this.list=[{name: '在线支付',Id: 1,disabled:false}]
 	   }
    }