Merge branch 'bd-test' of gitee.com:cabbage_qd/web-base-admin into bd-online

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
@@ -190,18 +206,23 @@
             prop="businessTypeVal"
             :label="'交易类型'"
           />
+          <el-table-column
+            align="center"
+            prop="orderTypeVal"
+            label="订单类型"
+          />
           <el-table-column
             align="center"
             prop="businessMoney"
             :formatter="stateFormat"
-            :label="'交易金额'+`(${isLocalSymbol()})`"
+            label="交易金额"
             width="150"
           />
           <el-table-column
             align="center"
             prop="payMoney"
             :formatter="stateFormat"
-            label="实际支付金额(¥)"
+            label="实际支付金额"
             width="150"
           />
           <!-- <el-table-column align="center"
@@ -252,6 +273,18 @@
             min-width="180px"
             :label="'单据编号'"
           />
+          <el-table-column
+            align="center"
+            prop="mainAccountMoney"
+            label="主账户金额"
+            width="150"
+          />
+          <el-table-column
+            align="center"
+            prop="subAccountMoney"
+            label="子账户金额"
+            width="150"
+          />
           <el-table-column
             align="center"
             prop="time"
@@ -304,7 +337,31 @@ export default {
   data() {
     return {
       creationTime: [],
-      select: {},
+      select: {
+        orderType: ''
+      },
+      orderTypeList: [
+        {
+          value: '-1',
+          label: '充值订单'
+        },
+        {
+          value: '1',
+          label: '注册订单'
+        },
+        {
+          value: '2',
+          label: '升级订单'
+        },
+        {
+          value: '3',
+          label: '复购订单'
+        },
+        {
+          value: '10',
+          label: '重消订单'
+        }
+      ],
       // 查询参数
       queryParams: {
         pageNum: 1,