Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/webapp/o2o/css/month.css

@@ -1,18 +0,0 @@
-.request {
-	width: 100%;
-	position: fixed;
-	bottom: 0;
-}
-
-.request div {
-	width: 50%;
-	color: #fff;
-	line-height: 30px;
-	border-radius: 5px;
-	text-align: center;
-	float: left;
-	display: inline-block;
-	padding: 5px 35px;
-	border: 1px solid rgba(0, 0, 0, 0.11);
-	background-color: rgba(255, 182, 233, 0.83);
-}

www/webapp/o2o/dist/js/page/im.js

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user"],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){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("im/im",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#homeImScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/month/Consultation.js

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(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){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".appointment",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("month/Consultation",{showNavBar:!s.isWX,recharges:r.data,title:"至惠套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#ConsultationScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(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){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("month/four",{showNavBar:!s.isWX,recharges:r.data,title:"至尊套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthFourScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(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){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("month/one",{showNavBar:!s.isWX,recharges:r.data,title:"至惠套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthOneScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/month/three.js

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(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){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("month/three",{showNavBar:!s.isWX,recharges:r.data,title:"至享套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthThreeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/month/two.js

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(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){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/month"},r),e.newTouch(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("month/two",{showNavBar:!s.isWX,recharges:r.data,title:"至悦套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthTwoScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/model/product.js

@@ -990,22 +990,32 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%281%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81.jpg",
                         width: 750,
                         height: 585
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%282%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_01.jpg",
                         width: 730,
                         height: 522
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%283%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_02.jpg",
                         width: 730,
                         height: 791
                     },
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%284%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_03.jpg",
+                        width: 730,
+                        height: 823
+                    },
+                    {
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_04.jpg",
+                        width: 730,
+                        height: 823
+                    },
+                    {
+                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_05.jpg",
                         width: 730,
                         height: 823
                     }

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

www/webapp/o2o/js/page/home.js

@@ -1,4 +1,4 @@
-define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'address','api'], function ($, template, IScroll, product, user, native, config, address,api) {
+define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'address'], function ($, template, IScroll, product, user, native, config, address) {
 
 	/*
 	 * 先定义一些模块内用到的function
@@ -314,13 +314,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 					});
 				}, 20);
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
-				api.geteservation(user.id,function (res) {
-					console.log(res);
-					console.log("res");
-
-				});
 				product.getListAll(user.id);
-				console.log(user.id);
 				address.getList({
 					request_from: 'weixin',
 					user_id: user.id

www/webapp/o2o/js/page/im.js

@@ -1,93 +0,0 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
-
-	function back(event) {
-		event.preventDefault();
-		$(document).trigger('spa:navigate', {
-			hash: '',
-			pushData: {
-				dontNeedReload: true
-			}
-		});
-	}
-	return {
-		title: '联系我们',
-		body: '',
-		init: function (pageData, dtd) {
-			/* this是什么？ */
-			var $view = this;
-			var $doc = $(document);
-			// 返回
-			$view.on('swipeRight', function (event) {
-				history.go(-1);
-			});
-			$.newTouch('.back-button', function (event) {
-				history.go(-1);
-			}, $view);
-			$view.on('tapBackButton', function (event) {
-				//back.call(this, event);
-				history.go(-1);
-			});
-			$.newTouch('.o2o-btn-homestay',function (event) {
-				event.preventDefault();
-				window.location.href='/index.php?r=o2o/advisory/SinglesDay';
-				// console.log('测试')
-			},$view);
-			// 首页
-			$.newTouch('.btn-action-my-order', function (event) {
-				event.preventDefault();
-				user.checkLogin(function () {
-					$doc.trigger('spa:navigate', {
-						hash: '',
-						pushData: {
-							needReset: true
-						}
-					});
-				});
-			}, $view);
-			// 个人中心
-			$.newTouch('.btn-action-coupon', function (event) {
-				event.preventDefault();
-				user.checkLogin(function () {
-					$doc.trigger('spa:navigate', {
-						hash: 'mine',
-						pushData: {
-							needReset: true
-						}
-					});
-				});
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('im/im', {
-							showNavBar: !config.isWX,
-							recharges: res.data
-						});
-						$('.spa-page-body', $view).html(tpl);
-						//var value = $(this).attr('data-value');
-						var value = $('.btn-add-recharge').attr('data-index');
-						for (var i = value; i < 2; i++) {
-						}
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#homeImScroll');
-						}, 500);
-					}
-				});
-			}
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

www/webapp/o2o/js/page/month/Consultation.js

@@ -1,97 +0,0 @@
-/**
- * Created by Jinguo on 2016/12/15.
- */
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-
-	function back(event) {
-		event.preventDefault();
-		$(document).trigger('spa:navigate', {
-			hash:'',
-			pushData: {
-				dontNeedReload: true
-			}
-		});
-	}
-
-	return {
-		title: '至惠套餐',
-		body: '',
-		init: function (pageData, dtd) {
-			/* this是什么？ */
-			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);
-			});
-
-			// im
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
-			}, $view);
-
-			// 首页
-			$.newTouch('.btn-action-my-order', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: '',
-					pushData: {
-						needReset: true
-					}
-				});
-			}, $view);
-			// 预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: '',
-					pushData: {
-						needReset: true
-					}
-				});
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('month/Consultation', {
-							showNavBar: !config.isWX,
-							recharges: res.data,
-							title:"至惠套餐"
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#ConsultationScroll');
-						}, 500);
-					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

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

