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

www/webapp/framework/ratchet-2.0.2/dist/css/ratchet.css

@@ -372,7 +372,7 @@ p {
   cursor: pointer;
   background-color: white;
   border: 1px solid #ccc;
-  border-radius: 3px;
+  border-radius: 0;
 }
 .btn:active, .btn.active {
   color: inherit;

www/webapp/o2o/css/common.css

@@ -184,7 +184,7 @@ ul, li {
 .coupon-form #coupon-code {
     display: table-cell;
     width: 100%;
-    border-radius: 10px;
+    border-radius: 0;
     border: 1px solid #cad1db;
     /*position: absolute;
     left: 10px;
@@ -198,7 +198,7 @@ ul, li {
     width: 90px;
     height: 42px;
     border: none;
-    border-radius: 10px;
+    border-radius: 0;
     background-color: rgba(146,118,3,1);
     box-shadow: inset 0px -1px 4px 0px rgba(0, 0, 0, 0.2);
     position: absolute;
@@ -232,7 +232,7 @@ ul, li {
 }
 
 .coupon-card {
-    border-radius: 8px;
+    border-radius: 0px;
 }
 
 .coupon-line {

www/webapp/o2o/css/myOrder.css

@@ -6,7 +6,8 @@
 
 .spa-page-my-order .order-type-control .control-item {
   padding: 0;
-  line-height: 30px;
+  line-height: 50px;
+  font-size: 1.2rem;
 }
 .spa-page-my-order .order-desc-line {
   font-size: 0;
@@ -73,7 +74,7 @@
   /*color: white;*/
   text-align: center;
   vertical-align: top;
-  border-radius: 3px;
+  border-radius: 0px;
   margin-left: 0.9rem;
 }
 .spa-page-my-order .order-btn.order-btn-review {

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

@@ -1 +1 @@
-define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},o),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"myCoupon"})},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll");var e=new Swiper(".swiper-container",{autoplay:2500,pagination:".swiper-pagination",paginationClickable:!0})},500),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});
+define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},o),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll");var e=new Swiper(".swiper-container",{autoplay:2500,pagination:".swiper-pagination",paginationClickable:!0,simulateTouch:!1})},500),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});

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

@@ -1 +1 @@
-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:"mine",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),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("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+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 i=this,s=e(document);i.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},i),i.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),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("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -489,7 +489,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57e0dffc9f5160dd048b4568",
                 name: "日常清洁",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_%E5%B9%BF%E5%91%8A%E4%BD%8D.png',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
                 status: 1,
                 is_extra: 0,
@@ -539,7 +539,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_%E5%B9%BF%E5%91%8A%E4%BD%8D.png",
+                        url: "http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
                         width: 537,
                         height: 537
                     },
@@ -588,7 +588,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57e0e0189f5160dc048b4568",
                 name: "深度清洁",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/2%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_sd.jpg"}, {content: "深度清洁"}],
                 status: 1,
                 is_extra: 0,
@@ -618,7 +618,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/2%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
                         width: 750,
                         height: 585
                     },
@@ -667,7 +667,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57e0e0369f5160b1048b456b",
                 name: "除螨杀菌",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_%E5%B9%BF%E5%91%8A%E4%BD%8D%28720+585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/3%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: 'http://odqeoyzxd.bkt.clouddn.com/image/image_etsj.jpg'}, {content: "除螨杀菌"}],
                 status: 1,
                 is_extra: 0,
@@ -697,7 +697,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_%E5%B9%BF%E5%91%8A%E4%BD%8D%28720+585%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/3%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg",
                         width: 720,
                         height: 585
                     },
@@ -721,7 +721,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "57e0e04e9f5160af048b456b",
                 name: "家电清洗",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_%E5%B9%BF%E5%91%8A%E4%BD%8D%28720x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
                 status: 1,
                 is_extra: 0,
@@ -763,7 +763,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_%E5%B9%BF%E5%91%8A%E4%BD%8D%28720x585%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg",
                         width: 720,
                         height: 585
                     },
@@ -813,7 +813,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 id: "57e0e0879f5160b8048b4571",
                 price: "8",
                 name: "新居开荒-每平米",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%28750x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/5%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '新居开荒'}],
                 status: 1,
                 is_extra: 0,
