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

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/tpl/myOrder/detail.html

@@ -68,26 +68,22 @@
               <div class="label-name">订单明细</div>
             </div>
           </li>
-          {{each order.products as product i}}
+          {{each order.products as data i}}
           <li class="table-view-cell">
             <div class="order-label">
-              <div class="label-name">{{product.name}}{{if product.count > 1}}<span class="service-count">x{{product.count}}</span>{{/if}}</div>
-              <div class="label-value">{{product.price}}元</div>
-            </div>
-          </li>
-          {{/each}}
-          {{each order.append_orders as appendProduct i}}
-          <li class="table-view-cell">
-            <div class="order-label append-order">
-              <div class="label-name">{{appendProduct.products_str}}</div>
-              <div class="label-value">{{appendProduct.price}}元</div>
+              <div class="label-name">{{data.product.name}}<span class="service-count">x{{data.product.count}}</span></div>
+              {{if data.product.price != ''}}
+              <div class="label-value">{{data.product.price}}元</div>
+              {{else}}
+              <div class="label-value">{{data.extra.price}}元</div>
+              {{/if}}
             </div>
           </li>
           {{/each}}
           <li class="table-view-cell">
             <div class="order-label">
               <div class="label-name">总价</div>
-              <div class="label-value">{{order.sum_price}}元</div>
+              <div class="label-value">{{order.pay_price}}元</div>
             </div>
           </li>
           <li class="table-view-cell">
@@ -124,9 +120,6 @@
                 {{if order.booking_time > time && order.status == 1}}
                 <a class="order-btn btn-default order-btn-refund {{if order.booking_time - time <= 7200}}btn-alert-info{{/if}}" data-order-id="{{order.id}}" data-type="{{order.products[0].type}}" data-index="{{i}}">申请退款</a>
                 {{/if}}
-                {{if order.products[0].type !== '7' && order.products[0].type !== '6'}}
-                <a class="order-btn btn-default order-btn-append" data-order-id="{{order.id}}" data-order-name="{{order.products[0].pet_types[0].name}}" data-order-price="{{order.price}}"  data-type="{{order.products[0].type}}">追加服务</a>
-                {{/if}}
                 {{if time > order.booking_time}}
                 <a class="order-btn btn-warning order-btn-done" data-order-id="{{order.id}}" data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">确认完成</a>
                 {{/if}}

www/webapp/o2o/tpl/myOrder/list.html

@@ -28,12 +28,7 @@
             {{/if}}
             <div class="order-desc-line order-service-name">
                 <span class="order-desc-title">价格</span>
-                <span class="order-desc-more">{{order.final_price.toFixed(2)}}元</span>
-                {{if order.append_orders}}
-                {{each order.append_orders as append_order i}}
-                <span class="order-append-price">&nbsp; + {{append_order.price}}元 </span>
-                {{/each}}
-                {{/if}}
+                <span class="order-desc-more">{{order.pay_price.toFixed(2)}}元</span>
             </div>
         </div>
     </li>