Skip to content

O
occloud-server
Commit 166b631d by liuliufashi
Options

update

parent 79c04df0
Showing with 124 additions and 64 deletions
web-vue-admin/src/views/goods-cabinet/components/goods/index.vue
......@@ -57,7 +57,7 @@
<div class="editor-text">
<p>1、商品描述需符合《中华人民共和国广告法》</p>
<p>
2、详情图片宽度750,高度不超过5000,每张图片最大不超过1M,图片仅支持JPG、JPEG、PNG格式。
2、详情图片宽度750,高度不超过5000,每张图片最大不超过2M,图片仅支持JPG、JPEG、PNG格式。
</p>
</div>
</a-form-item>
......
web-vue-admin/src/views/goods-cabinet/components/goodsubs/index.vue
......@@ -52,7 +52,7 @@
<div class="editor-text">
<p>1、商品描述需符合《中华人民共和国广告法》</p>
<p>
2、详情图片宽度750,高度不超过5000,每张图片最大不超过1M,图片仅支持JPG、JPEG、PNG格式。
2、详情图片宽度750,高度不超过5000,每张图片最大不超过2M,图片仅支持JPG、JPEG、PNG格式。
</p>
</div>
</a-form-item>
......@@ -66,9 +66,6 @@
{{ item.subject }}
</a-select-option>
</a-select>
<a-button type="primary" style="margin-left:20px;">
添加
</a-button>
<div class="please">请添加至少两个商品</div>
</div>
</a-form-item>
......@@ -344,7 +341,8 @@ const onSubmit = () => {
markingprice: fromData.markingprice * 100,
price: fromData.price * 100,
picurl: fromData.picurl,
sub: list.map((item: any) => { return item.label })
sub: list.map((item: any) => { return item.label }),
free:value.value
}
const data: any = await onCreateGoods(JSON.stringify(prarms))
if (data.state === 1) {
......@@ -495,12 +493,12 @@ defineExpose({
.please {
min-width: 140px;
height: 30px;
background-color: @primary-color;
color: white;
margin-left: 20px;
opacity: 0.67;
margin-left: 20px;
display: flex;
align-items: center;
padding: 5px;
}
}
</style>
......
web-vue-admin/src/views/goods-cabinet/index.vue
......@@ -16,7 +16,7 @@
</div>
</div>
<div class="goods-list" v-if="!isShowGoods">
<a-table :columns="columns" :data-source="list" :pagination="pagination" @change="tableChange">
<a-table :columns="columns" :data-source="list" :pagination="pagination" @change="tableChange" :scroll="{ y: 'calc(100vh - 300px)' }">>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'tags'">
<a-button type="primary" @click="onEdit(record)">编辑</a-button>
......@@ -143,7 +143,7 @@
<script lang="ts" setup>
import { ref, reactive, defineExpose, onMounted, watch, toRaw} from "vue";
import { LeftOutlined } from "@ant-design/icons-vue";
import { onSelectGoods, onUpdateGoods,onFindbyLikeName } from "@/api/index";
import { onSelectGoods, onUpdateGoods,onFindbyLikeName, } from "@/api/index";
import { getUid } from "@/utils/userInfo";
import { Form, message, Upload, UploadProps } from 'ant-design-vue';
import { QuillEditor } from '@vueup/vue-quill'
......
web-vue-admin/src/views/pay-info/index.vue
<template>
<div style="display: flex;margin-bottom: 20px;">
<a-input-search
v-model:value="value"
placeholder="请输入订单号"
style="width: 200px"
@search="onSearch"
/>
</div>
<div>
<div style="display: flex;margin-bottom: 20px;">
<a-input-search v-model:value="value" placeholder="请输入订单号" style="width: 200px" @search="onSearch" />
</div>
<a-table :columns="columns" :data-source="list">
<a-table :columns="columns" :data-source="list" @change="tableChange" :pagination="pagination" :scroll="{ y: 'calc(100vh - 300px)' }">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'nickname'">
<div v-if="record.nickname">
<div>{{ record.nickname }}</div>
</div>
<div v-else>
~
</div>
</template>
<template v-if="column.key === 'creator'">
<div v-if="record.creator">
<div>{{ record.creator }}</div>
</div>
<div v-else>
~
</div>
</template>
<template v-if="column.key === 'headimgurl'">
<div v-if="record.headimgurl">
<a-image :width="50" :src="record.headimgurl" />
</div>
<div v-else>
~
</div>
</template>
</template>
</a-table>
</div>
</template>
<script lang="ts" setup>
import { onMounted,ref ,defineExpose} from 'vue';
import {onFindPayInfo,onFindPayOrderid} from '@/api/index'
import { onMounted, ref, defineExpose } from 'vue';
import { onFindPayInfo, onFindPayOrderid } from '@/api/index'
import { getUid } from '@/utils/userInfo'
let list = ref<any>([])
let page = ref<any>('1')
let size = ref<any>('10')
let value = ref<any>('')
const columns = [
{
title: '商品名',
dataIndex: 'subject',
key: 'subject',
},
{
title: '订单数',
dataIndex: 'amount',
key: 'amount',
},
{
title: '订单号',
dataIndex: 'id',
key: 'id',
},
{
title: 'merchantorderid',
key: 'merchantorderid',
dataIndex: 'merchantorderid',
title: '昵称',
dataIndex: 'nickname',
key: 'nickname',
},
{
title: '手机号',
dataIndex: 'creator',
key: 'creator',
},
{
title: '头像',
dataIndex: 'headimgurl',
key: 'headimgurl',
},
{
title: '订单时间',
......@@ -46,30 +71,64 @@ const columns = [
key: 'updatetime',
},
];
const onSearch =async()=>{
const prarms ={
uid:getUid(),
orderid:value.value
}
const data:any = await onFindPayOrderid(prarms)
if(data.state === 1){
list.value=[data.data]
let list = ref<any>([])
let value = ref<any>('')
const pagination = ref({
current_page: 1,
total: 0,
defaultPageSize: 10,
showSizeChanger: true,
pageSizeOptions: ['5', '10', '15', '20'],
})
const onSearch = async () => {
// value.value = '' 搜索会报错
if (value.value !== '') {
const uid = getUid()
const prarms: any = {
page: pagination.value.current_page,
size: pagination.value.defaultPageSize,
uid
}
const data: any = await onFindPayInfo(prarms)
if (data.state === 1) {
list.value = data.data.payorder
pagination.value.total = data.data.count
}
} else {
const uid = getUid()
const prarms: any = {
page: pagination.value.current_page,
size: pagination.value.defaultPageSize,
uid
}
const data: any = await onFindPayInfo(prarms)
if (data.state === 1) {
list.value = data.data.payorder
pagination.value.total = data.data.count
}
}
}
onMounted(async()=>{
const uid =getUid()
const prarms:any = {
page:page.value,
size:size.value,
uid
}
const data:any = await onFindPayInfo(prarms)
if(data.state === 1){
list.value=data.data
const tableChange = async (e:any) => {
const uid = getUid()
const prarms: any = {
page: e.current,
size: e.pageSize,
uid
}
const data: any = await onFindPayInfo(prarms)
if (data.state === 1) {
list.value = data.data.payorder
pagination.value.total = data.data.count
}
}
onMounted(async () => {
onSearch()
})
defineExpose({
columns
columns,
pagination,
tableChange
})
</script>
\ No newline at end of file
web-vue-admin/src/views/pay-list/index.vue
......@@ -10,7 +10,7 @@
</div>
</div>
<div style="margin-top: 10px;" v-if="isShow">
<a-table :dataSource="list" :columns="columns" :pagination="pagination" @change="tableChange">
<a-table :dataSource="list" :columns="columns" :pagination="pagination" @change="tableChange" :scroll="{ y: 'calc(100vh - 270px)' }">
<template #bodyCell="{ column, record }">
<div v-if="column.key == 'picurl'">
<div style="display:flex;align-items: center;">
......@@ -18,14 +18,14 @@
</div>
</div>
</div>
<div v-else-if="column.key == 'status'">
<div v-if="record.status == 0" style="color: rgb(12, 191, 33);">
<div v-else-if="column.key == 'status'" style="width:80px;">
<div v-if="record.status == 0" style="color: rgb(12, 191, 33);width:80px;" >
正常
</div>
<div v-else-if="record.status == 1" style="color: #e6a23c;">
<div v-else-if="record.status == 1" style="color: #e6a23c;width:80px;">
预警额度
</div>
<div v-else style="color: #f56c6c;">
<div v-else style="color: #f56c6c;width:80px;">
风控
</div>
</div>
......@@ -33,12 +33,12 @@
{{record.payment/100}}
</div>
<div v-if="column.key == 'tags'">
<a-button type="primary" @click="onEdit(record)">编辑</a-button>
<a-button type="primary" style="margin-left: 20px;" @click="onCopy(record)">支付链接</a-button>
<div v-if="column.key == 'tags'" style="display:flex;">
<a-button type="primary" @click="onEdit(record)" style=";width: 80px;" >编辑</a-button>
<a-button type="primary" style="margin-left: 10px;width: 80px;" @click="onCopy(record)">支付链接</a-button>
<!-- <a-button type="primary" style="margin-left: 20px;">统计</a-button> -->
<a-popconfirm title="确定下架这条数据" ok-text="确定" cancel-text="取消" @confirm="onDel(record)">
<a-button type="primary" style="margin-left: 20px">删除</a-button>
<a-popconfirm title="确定下架这条数据" ok-text="确定" cancel-text="取消" @confirm="onDel(record)" style=";width: 80px;">
<a-button type="primary" style="margin-left: 10px">删除</a-button>
</a-popconfirm>
</div>
<div v-if="column.key == 'time' && (record.starttime >= new Date())" style="color: #DDD222;">
......@@ -158,6 +158,7 @@ const columns = [
title: '支付项目名称',
dataIndex: 'subject',
key: 'subject',
width: 130,
},
{
title: '绑定商品编号',
......@@ -173,6 +174,7 @@ const columns = [
title: '状态',
dataIndex: 'status',
key: 'status',
width: 100,
},
{
title: '创始人',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment