Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

src/views/financial/onlinePayDetails/index.vue

@@ -60,6 +60,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="订单类型">
+              <el-select
+                v-model="select.orderType"
+                clearable
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="item in orderTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'支付渠道'">
               <el-select
@@ -207,6 +223,11 @@
             prop="businessTypeVal"
             :label="'交易类型'"
           />
+          <el-table-column
+            align="center"
+            prop="orderTypeVal"
+            label="订单类型"
+          />
           <el-table-column
             align="center"
             prop="businessMoney"
@@ -252,7 +273,6 @@
           <el-table-column
             align="center"
             prop="businessCode"
-            min-width="180px"
             :label="'单据编号'"
           />
           <el-table-column
@@ -319,7 +339,9 @@ export default {
   data() {
     return {
       creationTime: [],
-      select: {},
+      select: {
+        orderType: ''
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -345,6 +367,28 @@ export default {
           label: '银行卡'
         }
       ],
+      orderTypeList: [
+        {
+          value: '-1',
+          label: '充值订单'
+        },
+        {
+          value: '1',
+          label: '注册订单'
+        },
+        {
+          value: '2',
+          label: '升级订单'
+        },
+        {
+          value: '3',
+          label: '复购订单'
+        },
+        {
+          value: '10',
+          label: '重消订单'
+        }
+      ],
       tradeTypeList: [],
       moren: 'onlinePayDetails',
       topList: [