一波优化

src/assets/css/main.less

@@ -47,6 +47,10 @@ html, body {
   .el-form-item {margin-bottom: 0}
 }
 
+.searchButton{
+  margin-top: 43px;
+}
+
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;

src/views/banner/bannerAdd.vue

@@ -94,7 +94,7 @@ export default {
       "url": this.addForm.url,
       "userName": JSON.parse(window.localStorage.getItem('userInfo')).data.userResponse.userName
      }
-    var postUrl = '/pcbanner/add/banner'
+    var postUrl = '/pcbanner/add/banner/picture'
      if (this.addForm.id) {
        postUrl = '/pcbanner/update/banner'
        params.id = this.addForm.id

src/views/cookManage/CookAdd.vue

@@ -125,6 +125,7 @@ export default {
         })
       } else {
         param.id = 0
+        param.status ? param.status = 'Y' : param.status = 'N'
         this.$axios.post('/pccook/add/cook', param).then(()=>{
           this.$message.success('新增成功')
           this.goBack()

src/views/orderList/OrderDetail.vue

@@ -90,6 +90,31 @@ export default {
     }
   },
   created () {
+//     amount: "90"
+// contactsName: null
+// contactsPhone: null
+// cook: null
+// createDate: "2019-07-02 11:46:59"
+
+// amount: "30"
+// foodName: "酱鸡腿"
+// imgUrl: "f21467425ac64f45a97375809d5275cf.png"
+// num: "1"
+// tradeId: "20190702114659"
+
+// detail: [{tradeId: "20190702114659", foodName: "酱鸡腿", num: "1", amount: "30",…}]
+// id: 166
+// message: null
+// num: "3"
+// operatorName: null
+// payType: "线下"
+// status: "DQR"
+// takeDate: null
+// tradeNo: "20190702114659"
+// type: "WM"
+// updateDate: null
+// userName: ""
+// userNo: ""
     this.getDetail()
   },
   methods: {

src/views/orderList/OrderList.vue

@@ -10,17 +10,17 @@
     <div class="order-list">
       <el-card class="box-card no-margin-card margin-bottom20">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
-          <el-col :sm="5" class="margin-bottom20">
+          <el-col :sm="4" class="margin-bottom20">
             <el-form-item label="订单号">
               <el-input v-model="formInline.orderNumber" placeholder="订单号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :sm="4" :offset="1">
+          <el-col :sm="4">
             <el-form-item label="姓名">
               <el-input v-model="formInline.name" placeholder="姓名"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :sm="10">
+          <el-col :sm="12">
             <el-form-item label="时间">
               <el-col :sm="11">
                 <el-form-item prop="date1">
@@ -44,9 +44,9 @@
               <el-option label="线下" value="线下"></el-option>
             </el-select>
           </el-form-item>-->
-          <el-col :sm="2">
+          <el-col :sm="2" :offset="1">
             <el-form-item>
-              <el-button type="primary" @click="searchList" size="small">搜索</el-button>
+              <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -54,7 +54,7 @@
       <el-card class="box-card no-margin-card">
         <div class="order_table">
           <p class="table_title padding-bottom15" style="text-align: right">
-            <el-button type="primary" plain class="btn-search" size="small">打印</el-button>
+            <!-- <el-button type="primary" plain class="btn-search" size="small">打印</el-button> -->
             <el-button type="primary" plain class="btn-search" size="small" @click="statistical">订单统计</el-button>
           </p>
           <el-table
@@ -295,6 +295,12 @@ export default {
           return '家政'
         } else if (type === 'CS') {
           return '超市'
+        } else if (type === 'CSSM') {
+          return '厨师上门'
+        } else if (type === 'BJ') {
+          return '保洁'
+        } else if (type === 'WX') {
+          return '维修'
         }
       }
     }