Merge branch 'feature/v1/plb' into 'master'

新增添加

See merge request !14

src/views/orderManagement/order/index.vue

@@ -32,14 +32,55 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单状态" prop="orderSn">
-        <el-select
-          v-model="queryParams.value"
-          placeholder="请选择"
-          clearable=""
-        >
+      <el-form-item label="当前状态" prop="orderSn">
+        <el-select v-model="queryParams.value" placeholder="全部" clearable="">
+          <el-option
+            v-for="item in [
+              {
+                label: '已发布',
+                value: '0',
+              },
+              {
+                label: '已接单',
+                value: '1',
+              },
+              {
+                label: '已完成',
+                value: '2',
+              },
+              {
+                label: '退款中',
+                value: '3',
+              },
+              {
+                label: '已退款',
+                value: '4',
+              },
+              {
+                label: '进行中',
+                value: '6',
+              },
+            ]"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单类型" prop="orderSn">
+        <el-select v-model="queryParams.value" placeholder="全部" clearable="">
           <el-option
-            v-for="item in []"
+            v-for="item in [
+              {
+                label: '小程序',
+                value: '0',
+              },
+              {
+                label: '美团',
+                value: '1',
+              },
+            ]"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -409,7 +450,16 @@
                 style="width: 270px"
               >
                 <el-option
-                  v-for="item in []"
+                  v-for="item in [
+                    {
+                      label: '小程序',
+                      value: '0',
+                    },
+                    {
+                      label: '美团',
+                      value: '1',
+                    },
+                  ]"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"