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

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

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){var n=e.pushData;a=n.backHash?n.backHash:"",t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".secondary-img",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"longOrder",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){var n=e.pushData;a=n.backHash?n.backHash:"",t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -1304,12 +1304,20 @@ define(['base', '$', 'api'], function (base, $, api) {
 		        type_str: "长期订",
 		        extra: [
 			        {
-				        type: "3张兑换券",
-				        price: "270"
+				        type: "3张（2小时/人）",
+				        price: "32"
 			        },
 			        {
-				        type: "6张兑换券",
-				        price: "270"
+				        type: "3张（3小时/人）",
+				        price: "33"
+			        },
+			        {
+				        type: "6张（2小时/人）",
+				        price: "62"
+			        },
+			        {
+				        type: "6张（3小时/人）",
+				        price: "63"
 			        }
 		        ],
 		        action_user: "",

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 = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

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

@@ -79,23 +79,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 					}
 				});
 			}, $view);
-			/* 点击产品列表的某一项 */
-			$.newTouch('.btn-appliances', function (event) {
-				event.preventDefault();
-				// var type = 4;
-				var type = parseInt($(this).attr('data-product-type'));
-				/*
-				 * 这个写法是SPA路由框架规定的。
-				 * $(selector).trigger(event, params)是jQuery的：触发被选元素上的指定事件
-				 */
-				$doc.trigger('spa:navigate', {
-					hash: 'placeOrder',
-					pushData: {
-						product: product.allList[type - 1],
-						needReset: true
-					}
-				});
-			}, $view);
+
 			/* 点击标签
 			 $.newTouch('.btn-product-group', function (event) {
 			 event.preventDefault();

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

@@ -832,7 +832,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 							$doc.trigger('spa:navigate', {
 								hash: 'paySuccess'
 							});
-
 						} else {
 							$doc.trigger('spa:navigate', {
 								hash: 'pay',

www/webapp/o2o/js/page/secondary.js

@@ -46,8 +46,8 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 			$view.on('tapBackButton', function (event) {
 				back.call(this, event);
 			});
-			/*长期订入口-。.secondary-img/*/
-			/*$.newTouch('.secondary-img', function (event) {
+			/*长期订入口-。.secondary-img*/
+			$.newTouch('.secondary-img', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 					hash: 'longOrder',
@@ -56,7 +56,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 						backHash: 'secondary'
 					}
 				});
-			}, $view);*/
+			}, $view);
 			/*活动入口*/
 			$.newTouch('.Long-term-set', function (event) {
 				event.preventDefault();

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

@@ -15,7 +15,7 @@
                     <div class="">
                         <ul class="table-view product-pic-o2o">
                             <li id="product-pic-bg">
-                                <img class="lazy" src="{{imgSrc}}" style="width: 100%;" alt="">
+                                <img class="lazy product-pic-o2o" src="{{imgSrc}}" style="width: 100%;" alt="">
                                 <div class="product-img"></div>
                             </li>
                         </ul>