:

Merge branch 'master' of https://gitee.com/longyears/wx-dangyuanjiaoyujidi

pages/activity/book.vue

@@ -333,6 +333,7 @@
 			this.type = options.type;
 			this.form.type = (options.type == 'user' ? 2 : 1);
 			this.form.activity_id = parseInt(options.activity_id);
+			this.form.activity_number_id = parseInt(options.activity_number_id);
 			var that = this;
 			wx.getStorage({
 				key: 'activityinfo',

pages/activity/index.vue

@@ -21,7 +21,7 @@
 						<view class="tag tag_green activityBox_btn">
 							<text>{{isUnde(item.type_name)}}</text>
 						</view>
-						<block v-if="item.orders_count==item.total">
+						<block v-if="item.orders_count==item.total&&item.orders_count!=0">
 							<view class="tag" v-if="item.isCanBook">
 								<text>已约满</text>
 							</view>
@@ -111,6 +111,7 @@
 				})
 			},
 			loadActivity() {
+				console.log("aaa")
 				var that = this;
 				var nt = new Date();
 				that.isloading = true;

pages/activity/info.vue

@@ -64,7 +64,26 @@
 					<rich-text style="text-indent: 2em;font-size: 28rpx;" :nodes="list.content"></rich-text>
 				</view>
 			</view>
-			<view class="infofooter flex-row" v-if="list.isCanBook&&list.total!=list.orders_total">
+		</view>
+		<view class="infofooter" v-if="list.isCanBook&&list.total!=list.orders_total">
+
+			<u-popup :show="showNumbers" mode="bottom" @close="closeNum" :round="10" closeable>
+				<view class="mpopup">
+					<view class="mpopup-title">
+						场次选择
+					</view>
+					<view class="mpopup-content">
+						<view class="numbers">
+							<u-radio-group placement="column" v-model="chooseNum" @change="numChange">
+								<u-radio activeColor="#EF9525" v-for="(item, index) in numbers" :key="index"
+									:label="item.label" :disabled="item.disabled" :name="item.id">
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</view>
+				</view>
+			</u-popup>
+			<view class="flex-row">
 				<view style="margin-right: 14rpx;flex: 1;" v-if="list.join_type==1||list.join_type==0">
 					<u-button type="primary" @click="tobook('team')">团体预约</u-button>
 				</view>
@@ -72,6 +91,7 @@
 					<u-button type="primary" @click="tobook('user')">个人预约</u-button>
 				</view>
 			</view>
+
 		</view>
 	</view>
 </template>
@@ -85,6 +105,11 @@
 				longitude: "",
 				list: {},
 				topSwiperIndex: 0,
+				chooseNum: "",
+				numbers: [],
+				showNumbers: false,
+				teamType:"",
+				activity_number_id:""
 			}
 		},
 		onLoad(options) {
@@ -119,12 +144,22 @@
 					address: this.list.address
 				})
 			},
-			tobook(type) {
-
+			closeNum(){
+				this.showNumbers=false
+				this.chooseNum = ""
+			},
+			numChange(val) {
+				console.log(val)
+				this.activity_number_id = val
+				console.log("book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id)
 				uni.navigateTo({
-					url: "book?type=" + type + "&activity_id=" + this.id
+					url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
 				})
 			},
+			tobook(type) {
+				this.showNumbers = true
+				this.teamType = type
+			},
 			loadActiveInfo() {
 				var that = this;
 				var nt = new Date();
@@ -138,6 +173,15 @@
 					utilSuccess: function(res) {
 						res.isCanBook = that.$moment(nt).isBefore(res.end_plan);
 						that.list = res;
+						let numberArr = []
+						for(var m of res.numbers){
+							m.label = m.name + "(" + that.timeFormat(m.start_time,"yyyy年MM月DD日") + " " + that.getHm(m.start_time)+"-"+that.getHm(m.end_time) + ")"
+							if(m.has_total==m.total&&m.total!=0){
+								m.disabled = true
+							}
+							numberArr.push(m)
+						}
+						that.numbers = numberArr
 						wx.setStorage({
 							key: 'activityinfo',
 							data: res,
@@ -212,6 +256,23 @@
 		box-shadow: 2px 3px 10px 0px rgba(107, 94, 77, 0.3);
 		padding: 22rpx 25rpx;
 		box-sizing: border-box;
+		/* background: linear-gradient(0deg, #ffffff 85%, #E4C8A2); */
+	}
+	.mpopup{
+		margin-top:0rpx;
+		min-height:200rpx
+		
+	}
+	.mpopup-title{
+		padding:20rpx 0
+	}
+	.numbers {
+		/* min-height: 300rpx; */
+		padding: 60rpx 40rpx;
+	}
+
+	.numbers .u-radio {
+		margin-bottom: 40rpx
 	}
 
 	swiper {

utils/util.js

@@ -1,6 +1,6 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development': 'https://leyiyuyue.szgmbwg.org.cn',
+	'development': 'http://leyitest.ali251.langye.net',
 	'production': 'https://leyiyuyue.szgmbwg.org.cn'
 }; // 审核状态