dujingxian 4 rokov pred
rodič
commit
f2a4acdba7

+ 8 - 19
src/pages/subPages/order.vue

@@ -7,7 +7,7 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        <el-select v-model="RechargeType" placeholder="--充值类型--" style="margin-left: 10px">
+        <el-select v-model="RechargeType" placeholder="--充值类型--" style="margin-left: 10px">
             <el-option
                 v-for="item in moneyType"
                 :key="item.value"
@@ -18,29 +18,18 @@
         <el-button style="margin-left:10px;" type="primary" @click="queryList">查询</el-button>
         <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
     </el-header>
-
-    <!-- 订单总数 -->
-    <!-- <el-alert
-        :title="'订单总数 : ' + oderCount +'笔 成功订单数 : ' + successCount + '笔 成功率 : '+ SuccessRate + '订单总金额 : '+ countMoney +'元 成功订单总金额 : '+successMoney +' 元 商户扣款 :'+deduction + '元'"
-        type="info"
-        show-icon
-        style="margin-top:20px"
-        :closable="false">
-    </el-alert> -->
    
     <el-table :data="tableData" border style="width: 100%; margin-top:20px">
         <el-table-column align="center" type="index" width="50" label="序号" />
-        <el-table-column align="center" prop="card_no" label="卡号"></el-table-column>
+        <el-table-column align="center" prop="card_no" width="160" label="卡号"></el-table-column>
         <el-table-column align="center" prop="mch_amount" label="充值金额"></el-table-column>
-        <!-- TODO -->
-        <el-table-column align="center" prop="card_type_name" label="充值类型"></el-table-column>
-        <el-table-column align="center" prop="order_time" label="充值时间"></el-table-column>
-        <el-table-column align="center" prop="notify_time" label="成功时间"></el-table-column>
+        <el-table-column align="center" prop="card_type_name" label="充值卡类型"></el-table-column>
+        <el-table-column align="center" prop="order_time" width="200" label="充值时间"></el-table-column>
+        <el-table-column align="center" prop="notify_time" width="200" label="成功时间"></el-table-column>
         <el-table-column align="center" prop="order_state_text" label="充值状态"></el-table-column>
-        <el-table-column align="center" prop="ch_trade_no" label="批次号"></el-table-column>
-        <el-table-column align="center" prop="order_sn" label="平台单号"></el-table-column>
-        <!-- TODO -->
-        <el-table-column align="center" prop="mch_order" label="客户单号"></el-table-column>
+        <!-- <el-table-column align="center" prop="ch_trade_no" label="批次号"></el-table-column> -->
+        <el-table-column align="center" prop="order_sn" width="200" label="平台单号"></el-table-column>
+        <el-table-column align="center" prop="mch_order" width="200" label="客户单号"></el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>

+ 2 - 1
src/pages/subPages/view.vue

@@ -23,7 +23,7 @@
         </el-form-item>
         <el-form-item label="ip白名单:" >
             <div v-for="(item, idx) in ipList" :key="idx">
-                <el-input style="width: 300px;margin-bottom: 10px;margin-right: 10px" v-model="item.ip"></el-input>
+                <el-input style="width: 300px;margin-bottom: 10px;margin-right: 10px;" v-model="item.ip"></el-input>
                 <i v-if="idx === 0" class="el-icon-circle-plus-outline" style="color:#409EFF;" @click="add"></i>
                 <i v-else class="el-icon-remove-outline" style="color:#F56C6C;" @click="del(idx)"></i>
             </div>
@@ -238,5 +238,6 @@ export default {
 .el-icon-circle-plus-outline,
 .el-icon-remove-outline {
     font-size: 25px;
+    vertical-align: middle;
 }
 </style>

+ 3 - 1
src/utils/constants.js

@@ -17,5 +17,7 @@ export const balanceType = [
 export const moneyType = [
   {value: 1, label: '中石油'},
   {value: 2, label: '中石化'},
-  {value: 3, label: '手机卡'}
+  {value: 4, label: '中国移动'},
+  {value: 5, label: '中国联通'},
+  {value: 6, label: '中国电信'}
 ]