diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts index 76ae0e79f..84274b1c0 100644 --- a/admin/src/app/api/diy.ts +++ b/admin/src/app/api/diy.ts @@ -60,7 +60,7 @@ export function editDiyPage(params: Record) { * @param params */ export function setUseDiyPage(params: Record) { - return request.put(`diy/use`, params, {showSuccessMessage: true}) + return request.put(`diy/use/${params.id}`, params, {showSuccessMessage: true}) } /** diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts index e9701c99b..1cf6b16e7 100644 --- a/admin/src/app/api/member.ts +++ b/admin/src/app/api/member.ts @@ -433,15 +433,6 @@ export function getMemberLevelPageList(params: Record) { return request.get(`member/level`, { params }) } -/** - * 获取会员等级列表 - * @param params - * @returns - */ -export function getMemberLevelList(params: Record) { - return request.get(`member/level/list`, { params }) -} - /** * 获取会员等级详情 * @param level_id 会员等级level_id @@ -521,4 +512,4 @@ export function setSignConfig(params: Record) { */ export function getMemberSignList(params: Record) { return request.get(`member/sign`, { params }); -} \ No newline at end of file +} diff --git a/admin/src/app/api/module.ts b/admin/src/app/api/module.ts index d6bf62cba..26b13b73d 100644 --- a/admin/src/app/api/module.ts +++ b/admin/src/app/api/module.ts @@ -3,26 +3,24 @@ import request from '@/utils/request' /** * 获取授权信息 */ -export function getAuthinfo() { +export function getAuthInfo() { return request.get('niucloud/authinfo', { showErrorMessage: false }) } /** * 设置 授权配置 */ -export function setAuthinfo(params: Record) { +export function setAuthInfo(params: Record) { return request.post('niucloud/authinfo', params, {showSuccessMessage: true}) } /** * 获取 授权配置 */ -export function getAdminAuthinfo() { +export function getAdminAuthInfo() { return request.get('niucloud/admin/authinfo') } - - /** * 获取授权插件列表 * @returns diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts index 0682d5d84..b5e3357d5 100644 --- a/admin/src/app/api/notice.ts +++ b/admin/src/app/api/notice.ts @@ -28,7 +28,6 @@ export function getNoticeLog(params: any) { return request.get(`notice/log`, {params}) } - /** * 消息启动与关闭 * @param params diff --git a/admin/src/app/api/printer.ts b/admin/src/app/api/printer.ts new file mode 100644 index 000000000..eccf6213c --- /dev/null +++ b/admin/src/app/api/printer.ts @@ -0,0 +1,184 @@ +import request from '@/utils/request' + +/** + * 获取小票打印机分页列表 + * @param params + * @returns + */ +export function getPrinterPageList(params: Record) { + return request.get(`sys/printer`, { params }) +} + +/** + * 获取小票打印机列表 + * @param params + * @returns + */ +export function getPrinterList(params: Record) { + return request.get(`sys/printer/list`, { params }) +} + +/** + * 获取小票打印机详情 + * @param printer_id 小票打印机printer_id + * @returns + */ +export function getPrinterInfo(printer_id: number) { + return request.get(`sys/printer/${ printer_id }`); +} + +/** + * 添加小票打印机 + * @param params + * @returns + */ +export function addPrinter(params: Record) { + return request.post('sys/printer', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑小票打印机 + * @param params + * @returns + */ +export function editPrinter(params: Record) { + return request.put(`sys/printer/${ params.printer_id }`, params, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 修改小票打印机状态 + * @param params + * @returns + */ +export function modifyPrinterStatus(params: Record) { + return request.put(`sys/printer/status`, params, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 删除小票打印机 + * @param printer_id + * @returns + */ +export function deletePrinter(printer_id: number) { + return request.delete(`sys/printer/${ printer_id }`, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 获取小票打印模板分页列表 + * @param params + * @returns + */ +export function getPrinterTemplatePageList(params: Record) { + return request.get(`sys/printer/template`, { params }) +} + +/** + * 获取小票打印模板列表 + * @param params + * @returns + */ +export function getPrinterTemplateList(params: Record) { + return request.get(`sys/printer/template/list`, { params }) +} + +/** + * 获取小票打印模板详情 + * @param template_id 小票打印模板template_id + * @returns + */ +export function getPrinterTemplateInfo(template_id: number) { + return request.get(`sys/printer/template/${ template_id }`); +} + +/** + * 添加小票打印模板 + * @param params + * @returns + */ +export function addPrinterTemplate(params: Record) { + return request.post('sys/printer/template', params, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 编辑小票打印模板 + * @param params + * @returns + */ +export function editPrinterTemplate(params: Record) { + return request.put(`sys/printer/template/${ params.template_id }`, params, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 删除小票打印模板 + * @param template_id + * @returns + */ +export function deletePrinterTemplate(template_id: number) { + return request.delete(`sys/printer/template/${ template_id }`, { + showErrorMessage: true, + showSuccessMessage: true + }) +} + +/** + * 获取小票打印模板类型 + * @param params + * @returns + */ +export function getPrinterType(params: Record) { + return request.get(`sys/printer/type`, { params }) +} + +/** + * 获取小票打印机设备品牌 + * @param params + * @returns + */ +export function getPrinterBrand(params: Record) { + return request.get(`sys/printer/brand`, { params }) +} + +/** + * 刷新打印机token + * @param printer_id 小票打印机printer_id + * @returns + */ +export function refreshPrinterToken(printer_id: number) { + return request.put(`sys/printer/refreshtoken/${ printer_id }`,{},{ + showErrorMessage: true, + showSuccessMessage: true + }); +} + +/** + * 测试打印 + * @param printer_id 小票打印机printer_id + * @returns + */ +export function testPrint(printer_id: number) { + return request.put(`sys/printer/testprint/${ printer_id }`, {},{ showErrorMessage: true, showSuccessMessage: true }); +} + +/** + * 打印小票内容 + * @param params + * @returns + */ +export function printTicket(params: Record) { + return request.post('sys/printer/printticket', params, { showErrorMessage: true, showSuccessMessage: true }) +} \ No newline at end of file diff --git a/admin/src/app/api/site.ts b/admin/src/app/api/site.ts index a1fb632e9..f656583cc 100644 --- a/admin/src/app/api/site.ts +++ b/admin/src/app/api/site.ts @@ -1,6 +1,6 @@ import request from '@/utils/request' -//包含站点管理,站点用户管理,站点操作日志 +// 包含站点管理,站点用户管理,站点操作日志 /***************************************************** 站点管理 ****************************************************/ @@ -69,7 +69,6 @@ export function getStatusList() { return request.get(`site/statuslist`) } - /***************************************************** 站点分组管理 ****************************************************/ /** @@ -167,7 +166,6 @@ export function editUser(params: Record) { return request.put(`site/user/${params.uid}`, params, { showSuccessMessage: true }) } - /** * 锁定用户 * @param uid @@ -177,7 +175,6 @@ export function lockUser(uid: number) { return request.put(`site/user/lock/${uid}`) } - /** * 解锁用户 * @param uid @@ -187,7 +184,6 @@ export function unlockUser(uid: number) { return request.put(`site/user/unlock/${uid}`) } - /***************************************************** 操作日志 **************************************************/ /** diff --git a/admin/src/app/api/stat.ts b/admin/src/app/api/stat.ts index 02f5f8551..4fc568bf3 100644 --- a/admin/src/app/api/stat.ts +++ b/admin/src/app/api/stat.ts @@ -13,5 +13,4 @@ export function getStatInfo() { */ export function getSiteStatInfo() { return request.get(`stat/siteindex`) -} - +} \ No newline at end of file diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 26df83cc5..b25101e29 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -138,7 +138,6 @@ export function getMenuByTypeDir(key: any = 'system') { return request.get(`sys/menu/dir/${key}`) } - /***************************************************** 站点菜单 ****************************************************/ /** @@ -149,7 +148,6 @@ export function getSiteMenus() { return request.get(`site/site/menu`) } - /***************************************************** 设置 ****************************************************/ /** @@ -279,20 +277,6 @@ export function getAuthMenu() { return request.get(`auth/site/showmenu`) } -/** - * 获取快捷菜单 - */ -export function getShortcutMenu() { - return request.get(`sys/config/shortcut_menu`) -} - -/** - * 添加快捷菜单 - */ -export function setShortcutMenu(params: Record) { - return request.put(`sys/config/shortcut_menu`, params, { showSuccessMessage: true }) -} - /** * 获取图标库分类列表 * @param params @@ -336,7 +320,6 @@ export function getAreatree(level: number = 1) { return request.get(`sys/area/tree/${level}`) } - /** * 获取地址信息 */ @@ -528,7 +511,6 @@ export function getChannelType() { return request.get(`sys/channel`); } - /** * 获取渠道域名 * @returns @@ -569,13 +551,12 @@ export function setPatConfig(params: Record) { return request.post(`pay/channel/set/all`, params, { showSuccessMessage: true }) } - /***************************************************** 刷新菜单 ****************************************************/ /** * 刷新菜单 */ export function menuRefresh(params: Record) { - return request.post(`sys/menu/refresh`, {}, { showSuccessMessage: true }) + return request.post(`sys/menu/refresh`, {}) } /** @@ -585,7 +566,6 @@ export function clearSchemaCache(params: Record) { return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true }) } - /***************************************************** 获取应用 ****************************************************/ /** * 获取应用 @@ -610,21 +590,6 @@ export function getMap() { return request.get(`sys/config/map`) } -/***************************************************** 首页 ****************************************************/ -/** - * 获取首页列表 - */ -export function getIndexList() { - return request.get(`sys/config/site_index`) -} - -/** - * 设置首页模版 - */ -export function setIndexList(params: Record) { - return request.put(`sys/config/site_index`, params, { showSuccessMessage: true }) -} - /** * 获取支付待审核记录 */ @@ -662,13 +627,6 @@ export function getAddonList() { return request.get(`app/getAddonList`) } -/** - * 获取手机端首页列表 - */ -export function getWapIndexList(params: Record) { - return request.get('sys/config/wap_index', { params }) -} - /** * 获取开发者key * @returns @@ -686,7 +644,6 @@ export function setDeveloperToken(params: Record) { return request.put(`sys/config/developer_token`, params, { showSuccessMessage: true }) } - /** * 获取布局设置 * @returns @@ -729,7 +686,6 @@ export function setThemecolor(params: Record) { return request.put(`sys/config/themecolor`, params) } - /***************************************************** 报表导出 ****************************************************/ /** diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts index 981a57995..c762ad811 100644 --- a/admin/src/app/api/user.ts +++ b/admin/src/app/api/user.ts @@ -40,6 +40,15 @@ export function getAllUserList(params: Record) { return request.get(`user/user_all`, { params }) } +/** + * 获取添加站点可选用户列表 + * @param params + * @returns + */ +export function getUserListSelect(params: Record) { + return request.get(`user/user_select`, { params }) +} + /** * 查询用户名是否存在 * @param username @@ -51,7 +60,7 @@ export function checkUsernameIsExist(username: string) { /** * 获取用户站点创建限制 - * @param params + * @param uid */ export function getUserCreateSiteLimit(uid: number) { return request.get(`user/user/create_site_limit/${uid}`) @@ -83,7 +92,7 @@ export function editUserCreateSiteLimit(params: Record) { /** * 编辑用户站点创建限制 - * @param params + * @param id */ export function delUserCreateSiteLimit(id: number) { return request.delete(`user/user/create_site_limit/${id}`, { showSuccessMessage: true }) diff --git a/admin/src/app/api/verify.ts b/admin/src/app/api/verify.ts index 1aa0a98a6..16af87419 100644 --- a/admin/src/app/api/verify.ts +++ b/admin/src/app/api/verify.ts @@ -34,7 +34,6 @@ export function getVerifierList(params: Record) { /** * 获取核销员列表 - * @param params * @returns */ export function getVerifierSelect() { diff --git a/admin/src/app/api/wechat.ts b/admin/src/app/api/wechat.ts index 8a4d3b680..336476650 100644 --- a/admin/src/app/api/wechat.ts +++ b/admin/src/app/api/wechat.ts @@ -49,7 +49,6 @@ export function getTemplateList() { return request.get('wechat/template') } - /** * 获取同步 * @param params @@ -131,7 +130,6 @@ export function getMediaList(params: Record) { return request.get('wechat/media', { params }) } - /** * 同步素材库 */ diff --git a/admin/src/app/assets/images/default_headimg_square.jpg b/admin/src/app/assets/images/default_headimg_square.jpg new file mode 100644 index 000000000..1be72280a Binary files /dev/null and b/admin/src/app/assets/images/default_headimg_square.jpg differ diff --git a/admin/src/app/assets/images/member_head.png b/admin/src/app/assets/images/member_head.png index bb09f5ec3..3c4876017 100644 Binary files a/admin/src/app/assets/images/member_head.png and b/admin/src/app/assets/images/member_head.png differ diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index ed8385d60..14a65fcf7 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -1,6 +1,5 @@