修改

components/page-component/app-diy-form/app-diy-form-checkbox-group.vue

@@ -96,9 +96,16 @@
         display: inline-block;
         height: #{56rpx};
         line-height: #{54rpx};
-        border: #{1rpx} solid;
+        // border: #{1rpx} solid;
+        border: #{1rpx} solid #D2D2D2 !important;
         padding: 0 #{28rpx};
-        border-radius: #{1000rpx};
+        // border-radius: #{1000rpx};
+        border-radius: #{8rpx};
         font-size: $uni-font-size-general-one;
+		color: #3D3D3D !important;
     }
+	.classic-red-background{
+		background-color: #F09A21 !important;
+		color: #ffffff !important;
+	}
 </style>

components/page-component/app-diy-form/app-diy-form.vue

@@ -83,7 +83,7 @@
                         </view>
                     </view>
 
-                    <view :key="index" v-if="item.key=='date'"
+                    <view :key="index" v-if="item.key=='date'" v-show="item.key=='date'? false:true"
                           class="item"
                           :class="[itemClass, index===0 ? `is-first-item` : ``,]"
                           :style="{

pages.json

@@ -143,6 +143,7 @@
           "path": "cats",
           "style": {
             "navigationBarTitleText": "分类"
+
           }
         }
       ]
@@ -506,7 +507,8 @@
         {
           "path": "index/index",
           "style": {
-            "navigationBarTitleText": "预约首页"
+            "navigationBarTitleText": "预约首页",
+			"navigationStyle": "custom"
           }
         },
         {

pages/goods/goods.vue

@@ -33,6 +33,16 @@
                 </view>
             </app-attr>
         </view>
+
+		<view class="upload-form" v-if="goods.is_negotiable == 0" @click="clickImage(index)">
+			<view class="upload-form-title">
+				查看下载报名表
+			</view>
+			<view class="Course-right">
+				<image src="../../static/image/share/img-share-right.png" mode=""></image>
+			</view>
+		</view>
+		
         <view class="marketing" v-if="goods">
             <app-goods-marketing :limit="goods.goods_marketing.limit"
                  :express="goods.express"
@@ -219,6 +229,16 @@
             });
         },
         methods: {
+			clickImage(index) {
+			    let urls = [];
+			    this.picList.forEach(item => {
+			        urls.push(item.pic_url);
+			    });
+			    uni.previewImage({
+			        current: index,
+			        urls: urls
+			    });
+			},
             change(e) {
                 this.current = e.detail.current;
             },
@@ -439,4 +459,28 @@
             color: #ffffff;
         }
     }
+	.upload-form{
+		width: #{100%};
+		height: #{101upx};
+		background-color: #FFFFFF;
+		padding: 0 13px;
+		font-size: 30upx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #3D3D3D;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.Course-right{
+			width: 15upx;
+			height: 28upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 </style>

pages/order-submit/order-submit.vue

@@ -3,7 +3,7 @@
         <view class="page" v-if="previewData">
             <template v-if="previewData.show_address !== false">
                 <view v-if="previewData.allZiti" class="address">
-                    <app-order-submit-row :show-nav="false" :no-padding="true">
+<!--                    <app-order-submit-row :show-nav="false" :no-padding="true">
                         <view class="dir-left-nowrap px-12">
                             <view class="box-grow-1">
                                 <app-input placeholder="请填写联系人" height="100"
@@ -17,7 +17,7 @@
                         <view slot="footer">
                             <image class="bottom-image" :src="appImg.common.address_bottom"></image>
                         </view>
-                    </app-order-submit-row>
+                    </app-order-submit-row> -->
                 </view>
                 <view v-else @click="navigateAddress" class="address">
                     <app-order-submit-row>
@@ -91,7 +91,7 @@
                       :key="mchIndex"
                       class="mch-item">
 
-                    <view class="mch-name">{{mch.mch.name}}</view>
+                    <!-- <view class="mch-name">{{mch.mch.name}}</view> -->
 
 <!--                    <view v-if="mch.show_delivery !== false" class="dir-left-nowrap cross-center delivery">
                         <view class="box-grow-1">配送方式</view>
@@ -115,7 +115,7 @@
                             暂无门店，请选择其他配送方式
                         </app-order-submit-row>
                         <app-order-submit-row v-else @click="navigateStore(mchIndex)" :show-nav="mch.mch.id == 0">
-                            <view slot="header" class="title">门店信息</view>
+                            <!-- <view slot="header" class="title">门店信息</view> -->
                             <template v-if="mch.store">
                                 <view class="dir-left-nowrap mb-12">
                                     <view class="box-grow-1">{{mch.store.name}}</view>
@@ -136,7 +136,7 @@
                                 </view>
                                 <view class="store-address">{{mch.store.address}}</view>
                             </template>
-                            <view v-else>请选择门店</view>
+                            <view v-else>请选择场地</view>
                         </app-order-submit-row>
                     </view>
                     <view v-else-if="mch.delivery.send_type == 'city' && mch.city" class="city">
@@ -287,9 +287,17 @@
                                     @input="handleGoodsFormInput"
                                     @validate="handleGoodsFormValidate"
                                     :sign="`${mchIndex},${goodsIndex},${goodsItem.form.id}`"></app-diy-form>
+<!-- 							<view class="upload-form">
+								<view class="upload-form-title">
+									上传报名表
+								</view>
+								<view class="Course-right">
+									<image src="../../static/image/share/img-share-right.png" mode=""></image>
+								</view>
+							</view> -->
                         </view>
                     </template>
-
+					
                 </view><!-- mch item end -->
             </view>
         </view>
@@ -352,6 +360,7 @@
                 payDataUrl: null,
                 showPayResult: true,
                 payCancelUrl: null,
+				date: []
             };
         },
         computed: {
@@ -423,12 +432,22 @@
                 }
             },
             handleOrderFormInput(data, sign) {
+				let that = this
+				uni.getStorage({
+					key: 'date',
+					success: function(res){
+						console.log(res.data)
+						that.date = res.data
+					}
+				})
+				console.log(this.date)
                 const result = [];
                 for (let i in data) {
                     result[i] = {
                         key: data[i].key,
                         label: data[i].name,
-                        value: data[i].value,
+                        // value: data[i].value,
+                        value: (data[i].label === '日期')||(data[i].label === '预约日期') ? `${this.date.date},${this.date.week}` :data[i].value,
                         required: data[i].is_required,
                     };
                 }
@@ -613,6 +632,15 @@
                     mask: true,
                     title: '提交中',
                 });
