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

www/webapp/o2o/css/placeOrder.css

@@ -205,6 +205,7 @@
   height: 6rem;
   background-repeat: no-repeat;
   background-size: cover;
+    padding: 30%!important;
 }
 .spa-page-place-order .product-pic::after {
   color: #fff;
@@ -270,7 +271,7 @@
   background-size: 60%;
 }
 .main-service {
-  padding: 8px;
+  padding: 5px;
   font-size: 0;
   background-color: #fff;
   margin-bottom: 15px;
@@ -322,8 +323,8 @@
   width: 100%;
   border-color: #f5f5f5;
   background-color: #f5f5f5;
-  padding: 10px 8px 10px;
-  font-size: 0.9rem;
+  padding: 5px 0;
+  font-size: 0.7rem;
   border-radius: 10px;
   border-width: 2px;
   transition-duration: 0s;
@@ -335,7 +336,7 @@
 .main-service .btn.on {
   background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0i5Zu+5bGCXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSI2IC03IDI4IDI4IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDYgLTcgMjggMjg7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+DQoJLnN0MHtmaWxsOiM4QkMzNEE7fQ0KPC9zdHlsZT4NCjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik02LjEsMjFoMjAuOGMzLjgsMCw3LjEtMy4xLDcuMS03Vi03TDYuMSwyMXogTTMyLDguN0wyMi44LDE4bC02LTUuOUwxOSwxMGwzLjgsMy45bDcuMy03LjVMMzIsOC40VjguN3oiLz4NCjwvc3ZnPg0K);
   background-repeat: no-repeat;
-  background-size: 28px 28px;
+  background-size: 25px 25px;
   background-position: right bottom;
   border-color: #8bc34a;
   color: #404040;

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

@@ -1 +1 @@
-define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(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){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mineScroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(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){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{needReload:!0}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mineScroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -293,6 +293,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                                 order.set('stationID', station, true);
 
                                 var addressStr = '';
+                                console.log(order.address.address.poi);
                                 if (order.address.address.poi) {
                                     addressStr = order.address.address.city + order.address.address.area + order.address.address.poi.name + order.address.address.detail
                                 } else {