@@ -825,7 +825,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%28750x585%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/5%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg",
                         width: 750,
                         height: 585
                     },
@@ -890,7 +890,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 id: "57fb4a909f5160b2048b4a0e",
                 price: "10",
                 name: "擦玻璃-每平米",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/6%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE2.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_kh.jpg"}, {content: '擦玻璃'}],
                 status: 1,
                 is_extra: 0,
@@ -902,7 +902,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_01%28720+560%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/6%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE2.jpg",
                         width: 720,
                         height: 560
                     },
@@ -972,7 +972,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 id: "57e3a5a49f5160c9048b457c",
                 price: "",
                 name: "母婴房清洁",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/7%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://7oxep6.com2.z0.glb.clouddn.com/0e287e871c3831474536840941.jpg"}, {content: '母婴房清洁'}],
                 status: 1,
                 is_extra: 0,
@@ -994,7 +994,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/7%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
                         width: 750,
                         height: 585
                     },
@@ -1033,7 +1033,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             {
                 id: "58085f4b9f5160a9048b490e",
                 name: "租房大扫除",
-                imgSrc: 'http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4_%E5%B9%BF%E5%91%8A%E4%BD%8D%28750x585%29.jpg',
+                imgSrc: 'http://odulvej8l.bkt.clouddn.com/8%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_jdqx.jpg"}, {content: "家电清洗"}],
                 status: 1,
                 is_extra: 0,
@@ -1063,7 +1063,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 action_log: "",
                 pics: [
                     {
-                        url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_01%28720x562%29.jpg",
+                        url: "http://odulvej8l.bkt.clouddn.com/8%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg",
                         width: 720,
                         height: 562
                     },
@@ -1138,12 +1138,10 @@ define(['base', '$', 'api'], function (base, $, api) {
         //列出所有的产品
         Product.prototype.getListAll = function (userID, callback) {
             var that = this;
-            console.log(callback);
             api.getProductList({
                 user_id: userID,
                 // type: type
             }, function (res) {
-                console.log("lalal");
                 if (res.success) {
                     that.productList = {};
                     var petDic = {};

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

@@ -45,8 +45,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
                 native.call('4000328170');
             }, $view);
-            //点击banner-1进入充值卡页面
-            $.newTouch('.btn-banner-recharge',function(event){
+            //点击banner-1进入充值卡页
+            $.newTouch('.btn-banner-recharge', function (event) {
                 event.preventDefault();
                 $doc.trigger('spa:navigate', {
                     hash: 'recharge',
@@ -54,14 +54,17 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                         needReload: true
                     }
                 });
-            },$view);
+            }, $view);
             //点击banner-2进入充值卡页面
-            $.newTouch('.btn-banner-coupon',function(event){
+            $.newTouch('.btn-banner-coupon', function (event) {
                 event.preventDefault();
                 $doc.trigger('spa:navigate', {
-                    hash: 'myCoupon'
+                    hash: 'myCoupon',
+                    pushData: {
+                        needReload: true
+                    }
                 });
-            },$view);
+            }, $view);
             /* 点击产品列表的某一项 */
             $.newTouch('.btn-product', function (event) {
                 event.preventDefault();
@@ -232,7 +235,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                     var swiper = new Swiper('.swiper-container', {
                         autoplay: 2500,
                         pagination: '.swiper-pagination',
-                        paginationClickable: true
+                        paginationClickable: true,
+                        simulateTouch : false
                     });
                 }, 500);
 

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

@@ -2,7 +2,7 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: 'mine',
+            hash: '',
             pushData: {
                 dontNeedReload: true
             }
@@ -29,15 +29,18 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
 
             // 返回
             $view.on('swipeRight', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             });
 
             $.newTouch('.back-button', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             }, $view);
 
             $view.on('tapBackButton', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             });
 
             // 兑换

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

@@ -251,6 +251,10 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 });
             }, $view);
 
