1

www/webapp/moonclub/build.js

@@ -16,6 +16,7 @@
 			'pageProduct',
 			'pagePicker',
 			'pageMyCoupon',
+			'pageMyOrder',
 			'pageSuccess',
 			'pageAgreement',
 			'pageBeautician',

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

@@ -28,6 +28,7 @@ model/review.js
 page/product.js
 page/picker.js
 page/myCoupon.js
+page/MyOrder.js
 page/success.js
 page/agreement.js
 page/beautician.js

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

@@ -0,0 +1 @@
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("MyOrder/index",u);e(".spa-page-body",s).html(a)}i.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/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&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()}}});
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("month/four",u);e(".spa-page-body",s).html(a)}i.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/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&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()}}});
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("month/one",u);e(".spa-page-body",s).html(a)}i.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/dist/js/page/month/three.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&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/three",{showNavBar:!i.isWX,title:"至享套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthThreeScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("month/three",u);e(".spa-page-body",s).html(a)}i.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/dist/js/page/month/two.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&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),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/two",{showNavBar:!i.isWX,title:"至悦套餐"});e(".spa-page-body",o).html(a),setTimeout(function(){r.scroll=new n("#monthTwoScroll")},500),u.trigger("spa:closeloader"),s.resolve()}s.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","user","config","api"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("month/two",u);e(".spa-page-body",s).html(a)}i.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/main.js

@@ -56,6 +56,7 @@ require.config({
 		pageMonthConsultation: './page/month/Consultation',
 
 		pageMyService: './page/MyService',
+		pageMyOrder: './page/MyOrder',
 		/*erve/myService&c*/
 
 
@@ -189,6 +190,18 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
+	//我的订单
+	var pageMyOrder = {
+		route: 'MyOrder',
+		classname: 'MyOrder',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMyOrder'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
 
 
 	//选择列表页
@@ -446,7 +459,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout,  pageMyService, pageProduct, pageProductInfo, pageDesc, pagePicker, pageAppendPay, pagePaySuccess, pageMyCoupon, pageAgreement, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule, pageMonthOne, pageMonthTwo, pageMonthThree, pageMonthFour, pageMonthConsultation, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout,  pageMyService, pageMyOrder,pageProduct, pageProductInfo, pageDesc, pagePicker, pageAppendPay, pagePaySuccess, pageMyCoupon, pageAgreement, 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/MyOrder.js

@@ -0,0 +1,98 @@
+/**
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
+ */
+define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config,  api) {
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: '',
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
+
+    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');
+            if (!pageData.pushData.dontNeedReload) {
+                $doc.trigger('spa:closeloader');
+                var tmpData = {
+                    showNavBar: !config.isWX && !config.isChubao
+                };
+                var tpl = template('MyOrder/index', tmpData);
+
+                $('.spa-page-body', $view).html(tpl);
+
+            }
+            /*api.geteservation({user_id: user.id}, function (res) {
+             $doc.trigger('spa:closeloader');
+             if (res.success) {
+             var timeArrea = [];
+             if (res.data.length==0) {
+             showListBar=false;
+             } else {
+             showListBar=true;
+             }
+             var tmpData = {
+             showNavBar: !config.isWX && !config.isChubao,
+             list: res.data,
+             timeArrea: timeArrea,
+             showListBar:showListBar
+             };
+             var tpl = template('MyOrder/index', tmpData);
+             $('.spa-page-body', $view).html(tpl);
+             setTimeout(function () {
+             pageData.scroll = new IScroll('#myOrderScroll');
+             }, 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/month/four.js

@@ -1,12 +1,14 @@
 /**
- * Created by Jinguo on 2016/12/15.
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
  */
-define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], function ($, template, IScroll,  native, config, user, product) {
-
+define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config,  api) {
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash:'',
+			hash: '',
 			pushData: {
 				dontNeedReload: true
 			}
@@ -14,57 +16,57 @@ define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], func
 	}
 
 	return {
-		title: '双十一活动',
+		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);
 			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=moonclub/reserve/xyhIm';
-			}, $view);
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
 			$doc.trigger('spa:openloader');
 			if (!pageData.pushData.dontNeedReload) {
-				var tpl = template('month/four', {
-					showNavBar: !config.isWX,
-					title:"至尊套餐"
-				});
-				$('.spa-page-body', $view).html(tpl);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#monthFourScroll');
-				}, 500);
 				$doc.trigger('spa:closeloader');
-				dtd.resolve();
+				var tmpData = {
+					showNavBar: !config.isWX && !config.isChubao
+				};
+				var tpl = template('month/four', tmpData);
+
+				$('.spa-page-body', $view).html(tpl);
+
 			}
+
 			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			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/month/one.js

@@ -1,7 +1,10 @@
 /**
- * Created by Jinguo on 2016/12/15.
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
  */
-define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], function ($, template, IScroll, native, config, user, product) {
+define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config,  api) {
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
@@ -13,57 +16,57 @@ define(['$', 'template', 'IScroll', 'native', 'config', 'user', 'product'], func
 	}
 
 	return {
-		title: '至惠套餐',
+		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);
 			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=moonclub/reserve/xyhIm';
-			}, $view);
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
 			$doc.trigger('spa:openloader');
 			if (!pageData.pushData.dontNeedReload) {
-				var tpl = template('month/one', {
-					showNavBar: !config.isWX,
-					title:"至惠套餐"
-				});
-				$('.spa-page-body', $view).html(tpl);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#monthOneScroll');
-				}, 500);
 				$doc.trigger('spa:closeloader');
