1

pages/school/JIaheactivitydetails.vue

@@ -152,6 +152,9 @@
 					<view class="details-b-time" v-if="detial.AgeLimit==0">
 						<text >年龄范围:{{detial.StartAge}}岁 ~ {{detial.EndAge}}岁</text>
 					</view>
+					<view class="details-b-time" v-if="detial.LnsideLimit==1">
+						<text>只针对甲鹤学员</text>
+					</view>
 					
 				</view>
 			</view>
@@ -173,6 +176,7 @@
 						<view style="display: flex;align-items: flex-end;">
 							<text v-if="detial.Price>0" style="font-size: 22rpx;margin-bottom: 6rpx;">￥</text>
 							<text v-if="detial.Price>0">{{detial.Price}}</text>
+							<text v-if="detial.Price>0" style="font-size: 22rpx;margin-bottom: 6rpx;">元</text>
 						</view>
 						<text v-if="detial.Price>0 && detial.PointNum>0" style="font-size: 12px;margin: 0 5px;">或</text>
 						<view style="display: flex;align-items: flex-end;">

pages/school/Jiaheactivity.vue

@@ -120,6 +120,12 @@
 			justify-content: space-between;
 			padding: 0 15px;
 		}
+		.scroll-box{
+			height: calc(100vh - 50px);
+			width: calc(100vw);
+			overflow: hidden;
+			padding-bottom:50px ;
+		}
 	}
 </style>
 <template>
@@ -136,12 +142,10 @@
 		</view>
 		<view v-show="current==1">
 			<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
-			<view v-if=" g.length>0"  style="
-			  height: calc(100vh - 50px);
-			  width: calc(100vw);
-			  overflow: hidden;
-					
-			">
+			<view v-if=" g.length>0"  
+			class="scroll-box"
+			:style="{'padding-bottom':tabbarH+'px'}"
+			>
 						<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" style="height: 100%;">
 							
 							<view class="details"  v-for="(item,index) in g" :key='index'>
@@ -233,17 +237,19 @@
 				</scroll-view>
 			</view>
 		</u-popup>
-		
+		<tabbar></tabbar>
 	</view>
 </template>
 
 <script>
 	import auth from "@/components/auth/index.vue";
-	import signUp from './components/signUpList.vue'
+	import signUp from './components/signUpList.vue';
+	import tabbar from "@/components/tabbar/index";
 	export default {
 		components: {
 			auth,
-			signUp
+			signUp,
+			tabbar
 		},
 		data() {
 			return {
@@ -269,13 +275,14 @@
 					loading: "努力加载中",
 					nomore: "没有更多了",
 				},
-				forumList:[{Id:1,Name:'亲子活动'},{Id:2,Name:'亲子活动2'}],
-			
+				forumList:[],
+				tabbarH:0,
 			};
 		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
 			this.pricecolor = this.$uiConfig.pricecolor;
+			this.tabbarH = this.$uiConfig.is_bang ? 78 : 50;
 		},
 		mounted() {
 			

pages/school/components/signUpList.vue

@@ -12,12 +12,8 @@
 		
     <view
       v-if="g.length > 0"
-      style="
-        height: calc(100vh - 90px);
-        width: calc(100vw);
-        overflow: hidden;
-		padding-bottom: 50px;
-      "
+	  class="scroll-box"
+      :style="{'padding-bottom':tabbarH+'px'}"
     >
       <scroll-view
         :scroll-y="true"
@@ -152,11 +148,13 @@ export default {
 	  },
 	  bmobj:{},
 	  cancelRemark:'',
+	  tabbarH:0,
     };
   },
   created() {
     this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
     this.mainColor = this.$uiConfig.mainColor;
+	this.tabbarH = this.$uiConfig.is_bang ? 78 : 50;
   },
   mounted() {
     let currentPages = getCurrentPages();
@@ -392,6 +390,11 @@ export default {
 	font-size: 13px;
 	color: #333333;
 }
+.mysignupList .scroll-box{
+	height: calc(100vh - 90px);
+	width: calc(100vw);
+	overflow: hidden;
+}
 
 
 

pages/school/jieheactivityBM.vue

@@ -79,11 +79,11 @@
 			<view class="box-c-l">联系电话</view>
 			<input type="number" v-model="addMsg.LinkTel" placeholder="请填写联系电话">
 		</view>
-		<view class="box-c-i">
+		<!-- <view class="box-c-i">
 			<view class="box-c-l">报名人数</view>
 			
 			<u-number-box v-model="addMsg.PeopleNum" :min='1' :disabled='true' @change="valChange"></u-number-box>
-		</view>
+		</view> -->
 		
 		<view class="box-c-i">
 			<view class="box-c-l">备注</view>
@@ -104,16 +104,16 @@
 				</u-radio>
 			</u-radio-group>
 		</view>
-		<view class="box-c-i" v-if="details.IsFree==2" style="justify-content: flex-end;border-bottom: none;height: 35px;margin-top: 10px;">
+		<!-- <view class="box-c-i" v-if="details.IsFree==2" style="justify-content: flex-end;border-bottom: none;height: 35px;margin-top: 10px;">
 			<view><text class="box-c-l">{{addMsg.PaymentWay==1?'现金单价:':'点数单价:'}} </text>{{addMsg.PaymentWay==1?addMsg.UnitPrice:addMsg.UnitPoint}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
-		</view>
+		</view> -->
 		<view class="box-c-i" v-if="details.IsFree==2" style="justify-content: flex-end;border-bottom: none;height: 35px;">
 			<view><text  class="box-c-l">{{addMsg.PaymentWay==1?'现金总价:':'点数总价:'}}</text>{{addMsg.PaymentWay==1?addMsg.Money:addMsg.TotalPoint}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
 		</view>
 		<view class="box-c-i" v-if="details.IsFree==1" style="justify-content: flex-end;border-bottom: none;height: 35px;">
 			<view class="box-c-l" style="text-align: right;">免费</view>
 		</view>
-		<view class="btn" @click="signup" :style="{background:mainColor}">
+		<view class="btn" @click="btnshow == true?signup():''" :style="{background:mainColor}">
 			报名
 		</view>
 	</view>
@@ -147,6 +147,7 @@ export default {
 	 },
 	 list: [{name: '在线支付',Id: 1,disabled:false},{name: '点数支付',Id: 6,disabled:false}],
 	 orderInfo:{},
+	 btnshow:true,
     };
   },
   created() {
@@ -193,7 +194,7 @@ export default {
 	  },
 	signup(){
 		
-		
+		this.btnshow= false
 		if(this.addMsg.LinkMan == ''){
 			uni.showToast({
 				title: '请填写姓名',
@@ -228,6 +229,7 @@ export default {
 			res => {
 				uni.hideLoading()
 				if (res.resultCode == 1) {
+					this.btnshow= true
 					if(this.addMsg.PaymentWay==6){
 						uni.showToast({
 							title:'报名成功',
@@ -244,6 +246,7 @@ export default {
 			error=>{
 				console.log('进入错误')
 				uni.hideLoading()
+				this.btnshow= true
 			}
 		);
 	},