Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/api/recruit/enterprise/member/points/index.js

@@ -38,4 +38,12 @@ export const rechargeOrderCreate = async (data) => {
     url: '/app-api/pay/currency-recharge/create',
     data
   })
+}
+
+// 企业-M豆交易明细
+export const getEnterpriseCurrencyPage = async (params) => {
+  return await request.get({
+    url: '/app-api/pay/currency-transaction/page',
+    params
+  })
 }

src/views/recruit/enterprise/membershipPackage/dynamic/package.vue

@@ -11,7 +11,7 @@
       <div class="font-size-14 color-999 mt-3 periodValidity py-2">有效期：{{ val.day }}天</div>
     </div>
   </div>
-  <div v-if="!Object.keys(select).length" class="color-warning text-center mt-10 font-size-14">请选择要购买的套餐</div>
+  <div v-if="!Object.keys(select).length" class="color-warning text-center mt-15 font-size-20">请选择要购买的套餐</div>
   <div v-if="payType && payQrCodeTxt" class="code pa-5 resume-box">
     <div class="resume-header">
       <div class="resume-title">扫码支付</div>

src/views/recruit/enterprise/membershipPackage/index.vue

@@ -2,7 +2,7 @@
 <template>
   <v-card class="card-box pa-3" style="min-width: 1100px;">
     <v-tabs v-model="tab" class="mb-3" align-tabs="center" color="primary" bg-color="#f7f8fa">
-      <v-tab :value="0">会员套餐</v-tab>
+      <v-tab :value="0">职位发布套餐</v-tab>
       <v-tab :value="1">余额充值</v-tab>
     </v-tabs>
     <Package v-if="tab === 0"></Package>

src/views/recruit/enterprise/tradingOrder/components/trading/balance.vue

@@ -0,0 +1,54 @@
+<template>
+  <CtTable
+    class="mt-3"
+    :items="dataList"
+    :headers="headers"
+    :loading="false"
+    :elevation="0"
+    :isTools="false"
+    :showPage="true"
+    :total="total"
+    :page-info="query"
+    itemKey="id"
+    @pageHandleChange="handleChangePage"
+  >
+  </CtTable>
+</template>
+
+<script setup>
+defineOptions({ name: 'trading-order-balance'})
+import { ref } from 'vue'
+import { timesTampChange } from '@/utils/date'
+import { getEnterpriseCurrencyPage } from '@/api/recruit/enterprise/member/points'
+
+const dataList = ref([])
+const headers = [
+  { title: '交易类型', key: 'title', sortable: false },
+  { title: '支出M豆', key: 'price', value: item => (item.price / 100) + 'M豆', sortable: false },
+  { title: '交易后剩余M豆', key: 'balance', value: item => (item.balance / 100) + 'M豆', sortable: false },
+  { title: '交易时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false }
+]
+
+const total = ref(0)
+const query = ref({
+  pageNo: 1,
+  pageSize: 10
+})
+
+const getData = async () => {
+  dataList.value = []; total.value = 0
+  const res = await getEnterpriseCurrencyPage(query.value)
+  dataList.value = res?.list || []
+  total.value = res.total
+}
+getData()
+
+const handleChangePage = (e) => {
+  query.value.pageNo = e
+  getData()
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/recruit/enterprise/tradingOrder/index.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="white-bgc pa-3 pt-3">
     <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f7f8fa">
-      <v-tab value="tab_transaction">{{ '交易订单' }}</v-tab>
-      <v-tab value="tab_recharge">{{ '充值订单' }}</v-tab>
+      <v-tab value="tab_transaction">交易订单</v-tab>
+      <v-tab value="tab_recharge">充值订单</v-tab>
+      <v-tab value="tab_balance">M豆交易明细</v-tab>
     </v-tabs>
     <Transaction v-if="tab === 'tab_transaction'"></Transaction>
     <Recharge v-if="tab === 'tab_recharge'"></Recharge>
+    <Balance v-if="tab === 'tab_balance'"></Balance>
   </div>
 </template>
 
@@ -15,6 +17,7 @@ import { ref } from 'vue'
 import { useUserStore } from '@/store/user'
 import Transaction from './components/trading/transaction.vue'
 import Recharge from './components/trading/recharge.vue'
+import Balance from './components/trading/balance.vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()