2

www/protected/modules/moonclub/views/reserve/month.php

@@ -71,7 +71,7 @@
 			<div class="form-group">
 				<input name="num" class="form-control" style="background-color: #fff;" id="demo1" type="text" readonly=""
 				       placeholder="请选择日期"/>
-<!--				<input type="hidden" name="user_id" id="userId">-->
+				<input type="hidden" name="user_id" id="userId">
 			</div>
 			<!--按钮-->
 			<div class="form-group">
@@ -119,8 +119,8 @@
 		/*表单提交进行判断*/
 		$('#SinglesDayBtn').on('click', function () {
 			/*获取user_id*/
-//			var ref=window.location.href.split("=");
-//			$("#userId").val(ref[2]);
+			var ref=window.location.href.split("=");
+			$("#userId").val(ref[2]);
 				/*姓名是否为空*/
 				if ($scope.username == undefined) {
 					model('请重填', '确认您的姓名');

www/webapp/moonclub/css/MyService.css

@@ -0,0 +1,191 @@
+h1.title{
+	position: absolute;
+	top:-1000px;
+}
+.booking {
+	min-width: 300px;
+	position: relative;
+}
+
+.booking img {
+	width: 100%;
+}
+
+.booking .booking-box {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.booking .booking-box .booking-box-1 {
+	font-weight: 900;
+	padding: 1.4rem 0;
+	font-size: 1.4rem;
+	width: 35%;
+	text-align: center;
+	color: #fff;
+	float: left;
+	font-family: "Microsoft YaHei UI";
+}
+
+.booking .booking-box .booking-box-2 {
+	width: 65%;
+	/*background-color: #00a0e9;*/
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	margin-left: 34%;
+	font-family: "Microsoft YaHei UI";
+	color: rgb(225, 230, 223);
+	vertical-align: middle;
+}
+
+.booking-box-2 div {
+	margin: 4px 0;
+	font-weight: 100;
+	font-family: "Microsoft YaHei UI";
+}
+
+
+.booking .booking-box .booking-box-2 div:nth-child(3) {
+	width: 98%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.booking .booking-box .booking-box-2 div:nth-child(1) {
+	font-size: 1.4rem;
+	color: #fff;
+	font-weight: 600;
+	margin-top: 8px;
+	margin-bottom: 0;
+}
+
+.booking .booking-box .booking-box-2 div:nth-child(2) {
+	margin-top: 0;
+}
+
+.booking-box-2 {
+	padding-left: 10px;
+}
+
+.booking-box-2 div span {
+	color: #dc6d62;
+}
+
+.booking .booking-box .booking-box-1 {
+	padding: 2.8rem 0;
+}
+
+.booking-box-2 div {
+	font-size: 1rem;
+}
+
+.booking .booking-box .booking-box-2 div:nth-child(1) {
+	margin: 12px 0px 6px 0;
+	font-size: 1.4rem;
+}
+
+/*最大宽度为320px*/
+@media (max-width: 320px) {
+	.booking .booking-box .booking-box-1 {
+		padding: 2rem 0;
+	}
+
+	.booking-box-2 div {
+		margin: 4px 0;
+		font-weight: 100;
+		font-size: 0.8rem;
+		font-family: "Microsoft YaHei UI";
+	}
+
+	.booking .booking-box .booking-box-2 div:nth-child(1) {
+		font-size: 1.2rem;
+		color: #fff;
+		font-weight: 600;
+		margin-top: 8px;
+		margin-bottom: 3px;
+	}
+}
+
+/*最大宽度为375px*/
+@media (min-width: 375px) {
+	.booking .booking-box .booking-box-1 {
+		font-weight: 900;
+		padding: 2.5rem 0;
+		font-size: 1.4rem;
+		width: 35%;
+		text-align: center;
+		color: #fff;
+		float: left;
+		font-family: "Microsoft YaHei UI";
+	}
+}
+
+/*最大宽度为414px*/
+@media (min-width: 414px) {
+	.booking .booking-box .booking-box-1 {
+		padding: 2.8rem 0;
+	}
+
+	.booking-box-2 div {
+		font-size: 0.8rem;
+	}
+
+	.booking .booking-box .booking-box-2 div:nth-child(1) {
+		margin: 12px 0px 6px 0;
+		font-size: 1.1rem;
+	}
+
+}
+
+/*最大宽度为768px*/
+@media (min-width: 768px) {
+	.booking .booking-box .booking-box-2 {
+		margin-left: 36%;
+	}
+
+	.booking .booking-box .booking-box-1 {
+		padding: 5rem 0;
+		font-size: 2.7rem;
+	}
+
+	.booking .booking-box .booking-box-2 div {
+		font-size: 1.4rem;
+		line-height: 1.6rem;
+		margin: 10px 0;
+	}
+
+	.booking .booking-box .booking-box-2 div:nth-child(1) {
+		font-size: 1.7rem;
+		margin:51px 0 29px 0;
+	}
+}
+
+@media (min-width: 769px) {
+
+	.booking .booking-box .booking-box-2 {
+		margin-left: 36%;
+	}
+
+	.booking .booking-box .booking-box-1 {
+		padding: 8rem 0;
+		font-size: 3.1rem;
+	}
+
+	.booking .booking-box .booking-box-2 div {
+		font-size: 1.6rem;
+		line-height: 1.9rem;
+		margin: 0.8rem 0;
+	}
+
+	.booking .booking-box .booking-box-2 div:nth-child(1) {
+		font-size: 2.9rem;
+		margin: 35px 0 15px 0;
+	}
+}

www/webapp/moonclub/css/main.css

@@ -1,7 +1,7 @@
-@import url("../../common/css/common.css");
-@import url("../../common/css/gird.css");
+/*@import url("../../common/css/common.css");*/
+/*@import url("../../common/css/gird.css");*/
 @import url("./ratchetOverloading.css");
-@import url("./common.css");
+/*@import url("./common.css");*/
 @import url("./home.css");
 @import url("./payAgreement.css");
 @import url("./product.css");
@@ -23,3 +23,4 @@
 @import url("./orderDetail.css");
 @import url("./beautician.css");
 @import url("./month.css");
+@import url("./MyService.css");

www/webapp/moonclub/dist/js/page/month/four.js

@@ -1 +1 @@
-define(["$","template","IScroll","native","config","user","product"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=moonclub/reserve/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,s){var o=this,u=e(document);u.trigger("spa:openloader");if(!r.pushData.dontNeedReload){var a=t("month/four",{showNavBar:!i.isWX,title:"至尊套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthFourScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","native","config","user","product"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=moonclub/reserve/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,s){var o=this,u=e(document);u.trigger("spa:openloader");if(!r.pushData.dontNeedReload){var a=t("month/four",{showNavBar:!i.isWX,title:"至尊套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthFourScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/moonclub/dist/js/page/month/one.js

@@ -1 +1 @@
-define(["$","template","IScroll","native","config","user","product"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"至惠套餐",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=moonclub/reserve/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,s){var o=this,u=e(document);u.trigger("spa:openloader");if(!r.pushData.dontNeedReload){var a=t("month/one",{showNavBar:!i.isWX,title:"至惠套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthOneScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","native","config","user","product"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"至惠套餐",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=moonclub/reserve/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,s){var o=this,u=e(document);u.trigger("spa:openloader");if(!r.pushData.dontNeedReload){var a=t("month/one",{showNavBar:!i.isWX,title:"至惠套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthOneScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/moonclub/js/page/home.js

@@ -122,7 +122,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			//预约
 			$.newTouch('.appointment', function (event) {
 				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month';
+				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 			}, $view);
 			// 咨询
 			$.newTouch('.im', function (event) {
@@ -172,6 +172,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
 				//加载之前
+				console.log(user.id);
 				product.getListAll(user.id);
 				address.getList({
 					request_from: 'weixin',

www/webapp/moonclub/js/page/month/four.js

@@ -32,7 +32,7 @@ define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], func
 			//预约
 			$.newTouch('.appointment', function (event) {
 				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month' ;
+				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 			}, $view);
 			// 咨询
 			$.newTouch('.im', function (event) {

www/webapp/moonclub/js/page/month/one.js

@@ -31,7 +31,7 @@ define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], func
 			//预约
 			$.newTouch('.appointment', function (event) {
 				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month' ;
+				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 			}, $view);
 			// 咨询
 			$.newTouch('.im', function (event) {

www/webapp/moonclub/tpl/MyService/index.html

@@ -10,7 +10,6 @@
 <div class="content" id="myCouponScroll" style="background: #efeff4;">
 	<div class="scroller">
 		<div class="page-content">
-			<h3 style="text-align: center;">我的预约</h3>
 			{{if list}}
 			<div class="my-service-box">
 				{{each list as e}}
@@ -24,8 +23,9 @@
 						<div class="booking-box-2">
 							<div>预约状态：<span>{{e.status}}</span></div>
 							<div>联系方式：{{e.mobile}}</div>
-							<div>预产日期：{{e.num}}</div>
-							<div>预约日期：{{e.time}}</div>
+							<!--<div>预产日期：{{e.num}}</div>-->
+							<!--<div>预约日期：{{e.time}}</div>-->
+							<div>联系地址：{{e.area}}</div>
 						</div>
 					</div>
 				</div>