更新

src/pages/orderHall/addOrder.vue

@@ -355,6 +355,25 @@
 					this.ok = false
 					return
 				}
+				if(this.morePer){
+					if(this.perNumber < 2){
+						uni.showToast({
+							title: '支持多人接单时，可接单人数应大于1',
+							icon: "none",
+						});
+						this.ok = false
+						return
+					}
+				}else{
+					if(this.perNumber > 1){
+						uni.showToast({
+							title: '不支持多人接单时，可接单人数应等于1',
+							icon: "none",
+						});
+						this.ok = false
+						return
+					}
+				}
 				if(this.ok){
 					let image = []
 					this.fileList3.forEach(function(item) {

src/pages/orderHall/orderHall.vue

@@ -3,7 +3,7 @@
 		<view class="">
 			<u-loading-page :loading="load"></u-loading-page>
 		</view>
-		<view class="page">
+		<view class="page" v-if="load == false">
 			<view class="nav">
 				<view class="list" v-for="(item,index) in list" :key="index" @click="onNav(item.code,index)">
 					<view :class="['text',action == index?'on':'']">{{item.text}}</view>
@@ -15,7 +15,7 @@
 			<view class="main" v-if="mainList.length > 0">
 				<view class="mainList" v-for="(item,i) in mainList" :key="i">
 					<view class="mainListImg" @click="toDetail(item.id)">
-						<img class='img' :src="item.cover" alt="">
+						<img class='img' :src="item.enclosure" alt="">
 					</view>
 					<view class="text">
 						<view class="text1">{{item.title}}</view>
@@ -84,6 +84,8 @@
 			this.getData();
 		},
 		onShow() {
+			this.pages = 1
+			this.mainList = []
 			this.getData()
 		},
 		methods: {

src/pages/orderHall/orderHallDetails.vue

@@ -3,7 +3,7 @@
 		<view class="">
 			<u-loading-page :loading="load"></u-loading-page>
 		</view>
-		<view class="page">
+		<view class="page" v-if="load == false">
 			<view class="return" @click="back">
 				<image src="../../static/orderLeftArrow.png" mode="scaleToFill"></image>
 			</view>
@@ -63,6 +63,7 @@
 					<view class="right">{{data.activityTime}}</view>
 				</view>
 			</view>
+			<view v-if="isCheck == 0">
 				<view class="orderBtn" v-if="data.isBaoming">
 					<view class="btnQ" @click="baoQ">取消接单</view>
 				</view>
@@ -70,6 +71,20 @@
 					<view class="btn" @click="bao">申请接单</view>
 				</view>
 			</view>
+			<view v-else-if="isCheck == 1">
+				<view class="bao_title">
+					已报名人员
+				</view>
+				<view class="per_line" v-for="(v,i) in userList" :key="i">
+					<view class="oer_image">
+						<image :src="v.userTx[0]"></image>
+					</view>
+					<view>
+						{{v.userName}}
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -82,11 +97,16 @@
 				data: {},
 				list: [],
 				list2: [],
+				userList:[],
 				currentNum: 0,
+				isCheck: 0,
 			}
 		},
 		onLoad(op) {
 			this.id = op.id
+			if(op.isCheck){
+				this.isCheck = op.isCheck
+			}
 		},
 		onShow() {
 			this.getData()
@@ -116,6 +136,11 @@
 							})
 						}
 						this.data = res.data
+						this.userList = res.data.users
+						this.userList.forEach(function(el){
+							let img = JSON.stringify(el.userTx)
+							el.userTx = img
+						})
 						this.load = false
 					}
 				}).catch(e => {
@@ -170,6 +195,10 @@
 </script>
 
 <style lang="scss" scoped>
+	image{
+		height: 100%;
+		width: 100%;
+	}
 	.page {
 		.return {
 			position: fixed;
@@ -278,7 +307,6 @@
 
 		.form {
 			padding: 32rpx 32rpx 24rpx;
-			margin-bottom: 132rpx;
 
 			.formList {
 				display: flex;
@@ -303,11 +331,8 @@
 
 		.orderBtn {
 			width: 100%;
-			height: 132rpx;
 			background-color: #FFF;
-			position: fixed;
+			
-			left: 0;
-			bottom: 0;
 
 			.btn {
 				width: calc(100% - 64rpx);
@@ -319,7 +344,7 @@
 				font-size: 32rpx;
 				font-weight: 600;
 				color: #FFFFFF;
-				margin: auto;
+				margin: 0 auto;
 			}
 			.btnQ {
 				width: calc(100% - 64rpx);
@@ -331,7 +356,28 @@
 				font-size: 32rpx;
 				font-weight: 600;
 				color: #99241B;
-				margin: auto;
+				margin: 0 auto;
+			}
+		}
+	
+		.bao_title{
+			width: 686rpx;
+			margin: 20rpx 32rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #32333C;
+		}
+		.per_line{
+			width: 686rpx;
+			margin: 10rpx 32rpx;
+			display: flex;
+			align-items: center;
+			
+			.oer_image{
+				width: 88rpx;
+				height: 88rpx;
+				border-radius: 50%;
+				margin-left: 30rpx;
 			}
 		}
 	}

src/pages/pageHome/pageHome.vue

@@ -148,8 +148,8 @@
 					},
 					{
 						id: 7,
-						imgUrl: '../../static/icon8.png',
+						imgUrl: '../../static/moreFun/moreFun10.png',
-						title: '媒体宣传'
+						title: '点单大厅'
 					},
 					{
 						id: 8,
@@ -286,7 +286,7 @@
 						break;
 					case 7:
 						uni.navigateTo({
-							url: "/pages/mediaProp/mediaProp"
+							url: "/pages/orderHall/orderHall"
 						})
 						break;
 					case 8: