Merge branch 'master' of http://rungit.jxdsy.cn:10000/taowj/ddd_display

display/displayOrder.html

@@ -288,13 +288,16 @@
                             <div class="gundon_shuju_zt" >用户订单展示</div>
                         </div>
                         <div>
-                            <ul class="ul_title">
+                            <ul class="ul_title" id="searchBar">
                                 <li class="nickname" style="width: 10%;">用户姓名</li>
                                 <li class="mobile" style="width: 10%;">手机号</li>
                                 <li class="car_plate" style="width:10%">车牌号</li>
-                                <li class="price" style="width: 10%;">订单金额</li>
-                                <li class="address" style="width: 40%;">所属区域</li>
-                                <li class="time" style="width: 10%;">创建时间</li>
+                                <li class="car_service" style="width:10%">服务类型</li>
+                                <li class="price" style="width: 5%;">订单金额</li>
+                                <li class="address" style="width: 20%;">所属区域</li>
+                                <li class="time" style="width: 15%;">创建时间</li>
+                                <li class="status" style="width: 10%;">订单状态</li>
+                                <li class="washer_nickname" style="width:10%;">技师</li>
                             </ul>
                             <ol class="ol" id="downpaly" style="background-color: #FFFFFF;">
                                 <li class="list" style="width: 100%; display: none" v-for="(item,index) in items"
@@ -302,9 +305,12 @@
                                     <div class="nickname" style="width: 10%;">{{ item.nickname}}</div>
                                     <div class="mobile" style="width: 10%;">{{ item.mobile}}</div>
                                     <div class="car_plate" style="width:10%">{{ item.car_plate}}</div>
-                                    <div class="price" style="width: 10%;">{{ item.price}}</div>
-                                    <div class="address" style="width: 40%;">{{ item.address}}</div>
-                                    <div class="time" style="width: 10%;">{{ item.time}}</div>
+                                    <div class="car_service" style="width:10%">{{ item.car_service}}</div>
+                                    <div class="price" style="width: 5%;">{{ item.price}}</div>
+                                    <div class="address" style="width: 20%;">{{ item.address}}</div>
+                                    <div class="time" style="width: 15%;">{{ item.time}}</div>
+                                    <div class="status" style="width: 10%;">{{ item.status}}</div>
+                                    <div class="washer_nickname" style="width: 10%;">{{ item.washer_nickname}}</div>
                                 </li>
                             </ol>
                         </div>  
@@ -398,13 +404,13 @@
                             that.dayamount = result['data']['dayAmount'];
                             that.daycount = result['data']['dayCount'];
                             if (max_id != '') {
-                                var i = max_id + 1;
+                                var i = max_id + 2;
                                 if (result['data']['order_list'].length > 0) {
                                     $(result['data']['order_list']).each(function (s, v) {
                                         that.items.splice(i, 0, v);
                                         i++;
                                     });
-                                    order_length = result['data']['order_list'].length + 1;
+                                    order_length = result['data']['order_list'].length + 2;
                                 }
                             } else {
                                 that.items = result['data']['order_list'];