+            /*特效*/
+            setInterval(function run() {
+                $('.product-img').fadeToggle();
+            },500);
             /* 点击选择extra。 */
             $.newTouch('.btn-main-service', function (event) {
                 /* on代表这一条的选中状态。如果已经选中了，就return。this的作用域是这一条extra。 */
@@ -774,7 +778,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 }
 
 
-
                 var payChannel = 'wx_pub';
 
                 /* 使备注输入框失去焦点，获取值 */

www/webapp/o2o/js/page/rechargee.js

@@ -3,7 +3,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: 'mine',
+            hash: '',
             pushData: {
                 dontNeedReload: true
             }
@@ -24,15 +24,18 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 
             // 返回
             $view.on('swipeRight', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             });
 
             $.newTouch('.back-button', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             }, $view);
 
             $view.on('tapBackButton', function (event) {
-                back.call(this, event);
+                //back.call(this, event);
+                history.go(-1);
             });
 
             // 点击充值

www/webapp/o2o/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "css": "node r.js -o cssIn=css/main.css out=dist/css/main.css optimizeCss=standard",
-    "js": "node r.js -o build.js"
+    "js": "node r.js -o build.js",
+    "html":"tmod tpl"
   },
   "author": "",
   "license": "ISC",

www/webapp/o2o/tpl/address/list/cell.html

@@ -23,6 +23,6 @@
 			</p>
 		</div>
 	</a>
-	<button class="btn btn-edit" data-id="{{ address.address_id }}" data-index="{{ i }}" style="background:rgba(146,118,3,1);color: rgb(233,233,216);border: 0;">编辑</button>
+	<button class="btn btn-edit" data-id="{{ address.address_id }}" data-index="{{ i }}" style="background:rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0;">编辑</button>
 </li>
 {{ /each }}

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

@@ -106,7 +106,7 @@
                     <!--LOGO-->
                     <div class="width-percent-33">
                         <div class="title-container-square">
-                            <a class="btn-home-action btn-action-logo">
+                            <a class="btn-home-action btn-action-logo" href="weixin://contacts/profile/honghaitzz">
                                 <div class="logo logo-my-logo"></div>
                             </a>
                         </div>

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

@@ -15,11 +15,9 @@
                     <div class="">
                         <ul class="table-view product-pic-o2o">
                             <li id="product-pic-bg">
-                                <!--<a class="navigate-right product-pic"
-                                   style="background-image: url({{imgSrc}});min-height: 250px;background-position: 50% 50%;">
-                                </a>-->
                                 <img src="{{imgSrc}}" style="width: 100%;" alt="">
-                                <div class="product-name" style="margin-top: -0.3rem">{{title}}详情及评价 <span>&gt;&gt;&gt;</span></div>
+                                <!--<div class="product-name">{{title}}详情及评价 <span id="hot">&gt;&gt;&gt;</span></div>-->
+                                <div class="product-img"></div>
                             </li>
                         </ul>
                         <!-- 选择extra -->
@@ -43,7 +41,7 @@
                                     <div class="service-count">
                                         <div class="btn btn-sub">-</div>
                                         <!--<span class="num">1</span>-->
-                                        <input type="text" class="input-num" style="text-align: center;padding: 0;width: 24px;height: 24px" maxlength="3" value="1"/>
+                                        <input type="text" class="input-num" style="text-align: center;padding: 0;width: 24px;height: 24px;border-radius:0;" maxlength="3" value="1"/>
                                         <div class="btn btn-add">+</div>
                                     </div>
                                 </div>
@@ -245,8 +243,8 @@
                 </div>
             </div>
             <div class="result-item btn-container prevent-scroll" style="padding-left: 15px; display: flex; justify-content: space-between; align-items: center">
-                <div style="font-size: 0.8rem">账户余额<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ {{balance}}</span></div>
-                <div style="font-size: 0.8rem">费用总计<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ 0</span></div><a class="btn btn-main btn-block btn-place">确认预约</a>
+                <!--<div style="font-size: 0.8rem">账户余额<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ {{balance}}</span></div>-->
+                <div style="font-size: 0.8rem">费用总计：<span class="order-cost" style="font-size: 0.8rem; color: #ec5330; text-align: right; display: inline">￥ 0</span></div><a class="btn btn-main btn-block btn-place">确认预约</a>
             </div>
         </div>
     </div>

www/webapp/o2o/tpl/recharge/cell.html

@@ -13,6 +13,6 @@
             </p>
         </div>
     </a>
-    <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 5px;">立即充值</button>
+    <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button>
 </li>
 {{ /each }}