我的订单 显示价格pay_price

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>