Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -21,7 +21,7 @@ var orderList = new Vue({
             sendOutStatus: '',//发货状态
             payStatus:'',//结算状态
             shopOrderNo:'',//订单编号
-            name: '',//买家名称
+            shouHuoRen: '',//收货人
         },
          pageInput: '1',
          listRecord: 0,

src/main/resources/templates/supplier-center/order/list.html

@@ -30,7 +30,7 @@
                 <div class="new-s-item">
                         <form action="">
                             <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入订单编号"></div>
-                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
+                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.shouHuoRen" class="Buyer" placeholder="请输入买家名称"> </div>
                             <div>
                                 结算状态：
                                 <select name="" id="settlement-status" class="state" @change="getpayStatus($event)">