交易订单

src/utils/position.js

@@ -76,7 +76,6 @@ export const getDictValueWithLabel = (dict, value, valueKey = 'value', labelKey
   getDict(dict).then(({ data }) => {
     if (!data || !data.length) return
     const obj = data.find(e => e[valueKey] === value)
-    console.log(obj, 'obj')
     if (!obj) return
     result = obj[labelKey]
   })

src/views/integral/pointsManagement/index.vue

@@ -7,7 +7,6 @@
       <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
         <v-tab :value="0">{{ $t('points.pointsDetails') }}</v-tab>
         <v-tab :value="1">{{ $t('points.balanceDetails') }}</v-tab>
-        <v-tab :value="2">支付订单明细</v-tab>
       </v-tabs>
       <CtTable
         class="mt-3"
@@ -66,14 +65,14 @@ const balanceHeaders = [
   { title: '发生时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false },
 ]
 
-const orderHeaders = [
-  { title: '充值时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false },
-  { title: '充值金额', key: 'price', sortable: false },
-  { title: '支付方式', key: 'type', sortable: false },
-  { title: '充值状态', key: 'status', sortable: false }
-]
+// const orderHeaders = [
+//   { title: '充值时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false },
+//   { title: '充值金额', key: 'price', sortable: false },
+//   { title: '支付方式', key: 'type', sortable: false },
+//   { title: '充值状态', key: 'status', sortable: false }
+// ]
 
-const headers = ref([integralHeaders, balanceHeaders, orderHeaders])
+const headers = ref([integralHeaders, balanceHeaders])
 
 // 积分、签到明细
 const getData = async () => {

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

@@ -25,28 +25,39 @@
 defineOptions({name: 'enterprise-memberCenter-tradingOrder'})
 import { getEnterpriseTradeOrderPage } from '@/api/recruit/enterprise/member/points'
 import { ref } from 'vue'
+import { timesTampChange } from '@/utils/date'
+import { getDict } from '@/hooks/web/useDictionaries'
 
 const tab = ref(0)
 const total = ref(0)
 const query = ref({
   pageNo: 1,
-  pageSize: 10,
-  type: 0 // 0积分 1余额
+  pageSize: 10
 })
 const dataList = ref([])
 
-const integralHeaders = [
-  { title: '标题', key: 'title', sortable: false },
-  { title: '描述', key: 'description', sortable: false },
-  { title: '积分点', key: 'point', sortable: false },
-  { title: '剩余点数', key: 'totalPoint', sortable: false },
-  // { title: '发生时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false },
-]
-// const balanceHeaders = [
-//   { title: '标题', key: 'title', sortable: false },
-// ]
+// 支付渠道
+const channelData = ref([])
+const getPayChannelCode = async () => {
+  const { data } = await getDict('pay_channel_code')
+  channelData.value = data
+}
+getPayChannelCode()
+
+
+const orderHeaders = ref([
+  { title: '商品名称', key: 'spuName', sortable: false },
+  { title: '价格', key: 'price', sortable: false },
+  { title: '是否已支付', key: 'payStatus', sortable: false, value: item => item.payStatus ? '已支付' : '未支付' },
+  { title: '支付订单编号', key: 'payOrderId', sortable: false },
+  { title: '支付渠道', key: 'payChannelCode', value: item => channelData.value.find(e => e.value === item.payChannelCode)?.label, sortable: false },
+  { title: '订单支付时间', key: 'payTime', value: item =>  timesTampChange(item.payTime), sortable: false },
+  { title: '退款订单编号', key: 'payReFundId', sortable: false },
+  { title: '退款金额', key: 'refundPrice', sortable: false },
+  { title: '退款时间', key: 'refundTime', value: item =>  timesTampChange(item.refundTime), sortable: false },
+  { title: '发生时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false },
+])
 
-// 积分、签到明细
 const getData = async () => {
   const res = await getEnterpriseTradeOrderPage(query.value)
   dataList.value = res.list
@@ -66,7 +77,7 @@ const handleChangeTab = () => {
   getData()
 }
 
-const headers = ref([integralHeaders])
+const headers = ref([orderHeaders.value])
 </script>
 <style lang="scss" scoped>
 </style>