fix

src/api/index.js

@@ -205,7 +205,7 @@ export const queryList = (params) => {
     // return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&curpage=${page}&start_time=${start_time}&end_time=${end_time}&card_type=${card_type}`, 'post')
     return axios({
         method: 'post',
-        url: `${Prefix}act=merchant_order&op=list&client_type=ajax&page=50`,
+        url: `${Prefix}act=merchant_order&op=list&client_type=ajax&page=200`,
         withCredentials: true,
         headers: {
             "Content-Type": "application/x-www-form-urlencoded"

src/pages/index.vue

@@ -29,7 +29,7 @@
                 </el-menu-item> -->
                 <el-menu-item index="order" route="/">
                     <i class="el-icon-edit-outline"></i>
-                    <span style="font-size: 19px;" slot="title">订单管理</span>
+                    <span style="font-size: 19px;" slot="title">订单查询</span>
                 </el-menu-item>
                 <!-- <el-menu-item index="message" route="message">
                     <i class="el-icon-message"></i>

src/pages/phoneSubPages/phoneOrder.vue

@@ -133,6 +133,7 @@ import {
 } from "@/api";
 import { moneyType, orderState, amountConstant, timeConstant, qualityCon } from '@/utils/constants'
 import {JSONToExcelConvertor} from '@/utils/export.js'
+// import moment from 'moment';
 export default {
     name: 'phoneOrder',
     data() {
@@ -366,16 +367,19 @@ export default {
             let p = 0
             // let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
             // let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+            
            if (!this.mch_order || !this.order_sn || !this.mch_order) {
              let timeStart =  (new Date(`${y}/${m}/${d} ${hend}:${mm}:${s}`)).getTime()
             let timeEnd = (new Date(`${p}/${p}/${p} ${p}:${p}:${p}`)).getTime()
+             console.log('dataRange',timeStart,timeEnd);
             this.dataRange[0] = timeStart
             this.dataRange[1] = timeEnd
+           
            } else {
-       let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
             let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
-              this.dataRange[0] = timeStart
-
+             console.log('dataRange',timeStart,timeEnd);    
+            this.dataRange[0] = timeStart
             this.dataRange[1] = timeEnd
            }
         },

src/pages/subPages/order.vue

@@ -54,7 +54,7 @@
                 :value="item.value">
             </el-option>
         </el-select>
-        <el-select
+        <!-- <el-select
             v-model="time"
             placeholder="--充值耗时--"
             style="margin-right: 10px;margin-bottom:20px;width: 140px;"
@@ -76,13 +76,13 @@
                 :label="item.label"
                 :value="item.value">
             </el-option>
-        </el-select>
-        <p style="float: right;font-size: 13px;color: #909399;margin: 17px 576px 0 0;">仅展示一小时内订单，如需查询历史订单，请输入单号或充值号码</p>
+        </el-select> -->
+        <p style="float: right;font-size: 13px;color: #909399;margin: 17px 576px 0 0;">仅展示当天内订单，如需查询历史订单，请输入单号或充值号码</p>
         <div>
             <el-button style="margin-right:10px;margin-bottom:20px" type="primary" @click="queryList">查询</el-button>
             <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="danger" @click="onReset">重置</el-button>
             <!-- <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="warning" @click="onExport">导出</el-button> -->
-            <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="success" @click="onExcopy">复制</el-button>
+            <!-- <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="success" @click="onExcopy">复制</el-button> -->
         </div>
     </el-header>
    
@@ -105,13 +105,13 @@
         </el-table-column>
         <!-- <el-table-column align="center" prop="official_sn" label="批次号"></el-table-column> -->
         <el-table-column align="center" prop="order_sn" width="185" label="椰林单号"></el-table-column>
-        <el-table-column align="center" prop="official_sn" width="250" label="官方流水号">
+        <el-table-column prop="official_sn" width="280" label="官方流水号">
             <template slot-scope="{row}">
                 {{row.official_sn ? row.official_sn : '无'}}
             </template>
         </el-table-column>
+        <el-table-column align="center" prop="mch_amount" label="扣款" width="70"></el-table-column>
         <el-table-column align="center" prop="err_msg" label="失败原因" width="300"></el-table-column>
-        <el-table-column align="center" prop="mch_amount" label="扣款" width="70" fixed="right"></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>
@@ -128,12 +128,13 @@ import {
 } from "@/api";
 import { moneyType, orderState, amountConstant, timeConstant, qualityCon } from '@/utils/constants'
 import {JSONToExcelConvertor} from '@/utils/export.js'
+import moment from 'moment';
 export default {
     name: 'order',
     data() {
         return {
             tableData: [],
-            pageSize: 50,
+            pageSize: 200,
             pageNumber: 1,
             total: 0,
             isDisabled: false,
@@ -240,9 +241,10 @@ export default {
             }
             try {
                 let param = new URLSearchParams()
-                param.append('page', 50)
+                param.append('page', 200)
                 param.append('start_time', this.startTime)
                 param.append('end_time', this.endTime)
+                console.log('param',param);
                 const res = await getOrderList(param)
                 console.log('订单列表', res);
                 if (res && res.code == 200) {
@@ -354,7 +356,7 @@ export default {
             let d = date.getDate()
             let dEnd = date.getDate() + 1
             let h = date.getHours(); //获取系统时
-            let hend = date.getHours() - 1; //获取系统时
+            // let hend = date.getHours() - 1; //获取系统时
             let mm = date.getMinutes(); //获取系统时
             let s = date.getSeconds(); //获取系统时
             let sEnd = date.getSeconds()  + 1; //获取系统时
@@ -362,13 +364,15 @@ export default {
             // let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
             // let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
            if (!this.mch_order || !this.order_sn || !this.mch_order) {
-             let timeStart =  (new Date(`${y}/${m}/${d} ${hend}:${mm}:${s}`)).getTime()
+            //  let timeStart =  (new Date(`${y}/${m}/${d} ${hend}:${mm}:${s}`)).getTime()
             let timeEnd = (new Date(`${p}/${p}/${p} ${p}:${p}:${p}`)).getTime()
-            this.dataRange[0] = timeStart
+            this.dataRange[0] = new Date(moment(new Date()).format('YYYY-MM-DD 00:00:00')).getTime()
             this.dataRange[1] = timeEnd
+            console.log('fetchData',this.dataRange,timeEnd)
            } else {
-       let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
             let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+             console.log('fetchData',timeStart,timeEnd)
               this.dataRange[0] = timeStart
 
             this.dataRange[1] = timeEnd

src/pages/subPages/reconciliation.vue

@@ -28,6 +28,7 @@
           <el-button style="margin-left:10px;" type="primary" @click="onExportOrder">导出订单</el-button>
 
       </div>
+       <div style="font-size:16px;margin-bottom:10px;">查询结果</div>
       <el-table :data="tableData" border style="width: 100%;font-size:13px;" v-loading="isLoading">
         <el-table-column align="center" prop="count" label="订单总数" />
         <el-table-column align="center" prop="successCount" label="成功订单数" />
@@ -38,9 +39,9 @@
       </el-table>
 
       <el-divider />
-      <el-button type="primary" style="margin-bottom:10px;" @click="getExportOrderList">刷新</el-button>
+      <span style="font-size:16px;margin-right:10px;">导出订单记录</span><el-button type="primary" style="margin-bottom:10px;" @click="getExportOrderList">更新状态</el-button>
       <el-table :data="exportOrderList" border style="width: 100%;font-size:13px;" v-loading="isLoading">
-        <el-table-column align="center" prop="title" label="标题" width="550" />
+        <el-table-column align="center" prop="title" label="记录名称" width="550" />
         <el-table-column align="center" prop="state" label="状态">
           <template slot-scope="scope">
             <el-tag type="info" v-if="scope.row.state == 1">待处理</el-tag>