Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/customerManage/customerOrder.vue

@@ -69,17 +69,17 @@
             <el-row :gutter="20">
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">订单号</span>
-                    <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号"
+                    <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
-                    <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="客人姓名"
+                    <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="客人姓名" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">出行概述</span>
-                    <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述"
+                    <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">

src/components/customerManage/myCustomerOrder.vue

@@ -69,17 +69,17 @@
             <el-row :gutter="20">
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">订单号</span>
-                    <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号"
+                    <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
-                    <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="客人姓名"
+                    <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="客人姓名" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
                     <span class="font-size-12" style="padding-right: 10px">出行概述</span>
-                    <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述"
+                    <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">

src/components/customerManage/orderList.vue

@@ -221,8 +221,8 @@
             </tr>
           </tbody>
         </template>
-<!--取消订单-->
-</table>
+    <!--取消订单-->
+    </table>
 </div>
 <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
     <customerInfoBox :CustomerId="CustomerId" />

src/components/planeTicketOrder/index.vue

@@ -434,7 +434,6 @@ export default {
             let data = res.data.data.pageData;
             this.tableData = data;
             this.msg.pageSize = res.data.data.pageSize
-            console.log(this.msg.pageSize)
             this.total = res.data.data.count;
             console.log(this.total)
           } else {