diff --git a/admin/src/app/api/cloud.ts b/admin/src/app/api/cloud.ts index 06b5793dd..966cdd472 100644 --- a/admin/src/app/api/cloud.ts +++ b/admin/src/app/api/cloud.ts @@ -2,7 +2,6 @@ import request from '@/utils/request' /** * 云编译 - * @param addon */ export function cloudBuild() { return request.post('niucloud/build', {}) @@ -10,7 +9,6 @@ export function cloudBuild() { /** * 获取云编译任务 - * @param addon */ export function getCloudBuildTask() { return request.get('niucloud/build') diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts index 3d3debbbe..76ae0e79f 100644 --- a/admin/src/app/api/diy.ts +++ b/admin/src/app/api/diy.ts @@ -8,15 +8,16 @@ import request from '@/utils/request' * @returns */ export function getDiyPageList(params: Record) { - return request.get(`diy/diy`, {params}) + return request.get(`diy/diy`, {params}) } + /** * 获取自定义页面分页列表,轮播搜索组件用 * @param params * @returns */ export function getDiyPageListByCarouselSearch(params: Record) { - return request.get(`diy/carousel_search`, {params}) + return request.get(`diy/carousel_search`, {params}) } /** @@ -25,7 +26,7 @@ export function getDiyPageListByCarouselSearch(params: Record) { * @returns */ export function getDiyList(params: Record) { - return request.get(`diy/list`, {params}) + return request.get(`diy/list`, {params}) } /** @@ -34,7 +35,7 @@ export function getDiyList(params: Record) { * @returns */ export function getDiyPageInfo(id: number) { - return request.get(`diy/diy/${id}`); + return request.get(`diy/diy/${id}`); } /** @@ -43,7 +44,7 @@ export function getDiyPageInfo(id: number) { * @returns */ export function addDiyPage(params: Record) { - return request.post('diy/diy', params, {showSuccessMessage: true}) + return request.post('diy/diy', params, {showSuccessMessage: true}) } /** @@ -51,7 +52,7 @@ export function addDiyPage(params: Record) { * @param params */ export function editDiyPage(params: Record) { - return request.put(`diy/diy/${params.id}`, params, {showSuccessMessage: true}) + return request.put(`diy/diy/${params.id}`, params, {showSuccessMessage: true}) } /** @@ -59,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, {showSuccessMessage: true}) } /** @@ -67,7 +68,7 @@ export function setUseDiyPage(params: Record) { * @param params */ export function editDiyPageShare(params: Record) { - return request.put(`diy/diy/share`, params, {showSuccessMessage: true}) + return request.put(`diy/diy/share`, params, {showSuccessMessage: true}) } /** @@ -76,35 +77,35 @@ export function editDiyPageShare(params: Record) { * @returns */ export function deleteDiyPage(id: number) { - return request.delete(`diy/diy/${id}`, {showSuccessMessage: true}) + return request.delete(`diy/diy/${id}`, {showSuccessMessage: true}) } /** * 获取自定义页面初始化数据 */ export function initPage(params: Record) { - return request.get(`diy/init`, {params}) + return request.get(`diy/init`, {params}) } /** * 获取自定义链接列表 */ export function getLink(params: Record) { - return request.get(`diy/link`, {params}) + return request.get(`diy/link`, {params}) } /** * 获取底部导航列表 */ export function getDiyBottomList(params: Record) { - return request.get(`diy/bottom`, {params}) + return request.get(`diy/bottom`, {params}) } /** * 获取底部导航数据 */ export function getDiyBottomConfig(params: Record) { - return request.get(`diy/bottom/config`, {params}) + return request.get(`diy/bottom/config`, {params}) } /** @@ -113,21 +114,21 @@ export function getDiyBottomConfig(params: Record) { * @returns */ export function setDiyBottomConfig(params: Record) { - return request.post('diy/bottom', params, {showSuccessMessage: true}) + return request.post('diy/bottom', params, {showSuccessMessage: true}) } /** * 获取页面模板类型 */ export function getDiyTemplate(params: Record) { - return request.get(`diy/template`, {params}) + return request.get(`diy/template`, {params}) } /** * 获取模板页面列表 */ export function getDiyTemplatePages(params: Record) { - return request.get(`diy/template/pages`, {params}) + return request.get(`diy/template/pages`, {params}) } /** @@ -136,7 +137,7 @@ export function getDiyTemplatePages(params: Record) { * @returns */ export function getDiyRouteList(params: Record) { - return request.get(`diy/route`, {params}) + return request.get(`diy/route`, {params}) } /** @@ -144,7 +145,7 @@ export function getDiyRouteList(params: Record) { * @returns */ export function getDiyRouteAppList() { - return request.get(`diy/route/apps`) + return request.get(`diy/route/apps`) } /** @@ -152,7 +153,7 @@ export function getDiyRouteAppList() { * @param params */ export function getDiyRouteInfo(params: Record) { - return request.get(`diy/route/info`, {params}); + return request.get(`diy/route/info`, {params}); } /** @@ -160,7 +161,7 @@ export function getDiyRouteInfo(params: Record) { * @param params */ export function editDiyRouteShare(params: Record) { - return request.put(`diy/route/share`, params, {showSuccessMessage: true}) + return request.put(`diy/route/share`, params, {showSuccessMessage: true}) } /** @@ -169,7 +170,7 @@ export function editDiyRouteShare(params: Record) { * @returns */ export function getDecoratePage(params: Record) { - return request.get(`diy/decorate`, {params}) + return request.get(`diy/decorate`, {params}) } /** @@ -178,7 +179,7 @@ export function getDecoratePage(params: Record) { * @returns */ export function changeTemplate(params: Record) { - return request.put(`diy/change`, params, {showSuccessMessage: true}) + return request.put(`diy/change`, params, {showSuccessMessage: true}) } /** @@ -187,5 +188,5 @@ export function changeTemplate(params: Record) { * @returns */ export function getApps(params: Record) { - return request.get(`diy/apps`) + return request.get(`diy/apps`) } \ No newline at end of file diff --git a/admin/src/app/api/home.ts b/admin/src/app/api/home.ts index c73c1bca5..80d10edfa 100644 --- a/admin/src/app/api/home.ts +++ b/admin/src/app/api/home.ts @@ -3,3 +3,17 @@ import request from '@/utils/request' export function getHomeSite(params: Record) { return request.get(`home/site`, { params }) } + +/** + * 查询站点套餐 + */ +export function getSiteGroup() { + return request.get(`home/site/group`) +} + +/** + * 创建站点套餐 + */ +export function createSite(params: Record) { + return request.post(`home/site/create`, params) +} diff --git a/admin/src/app/api/module.ts b/admin/src/app/api/module.ts index 876e0abe2..d6bf62cba 100644 --- a/admin/src/app/api/module.ts +++ b/admin/src/app/api/module.ts @@ -33,7 +33,6 @@ export function getModule() { /** * 获取插件版本 - * @param params * @returns */ export function getModuleVersion() { @@ -51,7 +50,6 @@ export function downloadVersion(params: Record) { /** * 获取框架最新版本 - * @param params * @returns */ export function getFrameworkNewVersion() { diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts index 426d0fbe9..fd37d4cbd 100644 --- a/admin/src/app/api/pay.ts +++ b/admin/src/app/api/pay.ts @@ -48,7 +48,7 @@ export function getPayRefundPages(params: Record) { /** * 获取退款详情 - * @param id + * @param refund_no */ export function getPayRefundInfo(refund_no: string) { return request.get(`pay/refund/${refund_no}`) @@ -56,7 +56,6 @@ export function getPayRefundInfo(refund_no: string) { /** * 退款方式 - * @param id */ export function getRefundType() { return request.get(`pay/refund/type`) @@ -64,8 +63,15 @@ export function getRefundType() { /** * 退款转账 - * @param id + * @param params */ export function getRefundTransfer(params: Record) { return request.post(`pay/refund/transfer`, params, {showSuccessMessage: true}) -} \ No newline at end of file +} + +/** + * 全部支付方式 + */ +export function getAllPayType() { + return request.get(`pay/type/all`) +} diff --git a/admin/src/app/api/site.ts b/admin/src/app/api/site.ts index dad1c52ca..a1fb632e9 100644 --- a/admin/src/app/api/site.ts +++ b/admin/src/app/api/site.ts @@ -83,7 +83,7 @@ export function getSiteGroupList(params: Record) { /** * 获取站点分组详情 - * @param site_id + * @param groupId */ export function getSiteGroupInfo(groupId: number) { return request.get(`site/group/${groupId}`); @@ -123,6 +123,14 @@ export function getSiteGroupAll(params: Record = {}) { return request.get(`site/group/all`) } +/** + * 获取全部站点分组(包含套餐下用户站点数量) + * @param params + */ +export function getUserSiteGroupAll(params: Record = {}) { + return request.get(`site/group/user`, { params }) +} + /***************************************************** 当前站点用户 *************************************************/ /** @@ -159,15 +167,6 @@ export function editUser(params: Record) { return request.put(`site/user/${params.uid}`, params, { showSuccessMessage: true }) } -/** - * 删除用户 - * @param uid - * @returns - */ -export function deleteUser(uid: number) { - return request.delete(`site/user/${uid}`, { showSuccessMessage: true }) -} - /** * 锁定用户 diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 95d2fe569..26df83cc5 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -81,6 +81,7 @@ export function getMenus(type: string) { /** * 获取菜单信息 + * @param app_type * @param menu_key */ export function getMenuInfo(app_type: string, menu_key: string) { @@ -106,6 +107,7 @@ export function editMenu(params: Record) { /** * 删除菜单 + * @param app_type * @param menu_key */ export function deleteMenu(app_type: string, menu_key: string) { @@ -311,7 +313,6 @@ export function getIconList(params: Record) { /** * 获取evn - * @param params * @returns */ export function getEnv() { @@ -414,7 +415,7 @@ export function getPayList() { * 获取打款设置配置 * @param channel */ -export function getTransferInfo(channel) { +export function getTransferInfo(channel: string) { return request.get(`pay/channel/lists/${channel}`) } @@ -624,14 +625,6 @@ export function setIndexList(params: Record) { return request.put(`sys/config/site_index`, params, { showSuccessMessage: true }) } -/** - * 获取布局 - * @returns - */ -export function getLayouts() { - return request.get('sys/layout') -} - /** * 获取支付待审核记录 */ @@ -719,6 +712,24 @@ export function setLayout(params: Record) { return request.put(`sys/config/layout`, params, { showSuccessMessage: true }) } +/** + * 获取色调设置 + * @returns + */ +export function getThemecolor() { + return request.get('sys/config/themecolor') +} + +/** + * 更新色调设置 + * @param params + * @returns + */ +export function setThemecolor(params: Record) { + return request.put(`sys/config/themecolor`, params) +} + + /***************************************************** 报表导出 ****************************************************/ /** @@ -767,4 +778,12 @@ export function exportDataCheck(type: string, params: Record) { */ export function deleteExport(id: number) { return request.delete(`sys/export/${id}`, { showSuccessMessage: true }) -} \ No newline at end of file +} + +/** + * 获取网站开放平台设置 + * @returns + */ +export function getWxoplatform() { + return request.get('sys/wxoplatform/config') +} diff --git a/admin/src/app/api/tools.ts b/admin/src/app/api/tools.ts index 2996acad2..fb0872a2a 100644 --- a/admin/src/app/api/tools.ts +++ b/admin/src/app/api/tools.ts @@ -37,7 +37,7 @@ export function getAddonDevelopCheck(key: any) { * 获取插件key黑名单 * @returns */ -export function getAddonKeyBlackList(key: any) { +export function getAddonKeyBlackList() { return request.get('addon_develop/key/blacklist') } diff --git a/admin/src/app/api/upgrade.ts b/admin/src/app/api/upgrade.ts index 979e2ab49..ed2f93fbe 100644 --- a/admin/src/app/api/upgrade.ts +++ b/admin/src/app/api/upgrade.ts @@ -11,7 +11,6 @@ export function getUpgradeContent(addon: string = '') { /** * 获取升级任务 - * @param addon */ export function getUpgradeTask() { return request.get('upgrade/task') diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts index 79fe9cc0f..981a57995 100644 --- a/admin/src/app/api/user.ts +++ b/admin/src/app/api/user.ts @@ -6,8 +6,8 @@ import request from '@/utils/request' /** * 获取用户列表 - * @param params - * @returns + * @param params + * @returns */ export function getUserList(params: Record) { return request.get(`user/user`, { params }) @@ -16,7 +16,7 @@ export function getUserList(params: Record) { /** * 获取用户详情 * @param uid 用户uid - * @returns + * @returns */ export function getUserInfo(uid: number) { return request.get(`user/user/${uid}`); @@ -24,25 +24,17 @@ export function getUserInfo(uid: number) { /** * 添加用户 - * @param params - * @returns + * @param params + * @returns */ export function addUser(params: Record) { return request.post('user/user', params, { showSuccessMessage: true }) } -/** - * 更新用户 - * @param params - */ -export function editUser(params: Record) { - return request.put(`user/user/${params.uid}`, params, { showSuccessMessage: true }) -} - /** * 获取所有用户列表 - * @param params - * @returns + * @param params + * @returns */ export function getAllUserList(params: Record) { return request.get(`user/user_all`, { params }) @@ -50,9 +42,49 @@ export function getAllUserList(params: Record) { /** * 查询用户名是否存在 - * @param username - * @returns + * @param username + * @returns */ export function checkUsernameIsExist(username: string) { return request.get(`user/isexist`, { params: { username } }) -} \ No newline at end of file +} + +/** + * 获取用户站点创建限制 + * @param params + */ +export function getUserCreateSiteLimit(uid: number) { + return request.get(`user/user/create_site_limit/${uid}`) +} + +/** + * + * @param id + */ +export function getUserCreateSiteLimitInfo(id: number) { + return request.get(`user/user/create_site_limit/info/${id}`) +} + +/** + * 添加用户站点创建限制 + * @param params + */ +export function addUserCreateSiteLimit(params: Record) { + return request.post(`user/user/create_site_limit`, params, { showSuccessMessage: true }) +} + +/** + * 编辑用户站点创建限制 + * @param params + */ +export function editUserCreateSiteLimit(params: Record) { + return request.put(`user/user/create_site_limit/${params.id}`, params, { showSuccessMessage: true }) +} + +/** + * 编辑用户站点创建限制 + * @param params + */ +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 f16304d9c..1aa0a98a6 100644 --- a/admin/src/app/api/verify.ts +++ b/admin/src/app/api/verify.ts @@ -33,10 +33,19 @@ export function getVerifierList(params: Record) { } /** - * 获取核销类型列表 + * 获取核销员列表 * @param params * @returns */ +export function getVerifierSelect() { + return request.get(`verify/verifier/select`) +} + + +/** + * 获取核销类型列表 + * @returns + */ export function getVerifyTypeList() { return request.get(`verify/verifier/type`) } diff --git a/admin/src/app/api/wechat.ts b/admin/src/app/api/wechat.ts index a537ddf8e..8a4d3b680 100644 --- a/admin/src/app/api/wechat.ts +++ b/admin/src/app/api/wechat.ts @@ -124,7 +124,6 @@ export function setSubscribeReply(params: Record) { return request.put('wechat/reply/subscribe', params, { showSuccessMessage: true }) } - /** * 查询素材列表 */ diff --git a/admin/src/app/api/wxoplatform.ts b/admin/src/app/api/wxoplatform.ts new file mode 100644 index 000000000..5938ba931 --- /dev/null +++ b/admin/src/app/api/wxoplatform.ts @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +/** + * 获取微信配置 + * @returns + */ +export function getConfig() { + return request.get('wxoplatform/config') +} + +/** + * 微信配置所需的静态信息 + */ +export function getStatic() { + return request.get('wxoplatform/static'); +} + +/** + * 编辑微信配置 + * @param params + * @returns + */ +export function editConfig(params: Record) { + return request.put('wxoplatform/config', params, { showSuccessMessage: true }) +} + +/** + * 获取授权url + */ +export function getAuthorizationUrl() { + return request.get('wxoplatform/authorizationUrl'); +} + +/** + * 获取授权结果 + */ +export function getAuthorizationResult(params: Record) { + return request.get('wxoplatform/authorization', { params, showErrorMessage: false }); +} + +/** + * 小程序代码提交 + * @returns + */ +export function weappCommit() { + return request.post('wxoplatform/weapp/version/commit', {}, { showSuccessMessage: true }) +} + +/** + * 获取提交记录 + */ +export function getWeappCommitRecord(params: Record) { + return request.get('wxoplatform/weapp/commit', { params }) +} + +/** + * 获取最后一次提交记录 + */ +export function getWeappLastCommitRecord() { + return request.get('wxoplatform/weapp/commit/last') +} + +/** + * 小程序代码提交 + * @returns + */ +export function siteWeappCommit() { + return request.post('wxoplatform/site/weapp/commit', {}, { showSuccessMessage: true }) +} diff --git a/admin/src/app/assets/images/creatBg.png b/admin/src/app/assets/images/creatBg.png new file mode 100644 index 000000000..2460bc7fe Binary files /dev/null and b/admin/src/app/assets/images/creatBg.png differ diff --git a/admin/src/app/assets/images/diy/head/nav_style6.jpg b/admin/src/app/assets/images/diy/head/nav_style6.jpg new file mode 100644 index 000000000..e16bd39d5 Binary files /dev/null and b/admin/src/app/assets/images/diy/head/nav_style6.jpg differ diff --git a/admin/src/app/assets/images/diy/head/nav_style6.png b/admin/src/app/assets/images/diy/head/nav_style6.png deleted file mode 100644 index 9c11b4867..000000000 Binary files a/admin/src/app/assets/images/diy/head/nav_style6.png and /dev/null differ diff --git a/admin/src/app/assets/images/empty.png b/admin/src/app/assets/images/empty.png deleted file mode 100644 index c8421c96c..000000000 Binary files a/admin/src/app/assets/images/empty.png and /dev/null differ diff --git a/admin/src/app/assets/images/error.png b/admin/src/app/assets/images/error.png index 143d6c633..053a54a14 100644 Binary files a/admin/src/app/assets/images/error.png and b/admin/src/app/assets/images/error.png differ diff --git a/admin/src/app/assets/images/index/app1.png b/admin/src/app/assets/images/index/app1.png index 476affffd..5f1e4e71d 100644 Binary files a/admin/src/app/assets/images/index/app1.png and b/admin/src/app/assets/images/index/app1.png differ diff --git a/admin/src/app/assets/images/index/auth1.png b/admin/src/app/assets/images/index/auth1.png index 01c07663e..f6da7255d 100644 Binary files a/admin/src/app/assets/images/index/auth1.png and b/admin/src/app/assets/images/index/auth1.png differ diff --git a/admin/src/app/assets/images/index/new_site1.png b/admin/src/app/assets/images/index/new_site1.png index f9d2b2e05..b8071933d 100644 Binary files a/admin/src/app/assets/images/index/new_site1.png and b/admin/src/app/assets/images/index/new_site1.png differ diff --git a/admin/src/app/assets/images/index/site1.png b/admin/src/app/assets/images/index/site1.png index b1ea6dd92..3e630ff30 100644 Binary files a/admin/src/app/assets/images/index/site1.png and b/admin/src/app/assets/images/index/site1.png differ diff --git a/admin/src/app/assets/images/index/site_class1.png b/admin/src/app/assets/images/index/site_class1.png index d15af258f..8137ae574 100644 Binary files a/admin/src/app/assets/images/index/site_class1.png and b/admin/src/app/assets/images/index/site_class1.png differ diff --git a/admin/src/app/assets/images/no_attachment.png b/admin/src/app/assets/images/no_attachment.png new file mode 100644 index 000000000..c80ea4152 Binary files /dev/null and b/admin/src/app/assets/images/no_attachment.png differ diff --git a/admin/src/app/assets/images/site_empty.png b/admin/src/app/assets/images/site_empty.png new file mode 100644 index 000000000..7703baa42 Binary files /dev/null and b/admin/src/app/assets/images/site_empty.png differ diff --git a/admin/src/app/assets/images/tools/code.png b/admin/src/app/assets/images/tools/code.png index 498bd675d..60e94e15c 100644 Binary files a/admin/src/app/assets/images/tools/code.png and b/admin/src/app/assets/images/tools/code.png differ diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue index 2b0eeed30..c14982707 100644 --- a/admin/src/app/components/cloud-build/index.vue +++ b/admin/src/app/components/cloud-build/index.vue @@ -1,8 +1,7 @@