浏览代码

Merge branch 'ctt_dev' into dev

dev
chutingting 1年前
父节点
当前提交
bd7fb0d798
共有 4 个文件被更改,包括 139 次插入24 次删除
  1. +25
    -1
      src/apis/my.js
  2. +64
    -6
      src/views/my/coindeduc.vue
  3. +0
    -11
      src/views/my/detail.vue
  4. +50
    -6
      src/views/my/recharge.vue

+ 25
- 1
src/apis/my.js 查看文件

@@ -2,7 +2,7 @@
* @Autor: Chutingting
* @Date: 2023-11-13 14:29:58
* @LastEditors: Chutingting
* @LastEditTime: 2023-11-14 09:41:31
* @LastEditTime: 2023-11-14 10:48:23
* @Description:
*/
import request from "@/utils/request.js";
@@ -54,4 +54,28 @@ export function getUserPoinsApi() {
url: `/api/user/getUserPoins`,
method: 'get'
})
}

/**
* @description 充值订单详情
* @params
* @returns
*/
export function findByNumberApi(orderNumber) {
return request({
url: `/api/productOrder/findByNumber?orderNumber=${orderNumber}`,
method: 'get'
})
}

/**
* @description 扣币订单详情
* @params
* @returns
*/
export function findByIdApi(id) {
return request({
url: `/api/userVideo/findById?id=${id}`,
method: 'get'
})
}

+ 64
- 6
src/views/my/coindeduc.vue 查看文件

@@ -14,6 +14,16 @@
label="视频地址"
align="center"
/>
<el-table-column
prop="videoTime"
label="视频时长"
align="center"
/>
<el-table-column
prop="costPoints"
label="扣币数量"
align="center"
/>
<el-table-column
prop="createTime"
label="创建时间"
@@ -29,7 +39,7 @@
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small">查看</el-button>
<el-button link type="primary" size="small" @click="detailView(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -48,8 +58,43 @@
@current-change="handleCurrentChange"
/>
</div>
<el-dialog v-model="dialogVisible" title="查看详情" width="40%" :before-close="handleClose" >
<detail @close="handleClose"></detail>
<el-dialog v-model="dialogVisible" title="扣币详情:" width="40%" :before-close="handleClose" >
<el-form :model="form" label-width="120px">
<el-form-item label="名称">
<el-input v-model="form.title" />
</el-form-item>
<el-form-item label="视频类型">
<el-radio-group v-model="form.videoType">
<el-radio :label="1">竖版</el-radio>
<el-radio :label="2">横版</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="文案">
<el-input v-model="form.paperwork" type="textarea" />
</el-form-item>
<el-form-item label="封面图">
<img :src="form.coverImg" alt="" style="width:100%;max-height: 200px;">
</el-form-item>
<el-form-item label="视频地址">
<el-input v-model="form.videoPlayUrl" />
<!-- <video :src="form.videoPlayUrl" style="width:100%;max-height: 300px;"></video> -->
</el-form-item>
<el-form-item label="视频时长">
<el-input v-model="form.videoTime" />
</el-form-item>
<el-form-item label="创建时间">
<el-input v-model="form.createDate" />
</el-form-item>
<el-form-item label="消耗金币">
<el-input v-model="form.costPoints" />
</el-form-item>
<el-form-item label="消耗金币明细">
<el-input v-model="form.costPointsDetail" />
</el-form-item>
<el-form-item>
<el-button @click="dialogVisible = false">关闭</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
@@ -57,9 +102,8 @@
<!-- videoType==1为竖,==2为横 -->
<script setup>
//#region 导入
import { coindedApi, getDetailApi, getUserPoinsApi } from '@/apis/my.js'
import { coindedApi, getDetailApi, getUserPoinsApi, findByIdApi } from '@/apis/my.js'
import dayjs from "dayjs";
import detail from './detail.vue'

const tableData = ref([]);

@@ -68,7 +112,7 @@ const pageSize = ref(10);
const total = ref(0);

const getDate = (val) => {
return dayjs(val).format("YYYY-MM-DD");
return dayjs(val).format("YYYY-MM-DD HH:mm:ss");
};

const handleSizeChange = (val) => {
@@ -106,6 +150,20 @@ function currentValFn() {

// 查看详情
const dialogVisible = ref(false)
const form = ref({
title: '',
videoPlayUrl: ''

})

function detailView(item) {
findByIdApi(item.id).then(res => {
res.data.createDate = getDate(res.data.createDate)
res.data.videoTime = res.data.videoTime + '(秒)'
form.value = res.data
dialogVisible.value = true
})
}

onMounted(() => {
getListData(1, 10);


+ 0
- 11
src/views/my/detail.vue 查看文件

@@ -1,11 +0,0 @@
<!--
* @Autor: Chutingting
* @Date: 2023-11-09 10:24:45
* @LastEditors: Chutingting
* @LastEditTime: 2023-11-09 15:13:05
* @Description:
-->
<template>
<div></div>
</template>
<script setup></script>

+ 50
- 6
src/views/my/recharge.vue 查看文件

@@ -14,6 +14,12 @@
label="订单号"
align="center"
/>
<el-table-column
prop="paymentStr"
label="金额"
align="center"
/>
<el-table-column
prop="createTime"
label="创建时间"
@@ -29,7 +35,7 @@
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small">查看</el-button>
<el-button link type="primary" size="small" @click="detailView(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -48,8 +54,33 @@
@current-change="handleCurrentChange"
/>
</div>
<el-dialog v-model="dialogVisible" title="查看详情" width="40%" :before-close="handleClose" >
<detail @close="handleClose"></detail>
<el-dialog v-model="dialogVisible" title="充值详情:" width="40%" >
<el-form :model="form" label-width="120px">
<el-form-item label="名称">
<el-input v-model="form.productTitle" />
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="form.orderNumber" />
</el-form-item>
<el-form-item label="支付方式">
<el-radio-group v-model="form.payVendor">
<el-radio :label="2">微信</el-radio>
<el-radio :label="4">支付宝</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="支付金额">
<el-input v-model="form.paymentStr" />
</el-form-item>
<el-form-item label="支付状态">
<el-input v-model="form.orderStatus" />
</el-form-item>
<el-form-item label="支付时间">
<el-input v-model="form.paymentTime" />
</el-form-item>
<el-form-item>
<el-button @click="dialogVisible = false">关闭</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
@@ -57,9 +88,8 @@
<!-- videoType==1为竖,==2为横 -->
<script setup>
//#region 导入
import { rechargeListApi, getDetailApi, getUserPoinsApi, coindedApi } from '@/apis/my.js'
import { rechargeListApi, getDetailApi, getUserPoinsApi, findByNumberApi } from '@/apis/my.js'
import dayjs from "dayjs";
import detail from './detail.vue'

const tableData = ref([]);

@@ -68,7 +98,7 @@ const pageSize = ref(10);
const total = ref(0);

const getDate = (val) => {
return dayjs(val).format("YYYY-MM-DD");
return dayjs(val).format("YYYY-MM-DD HH:mm:ss");
};

const handleSizeChange = (val) => {
@@ -106,6 +136,20 @@ function currentValFn() {

// 查看详情
const dialogVisible = ref(false)
const form = ref({
productTitle: '',
orderStatus:'',
paymentTime: '',
})

function detailView(item) {
findByNumberApi(item.id).then(res => {
res.data.paymentTime = getDate(res.data.paymentTime)
res.data.orderStatus = res.data.orderStatus === 3 ? '支付成功' : '支付失败'
form.value = res.data
dialogVisible.value = true
})
}

onMounted(() => {
getListData(1, 10);


正在加载...
取消
保存