-				dtd.resolve();
+				var tmpData = {
+					showNavBar: !config.isWX && !config.isChubao
+				};
+				var tpl = template('month/one', tmpData);
+
+				$('.spa-page-body', $view).html(tpl);
+
 			}
+
 			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			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/month/three.js

@@ -1,12 +1,14 @@
 /**
- * Created by Jinguo on 2016/12/15.
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
  */
-define(['$', 'template', 'IScroll',  'native', 'config', 'user', 'product'], function ($, template, IScroll,  native, config, user, product) {
-
+define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config,  api) {
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash:'',
+			hash: '',
 			pushData: {
 				dontNeedReload: true
 			}
@@ -14,57 +16,57 @@ define(['$', 'template', 'IScroll',  'native', 'config', 'user', 'product'], fun
 	}
 
 	return {
-		title: '双十一活动',
+		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);
 			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=moonclub/reserve/xyhIm';
-			}, $view);
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
 			$doc.trigger('spa:openloader');
 			if (!pageData.pushData.dontNeedReload) {
-				var tpl = template('month/three', {
-					showNavBar: !config.isWX,
-					title:"至享套餐"
-				});
-				$('.spa-page-body', $view).html(tpl);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#monthThreeScroll');
-				}, 500);
 				$doc.trigger('spa:closeloader');
-				dtd.resolve();
+				var tmpData = {
+					showNavBar: !config.isWX && !config.isChubao
+				};
+				var tpl = template('month/three', tmpData);
+
+				$('.spa-page-body', $view).html(tpl);
+
 			}
+
 			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			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/month/two.js

@@ -1,12 +1,14 @@
 /**
- * Created by Jinguo on 2016/12/15.
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2017/1/5
+ * Time: 14:24
  */
-define(['$', 'template', 'IScroll',  'native', 'config', 'user', 'product'], function ($, template, IScroll,  native, config, user, product) {
-
+define(['$', 'template', 'user', 'config',  'api'], function ($, template, user, config,  api) {
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash:'',
+			hash: '',
 			pushData: {
 				dontNeedReload: true
 			}
@@ -14,56 +16,57 @@ define(['$', 'template', 'IScroll',  'native', 'config', 'user', 'product'], fun
 	}
 
 	return {
-		title: '双十一活动',
+		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);
 			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=moonclub/reserve/xyhIm';
-			}, $view);
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
 			$doc.trigger('spa:openloader');
 			if (!pageData.pushData.dontNeedReload) {
-				var tpl = template('month/two', {
-					showNavBar: !config.isWX,
-					title:"至悦套餐"
-				});
-				$('.spa-page-body', $view).html(tpl);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#monthTwoScroll');
-				}, 500);
 				$doc.trigger('spa:closeloader');
-				dtd.resolve();
+				var tmpData = {
+					showNavBar: !config.isWX && !config.isChubao
+				};
+				var tpl = template('month/two', tmpData);
+
+				$('.spa-page-body', $view).html(tpl);
+
 			}
+
 			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			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/tpl/MyOrder/index.html

@@ -0,0 +1,16 @@
+{{ 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="MyOrderScroll" style="background: #efeff4;">
+    <div class="page-content">
+        <div style="width: 90%;margin: 30px auto;color: #d3d3d3;font-size: 2rem;text-align: center;">
+            暂无订单信息
+        </div>
+    </div>
+</div>

www/webapp/moonclub/tpl/month/four.html

@@ -6,18 +6,10 @@
 	<h1 class="title">{{title}}</h1>
 </header>
 {{ /if }}
+<div class="content" id="monthOneScroll" style="background: #efeff4;">
+	<div class="page-content">
+		<img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E5%B0%8A.jpg" style="width: 100%;margin-bottom: 35px;">
 
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
-				<div class="scroller">
-					<img
-						src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E5%B0%8A.jpg"
-						style="width: 100%;margin-bottom: 15px;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
 	</div>
+	<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 </div>

www/webapp/moonclub/tpl/month/one.html

@@ -7,17 +7,10 @@
 </header>
 {{ /if }}
 
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
-				<div class="scroller">
-					<img
-						src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%83%A0.jpg"
-						style="width: 100%;margin-bottom: 15px;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
+<div class="content" id="monthOneScroll" style="background: #efeff4;">
+	<div class="page-content">
+		<img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%83%A0.jpg" style="width: 100%;margin-bottom: 35px;">
+
 	</div>
+	<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 </div>

www/webapp/moonclub/tpl/month/three.html

@@ -7,17 +7,10 @@
 </header>
 {{ /if }}
 
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
-				<div class="scroller">
-					<img
-						src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E4%BA%AB.jpg"
-						style="width: 100%;margin-bottom: 15px;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
+<div class="content" id="monthOneScroll" style="background: #efeff4;">
+	<div class="page-content">
+		<img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E4%BA%AB.jpg" style="width: 100%;margin-bottom: 35px;">
+
 	</div>
-</div>
+	<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
+</div>

www/webapp/moonclub/tpl/month/two.html

@@ -7,17 +7,10 @@
 </header>
 {{ /if }}
 
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background:#7f6b8e;">
-				<div class="scroller">
-					<img
-						src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%82%A6.jpg"
-						style="width: 100%;margin-bottom: 15px;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
+<div class="content" id="monthOneScroll" style="background: #efeff4;">
+	<div class="page-content">
+		<img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%82%A6.jpg" style="width: 100%;margin-bottom: 35px;">
+
 	</div>
+	<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 </div>