1

www/webapp/moonclub/build.js

@@ -38,7 +38,8 @@
 			'panelDataPicker',
 			'panelDataPicker',
 			'panelProductOption',
-			'panelPostReview'
+			'panelPostReview',
+			'pageMyService'
 		]
 	}]
 })

www/webapp/moonclub/css/ratchetOverloading.css

@@ -160,4 +160,16 @@
 	height: 30px;
 	bottom: 15px;
 	right: 15px;
+}
+
+/*
+my-service-box
+*/
+.my-service-box{
+	width: 100%;
+}
+.my-service-box .width-percent-100{
+	background-color: #fff;
+	padding: 10px;
+	margin: 10px 0;
 }

www/webapp/moonclub/dist/js/build.txt

@@ -52,3 +52,4 @@ panel/dataPicker.js
 panel/productOption.js
 autosize.js
 panel/postReview.js
+page/MyService.js

www/webapp/moonclub/dist/js/page/MyService.js

@@ -0,0 +1 @@
+define(["$","template","user","config","IScroll","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function u(e){e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new i("#myCouponScroll")},50)}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),n.resolve()},beforeopen:function(o,u){var a=this,f=e(document);f.trigger("spa:openloader"),s.geteservation({user_id:n.id},function(e){console.log(e)}),s.geteservation({user_id:n.id},function(n){f.trigger("spa:closeloader");if(n.success){function s(e){return(new Date(parseInt(e)*1e3)).toLocaleString().replace(/年|月/g,"-").replace(/日/g," ")}console.log(s(n.data[0].time));var u=[];for(var l=0;l<n.data.length;l++)n.data[l].time=s(n.data[l].time);console.log(u);var c={showNavBar:!r.isWX&&!r.isChubao,list:n.data,timeArrea:u},h=t("MyService/index",c);e(".spa-page-body",a).html(h),setTimeout(function(){o.scroll=new i("#myServiceScroll")},500)}else f.trigger("spa:openpanel",["simpleAlert",{message:n.message}])}),u.resolve(),r.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"家政服务，首选壹管家",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"}),wx.onMenuShareAppMessage({title:"家政服务，首选壹管家",desc:"全程管家，精心每一个细节！",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});

www/webapp/moonclub/js/api.js

@@ -24,7 +24,7 @@ define(['config', 'base'], function (config, base) {
 		var that = this;
 		this.isLoading = true;
 		$.signAjax({
-			url: config.apiPath + '/index.php?r=moonclub/reserve/myServices',
+			url: config.apiPath + '/index.php?r=moonclub/reserve/myService',
 			data: data,
 			dataType: 'JSON',
 			success: function (res) {

www/webapp/moonclub/js/main.js

@@ -65,6 +65,9 @@ require.config({
 		pageMonthFour:'./page/month/four',
 		pageMonthConsultation:'./page/month/Consultation',
 
+		pageMyService: './page/MyService',
+		/*erve/myService&c*/
+
 
 		pageAppend: './page/append',
 		pageRefund: './page/refund',
@@ -244,6 +247,18 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
+	//
+	var pageMyService={
+		route: 'MyService',
+		classname: 'MyService',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMyService'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
 
 	//订单页
 	var pagePlaceOrder = {
@@ -610,7 +625,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageLongOrder, pageHelp, pageMine, pageSecondary, pageHomestay, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule,pageMonthOne,pageMonthTwo,pageMonthThree,pageMonthFour, pageMonthConsultation,pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageLongOrder, pageHelp, pageMine, pageSecondary, pageHomestay,pageMyService, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule,pageMonthOne,pageMonthTwo,pageMonthThree,pageMonthFour, pageMonthConsultation,pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
 	var panelAlert = {
 		id: 'simpleAlert',

www/webapp/moonclub/js/page/MyService.js

@@ -0,0 +1,109 @@
+/**
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
+ */
+define(['$', 'template', 'user', 'config', 'IScroll','api'], function ($, template, user, config, IScroll,api) {
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: '',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
+
+	function fixScroll(pageData) {
+		if (pageData.scroll) {
+			pageData.scroll.destroy();
+			pageData.scroll = null;
+		}
+
+		setTimeout(function () {
+			pageData.scroll = new IScroll('#myCouponScroll');
+		}, 50);
+	}
+
+	return {
+		title: '壹管家上门服务',
+		body: '',
+		init: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
+
+			// 返回
+			$view.on('swipeRight', function (event) {
+				back.call(this, event);
+			});
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+			dtd.resolve();
+		},
+		beforeopen: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
+			$doc.trigger('spa:openloader');
+			api.geteservation({user_id: user.id},function (res) {
+				console.log(res);
+			});
+			api.geteservation({user_id: user.id},function (res) {
+				$doc.trigger('spa:closeloader');
+				if (res.success) {
+					function getLocalTime(nS) {
+						return new Date(parseInt(nS) * 1000).toLocaleString().replace(/年|月/g, "-").replace(/日/g, " ");
+					}
+					console.log(getLocalTime(res.data[0].time));
+					var timeArrea=[];
+					for(var i=0;i<res.data.length;i++){
+						res.data[i].time=getLocalTime(res.data[i].time)
+					}
+
+					console.log(timeArrea);
+
+
+
+
+					var tmpData={
+						showNavBar: !config.isWX && !config.isChubao,
+						list:res.data,
+						timeArrea:timeArrea
+					};
+					var tpl = template('MyService/index', tmpData);
+					$('.spa-page-body', $view).html(tpl);
+					setTimeout(function () {
+						pageData.scroll = new IScroll('#myServiceScroll');
+					}, 500);
+				} else {
+					$doc.trigger('spa:openpanel', ['simpleAlert', {
+						message: res.message
+					}]);
+				}
+			});
+
+			dtd.resolve();
+			if (config.isWX) {
+				wx.ready(function () {
+					wx.onMenuShareTimeline({
+						title: '家政服务，首选壹管家',
+						link: 'http://www.yiguanjia.me/o2o/web/index',
+						imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+					});
+					wx.onMenuShareAppMessage({
+						title: '家政服务，首选壹管家',
+						desc: '全程管家，精心每一个细节！',
+						link: 'http://www.yiguanjia.me/o2o/web/index',
+						imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+					});
+				});
+			}
+		}
+	}
+})

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&user_id='+user.id;
+				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 			}, $view);
 			// 咨询
 			$.newTouch('.im', function (event) {
@@ -167,17 +167,11 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 					pageData.scroll = new IScroll('#homeScroll');
 				}, 500);
 				setInterval(function () {
-					$('.swiper-container').height($('.lazy').height()+4);
-				},1000);
+					$('.swiper-container').height($('.lazy').height() + 4);
+				}, 1000);
 
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
 				//加载之前
-				console.log("加载之前"+user.id);
-				api.geteservation({user_id: user.id},function (res) {
-					console.log(res);
-				});
-				//加载之后
-				console.log("加载之后"+user.id);
 				product.getListAll(user.id);
 				address.getList({
 					request_from: 'weixin',

www/webapp/moonclub/js/page/myCoupon.js

@@ -16,7 +16,7 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
 		}
 
 		setTimeout(function () {
-			pageData.scroll = new IScroll('#myCouponScroll');
+			pageData.scroll = new IScroll('#myServicenScroll');
 		}, 50);
 	}
 

www/webapp/moonclub/js/page/placeOrder.js

@@ -82,159 +82,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 		$orderCost.text('￥' + order.payValue);
 	}
 
-	/* 也是自动选取最大优惠券的操作，只是与setCoupon策略不同
-	 function suitable(me, doc, productID, type, petPrice, pay, pageData, extra, precedence) {
-	 extra = extra || 0;
-	 precedence = precedence || 0;
-	 // 获取该类型宠物 可用优惠券
-	 doc.trigger('spa:openloader');
-	 api.getCouponList({
-	 products: JSON.stringify([{
-	 product_id: productID,
-	 count: 1
-	 }]),
-	 type: type,
-	 user_id: user.id
-	 }, function (res) {
-	 doc.trigger('spa:closeloader');
-	 if (!res.success) {
-	 doc.trigger('spa:openpanel', ['simpleAlert', {
-	 message: res.message
-	 }]);
-	 } else {
-	 user.orderCoupons = res.data;
-
-	 // 优惠券数据更新
-	 var coupons = user.orderCoupons;
-	 var couponSelectVal = 0;
-	 if (coupons.length) {
-	 // 选取最大金额
-	 var selectCoupon = user.getMaxAvailableCoupon();
-
-	 // 缓存到购物车
-	 cart['products'][type]['couponName'] = coupons[selectCoupon.couponIndex].coupon.name;
-	 cart['products'][type]['couponVal'] = selectCoupon.couponSelectVal;
-	 cart['products'][type]['couponId'] = coupons[selectCoupon.couponIndex].id;
-	 cart['products'][type]['couponList'] = coupons;
-
-	 // dom 更新
-	 $('.coupon-selected-name', me).html(user.getCouponName(coupons[selectCoupon.couponIndex].id));
-	 $('.coupon-cost', me).html('-' + selectCoupon.couponSelectVal);
-	 $('.select-coupon', me).removeClass('hide');
-	 $('.order-cost', me).attr('data-coupon', selectCoupon.couponSelectVal);
-	 $('.order-list', me).removeClass('hide');
-	 $('.order-cost', me).attr('data-pay', parseFloat(petPrice) - parseFloat(selectCoupon.couponSelectVal) + extra);
-
-	 // 减去优惠
-	 petPrice = parseFloat(petPrice) - parseFloat(selectCoupon.couponSelectVal) + extra + precedence;
-
-	 } else {
-	 // 缓存到购物车
-	 cart['products'][type]['couponName'] = '';
-	 cart['products'][type]['couponVal'] = '';
-	 cart['products'][type]['couponId'] = '';
-	 cart['products'][type]['couponList'] = [];
-
-	 $('.coupon-selected-name', me).html('');
-	 $('.coupon-cost', me).html('- 0');
-	 $('.select-coupon', me).addClass('hide');
-	 $('.order-cost', me).attr('data-coupon', 0);
-
-	 petPrice = parseFloat(petPrice) + extra + precedence;
-	 }
-	 // 缓存到本地
-	 cart.setCache('products');
-
-	 // 更新dom总价
-	 $('.order-cost', me).attr('data-costs', pay);
-	 $('.order-cost', me).html('￥' + petPrice);
-
-	 $('.select-pet', me).removeClass('hide');
-
-	 if (pageData && pageData.scroll) {
-	 pageData.scroll.refresh();
-	 }
-	 }
-	 });
-	 }
-	 */
-	/* 优惠券取决于主服务、宠物、数量、时间，所以在这几个值改变后要调用这个方法，更新最大优惠
-	 function setCoupon(me, pageData, extraServicePrice) {
-	 $(document).trigger('spa:openloader');
-	 var products = JSON.stringify([{
-	 product_id: order['productID'],
-	 count: order.productCount
-	 }]);
-	 var time = order.bookingDate + ' ' + order.bookingTime + ':00';
-	 user.getProductCoupon(products, time, cachePageData.productType, function (res) {
-	 $(document).trigger('spa:closeloader');
-	 if (res.success) {
-	 var coupons = user.orderCoupons;
-	 var price = 0;
-	 if (coupons.length) {
-	 var selectCoupon = user.getMaxAvailableCoupon();
-	 cart['products'][cachePageData.productType]['couponName'] = coupons[selectCoupon.couponIndex].coupon.name;
-	 cart['products'][cachePageData.productType]['couponVal'] = selectCoupon.couponSelectVal;
-	 cart['products'][cachePageData.productType]['couponId'] = coupons[selectCoupon.couponIndex].id;
-	 cart['products'][cachePageData.productType]['couponList'] = coupons;
-
-	 $('.coupon-selected-name', me).html(user.getCouponName(coupons[selectCoupon.couponIndex].id));
-	 $('.coupon-cost', me).html('-' + selectCoupon.couponSelectVal);
-	 $('.select-coupon', me).removeClass('hide');
-	 $('.order-cost', me).attr('data-coupon', selectCoupon.couponSelectVal);
-	 $('.order-list', me).removeClass('hide');
-	 price = parseFloat(order.petPrice) * order.productCount - parseFloat(selectCoupon.couponSelectVal) + parseFloat(extraServicePrice);
-
-	 } else {
-	 price = parseFloat(order.petPrice) * order.productCount + parseFloat(extraServicePrice);
-
-	 $('.coupon-selected-name', me).html('');
-	 $('.select-coupon', me).addClass('hide');
-	 $('.order-cost', me).attr('data-coupon', '0');
-	 $('.order-cost', me).attr('data-pay', parseFloat(order.petPrice));
-	 cart['products'][cachePageData.productType]['couponName'] = '';
-	 cart['products'][cachePageData.productType]['couponVal'] = '';
-	 cart['products'][cachePageData.productType]['couponId'] = '';
-	 cart['products'][cachePageData.productType]['couponList'] = [];
-	 }
-	 // 加急
-	 if (order.precedence) {
-	 price = price + parseFloat(product.precedence);
-	 }
-	 $('.order-cost', me).attr('data-pay', price);
-	 $('.order-cost', me).attr('data-costs', order.petPrice);
-	 $('.order-cost', me).html('￥' + price);
-
-	 cart.setCache('products');
-
-	 pageData.scroll.refresh();
-	 } else {
-	 $(document).trigger('spa:openpanel', ['simpleAlert', {
-	 message: res.message
-	 }]);
-	 }
-	 });
-	 }  */
-	/* 在选择主服务或宠物后，筛选附加服务
-	 function suitExtraService(me, checkedName) {
-	 var newExtraService = product.getExtraServiceList(order.productType, order.petName, checkedName);
-	 var extraService = {
-	 extraService: newExtraService
-	 }
-	 var extraServiceTpl = template('placeOrder/list', extraService);
-	 var extraServiceTpl2 = template('placeOrder/list2', extraService);
-	 me.find('.extra-service-list').html(extraServiceTpl);
-	 me.find('.calc-items').html(extraServiceTpl2).addClass('hide');
-
-	 cachePageData.extraServicePrice = 0;
-	 cachePageData.extraServiceCount = 0;
-	 } */
-	/* 在选择主服务、附加服务、宠物、时间、地点之后，重置保洁师
-	 function resetTech(me) {
-	 order.beautician.name = '请选择';
-	 order.beautician.id = '';
-	 $('.booking-people', me).html(order.beautician.name);
-	 }  */
 	return {
 		title: '壹管家上门服务',
 		body: '',

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

@@ -0,0 +1,30 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
+	<h1 class="title">我的预约</h1>
+</header>
+{{ /if }}
+
+<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}}
+				<div class="width-percent-100">
+					<div>{{e.homeType}}</div>
+					<div>{{e.mobile}}</div>
+					<div>{{e.status}}</div>
+					<div>{{e.time}}</div>
+				</div>
+				{{/each}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+	</div>
+
+</div>