From 20f082895348f50ce5b47442790cb454d4cfd19c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:27:06 +0800
Subject: [PATCH] 经销商管理
---
admin/src/assets/style/style.scss | 43 ++++++++++++++++++++++---------------------
admin/src/components/system/dict/DictDataManagerWindow.vue | 8 ++++----
admin/src/api/business/coupon.js | 5 +++++
3 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/admin/src/api/business/coupon.js b/admin/src/api/business/coupon.js
index bc84bd2..356da1e 100644
--- a/admin/src/api/business/coupon.js
+++ b/admin/src/api/business/coupon.js
@@ -6,6 +6,11 @@
trim: true
})
}
+export function allList (data) {
+ return request.post('/business/coupon/list', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index 658bfcf..5201527 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -89,28 +89,29 @@
}
.global-window {
- .tip-header{
- font-size: 16px;
+
+}
+.tip-header{
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+.tip {
+ em {
+ font-style: normal;
+ color: $primary-color;
font-weight: bold;
- margin-bottom: 20px;
}
- .tip {
- em {
- font-style: normal;
- color: $primary-color;
- font-weight: bold;
- }
- }
- .tip-warn {
- margin: 4px 0 12px 0;
- font-size: 12px;
- color: #999;
- i {
- color: orange;
- margin-right: 4px;
- font-size: 14px;
- position: relative;
- top: 1px;
- }
+}
+.tip-warn {
+ margin: 4px 0 12px 0;
+ font-size: 12px;
+ color: #999;
+ i {
+ color: orange;
+ margin-right: 4px;
+ font-size: 14px;
+ position: relative;
+ top: 1px;
}
}
diff --git a/admin/src/components/system/dict/DictDataManagerWindow.vue b/admin/src/components/system/dict/DictDataManagerWindow.vue
index d4ea888..5294594 100644
--- a/admin/src/components/system/dict/DictDataManagerWindow.vue
+++ b/admin/src/components/system/dict/DictDataManagerWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="dictName + '鏁版嵁绠＄悊'"
- width="78%"
+ width="100%"
:visible.sync="visible"
:with-footer="false"
>
@@ -20,10 +20,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="label" label="鏁版嵁鏍囩" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="璇存槑" min-width="100px"></el-table-column>
+ <el-table-column prop="label" label="鏁版嵁鏍囩" min-width="200px"></el-table-column>
<el-table-column prop="code" label="鏁版嵁鍊�" min-width="100px">
<template slot-scope="{row}">
- <div v-if="row.code || row.code.length>500" >
+ <div v-if="row.code!=null && row.code.length>500" >
<el-button type="text" @click="showCode(row)" >鐐瑰嚮鏌ョ湅</el-button>
</div>
<div v-else>{{row.code}}</div>
@@ -38,7 +39,6 @@
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="remark" label="璇存槑" min-width="100px"></el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
--
Gitblit v1.9.3