@@ -1,76 +0,0 @@
-/**
- * Created by Jinguo on 2016/12/15.
- */
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-
-	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);
-			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/month';
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('month/four', {
-							showNavBar: !config.isWX,
-							recharges: res.data,
-							title:"至尊套餐"
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#monthFourScroll');
-						}, 500);
-					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

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

@@ -1,73 +0,0 @@
-/**
- * Created by Jinguo on 2016/12/15.
- */
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-	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);
-			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/month';
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('month/one', {
-							showNavBar: !config.isWX,
-							recharges: res.data,
-							title: "至惠套餐"
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#monthOneScroll');
-						}, 500);
-					}
-				});
-			}
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

www/webapp/o2o/js/page/month/three.js

@@ -1,76 +0,0 @@
-/**
- * Created by Jinguo on 2016/12/15.
- */
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-
-	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);
-			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/month';
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('month/three', {
-							showNavBar: !config.isWX,
-							recharges: res.data,
-							title:"至享套餐"
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#monthThreeScroll');
-						}, 500);
-					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

www/webapp/o2o/js/page/month/two.js

@@ -1,76 +0,0 @@
-/**
- * Created by Jinguo on 2016/12/15.
- */
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-
-	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);
-			});
-			//预约
-			$.newTouch('.appointment', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/month';
-			}, $view);
-			// 咨询
-			$.newTouch('.im', function (event) {
-				event.preventDefault();
-				console.log("测试");
-				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
-			}, $view);
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('month/two', {
-							showNavBar: !config.isWX,
-							recharges: res.data,
-							title:"至悦套餐"
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#monthTwoScroll');
-						}, 500);
-					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

www/webapp/o2o/js/page/myCoupon.js

@@ -97,7 +97,7 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
                             overtime_coupons: user.overtime_coupons
                         });
                         $('.spa-page-body', $view).html(tpl);
-                        // fixScroll(pageData);
+                        fixScroll(pageData);
                     } else {
                         $doc.trigger('spa:openpanel', ['simpleAlert', {
                             message: res.message

www/webapp/o2o/js/page/placeOrder.js

@@ -16,7 +16,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
     var product;
     var backHash;
     /* 软键盘弹出与消失时布局变动。 */
-    /*function checkScroll(pageData, callback) {
+    function checkScroll(pageData, callback) {
         if (pageData.scroll) {
             if (!pageData.scrollHeight) {
                 pageData.scrollHeight = 0;
@@ -34,7 +34,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 clearInterval(pageData.scrollCheck);
             }, 500);
         }
-    }*/
+    }
 
     /* 返回上一级 */
     function back(event) {
@@ -924,7 +924,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 payCharge($('.order-cost', $view));
 
                 /* 软键盘相关操作时对IScroll的补偿 */
-                // fixScroll(pageData);
+                fixScroll(pageData);
                 $('.order-memo', $view).focus(function (event) {
                     var that = this;
                     checkScroll(pageData, function () {
@@ -934,11 +934,11 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                     });
                 });
                 $('.order-memo', $view).on('closeKeyboard', function (event) {
-                    // checkScroll(pageData);
+                    checkScroll(pageData);
                     $(this).blur();
                 });
                 $('.order-memo', $view).blur(function (event) {
-                    // checkScroll(pageData);
+                    checkScroll(pageData);
                 });
 
                 /* 填写备注时，提交按钮失焦 */

www/webapp/o2o/tpl/homeenterprise/index.html

@@ -14,18 +14,23 @@
 				<div class="scroller">
 					<div class="home-stay-content">
 						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%281%29.jpg"
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81.jpg"
 							style="width: 100%;display: block;"><img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%282%29.jpg"
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_01.jpg"
 							style="width: 100%;display: block;">
 						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%283%29.jpg"
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_02.jpg"
 							style="width: 100%;display: block;">
 						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF%20%284%29.jpg"
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_03.jpg"
 							style="width: 100%;display: block;">
-
-						<div style="padding-bottom:10%;"></div>
+						<img
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_04.jpg"
+							style="width: 100%;display: block;">
+						<img
+							src="http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_05.jpg"
+							style="width: 100%;display: block;">
+												<div style="padding-bottom:10%;"></div>
 					</div>
 				</div>
 				<div class="prevent-scroll">

www/webapp/o2o/tpl/month/Consultation.html

@@ -1,24 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">{{title}}</h1>
-</header>
-{{ /if }}
-
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="ConsultationScroll" class="scroll-container box-flex-1" style="background: #dadada;">
-				<div class="scroller">
-					<img
-						src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
-						style="width: 100%;">
-					<!--<div style="width: 100%;padding-bottom:15%; "></div>-->
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
-	</div>
-</div>

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

@@ -1,23 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">{{title}}</h1>
-</header>
-{{ /if }}
-
-<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/52%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
-						style="width: 100%;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
-	</div>
-</div>

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

@@ -1,23 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">{{title}}</h1>
-</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/26%E5%A4%A9%E8%87%B3%E6%83%A0%E5%8E%8B%E7%BC%A9.jpg"
-						style="width: 100%;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
-	</div>
-</div>

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

@@ -1,23 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">{{title}}</h1>
-</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/42%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
-						style="width: 100%;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
-	</div>
-</div>

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

@@ -1,23 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">{{title}}</h1>
-</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/26%E5%A4%A9-%E8%87%B3%E6%82%A6%E5%8E%8B%E7%BC%A9.jpg"
-						style="width: 100%;">
-				</div>
-				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
-			</div>
-		</div>
-	</div>
-</div>