+				let formData = this.$store.state.orderSubmit.formData
+				let order_form = formData.list[0].order_form
+				for(let i=0; i<order_form.length; i++){
+					if(order_form[i].label === '预约日期' || order_form[i].label === '日期'){
+						
+					}
+				}
+				
+				console.log(formData)
                 this.$request({
                     url: this.submitUrl,
                     method: 'post',
@@ -1112,4 +1140,29 @@
             background: $uni-general-color-two;
         }
     }
+	// .upload-form{
+	// 	width: #{100%};
+	// 	height: #{101upx};
+	// 	background-color: #FFFFFF;
+	// 	padding: 0 13px;
+	// 	font-size: 30upx;
+	// 	font-family: Source Han Sans CN;
+	// 	font-weight: 500;
+	// 	color: #3D3D3D;
+	// 	display: flex;
+	// 	align-items: center;
+	// 	justify-content: space-between;
+	// 	margin-top: 20upx;
+	// 	.Course-right{
+	// 		width: 15upx;
+	// 		height: 28upx;
+	// 		display: flex;
+	// 		align-items: center;
+	// 		justify-content: center;
+	// 		image{
+	// 			width: 100%;
+	// 			height: 100%;
+	// 		}
+	// 	}
+	// }
 </style>

plugins/book/components/app-product-list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-list dir-top-nowrap">
-		<view v-if="goodsList.length > 0"  class="row dir-left-nowrap main-between box-grow-1" v-for="(item, key) in goodsList" :key="key" >
+<!-- 		<view v-if="goodsList.length > 0"  class="row dir-left-nowrap main-between box-grow-1" v-for="(item, key) in goodsList" :key="key" >
 			<view class="item box-grow-0" v-for="(good, index) in item"  :key="index" @click="route_go(good)">
 				<view class="image-name dir-top-nowrap main-left">
 					<view class="out-dialog" v-if="good.goods_stock == 0 && appSetting.is_show_stock == '1'">
@@ -16,6 +16,32 @@
 					<view v-if="good.discount > 0">
 						<app-sup-vip :is_vip_card_user="good.is_vip_card_user" :discount="good.discount"></app-sup-vip>
 					</view>
