fix 我的订单页面

www/webapp/o2o/js/build/template.js

@@ -1173,10 +1173,10 @@ $out+='active';
 }
 $out+='" data-order-type="2">已取消</a> </div> <div id="myOrderScroll" class="box-flex-1 scroll-container"> <div class="scroller"> <div class="page-content list-content"> </div> <div class="btn-more-container box-center more-container hide"> <a class="btn btn-block btn-more-orders" data-type="1">加载更多</a> </div> </div> </div> </div> ';
 return new String($out);
-});/*v:1*/
+});/*v:5*/
 template('myOrder/list',function($data,$filename
 /**/) {
-'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,orders=$data.orders,order=$data.order,i=$data.i,$escape=$utils.$escape,append_order=$data.append_order,time=$data.time,chubao=$data.chubao,$out='';$each(orders,function(order,i){
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,orders=$data.orders,order=$data.order,i=$data.i,$escape=$utils.$escape,append_order=$data.append_order,time=$data.time,$out='';$each(orders,function(order,i){
 $out+=' <ul class="table-view"> <li class="table-view-cell"> <span class="order-desc-title">预约时间</span> <span class="order-desc-more">';
 $out+=$escape(order.booking_time_str);
 $out+='</span> <span class="order-precedence-status">';
@@ -1226,12 +1226,6 @@ $out+='元 </span> ';
 });
 $out+=' ';
 }
-$out+=' ';
-if(order.append_orders.length){
-$out+=' <span class="order-append-price">&nbsp;=&nbsp;';
-$out+=$escape(order.sum_price);
-$out+='元</span> ';
-}
 $out+=' </div> </div> </li> ';
 if(order.status == 0){
 $out+=' <li class="table-view-cell brn-group"> &nbsp; <div class="table-cell-accessory"> <a class="order-btn btn-default order-btn-cancel" data-order-id="';
@@ -1265,18 +1259,6 @@ $out+=$escape(i);
 $out+='">申请退款</a> ';
 }
 $out+=' ';
-if(!chubao && order.products[0].type !== '7' && order.products[0].type !== '6'){
-$out+=' <a class="order-btn btn-default order-btn-append" data-order-id="';
-$out+=$escape(order.id);
-$out+='" data-order-name="';
-$out+=$escape(order.products[0].pet_types[0].name);
-$out+='" data-order-price="';
-$out+=$escape(order.price);
-$out+='" data-type="';
-$out+=$escape(order.products[0].type);
-$out+='">追加服务</a> ';
-}
-$out+=' ';
 if(time > order.booking_time){
 $out+=' <a class="order-btn btn-warning order-btn-done" data-order-id="';
 $out+=$escape(order.id);

www/webapp/o2o/js/page/myOrder.js

@@ -18,6 +18,7 @@ define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, te
         user.getOrderList(user.id, type, function (res) {
             $doc.trigger('spa:closeloader');
             if (res.success) {
+                console.log(user.orders[type].data)
                 var time = new Date().getTime();
                 var tpl = template('myOrder/list', {
                     orders: user.orders[type].data,

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

@@ -1,76 +1,75 @@
 {{each orders as order i}}
 <ul class="table-view">
-	<li class="table-view-cell">
-		<span class="order-desc-title">预约时间</span>
-		<span class="order-desc-more">{{order.booking_time_str}}</span>
-		<span class="order-precedence-status">{{if order.precedence}}(加急){{/if}}</span>
-		<div class="table-cell-accessory">
+    <li class="table-view-cell">
+        <span class="order-desc-title">预约时间</span>
+        <span class="order-desc-more">{{order.booking_time_str}}</span>
+        <span class="order-precedence-status">{{if order.precedence}}(加急){{/if}}</span>
+        <div class="table-cell-accessory">
 			<span class="order-status {{if order.status == 0}}order-status-pay{{/if}}">
         {{if order.have_comment}}已评价{{else}}{{order.status_str}}{{/if}}
       </span>
-		</div>
-	</li>
-	<li class="table-view-cell btn-order-detail" data-order-id="{{order.id}}">
-		<div>
-			<div class="order-desc-line order-number">
-				<span class="order-desc-title">编号</span><span class="order-desc-more">{{order.order_num}}</span>
-			</div>
-			<div class="order-desc-line order-service-name">
-				<span class="order-desc-title">服务</span><span class="order-desc-more">{{order.products_str}}{{if order.products[0].count > 1}}（{{order.products[0].count}}只） {{/if}}</span>
-			</div>
-      {{if order.append_orders}}
-        {{each order.append_orders as append_order i}}
-        <div class="order-desc-line order-service-name order-append">
-  				<span class="order-desc-title">追加</span><span class="order-desc-more">{{append_order.products_str}}</span>
-  			</div>
-        {{/each}}
-      {{/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}}
-        {{if order.append_orders.length}}
-        <span class="order-append-price">&nbsp;=&nbsp;{{order.sum_price}}元</span>
-        {{/if}}
-			</div>
-		</div>
-	</li>
-	{{if order.status == 0}}
-	<li class="table-view-cell brn-group">
-		&nbsp;
-		<div class="table-cell-accessory">
-			<a class="order-btn btn-default  order-btn-cancel" data-order-id="{{order.id}}" data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">取消订单</a>
-			<a class="order-btn btn-warning order-btn-pay" data-order-id="{{order.id}}" data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">立即支付</a>
-		</div>
-	</li>
-	{{ /if }}
-  {{ if order.status >= 1 && order.status <= 5}}
-	<li class="table-view-cell brn-group">
-		&nbsp;
-		<div class="table-cell-accessory">
-      {{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 !chubao && 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}}
-		</div>
-	</li>
-	{{/if}}
-	{{if order.status == 6 && !order.have_comment}}
-	<li class="table-view-cell brn-group">
-		&nbsp;
-		<div class="table-cell-accessory">
-			<a class="order-btn order-btn-review btn-main" data-order-id="{{order.id}}">立即评价</a>
-		</div>
-	</li>
-	{{/if}}
+        </div>
+    </li>
+    <li class="table-view-cell btn-order-detail" data-order-id="{{order.id}}">
+        <div>
+            <div class="order-desc-line order-number">
+                <span class="order-desc-title">编号</span><span class="order-desc-more">{{order.order_num}}</span>
+            </div>
+            <div class="order-desc-line order-service-name">
+                <span class="order-desc-title">服务</span><span class="order-desc-more">{{order.products_str}}{{if order.products[0].count > 1}}（{{order.products[0].count}}只） {{/if}}</span>
+            </div>
+            {{if order.append_orders}}
+            {{each order.append_orders as append_order i}}
+            <div class="order-desc-line order-service-name order-append">
+                <span class="order-desc-title">追加</span><span
+                    class="order-desc-more">{{append_order.products_str}}</span>
+            </div>
+            {{/each}}
+            {{/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}}
+            </div>
+        </div>
+    </li>
+    {{if order.status == 0}}
+    <li class="table-view-cell brn-group">
+        &nbsp;
+        <div class="table-cell-accessory">
+            <a class="order-btn btn-default  order-btn-cancel" data-order-id="{{order.id}}"
+               data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">取消订单</a>
+            <a class="order-btn btn-warning order-btn-pay" data-order-id="{{order.id}}"
+               data-order-name="{{order.products[0].name}}" data-order-price="{{order.price}}">立即支付</a>
+        </div>
+    </li>
+    {{ /if }}
+    {{ if order.status >= 1 && order.status <= 5}}
+    <li class="table-view-cell brn-group">
+        &nbsp;
+        <div class="table-cell-accessory">
+            {{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 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}}
+        </div>
+    </li>
+    {{/if}}
+    {{if order.status == 6 && !order.have_comment}}
+    <li class="table-view-cell brn-group">
+        &nbsp;
+        <div class="table-cell-accessory">
+            <a class="order-btn order-btn-review btn-main" data-order-id="{{order.id}}">立即评价</a>
+        </div>
+    </li>
+    {{/if}}
 </ul>
 {{/each}}