diff --git a/src/api/system/article.js b/src/api/system/article.js index 0df2588..4963ca9 100644 --- a/src/api/system/article.js +++ b/src/api/system/article.js @@ -9,6 +9,14 @@ export function listArticle(query) { }) } +// 查询文章列表ByIds +export function listArticleByIds(ids) { + return request({ + url: `/system/article/listByIds/${ids}`, + method: 'get' + }) +} + // 查询文章详细 export function getArticle(articleId) { return request({ diff --git a/src/api/system/config.js b/src/api/system/config.js index 509f4d9..94074a8 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -60,10 +60,11 @@ export function refreshCache() { } // 根据参数键名查询参数值 -export function getConfigKeys(configKeys) { +export function getConfigKeys(data) { return request({ - url: '/system/config/configKeys/' + configKeys, - method: 'get' + url: '/system/config/configKeys', + method: 'post', + data }) } diff --git a/src/components/Business/Article/ArticleDialog.vue b/src/components/Business/Article/ArticleDialog.vue new file mode 100644 index 0000000..e28c366 --- /dev/null +++ b/src/components/Business/Article/ArticleDialog.vue @@ -0,0 +1,209 @@ + + + + + + diff --git a/src/components/Business/Article/ArticleInput.vue b/src/components/Business/Article/ArticleInput.vue new file mode 100644 index 0000000..d729bbd --- /dev/null +++ b/src/components/Business/Article/ArticleInput.vue @@ -0,0 +1,195 @@ + + + + + + diff --git a/src/components/Business/Store/StoreDialog.vue b/src/components/Business/Store/StoreDialog.vue index 2e89305..9b4c14b 100644 --- a/src/components/Business/Store/StoreDialog.vue +++ b/src/components/Business/Store/StoreDialog.vue @@ -86,7 +86,7 @@ export default { }, prop: { type: String, - default: 'id' + default: 'storeId' } }, data() { @@ -108,7 +108,7 @@ export default { this.loadTable = true; if (this.userType === UserType.APP) { - mchListStore().then(response => { + mchListStore(this.searchForm).then(response => { this.tableData = response.rows; this.total = response.total; // 刷新表格状态 @@ -119,7 +119,7 @@ export default { this.loadTable = false; }) } else { - listStore.then(response => { + listStore(this.searchForm).then(response => { this.tableData = response.rows; this.total = response.total; // 刷新表格状态 diff --git a/src/utils/constants.js b/src/utils/constants.js index efb2372..710cc75 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -136,3 +136,19 @@ export const RecordTimeOperatorType = { ADMIN: '1', // 管理员 USER: '2', // 用户 } + +// 系统参数KEY +export const ConfigKey = { + SERVICE_FEE_RATE: "sm.transactionBill.serviceFee", // 充值服务费费率 + WECHAT_APPROVAL: "sys.wechat.approval", // 微信小程序敏感内容展示 + DAILY_WITHDRAW_AMOUNT: "daily.withdraw.amount", // 单日单用户提现限额(元) + DAILY_WITHDRAW_COUNT: "daily.withdraw.count", // 单日单用户提现次数(次) + NOVERIFY_WITHDRAW_SINGLE: "noverify.withdraw.single", // 提现单笔免审核额度(元) + RECHARGE_MIN_SERVICE: "recharge.min.service", // 充值最低服务费(元) + ORDER_AUTO_CLOSE_CD: "order.auto.close.cd", // 订单自动关闭冷却时间(分) + SS_LICENCE_USER_ID: "ss.licence.user.id", // 用户协议文章ID + SS_LICENCE_PRIVACY_ID: "ss.licence.privacy.id", // 隐私政策文章ID + SS_LICENCE_ABOUT_ID: "ss.licence.about.id", // 关于我们文章ID + SS_LICENCE_MCH_ID: "ss.licence.mch.id", // 商户协议文章ID + SS_LICENCE_COLLECTION_ID: "ss.licence.collection.id", // 个人信息收集清单文章ID +} diff --git a/src/views/system/config/components/ConfigItem.vue b/src/views/system/config/components/ConfigItem.vue new file mode 100644 index 0000000..e18b3da --- /dev/null +++ b/src/views/system/config/components/ConfigItem.vue @@ -0,0 +1,66 @@ + + + diff --git a/src/views/system/config/group.vue b/src/views/system/config/group.vue new file mode 100644 index 0000000..411f9d0 --- /dev/null +++ b/src/views/system/config/group.vue @@ -0,0 +1,87 @@ + + + + +