+					<view class="price-btn dir-left-nowrap main-between cross-center">
+						<view class="price">{{good.price_str}}</view>
+						<view v-if="good.goods_stock != 0" class="btn">预约</view>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<view class="row" v-for="(item, key) in goodsList" :key="key" >
+			<view class="good-item dir-left-nowrap" v-for="(good, index) in item"  :key="index" @click="route_go(good)">
+				<view class="box-grow-0 cover-pic">
+			<!-- 		<view class="out-dialog" v-if="good.goods_stock == 0 && appSetting.is_show_stock == '1'">
+						<image :src="appSetting.is_use_stock == '1' ? appImg.plugins_out : appSetting.sell_out_pic"></image>
+					</view> -->
+					<image :lazy-load="true"  class="cover_pic" :src="good.cover_pic"></image>
+					
+				</view>
+				<view class="box-grow-1 dir-top-nowrap main-betweens">
+					<view class="box-grow-0 name t-omit t-omit-two">{{good.name}}</view>
+					
+					<view class="price-bottom" v-if="good.is_level == 1">
+						<app-member-price :price="good.level_price"></app-member-price>
+					</view>
+					<view v-if="good.discount > 0">
+						<app-sup-vip :is_vip_card_user="good.is_vip_card_user" :discount="good.discount"></app-sup-vip>
+					</view>
+					
 					<view class="price-btn dir-left-nowrap main-between cross-center">
 						<view class="price">{{good.price_str}}</view>
 						<view v-if="good.goods_stock != 0" class="btn">预约</view>
@@ -88,6 +114,8 @@
 	}
 	.row {
 		margin-bottom: #{16upx};
+		font-size: 28rpx;
+		color: #353535;
 	}
 	.item {
 		width: #{350upx};
@@ -119,18 +147,29 @@
 		height: calc(100% - #{405upx});
 	}
 	.cover_pic {
-		width: #{350upx};
-		height: #{350upx};
+		width: #{100%};
+		height: #{100%};
+		// width: #{350upx};
+		// height: #{350upx};
 		margin-bottom: #{20upx};
 		border-top-right-radius: #{15upx};
 		border-top-left-radius: #{15upx};
 	}
 	.name {
-		width: #{310upx};
-		margin: #{0 20upx};
-		font-size: #{28upx};
-		line-height: 1;
-		color: #353535;
+		// width: #{310upx};
+		// margin: #{0 20upx};
+		// font-size: #{28upx};
+		// line-height: 1;
+		// color: #353535;
+		font-size: 34rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #3d3d3d;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		
 	}
 	.btn {
 		width: #{110upx};
@@ -148,11 +187,35 @@
 		margin-bottom: #{10upx};
 	}
 	.price {
-		font-size: #{25upx};
-		color: #ff4544;
+		// font-size: #{25upx};
+		// color: #ff4544;
+		font-size: 34rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #FF4800;
 	}
 	.price-btn {
 		margin-top: #{10upx};
 		margin-bottom: #{16upx};
 	}
+	.good-item{
+		padding: 16rpx 24rpx;
+		background-color: #ffffff;
+		border-top: 1rpx solid #e2e2e2;
+	}
+	.cover-pic{
+		width: 138px;
+		height: 110px;
+		margin-right: 24rpx;
+	}
+	.main-between{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.main-betweens{
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
 </style>

plugins/book/index/index.vue

@@ -1,19 +1,52 @@
 <template>
 	<app-layout>
 		<view class="book-index">
+			
+			<view class="custom-header-container">
+				<view class="header-bg" :style="{height:headerBgHeight}">
+					<image src="../../../static/image/course/bg.png"/>
+				</view>
+				<view class="custom-header-status-bar" :style="{height:getStausBarHeight}"></view>
+				<view class="custom-header-top-container">
+					<view class="custom-header-title">场地预约</view>
+				</view>
+			</view>
+			<view class="swiper-container">
+				<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
+					<swiper-item class="swiper-item">
+						<image class="swiper-item-img" src="../../../static/image/course/banner.png" mode=""></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			
+			<view class="check-container">
+				<view class="check-item" v-for="(item, index) in dateArr" 
+					  :key="index" @click="dateActive(index, item)" 
+					  :class="(index == dateArrIndex) && dateArrActive?'check-item-active' : ''">
+					<view class="week">{{item.week}}</view>
+					<view class="data">{{item.date}}</view>
+				</view>
+			</view>
+			
 			<view class="page-width quick-navigation">
 				<app-quick-navigation></app-quick-navigation>
 			</view>
 			
-			<view class="page-width head-nav-list">
+	<!-- 		<view class="page-width head-nav-list">
 				<app-head-nav-list
 					v-bind:catList="catList"
 					@click="changeStatus"
 					v-bind:cat_id="cat_id"
 				></app-head-nav-list>
 			</view>
-			
+			 -->
 			<view class="page-width product-list" v-if="goods_list.length > 0">
+				<view class="title">
+					<view class="title-icon">
+						<image src="../../../static/image/reservation.png" mode=""></image>
+					</view>
+					<text class="title-content">场地预约</text>
+				</view>
 				<app-product-list v-bind:goodsList="goods_list"></app-product-list>
 			</view>
 			
@@ -45,6 +78,9 @@
                 page: 1,
                 goods_list: [],
                 page_count: 1,
+				dateArr:[],
+				dateArrIndex: -1,
+				dateArrActive: false
             }
 	    },
 	    onLoad(option) {
@@ -66,10 +102,55 @@
 	                // this.request();
                 }
             });
