XinLingKeJi/jdt-mer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(custom): 订单列表改版

Browse Source
This commit is contained in:
YuanHuakk
2023-11-14 20:45:30 +08:00
parent 1ea4b218af
commit ba00cf26a6
10 changed files with 125 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/plugin/index.js
View File

@@ -29,7 +29,7 @@ export function createVitePlugins(viteEnv, isBuild) {
if (isBuild) {
plugins.push(
visualizer({
open: true,
open: false,
gzipSize: true,
brotliSize: true,
})

10
src/store/modules/user/index.js
View File

@@ -29,10 +29,10 @@ export const useUserStore = defineStore('user', {
},
actions: {
async getUserInfo() {
const typeMer = localStorage.getItem('type')
this.userInfo = {
role: [typeMer],
}
// const typeMer = localStorage.getItem('type')
// this.userInfo = {
// role: [typeMer],
// }
// try {
// const res = await api.getUser()
// const { id, name, avatar, role } = res.data
@@ -48,7 +48,7 @@ export const useUserStore = defineStore('user', {
removeToken()
resetTags()
resetPermission()
resetRouter()
await resetRouter()
this.$reset()
toLogin()
},

37
src/views/goods/add/index.vue
View File

@@ -1,12 +1,12 @@
<template>
<CommonPage show-footer :title="$route.title">
<!--{{ model }}-->
{{ model }}
<n-spin size="large" :show="isShowSpin">
<n-form ref="formRef" label-width="100" :model="model" :rules="rules" label-placement="left">
<n-grid :cols="2" :x-gap="24">
<n-form-item-gi :span="12" label="商品分类:" path="class_id">
<n-select
v-model:value="model.class_id"
v-model:value="model.goods_class_id"
label-field="name"
value-field="ID"
:options="classList"
@@ -22,14 +22,24 @@
<n-form-item-gi :span="12" label="商品轮播图:" path="rotation">
<Upload v-model:list="model.rotation" :max="5" multiple />
</n-form-item-gi>
<n-form-item-gi :span="12" label="商品价格:" path="number">
<n-input-number v-model:value="model.number" placeholder="输入商品价格" />
<!-- <n-form-item-gi :span="12" label="支付方式:" path="pay_type">-->
<!-- <n-select-->
<!-- v-model:value="model.pay_type"-->
<!-- multiple-->
<!-- :options="[-->
<!-- { label: '微信支付', value: 1 },-->
<!-- { label: '积分支付', value: 2 },-->
<!-- ]"-->
<!-- />-->
<!-- </n-form-item-gi>-->
<n-form-item-gi :span="12" label="现金价格:" path="number">
<n-input-number v-model:value="model.number" :min="0" placeholder="输入现金价格" />
</n-form-item-gi>
<n-form-item-gi :span="12" label="市场价格:" path="market_num">
<n-input-number v-model:value="model.market_num" placeholder="输入市场价格" />
<n-form-item-gi :span="12" label="积分价格:" path="exchange">
<n-input-number v-model:value="model.exchange" :min="0" placeholder="输入积分价格" />
</n-form-item-gi>
<n-form-item-gi :span="12" label="商品库存:" path="stock">
<n-input-number v-model:value="model.stock" placeholder="输入商品库存" />
<n-input-number v-model:value="model.stock" :min="0" placeholder="输入商品库存" />
</n-form-item-gi>
<n-form-item-gi :span="12" label="商品简介:" path="profile">
<n-input v-model:value="model.profile" type="textarea" placeholder="输入商品简介" />
@@ -60,11 +70,12 @@ const formRef = ref(null)
const model = ref({
name: '',
class_id: null,
goods_class_id: null,
cover: [],
rotation: [],
profile: '',
details: '',
pay_type: [],
stock: null,
number: null,
market_num: null,
@@ -77,7 +88,7 @@ const rules = {
message: '请输入商品名称',
trigger: 'blur',
},
class_id: {
goods_class_id: {
required: true,
type: 'number',
message: '请选择商品分类',
@@ -95,13 +106,19 @@ const rules = {
message: '请上传商品轮播图',
trigger: 'change',
},
pay_type: {
required: true,
type: 'array',
message: '请选择支付方式',
trigger: 'change',
},
number: {
required: true,
type: 'number',
message: '请输入商品价格',
trigger: 'blur',
},
market_num: {
exchange: {
required: true,
type: 'number',
message: '请输入市场价格',

2
src/views/goods/index/index.vue
View File

@@ -43,7 +43,7 @@ const columns = ref([
align: 'center',
slot: 'class_id',
render(row) {
const data = optList.value.filter((item) => item.ID === row.class_id)
const data = optList.value.filter((item) => item.ID === row.goods_class_id)
return h('span', data[0]?.name)
},
},

79
src/views/order/index1/index.vue
View File

@@ -84,7 +84,6 @@
<script setup>
import api from './api'
import { NEllipsis } from 'naive-ui'
const loading = ref(false)
@@ -142,27 +141,54 @@ const columns = ref([
{
title: '用户',
align: 'center',
key: 'user_name',
slot: 'user',
render: (row) => {
return [
h(
'div',
{},
{
default: () => row.User.nickName,
}
),
]
},
},
{
title: '手机号',
title: '用户电话',
align: 'center',
key: 'phone',
slot: 'phone',
render: (row) => {
return [
h(
'div',
{},
{
default: () => row.User.phone,
}
),
]
},
},
{
title: '商品名称',
align: 'center',
slot: 'goods_name',
render: (row) => {
return h(
NEllipsis,
{
style: 'max-width: 240px',
},
{
default: () => row.goods_name,
}
)
const el = []
row.OrderGoods.forEach((item) => {
el.push(
h(
'div',
{},
{
default: () =>
`${item.Goods.name}|${item.pay_price}元或${item.pay_integral}积分|X${item.number}`,
}
)
)
})
return el
},
},
{
@@ -171,9 +197,22 @@ const columns = ref([
key: 'count',
},
{
title: '商品总价',
title: '订单总价',
align: 'center',
key: 'number',
slot: 'number',
render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`),
},
{
title: '支付方式',
align: 'center',
slot: 'pay_type',
render: (row) => h('span', row.pay_type === 1 ? '微信' : '积分'),
},
{
title: '订单总价',
align: 'center',
slot: 'number',
render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`),
},
{
title: '订单状态',
@@ -184,9 +223,9 @@ const columns = ref([
case 0:
return h('span', '待付款')
case 1:
return h('span', '待使用')
return h('span', '待核销')
case 2:
return h('span', '已完成')
return h('span', '已核销')
case 3:
return h('span', '已过期')
}
@@ -195,17 +234,17 @@ const columns = ref([
{
title: '赠送豆子',
align: 'center',
key: 'pulse_number',
key: 'gift_pulse',
},
{
title: '赠送积分',
align: 'center',
key: 'integral',
key: 'gift_integral',
},
{
title: '推广积分',
align: 'center',
key: 'commission_number',
key: 'commission_integral',
},
{
title: '分佣类型',

28
src/views/order/route.js
View File

@@ -4,7 +4,7 @@ export default {
name: 'Order',
path: '/order',
component: Layout,
redirect: '/order_list',
redirect: 'gy_list',
meta: {
title: '订单管理',
icon: 'majesticons:compass-line',
@@ -16,22 +16,22 @@ export default {
path: 'gy_list',
component: () => import('./index1/index.vue'),
meta: {
requireAuth: true,
role: ['1'],
// requireAuth: true,
// role: ['1'],
title: '订单列表',
icon: 'material-symbols:auto-awesome-outline-rounded',
},
},
{
name: 'dhList',
path: 'dh_list',
component: () => import('./index/index.vue'),
meta: {
requireAuth: true,
title: '订单列表',
role: ['2'],
icon: 'material-symbols:auto-awesome-outline-rounded',
},
},
// {
// name: 'dhList',
// path: 'dh_list',
// component: () => import('./index/index.vue'),
// meta: {
// requireAuth: true,
// title: '订单列表',
// role: ['2'],
// icon: 'material-symbols:auto-awesome-outline-rounded',
// },
// },
],
}

2
src/views/settlement/route.js
View File

@@ -4,7 +4,7 @@ export default {
name: '积分管理',
path: '/settlement',
component: Layout,
redirect: '/settlement_list',
redirect: 'jf_list',
meta: {
title: '积分管理',
requireAuth: true,

4
src/views/sys/index/index.vue
View File

@@ -93,7 +93,6 @@ const days = ref([
const getInfo = async () => {
const res = await api.getMerchantInfo()
infoData.value = res.data.data
console.log((!res.data.data.week_start && 1) || '00:00:00')
model.value = {
...res.data.data,
head_photo: [{ url: res.data.data.head_photo, status: 'finished', id: 1 }],
@@ -129,7 +128,7 @@ const submit = () => {
delete data.lt
const res = await api.updateMerchantInfo(data)
$message.success(res.msg)
getInfo()
await getInfo()
}
})
}
@@ -141,7 +140,6 @@ const submit = () => {
<n-tab-pane name="1" tab="基本信息">
<div>商户名称: {{ infoData.name }}</div>
<div>负责人手机号码: {{ infoData.phone }}</div>
<div>商户类型: {{ infoData.bType === 1 ? '供应商' : '兑换商' }}</div>
<!-- <div>经营类目: {{ infoData.scope }}</div> -->
<div>入驻时间: {{ infoData.add_time }}</div>
</n-tab-pane>

2
src/views/sys/route.js
View File

@@ -4,7 +4,7 @@ export default {
name: '商户设置',
path: '/sys',
component: Layout,
redirect: '/sys_info',
redirect: 'sys_info',
meta: {
title: '商户设置',
icon: 'mdi:account-multiple',

30
src/views/user/route.js
View File

@@ -4,32 +4,32 @@ export default {
name: '用户管理',
path: '/user',
component: Layout,
redirect: '/user_list',
redirect: 'dh_user_list',
meta: {
title: '用户管理',
icon: 'mdi:account-multiple',
order: 10,
},
children: [
{
name: 'dhUserlist',
path: 'dh_user_list',
component: () => import('./index/index.vue'),
meta: {
requireAuth: true,
role: ['2'],
title: '用户列表',
icon: 'mdi:account-multiple',
order: 10,
},
},
// {
// name: 'dhUserlist',
// path: 'dh_user_list',
// component: () => import('./index/index.vue'),
// meta: {
// // requireAuth: true,
// // role: ['2'],
// title: '用户列表',
// icon: 'mdi:account-multiple',
// order: 10,
// },
// },
{
name: 'gyUserlist',
path: 'gy_user_list',
component: () => import('./index1/index.vue'),
meta: {
requireAuth: true,
role: ['1'],
// requireAuth: true,
// role: ['1'],
title: '用户列表',
icon: 'mdi:account-multiple',
order: 10,