pay price

www/protected/modules/o2o/controllers/OrderController.php

@@ -145,7 +145,8 @@ class  OrderController extends O2oBaseController{
         $order->price = $price;
         $order->channel = $order_channel;
         $order->counts = $counts;
-        $order->final_price = ceil($final_price*100)/100-$balance;
+        $order->final_price = ceil($final_price*100)/100;
+        $order->pay_price = $order->final_price-$balance;
         $order->address = $o2o_address;
         $order->memo = $memo;
         $order->station = $divide_station;
@@ -248,7 +249,7 @@ class  OrderController extends O2oBaseController{
             $str = isset(Yii::app()->params['o2o_service'][$product->type]['name'])?Yii::app()->params['o2o_service'][$product->type]['name']:'';
         }
         $str = isset($str)&&$str?$str:'上门';
-        $amount = ceil($order->final_price*1000)/10;
+        $amount = ceil($order->pay_price*1000)/10;
         $result = Service::factory('PayService')->Pay($pay_channel,$amount,(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');

www/protected/modules/o2o/models/ROrder.php

@@ -31,6 +31,8 @@ class ROrder extends MongoAr
 
     public $final_price;  //订单使用代金券之后的金额  如果没有使用代金券   $final_price=$price
 
+    public $pay_price;//订单最终支付的金额  price-coupons-用户要支付的余额
+
     public $coupons=array();//订单使用的代金券  数据库设计可以支持多张
     
     public $coupon_type;
@@ -152,8 +154,10 @@ class ROrder extends MongoAr
 
         $newRow['sum_price'] = 0;
         $newRow['price'] = CommonFn::get_val_if_isset($row,'price',0);
+
         $newRow['af_sum_price'] = $newRow['price'];
         $newRow['final_price'] = intval(CommonFn::get_val_if_isset($row,'final_price',0));
+        $newRow['pay_price'] = CommonFn::get_val_if_isset($row,'pay_price',$newRow['final_price']);
         $newRow['sum_price'] = $newRow['final_price'];
         $newRow['memo'] = CommonFn::get_val_if_isset($row,'memo','');
         $newRow['remark'] = CommonFn::get_val_if_isset($row,'remark','');

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,5 @@
-define(["$","template","IScroll","user","native","config","address"],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){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-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},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,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});
+<<<<<<< HEAD
+define(["$","template","IScroll","user","native","config","address"],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){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-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},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,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.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()}}});
+>>>>>>> test

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

@@ -284,6 +284,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 {