-            
+			// uni.removeStorage({
+			// 	key: 'date'  
+			// })
+			this.getDate(7)
         },
+		computed:{
+			getStausBarHeight(){
+				try {
+					const res = uni.getSystemInfoSync();
+					return res.statusBarHeight + 'px';
+				} catch (err) {
+					console.log(err)
+				}
+			},
+			headerBgHeight(){
+				try {
+					const res = uni.getSystemInfoSync();
+					return 120+44+res.statusBarHeight + 'px';
+				} catch (err) {
+					console.log(err)
+				}
+			}
+		},
 	    methods: {
-            
+            dateActive(index, item){
+				uni.showToast({
+					icon: 'none',
+				    title: '选中日期',
+				    duration: 1000
+				});
+				// if(this.dateArrIndex == index){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 	    title: '取消日期',
+				// 	    duration: 1000
+				// 	});
+				// 	uni.removeStorage({
+				// 	    key: 'date'  
+				// 	})
+				// 	this.dateArrActive = !this.dateArrActive
+				// }else{
+					this.dateArrIndex = index
+					this.dateArrActive = true
+					uni.setStorage({
+						key: 'date',
+						data: item
+					})
+				// }
+			},
             changeStatus(status) {
 	            this.page = 1;
 	            this.cat_id = status;
@@ -103,7 +184,49 @@
                     }
                 }
                 this.page_count = data.pagination.page_count;
