历史记录

src/views/audit/bean/beanAudit.vue

@@ -37,7 +37,11 @@
     </div>
 
     <el-table :data="tableData" height="540px" @sort-change="handleSortChange">
-      <el-table-column prop="id" label="序号" width="80" />
+      <el-table-column type="index" label="序号" width="80">
+        <template #default="scope">
+          {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
+        </template>
+      </el-table-column>
       <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
       <el-table-column prop="jwcode" label="精网号" width="120" />
       <el-table-column prop="market" label="所属地区" width="120" />

src/views/consume/gold/addCoinConsume.vue

@@ -365,7 +365,7 @@ const ConsumeDialogVisibleCancel = () => {
 };
 // 实际执行充值操作
 const proceedWithConsume = () => {
-  ElMessageBox.confirm('确认充值？')
+  ElMessageBox.confirm('确认购买?')
       .then(() => {
         add();
         console.log('添加成功');
@@ -735,7 +735,7 @@ onMounted(async function () {
       <template #footer>
         <div class="dialog-footer-center">
           <el-button @click="ConsumeDialogVisibleCancel">取 消</el-button>
-          <el-button type="primary" @click="ConsumeDialogVisibleContinue">确认充值</el-button>
+          <el-button type="primary" @click="ConsumeDialogVisibleContinue">确认购买</el-button>
         </div>
       </template>
     </el-dialog>

src/views/history/history.vue

@@ -7,34 +7,37 @@
         <el-text size="large">姓名：</el-text>
         <el-input v-model="searchObj.name" placeholder="请输入姓名" style="width: 12vw;margin-right:1vw"
             clearable></el-input>
+
         <el-text size="large">精网号：</el-text>
         <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
             clearable></el-input>
+
         <el-text size="large" style="width: 80px">充值时间：</el-text>
-        <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
-            end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" @change="handleDatePickerChange"  :default-time="defaultTime"/>
+        <el-date-picker v-model="dateRange" type="datetimerange" :default-time="defaultTime" range-separator="至"
+            start-placeholder="开始时间" end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" />
+
         <el-button type="success" @click="resetSearch">重置</el-button>
         <el-button type="primary" v-if="activeName == 'new'" @click="get">查询</el-button>
         <el-button type="primary" v-else-if="activeName == 'old'" @click="getOld">查询</el-button>
     </el-card>
-    <el-card style="margin-top:10px">
+
+    <el-card style="margin-top:10px" v-show="tableData.length > 0">
         <el-table :data="tableData" style="width: 100%" height="600">
             <el-table-column type="index" label="序号" width="55" header-align="center" align="center">
                 <template #default="scope">
                     {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
                 </template>
-
             </el-table-column>
             <el-table-column prop="name" label="客户姓名" width="120" show-overflow-tooltip />
-            <el-table-column prop="jwcode" label="精网号" width="130" header-align="center" align="center"/>
+            <el-table-column prop="jwcode" label="精网号" width="120" header-align="center" align="center" />
             <el-table-column prop="num" label="数量" width="120" header-align="center" align="center" />
-            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="150" header-align="center" align="center"/>
-            <el-table-column v-if="activeName === 'new'" prop="freeGold" label="免费金币" width="120" header-align="center" align="center"/>
-            <el-table-column v-if="activeName === 'new'" prop="permanentGold" label="永久金币" width="120" header-align="center" align="center"/>
-            <el-table-column v-if="activeName === 'new'" prop="taskGold" label="任务金币" width="120" header-align="center" align="center"/>
-            <el-table-column prop="operator" label="操作人" width="130" />
+            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="120" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="freeGold" label="免费金币" width="120" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="permanentGold" label="永久金币" width="120" align="center" />
+            <el-table-column v-if="activeName === 'new'" prop="taskGold" label="任务金币" width="120" align="center" />
+            <el-table-column prop="operator" label="操作人" width="120" />
             <el-table-column prop="createTime" label="更新时间" width="200" header-align="center" align="center" />
-            <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="250" header-align="center" align="center"/>
+            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="180" align="center" />
         </el-table>
         <el-pagination background style="margin-top:20px" v-model:current-page="pagination.pageNum"
             v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
@@ -53,26 +56,21 @@ import dayjs from 'dayjs'
 const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
-
-
 const defaultTime = [
     new Date(2000, 1, 1, 0, 0, 0),
     new Date(2000, 2, 1, 23, 59, 59),
 ]
-
 const activeName = ref('new')
 const handleClick = function (tab) {
-  //resetSearch()
     activeName.value = tab.props.name
     if (tab.props.name === 'new') {
-    //selectNew()
         resetSearch()
+        pagination.value.pageNum = 1
         tableData.value = []
         console.log('新的');
-    
     } else if (tab.props.name === 'old') {
-    //selectOld()
         resetSearch()
+        pagination.value.pageNum = 1
         console.log('旧的');
         tableData.value = []
     }
@@ -93,12 +91,15 @@ const pagination = ref({
 const getOld = async function () {
     if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
         try {
-            if (searchObj.value.name || searchObj.value.jwcode) {
-                const res = await API({url:'/history/getOldHistoryRecord', 
+            if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'old') {
+                const startTime = dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const endTime = dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const res = await API({
+                    url: '/history/getOldHistoryRecord',
                     data: {
                         ...searchObj.value,
-                        startTime: dateRange.value[0],
-                        endTime: dateRange.value[1],
+                        startTime: startTime,
+                        endTime: endTime,
                         pageNum: pagination.value.pageNum,
                         pageSize: pagination.value.pageSize,
                     }
@@ -120,12 +121,15 @@ const getOld = async function () {
 const get = async function () {
     if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
         try {
-            if (searchObj.value.name || searchObj.value.jwcode) {
-                 const res = await API({url:'/history/getNewHistoryRecord', 
+            if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'new') {
+                const startTime = dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const endTime = dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+                const res = await API({
+                    url: '/history/getNewHistoryRecord',
                     data: {
                         ...searchObj.value,
-                        startTime: dateRange.value[0],
-                        endTime: dateRange.value[1],
+                        startTime: startTime,
+                        endTime: endTime,
                         pageNum: pagination.value.pageNum,
                         pageSize: pagination.value.pageSize,
                     }
@@ -141,58 +145,29 @@ const get = async function () {
         }
     }
 }
-const activeTimeRange = ref('')
 const resetSearch = function () {
     searchObj.value = {
         name: '',
         jwcode: ''
     }
     dateRange.value = []
-    //get()
-}
-const getToday = function () {
-    const today = dayjs()
-    const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = 'today'
-    get()
-}
-const getYesterday = function () {
-    const today = dayjs()
-    const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = 'yesterday'
-    get()
-}
-const get7Days = function () {
-    const today = dayjs()
-    const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = '7days'
-    get()
-}
-const handleDatePickerChange = () => {
-    activeTimeRange.value = ''
 }
 const handlePageSizeChange = function (val) {
     pagination.value.pageSize = val
+    if (activeName.value == 'new') {
         get()
+    } else if (activeName.value == 'old') {
+        getOld()
+    }
 }
 const handleCurrentChange = function (val) {
     pagination.value.pageNum = val
+    if (activeName.value == 'new') {
         get()
+    } else if (activeName.value == 'old') {
+        getOld()
+    }
 }
 </script>
 
-<style scoped>
-/* .pagination {
-    display: flex;
-    margin-top: 0.5vh;
-} */
-</style>
+<style scoped></style>

src/views/recharge/bean/beanOnlineRecharge.vue

@@ -422,7 +422,7 @@ onMounted(async function () {
                                     }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column fixed="left" prop="name" label="姓名" min-width="120" />
+                        <el-table-column fixed="left" prop="name" label="姓名" min-width="120" show-overflow-tooltip />
                         <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
                         <el-table-column prop="market" label="所属地区" min-width="100px" />
                         <el-table-column prop="orderNo" header-align="center" align="center" label="订单号"

src/views/recharge/gold/addCoinRecharge.vue

@@ -558,6 +558,10 @@ const handleAvatarSuccess = (response, file) => {
 //支付方式条目
 const payModel = [
 {
+    value: '银行转账',
+    label: '银行转账'
+  },
+  {
     value: '现金',
     label: '现金'
   },
@@ -570,8 +574,32 @@ const payModel = [
     label: '刷卡'
   },
   {
-    value: '其他(各地区电子支付)',
-    label: '其他(各地区电子支付)'
+    value: 'Grabpay',
+    label: 'Grabpay'
+  },
+  {
+    value: 'Nets',
+    label: 'Nets'
+  },
+  {
+    value: 'PayPal',
+    label: 'PayPal'
+  },
+  {
+    value: 'Stripe-链接收款',
+    label: 'Stripe-链接收款'
+  },
+  {
+    value: 'Ipay88-链接收款',
+    label: 'Ipay88-链接收款'
+  },
+  {
+    value: 'PaymentAsia-链接收款',
+    label: 'PaymentAsia-链接收款'
+  },
+  {
+    value: '其他',
+    label: '其他'
   }
 ]
 
@@ -642,13 +670,14 @@ onMounted(() => {
       </el-form-item>
       <el-form-item prop="permanentGold" label="永久金币">
         <el-input v-model="recharge.permanentGold" placeholder="0" style="width: 100px"/>
-        <p>个</p>
+        <p>&nbsp;个</p>
 
       </el-form-item>
       <el-form-item prop="freeGold" label="免费金币">
 
         <el-input v-model="recharge.freeGold" placeholder="0" style="width: 100px"/>
-        <p>个</p>
+        <p>&nbsp;个</p>
+
       </el-form-item>
       <!-- <el-form-item label="充值金额">
       <el-select