-            }
+            },
+			getDate(num){
+				// 获取当前时间
+				let Date1 = new Date()
+				for(let i = 0; i < num; i++ ){
+					let Date2 = new Date()
+					Date2.setDate(Date1.getDate() + i + 1)
+					let time = (Date2.getMonth() + 1) + "月" + Date2.getDate() + "日";
+					console.log(time)
+					let Day = Date2.getDay()
+					let days;
+					switch(Day){
+						case 1:
+						days = '星期一';
+						break;
+						case 2:
+						days = '星期二';
+						break;
+						case 3:
+						days = '星期三';
+						break;
+						case 4:
+						days = '星期四';
+						break;
+						case 5:
+						days = '星期五';
+						break;
+						case 6:
+						days = '星期六';
+						break;
+						case 0:
+						days = '星期日';
+						break;
+					}
+					console.log(days)
+					let dateObj = {
+						date: time,
+						week: days,
+					}
+					this.dateArr.push(dateObj)
+				}
+			}
+			
 	    },
 	    onReachBottom() {
             if (this.page < this.page_count) {
@@ -137,11 +260,150 @@
 		z-index: 1500;
 	}
 	
+	// .product-list {
+	// 	margin-top: #{100rpx};
+	// }
 	.product-list {
-		margin-top: #{100rpx};
+		margin-top: #{30rpx};
 	}
 	
 	.no-goods {
 		margin-top: #{150rpx};
 	}
+	.custom-header-container{
+		width: 100%;
+		top: 0;
+		z-index: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
+		font-size: 26upx;
+		background: transparent;
+		.header-bg{
+			width: 100%;
+			position: absolute;
+			overflow: hidden;
+			z-index: 0;
+			image{
+				width: 100%;
+				height: 230px;
+			}
+		}
+		.custom-header-status-bar{
+			width: 100%;
+			top: 0;
+			position: sticky;
+			z-index: 100;
+		}
+		.custom-header-top-container{
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 0 15upx;
+			.custom-header-title{
+				height: 44px;
+				line-height: 44px;
+				font-size: 36upx;
+				font-weight:400;
+				font-family:Source Han Sans CN;
+				color: #FBF9F9;
+				z-index: 1;
+			}
+		}
+		.cu-bar{
+			width: 100%;
+			height: 55px;
+		}
+		.head-search{
+			width: 100%;
+			height: 60upx;
+			.head-search-item{
+				width: 690upx;
+				height: 65upx;
+				background: #fff;
+				border-radius: 50%;
+			}
+		}
+	}	
+	.title{
+		height: 80upx;
+		line-height: 80upx;
+		padding: 0 24upx;
+		font-size: 28upx;
+		background-color: #ffffff;
+		position: relative;
+		display: flex;
+		align-items: center;
+		.title-icon{
+			width: 33upx;
+			height: 33upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// display: inline-block;
+			image{
+				width: 100%;
+				height: 100%;			
+			}
+		}
+		.title-content{
+			display: inline-block;
+			font-size: 34upx;
+			font-family: Source Han Sans CN;
+			font-weight: 500;
+			color: #3D3D3D;
+			margin-left: 10upx;
+		}
+	}
+	.swiper-container{
+		width: 94vw;
+		height: auto;
+		margin: 0 3vw;
+		padding: 5vw 0;
+		z-index: 1;
+		.swiper-item{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			transform: translate(0%, 0px) translateZ(0px);
+			.swiper-item-img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.check-container{
+		width: 100%;
+		height: 115upx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		border-top: 2rpx solid #D8D8D8;
+		border-bottom: 2rpx solid #D8D8D8;
+		.check-item{
+			width: 90upx;
+			height: 80upx;
+			color: #000;
+			background: #F2F2F2;
+			font-size: 18upx;
+			border-radius: 8upx;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+			.week{
+				text-align: center;
+			}
+			.data{
+				margin-top: 10upx;
+				text-align: center;
+			}
+		}
+		.check-item-active{
+			background: #F09A21;
+			color: #FFFFFF;
+		}
+	}
 </style>

plugins/book/order/order.vue

@@ -70,7 +70,7 @@
 								</view>
 							</view>
 							<view class="text-bottom dir-left-nowrap main-right cross-center">
-								<view class="original-price">￥{{item.detail[0].total_original_price}}</view>
+								<!-- <view class="original-price">￥{{item.detail[0].total_original_price}}</view> -->
 								<view class="current-price">￥{{item.detail[0].total_price}}</view>
 							</view>
 						</view>
@@ -78,10 +78,15 @@
 					<view class="bottom dir-left-nowrap main-right cross-center"
 					      v-if="item.cancel_status === '0' && item.is_sale === '0' && item.sale_status === '0' && item.is_comment == 0"
 					>
-						<view class="but no" @click.stop="operationOrder(1, item)" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
+					<!-- 	<view class="but no" @click.stop="operationOrder(1, item)" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
 							<app-form-id>
 								申请退款
 							</app-form-id>
+						</view>	 -->		
+						<view class="but no" @click.stop="to" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
+							<app-form-id>
+								代付尾款
+							</app-form-id>
 						</view>
 						<view class="but ok" @click.stop="operationOrder(2, item)" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
 							<app-form-id>
@@ -336,7 +341,12 @@
                     open_type: 'navigate',
 	                url: `/plugins/book/orderDetails/orderDetails?id=${data.id}`
                 });
-            }
+            },
+			to(){
+				uni.navigateTo({
+					url:'/plugins/scan_code/index/index'
+				})
+			}
 	    }
     }
 </script>

plugins/book/orderDetails/orderDetails.vue

@@ -69,10 +69,15 @@
 						<view class="app-button app-red" @click="useImmediately">立即使用</view>
 					</app-form-id>
 				</view>
-				<view class="app-button" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
+<!-- 				<view class="app-button" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
 					<app-form-id >
 						<view class="app-button app-white" @click="refundBoolean = true">申请退款</view>
 					</app-form-id>
+				</view> -->
+				<view class="app-button" v-if="item.cancel_status != 2 && item.is_pay == 1 && item.is_confirm == 0">
+					<app-form-id >
+						<view class="app-button app-white" @click="to">代付尾款</view>
+					</app-form-id>
 				</view>
 			</view>
 		</view>
@@ -168,7 +173,12 @@
 				uni.navigateTo({
 					url: `/pages/order/appraise/appraise?id=${this.item.id}`
 				});
-            }
+            },
+			to(){
+				uni.navigateTo({
+					url:'/plugins/scan_code/index/index'
+				})
+			}
 	    }
     }
 </script>

plugins/scan_code/index/index.vue

@@ -71,7 +71,7 @@
                             font-size="32"
                             height="88"
                             width="702"
-                            :background="list.price > 0 ? '#ff4544': '#cdcdcd'"
+                            :background="list.price > 0 ? '#F09A21': '#cdcdcd'"
                             :disabled="list.price <= 0"
                             round>已与店员确认，立即买单
                 </app-button>
@@ -557,5 +557,7 @@
         height: 100%;
         width: 100%;
     }
-
+	.btn-shadow{
+		box-shadow: 0 4px 10px #999;
+	}
 </style>