diff --git a/admin/.env.development b/admin/.env.development index 6b3fa95fb..977806351 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -7,7 +7,4 @@ VITE_APP_BASE_URL='/adminapi/' VITE_IMG_DOMAIN='' # 请求时header中token的参数名 -VITE_REQUEST_HEADER_TOKEN_KEY='token' - -# 请求时header中站点的参数名 -VITE_REQUEST_HEADER_SITEID_KEY='site-id' \ No newline at end of file +VITE_REQUEST_HEADER_TOKEN_KEY='token' \ No newline at end of file diff --git a/admin/.env.production b/admin/.env.production index 4290f9e31..51f575b44 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -7,7 +7,4 @@ VITE_APP_BASE_URL='/adminapi/' VITE_IMG_DOMAIN='' # 请求时header中token的参数名 -VITE_REQUEST_HEADER_TOKEN_KEY='token' - -# 请求时header中站点的参数名 -VITE_REQUEST_HEADER_SITEID_KEY='site-id' \ No newline at end of file +VITE_REQUEST_HEADER_TOKEN_KEY='token' \ No newline at end of file diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index 8139ac907..08908edd6 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,5 @@ // Generated by 'unplugin-auto-import' export {} declare global { - const ElMessage: typeof import('element-plus/es')['ElMessage'] + } diff --git a/admin/components.d.ts b/admin/components.d.ts index 70150d5dc..13b0e5920 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -16,8 +16,12 @@ declare module '@vue/runtime-core' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCalendar: typeof import('element-plus/es')['ElCalendar'] ElCard: typeof import('element-plus/es')['ElCard'] + ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] + ElCheckTag: typeof import('element-plus/es')['ElCheckTag'] ElCol: typeof import('element-plus/es')['ElCol'] ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] @@ -28,6 +32,7 @@ declare module '@vue/runtime-core' { ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElDivider: typeof import('element-plus/es')['ElDivider'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] @@ -41,11 +46,11 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] @@ -65,8 +70,10 @@ declare module '@vue/runtime-core' { ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] + ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] HeatMap: typeof import('./src/components/heat-map/index.vue')['default'] Icon: typeof import('./src/components/icon/index.vue')['default'] diff --git a/admin/package-lock.json b/admin/package-lock.json index 328310d0e..282cd5399 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "dependencies": { "@element-plus/icons-vue": "^2.0.10", + "@highlightjs/vue-plugin": "^2.1.0", "@vueuse/core": "^9.12.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", @@ -17,6 +18,7 @@ "css-color-function": "^1.3.3", "echarts": "^5.4.1", "element-plus": "^2.2.29", + "highlight.js": "^11.8.0", "nprogress": "^0.2.0", "pinia": "^2.0.30", "qrcode": "^1.5.1", @@ -855,6 +857,15 @@ "@floating-ui/core": "^1.1.0" } }, + "node_modules/@highlightjs/vue-plugin": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", + "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==", + "peerDependencies": { + "highlight.js": "^11.0.1", + "vue": "^3" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -3922,6 +3933,14 @@ "he": "bin/he" } }, + "node_modules/highlight.js": { + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz", + "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/hls.js": { "version": "1.3.4", "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.3.4.tgz", @@ -7065,6 +7084,12 @@ "@floating-ui/core": "^1.1.0" } }, + "@highlightjs/vue-plugin": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", + "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==", + "requires": {} + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -9533,6 +9558,11 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, + "highlight.js": { + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz", + "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==" + }, "hls.js": { "version": "1.3.4", "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.3.4.tgz", diff --git a/admin/package.json b/admin/package.json index baf556113..6527b6166 100644 --- a/admin/package.json +++ b/admin/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", + "@highlightjs/vue-plugin": "^2.1.0", "@vueuse/core": "^9.12.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", @@ -18,6 +19,7 @@ "css-color-function": "^1.3.3", "echarts": "^5.4.1", "element-plus": "^2.2.29", + "highlight.js": "^11.8.0", "nprogress": "^0.2.0", "pinia": "^2.0.30", "qrcode": "^1.5.1", diff --git a/admin/src/App.vue b/admin/src/App.vue index f56b86b2a..b3376ded8 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -24,7 +24,7 @@ const toggleDark = useToggle(useDark()) watch(route, () => { useAppStore().$patch(state => { - state.route = route.meta.view || route.path + state.route = route }) }, { immediate: true }) diff --git a/admin/src/api/article.ts b/admin/src/api/article.ts deleted file mode 100644 index 0825f0054..000000000 --- a/admin/src/api/article.ts +++ /dev/null @@ -1,102 +0,0 @@ -import request from '@/utils/request' - -/***************************************************** 文章表 ****************************************************/ - -/** - * 获取文章表列表 - * @param params - * @returns - */ -export function getArticleList(params: Record) { - return request.get(`article/article`, {params}) -} - -/** - * 获取文章表详情 - * @param id 文章表id - * @returns - */ -export function getArticleInfo(id: number) { - return request.get(`article/article/${id}`); -} - -/** - * 添加文章表 - * @param params - * @returns - */ -export function addArticle(params: Record) { - return request.post('article/article', params, {showSuccessMessage: true}) -} - -/** - * 编辑文章表 - * @param params - */ -export function editArticle(params: Record) { - return request.put(`article/article/${params.id}`, params, {showSuccessMessage: true}) -} - -/** - * 删除文章表 - * @param id - * @returns - */ -export function deleteArticle(id: number) { - return request.delete(`article/article/${id}`, {showSuccessMessage: true}) -} - -/***************************************************** 文章分类管理 ****************************************************/ - -/** - * 获取文章分类列表 - * @param params - * @returns - */ -export function getArticleCategoryList(params: Record) { - return request.get(`article/category`, {params}) -} - - -/** - * 获取文章全部分类 - * @param params - * @returns - */ -export function getArticleCategoryAll(params: Record) { - return request.get(`article/category/all`, params) -} - -/** - * 获取文章分类详情 - * @param category_id - */ -export function getArticleCategoryInfo(category_id: number) { - return request.get(`article/category/${category_id}`); -} - -/** - * 添加文章分类 - * @param params - * @returns - */ -export function addArticleCategory(params: Record) { - return request.post('article/category', params, {showSuccessMessage: true}) -} - -/** - * 编辑文章分类 - * @param params - * @returns - */ -export function editArticleCategory(params: Record) { - return request.put(`article/category/${params.category_id}`, params, {showSuccessMessage: true}) -} - -/** - * 文章分类删除 - * @param category_id - */ -export function deleteArticleCategory(category_id: number) { - return request.delete(`article/category/${category_id}`, {showSuccessMessage: true}); -} \ No newline at end of file diff --git a/admin/src/api/order.ts b/admin/src/api/order.ts deleted file mode 100644 index 7fdf586e5..000000000 --- a/admin/src/api/order.ts +++ /dev/null @@ -1,70 +0,0 @@ -import request from '@/utils/request' - -/***************************************************** 充值订单 ****************************************************/ - -/** - * 获取充值订单列表 - * @param params - * @returns - */ -export function getRechargeOrderList(params: Record) { - return request.get(`order/recharge`, {params}) -} - -/** - * 获取充值订单统计 - * @param params - * @returns - */ -export function getRechargeStat(params: Record) { - return request.get(`order/recharge/stat`, {params}) -} - -/** - * 获取充值订单详情 - * @param order_id - * @returns - */ -export function getRechargeOrderInfo(order_id: number) { - return request.get(`order/recharge/${order_id}`); -} - -/** - * 获取充值订单状态列表 - * @returns - */ -export function getRechargeOrderStatusList() { - return request.get(`order/recharge/status`) -} - -/** - * 获取退款记录 - * @returns - */ -export function getRechargeRefund(params: Record) { - return request.get(`order/recharge/refund`, {params}) -} - -/** - * 获取退款状态 - * @returns - */ -export function getRechargeRefundStatus() { - return request.get(`order/recharge/refund/status`) -} - -/** - * 充值订单发起退款 - * @returns - */ -export function rechargeRefund(id: number) { - return request.put(`order/recharge/refund/${id}`, {}, {showSuccessMessage: true}); -} - -/** - * 获取退款统计 - * @returns - */ -export function getRechargeRefundStat() { - return request.get(`order/recharge/refund/stat`); -} \ No newline at end of file diff --git a/admin/src/api/site.ts b/admin/src/api/site.ts deleted file mode 100644 index ae0415ea7..000000000 --- a/admin/src/api/site.ts +++ /dev/null @@ -1,236 +0,0 @@ -import request from '@/utils/request' - -//包含站点管理，站点用户管理，站点操作日志 - -/***************************************************** 站点管理 ****************************************************/ - -/** - * 获取站点列表 - * @param params - * @returns - */ -export function getSiteList(params: Record) { - return request.get(`site/site`, {params}) -} - -/** - * 获取站点详情 - * @param site_id - */ -export function getSiteInfo(site_id: number) { - return request.get(`site/site/${site_id}`); -} - -/** - * 添加站点 - * @param params - * @returns - */ -export function addSite(params: Record) { - return request.post('site/site', params, {showSuccessMessage: true}) -} - -/** - * 更新站点 - * @param params - */ -export function editSite(params: Record) { - return request.put(`site/site/${params.site_id}`, params, {showSuccessMessage: true}) -} - -/** - * 关闭站点 - * @param params - */ -export function closeSite(params: Record) { - return request.put(`site/closesite/${params.site_id}`, params, {showSuccessMessage: true}) -} - -/** - * 打开站点 - * @param params - */ -export function openSite(params: Record) { - return request.put(`site/opensite/${params.site_id}`, params, {showSuccessMessage: true}) -} - -/** - * 获取全部站点状态 - */ -export function getStatusList() { - return request.get(`site/statuslist`) -} - - -/***************************************************** 站点分组管理 ****************************************************/ - -/** - * 获取站点分组列表 - * @param params - * @returns - */ -export function getSiteGroupList(params: Record) { - return request.get(`site/group`, {params}) -} - -/** - * 获取站点分组详情 - * @param site_id - */ -export function getSiteGroupInfo(site_id: number) { - return request.get(`site/group/${site_id}`); -} - -/** - * 添加站点分组 - * @param params - * @returns - */ -export function addSiteGroup(params: Record) { - return request.post('site/group', params, {showSuccessMessage: true}) -} - -/** - * 更新站点分组 - * @param params - */ -export function editSiteGroup(params: Record) { - return request.put(`site/group/${params.group_id}`, params, {showSuccessMessage: true}) -} - -/** - * 删除站点分组 - * @param group_id - */ -export function deleteSiteGroup(group_id: number) { - return request.delete(`site/group/${group_id}`, {showSuccessMessage: true}); -} - -/** - * 获取全部站点分组 - * @param params - * @returns - */ -export function getSiteGroupAll(params: Record) { - return request.get(`site/group/all`, params) -} - -/***************************************************** 当前站点用户 *************************************************/ - -/** - * 获取站点用户列表 - * @param params - * @returns - */ -export function getUserList(params: Record) { - return request.get(`site/user`, {params}) -} - -/** - * 获取站点用户详情 - * @param uid - */ -export function getUserInfo(uid: number) { - return request.get(`site/user/${uid}`); -} - -/** - * 添加用户 - * @param params - * @returns - */ -export function addUser(params: Record) { - return request.post('site/user', params, {showSuccessMessage: true}) -} - -/** - * 编辑用户 - * @param params - */ -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}) -} - - -/** - * 锁定用户 - * @param uid - * @returns - */ -export function lockUser(uid: number) { - return request.put(`site/user/lock/${uid}`) -} - - -/** - * 解锁用户 - * @param uid - * @returns - */ -export function unlockUser(uid: number) { - return request.put(`site/user/unlock/${uid}`) -} - - -/***************************************************** 操作日志 **************************************************/ - -/** - * 获取操作日志列表 - * @param params - * @returns - */ -export function getLogList(params: Record) { - return request.get(`site/log`, {params}) -} - -/** - * 获取操作日志详情 - * @param id - */ -export function getLogInfo(id: number) { - return request.get(`site/log/${id}`) -} - -/***************************************************** 账单列表 **************************************************/ - -/** - * 获取账单列表 - * @param params - * @returns - */ -export function getAccountList(params: Record) { - return request.get(`site/account`, {params}) -} - -/** - * 获取账单详情 - * @param id - */ -export function getAccountInfo(id: number) { - return request.get(`site/account/${id}`) -} - -/** - * 获取账单统计 - * @returns - */ -export function getAccountStat() { - return request.get(`site/account/stat`) -} - -/** - * 获取账单类型 - * @returns - */ -export function getAccountType() { - return request.get(`site/account/type`) -} \ No newline at end of file diff --git a/admin/src/api/tools.ts b/admin/src/api/tools.ts deleted file mode 100644 index 37c25f0eb..000000000 --- a/admin/src/api/tools.ts +++ /dev/null @@ -1,70 +0,0 @@ -import request from '@/utils/request' - -/***************************************************** 代码生成 ****************************************************/ - -/** - * 获取代码生成列表 - * @param params - * @returns - */ -export function getGenerateTableList(params: Record) { - return request.get(`generator/generator`, {params}) -} - -/** - * 获取代码生成详情 - * @param id 代码生成id - * @returns - */ -export function getGenerateTableInfo(id: number) { - return request.get(`generator/generator/${id}`); -} - -/** - * 添加代码生成 - * @param params - * @returns - */ -export function addGenerateTable(params: Record) { - return request.post('generator/generator', params, {showSuccessMessage: true}) -} - -/** - * 编辑代码生成 - * @param params - */ -export function editGenerateTable(params: Record) { - return request.put(`generator/generator/${params.id}`, params, {showSuccessMessage: true}) -} - -/** - * 删除代码生成 - * @param id - * @returns - */ -export function deleteGenerateTable(id: number) { - return request.delete(`generator/generator/${id}`, {showSuccessMessage: true}) -} - -/** - * 代码生成 - * @param params - * @returns - */ -export function generateCreate(params: Record) { - return request.post(`generator/download`, params) -} - -/** - * 数据表 - */ -export function generateTable() { - return request.get(`generator/table`) -} - -/** - * 获取服务器环境配置 - */ -export function getSystem() { - return request.get(`sys/system`) -} diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts deleted file mode 100644 index 3e71e1635..000000000 --- a/admin/src/api/user.ts +++ /dev/null @@ -1,41 +0,0 @@ -import request from '@/utils/request' - -//当前接口用户指系统整体用户管理，站内用户添加，编辑，详情，操作日志，请查看站点内部相关接口 - -/***************************************************** 用户 ****************************************************/ - -/** - * 获取用户列表 - * @param params - * @returns - */ -export function getUserList(params: Record) { - return request.get(`user/user`, { params }) -} - -/** - * 获取用户详情 - * @param uid 用户uid - * @returns - */ -export function getUserInfo(uid: number) { - return request.get(`user/user/${uid}`); -} - -/** - * 添加用户 - * @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 }) -} - diff --git a/admin/src/api/addon.ts b/admin/src/app/api/addon.ts similarity index 90% rename from admin/src/api/addon.ts rename to admin/src/app/api/addon.ts index 8a8c77f48..a01b23707 100644 --- a/admin/src/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -16,6 +16,14 @@ export function getAddonDetial(id: number) { return request.get(`addon/${id}`) } +/** + * 插件信息 + * @returns + */ +export function getAddonByKey(key: string) { + return request.get(`addon/addon_by_key/${key}`) +} + /** * 安装插件 * @param params diff --git a/admin/src/api/aliapp.ts b/admin/src/app/api/aliapp.ts similarity index 100% rename from admin/src/api/aliapp.ts rename to admin/src/app/api/aliapp.ts diff --git a/admin/src/app/api/apply.ts b/admin/src/app/api/apply.ts new file mode 100644 index 000000000..0a98f23c6 --- /dev/null +++ b/admin/src/app/api/apply.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +/** + * 应用列表 + * @returns + */ +export function getApply(params: Record) { + return request.get(`auth/authaddon`, {params}) +} \ No newline at end of file diff --git a/admin/src/api/auth.ts b/admin/src/app/api/auth.ts similarity index 63% rename from admin/src/api/auth.ts rename to admin/src/app/api/auth.ts index 5caaa2c76..f320959d2 100644 --- a/admin/src/api/auth.ts +++ b/admin/src/app/api/auth.ts @@ -3,10 +3,9 @@ import request from '@/utils/request' /** * 登录 * @param params - * @param app_type */ -export function login(params: Record, app_type: string) { - return request.get(`login/${app_type}`, {params}) +export function login(params: Record) { + return request.get('login', { params }) } /** @@ -31,4 +30,12 @@ export function getSiteInfo() { */ export function getLoginConfig() { return request.get('login/config') +} + +/** + * 设置加星应用 + * @returns + */ +export function setStarAddon(params: Record) { + return request.post('auth/appstar', params) } \ No newline at end of file diff --git a/admin/src/api/diy.ts b/admin/src/app/api/diy.ts similarity index 100% rename from admin/src/api/diy.ts rename to admin/src/app/api/diy.ts diff --git a/admin/src/api/h5.ts b/admin/src/app/api/h5.ts similarity index 100% rename from admin/src/api/h5.ts rename to admin/src/app/api/h5.ts diff --git a/admin/src/api/member.ts b/admin/src/app/api/member.ts similarity index 100% rename from admin/src/api/member.ts rename to admin/src/app/api/member.ts diff --git a/admin/src/api/module.ts b/admin/src/app/api/module.ts similarity index 96% rename from admin/src/api/module.ts rename to admin/src/app/api/module.ts index 3a3656a0d..16f334e6e 100644 --- a/admin/src/api/module.ts +++ b/admin/src/app/api/module.ts @@ -22,7 +22,6 @@ export function getAdminAuthinfo() { } - /** * 获取授权插件列表 * @returns @@ -33,7 +32,6 @@ export function getModule() { /** * 获取插件版本 - * @param params * @returns */ export function getModuleVersion() { @@ -42,7 +40,7 @@ export function getModuleVersion() { /** * 下载版本 - * @param params + * @param addon * @returns */ export function downloadVersion(addon) { diff --git a/admin/src/api/notice.ts b/admin/src/app/api/notice.ts similarity index 100% rename from admin/src/api/notice.ts rename to admin/src/app/api/notice.ts diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts new file mode 100644 index 000000000..03ffd00f1 --- /dev/null +++ b/admin/src/app/api/pay.ts @@ -0,0 +1,38 @@ +import request from '@/utils/request' + + + +/***************************************************** 账单列表 **************************************************/ + +/** + * 获取账单列表 + * @param params + * @returns + */ +export function getAccountList(params: Record) { + return request.get(`pay/account`, {params}) +} + +/** + * 获取账单详情 + * @param id + */ +export function getAccountInfo(id: number) { + return request.get(`pay/account/${id}`) +} + +/** + * 获取账单统计 + * @returns + */ +export function getAccountStat() { + return request.get(`pay/account/stat`) +} + +/** + * 获取账单类型 + * @returns + */ +export function getAccountType() { + return request.get(`pay/account/type`) +} \ No newline at end of file diff --git a/admin/src/api/personal.ts b/admin/src/app/api/personal.ts similarity index 100% rename from admin/src/api/personal.ts rename to admin/src/app/api/personal.ts diff --git a/admin/src/api/stat.ts b/admin/src/app/api/stat.ts similarity index 100% rename from admin/src/api/stat.ts rename to admin/src/app/api/stat.ts diff --git a/admin/src/api/sys.ts b/admin/src/app/api/sys.ts similarity index 91% rename from admin/src/api/sys.ts rename to admin/src/app/api/sys.ts index 2e3dc6c21..c39af19ca 100644 --- a/admin/src/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -61,6 +61,13 @@ export function deleteRole(roleId: number) { return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true }) } +/** + * 修改用户组状态 + * @param params + */ +export function edstatus(params: Record) { + return request.put(`sys/role/status/${params.role_id}/${params.status}`, { showSuccessMessage: true }) +} /** * 全部分组 * @returns @@ -69,14 +76,34 @@ export function allRole() { return request.get('sys/role/all') } +/** + * 获取全部权限 + * @returns + */ +export function getSystem() { + return request.get(`sys/menu/system_menu`) +} +/** + * 应用权限列表 + */ +export function getAddonList() { + return request.get(`app/getAddonList`) +} +/** + * 应用权限详情列表 + * @param key + */ +export function getaddonMenu(key: any) { + return request.get(`sys/menu/addon_menu/${key}`) +} /***************************************************** 全部菜单 ****************************************************/ /** * 获取全部菜单 * @returns */ -export function getMenus(type: string) { - return request.get(`sys/menu/${type}`) +export function getMenus() { + return request.get(`sys/menu`) } /** @@ -103,7 +130,6 @@ export function addMenu(params: Record) { export function editMenu(params: Record) { return request.put(`sys/menu/${params.menu_key}`, params, { showSuccessMessage: true }) } - /** * 删除菜单 * @param menu_key @@ -111,7 +137,20 @@ export function editMenu(params: Record) { export function deleteMenu(menu_key: string) { return request.delete(`sys/menu/${menu_key}`, { showSuccessMessage: true }) } - +/** + * 获取系统菜单 + * + */ +export function getSystemMenu() { + return request.get(`sys/menu/system_menu`) +} +/** + * 获取应用菜单 + * + */ +export function getAddonMenu(key:any) { + return request.get(`sys/menu/addon_menu/${key}`) +} /***************************************************** 站点菜单 ****************************************************/ /** @@ -126,7 +165,7 @@ export function getSiteMenus() { /***************************************************** 设置 ****************************************************/ /** - * 获取网站设置 + * 获取网站设置 [需要登录] * @returns */ export function getWebsite() { @@ -134,7 +173,7 @@ export function getWebsite() { } /** - * 获取网站设置 + * 获取网站设置 [不需要登录] * @returns */ export function getWebConfig() { @@ -147,7 +186,7 @@ export function getWebConfig() { * @returns */ export function setWebsite(params: Record) { - return request.put(`sys/config/website`, params, { showSuccessMessage: true }) + return request.post(`sys/config/website`, params, { showSuccessMessage: true }) } /** @@ -536,15 +575,6 @@ export function clearSchemaCache(params: Record) { return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true }) } - -/***************************************************** 获取应用 ****************************************************/ -/** - * 获取应用 - */ -export function getAppMange() { - return request.get(`sys/applist`) -} - /***************************************************** 地图设置 ****************************************************/ /** @@ -576,22 +606,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') -} - -/** - * 设置布局 - * @returns - */ -export function setLayout(key: string) { - return request.put('sys/layout', { key }, { showSuccessMessage: true }) -} - /** * 获取支付待审核记录 */ @@ -621,3 +635,10 @@ export function payAuditRefuse(params: Record) { export function getPayDetail(id: number) { return request.get(`pay/detail/${id}`) } + +/** + * 获取手机端首页列表 + */ +export function getWapIndexList(params: Record) { + return request.get('sys/config/wap_index', { params }) +} \ No newline at end of file diff --git a/admin/src/app/api/tools.ts b/admin/src/app/api/tools.ts new file mode 100644 index 000000000..86036de06 --- /dev/null +++ b/admin/src/app/api/tools.ts @@ -0,0 +1,163 @@ +import request from '@/utils/request' +/***************************************************** 插件开发 ****************************************************/ +/** + * 获取插件列表 + * @returns + */ +export function getaddonDevelop(params: Record) { + return request.get(`addon_develop`,{params}); +} +/** + * 获取插件类型配置 + * @returns + */ +export function getAddontype() { + return request.get(`addontype`); +} +/** + * 获取插件详情 + + * @returns + */ +export function getAddonDevelop(key:any) { + return request.get(`addon_develop/${key}`) +} +/** + * 获取插件key是否存在 + + * @returns + */ +export function getAddonDevelopCheck(key:any) { + return request.get(`addon_develop/check/${key}`) +} +/** + * 添加插件 + * @param params + * @returns + */ +export function addAddonDevelop(key:any,params: Record) { + return request.post(`addon_develop/${key}`, params) +} +/** + * 编辑插件 + * @param params + * @returns + */ +export function editAddonDevelop(key:any,params: Record) { + return request.put(`addon_develop/${key}`, params) +} +/** + * 删除插件 + * @param id + * @returns + */ +export function deleteAddonDevelop(key: any) { + return request.delete(`addon_develop/${key}`, {showSuccessMessage: true}) +} +/** + * 打包插件 + * @returns + */ +export function addonDevelopBuild(key:any) { + return request.post(`addon_develop/build/${key}`) +} +/** + * 下载插件 + * @returns + */ +export function addonDevelopDownload(key:any) { + return request.post(`addon_develop/download/${key}`,{},{ "responseType": "blob" }) +} +/***************************************************** 代码生成 ****************************************************/ + +/** + * 获取代码生成列表 + * @param params + * @returns + */ +export function getGenerateTableList(params: Record) { + return request.get(`generator/generator`, {params}) +} + +/** + * 获取代码生成详情 + * @param id 代码生成id + * @returns + */ +export function getGenerateTableInfo(id: number) { + return request.get(`generator/generator/${id}`); +} + +/** + * 添加代码生成 + * @param params + * @returns + */ +export function addGenerateTable(params: Record) { + return request.post('generator/generator', params, {showSuccessMessage: true}) +} + +/** + * 编辑代码生成 + * @param params + */ +export function editGenerateTable(params: Record) { + return request.put(`generator/generator/${params.id}`, params) +} + +/** + * 删除代码生成 + * @param id + * @returns + */ +export function deleteGenerateTable(id: number) { + return request.delete(`generator/generator/${id}`, {showSuccessMessage: true}) +} + +/** + * 代码生成 + * @param params + * @returns + */ +export function generateCreate(params: Record) { + return request.post(`generator/download`, params) +} +/** + * 代码生成预览 + * @param params + * @returns + */ +export function generatePreview(id: number) { + return request.get(`generator/preview/${id}`) +} +/** + * 数据表 + */ +export function generateTable() { + return request.get(`generator/table`) +} + +/** + * 获取服务器环境配置 + */ +export function getSystem() { + return request.get(`sys/system`) +} +/** + * 获取全部模型 + */ +export function getGeneratorAllModel(params:any) { + return request.get(`generator/all_model`,params) +} +/** + * 获取 表字段 + */ +export function getGeneratorTableColumn(params:any){ + return request.get(`generator/table_column`,params) +} +/** + * 同步校验 + */ +export function generatorCheckFile(params: Record){ + return request.get(`generator/check_file`,{params}) +} \ No newline at end of file diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts new file mode 100644 index 000000000..97aba357e --- /dev/null +++ b/admin/src/app/api/user.ts @@ -0,0 +1,73 @@ +import request from '@/utils/request' + +//当前接口用户指系统整体用户管理，站内用户添加，编辑，详情，操作日志，请查看站点内部相关接口 + +/***************************************************** 用户 ****************************************************/ + +/** + * 获取用户列表 + * @param params + * @returns + */ +export function getUserList(params: Record) { + return request.get(`user`, { params }) +} + +/** + * 获取用户详情 + * @param uid 用户uid + * @returns + */ +export function getUserInfo(uid: number) { + return request.get(`user/${uid}`); +} + +/** + * 添加用户 + * @param params + * @returns + */ +export function addUser(params: Record) { + return request.post('user', params, { showSuccessMessage: true }) +} + +/** + * 更新用户 + * @param params + */ +export function editUser(params: Record) { + return request.put(`user/${params.uid}`, params, { showSuccessMessage: true }) +} + +/** + * 锁定用户 + */ +export function lockUser(uid: number) { + return request.put(`user/lock/${uid}`, {}, { showSuccessMessage: true }) +} + +/** + * 解除用户锁定 + */ +export function unlockUser(uid: number) { + return request.put(`user/unlock/${uid}`, {}, { showSuccessMessage: true }) +} + +/***************************************************** 操作日志 **************************************************/ + +/** + * 获取操作日志列表 + * @param params + * @returns + */ +export function getLogList(params: Record) { + return request.get(`user/userlog`, { params }) +} + +/** + * 获取操作日志详情 + * @param id + */ +export function getLogInfo(id: number) { + return request.get(`user/userlog/${id}`) +} diff --git a/admin/src/api/weapp.ts b/admin/src/app/api/weapp.ts similarity index 57% rename from admin/src/api/weapp.ts rename to admin/src/app/api/weapp.ts index ff344ea67..8d48dd6e9 100644 --- a/admin/src/api/weapp.ts +++ b/admin/src/app/api/weapp.ts @@ -14,7 +14,7 @@ export function getWeappConfig() { * @returns */ export function setWeappConfig(params: Record) { - return request.put('weapp/config', params, {showSuccessMessage: true}) + return request.put('weapp/config', params, { showSuccessMessage: true }) } /** @@ -31,9 +31,34 @@ export function getTemplateList() { * @returns */ export function getBatchAcquisition(params: Record) { - return request.put('weapp/template/sync', params, {showSuccessMessage: true}) + return request.put('weapp/template/sync', params, { showSuccessMessage: true }) +} +/** + * 添加微信小程序版本 + * @param params + * @returns + */ +export function setWeappVersion(params: Record) { + return request.post('weapp/version', params, { showSuccessMessage: true }) } +/** + * 微信小程序预览码 + * @param params + * @returns + */ +export function getWeappPreview() { + return request.get('weapp/preview') +} + +/** + * 微信小程序版本列表 + * @param params + * @returns + */ +export function getWeappVersionList(params: Record) { + return request.get('weapp/version', { params }) +} /***************************************************** 管理端 ****************************************************/ /** @@ -42,7 +67,7 @@ export function getBatchAcquisition(params: Record) { * @returns */ export function uploadVersion(params: Record) { - return request.put('applet/upload', params, {showSuccessMessage: true}) + return request.put('applet/upload', params, { showSuccessMessage: true }) } /** @@ -51,7 +76,7 @@ export function uploadVersion(params: Record) { * @returns */ export function addVersion(params: Record) { - return request.post('applet/version', params, {showSuccessMessage: true}) + return request.post('applet/version', params, { showSuccessMessage: true }) } /** @@ -60,7 +85,7 @@ export function addVersion(params: Record) { * @returns */ export function getVersionList(params: Record) { - return request.get('applet/version', {params}) + return request.get('applet/version', { params }) } /** @@ -78,7 +103,7 @@ export function getVersionInfo(id: string) { * @returns */ export function editVersion(params: Record) { - return request.put(`applet/version/${params.id}`, params, {showSuccessMessage: true}) + return request.put(`applet/version/${params.id}`, params, { showSuccessMessage: true }) } /** @@ -97,4 +122,13 @@ export function deleteVersion(id: string) { */ export function versionDown(id: string) { return request.get(`applet/version/download/${id}`, { "responseType": "blob" }) +} + +/** + * 版本提交 + * @param params + * @returns + */ +export function addProcess(params: Record) { + return request.post('weapp/examine', params, { showSuccessMessage: true }) } \ No newline at end of file diff --git a/admin/src/api/wechat.ts b/admin/src/app/api/wechat.ts similarity index 100% rename from admin/src/api/wechat.ts rename to admin/src/app/api/wechat.ts diff --git a/admin/src/assets/images/app_default.png b/admin/src/app/assets/images/app_default.png similarity index 100% rename from admin/src/assets/images/app_default.png rename to admin/src/app/assets/images/app_default.png diff --git a/admin/src/assets/images/app_store/app_store_default.png b/admin/src/app/assets/images/app_store/app_store_default.png similarity index 100% rename from admin/src/assets/images/app_store/app_store_default.png rename to admin/src/app/assets/images/app_store/app_store_default.png diff --git a/admin/src/assets/images/app_store/local_icon.png b/admin/src/app/assets/images/app_store/local_icon.png similarity index 100% rename from admin/src/assets/images/app_store/local_icon.png rename to admin/src/app/assets/images/app_store/local_icon.png diff --git a/admin/src/assets/images/app_store/local_icon_select.png b/admin/src/app/assets/images/app_store/local_icon_select.png similarity index 100% rename from admin/src/assets/images/app_store/local_icon_select.png rename to admin/src/app/assets/images/app_store/local_icon_select.png diff --git a/admin/src/assets/images/app_store/market_icon.png b/admin/src/app/assets/images/app_store/market_icon.png similarity index 100% rename from admin/src/assets/images/app_store/market_icon.png rename to admin/src/app/assets/images/app_store/market_icon.png diff --git a/admin/src/assets/images/app_store/market_icon_select.png b/admin/src/app/assets/images/app_store/market_icon_select.png similarity index 100% rename from admin/src/assets/images/app_store/market_icon_select.png rename to admin/src/app/assets/images/app_store/market_icon_select.png diff --git a/admin/src/assets/images/app_store/switch_icon_1.png b/admin/src/app/assets/images/app_store/switch_icon_1.png similarity index 100% rename from admin/src/assets/images/app_store/switch_icon_1.png rename to admin/src/app/assets/images/app_store/switch_icon_1.png diff --git a/admin/src/assets/images/app_store/switch_icon_2.png b/admin/src/app/assets/images/app_store/switch_icon_2.png similarity index 100% rename from admin/src/assets/images/app_store/switch_icon_2.png rename to admin/src/app/assets/images/app_store/switch_icon_2.png diff --git a/admin/src/app/assets/images/arrow.png b/admin/src/app/assets/images/arrow.png new file mode 100644 index 000000000..4383e91a1 Binary files /dev/null and b/admin/src/app/assets/images/arrow.png differ diff --git a/admin/src/assets/images/back_login.jpg b/admin/src/app/assets/images/back_login.jpg similarity index 100% rename from admin/src/assets/images/back_login.jpg rename to admin/src/app/assets/images/back_login.jpg diff --git a/admin/src/app/assets/images/category_default.png b/admin/src/app/assets/images/category_default.png new file mode 100644 index 000000000..fcd7f98f3 Binary files /dev/null and b/admin/src/app/assets/images/category_default.png differ diff --git a/admin/src/assets/images/channel/preview.png b/admin/src/app/assets/images/channel/preview.png similarity index 100% rename from admin/src/assets/images/channel/preview.png rename to admin/src/app/assets/images/channel/preview.png diff --git a/admin/src/app/assets/images/complete.png b/admin/src/app/assets/images/complete.png new file mode 100644 index 000000000..c7d018eb8 Binary files /dev/null and b/admin/src/app/assets/images/complete.png differ diff --git a/admin/src/app/assets/images/config_info.png b/admin/src/app/assets/images/config_info.png new file mode 100644 index 000000000..4068920da Binary files /dev/null and b/admin/src/app/assets/images/config_info.png differ diff --git a/admin/src/assets/images/default_headimg.png b/admin/src/app/assets/images/default_headimg.png similarity index 100% rename from admin/src/assets/images/default_headimg.png rename to admin/src/app/assets/images/default_headimg.png diff --git a/admin/src/assets/images/diy/text/style1.png b/admin/src/app/assets/images/diy/text/style1.png similarity index 100% rename from admin/src/assets/images/diy/text/style1.png rename to admin/src/app/assets/images/diy/text/style1.png diff --git a/admin/src/assets/images/diy/text/style2.png b/admin/src/app/assets/images/diy/text/style2.png similarity index 100% rename from admin/src/assets/images/diy/text/style2.png rename to admin/src/app/assets/images/diy/text/style2.png diff --git a/admin/src/assets/images/diy_preview_head.png b/admin/src/app/assets/images/diy_preview_head.png similarity index 100% rename from admin/src/assets/images/diy_preview_head.png rename to admin/src/app/assets/images/diy_preview_head.png diff --git a/admin/src/assets/images/empty.png b/admin/src/app/assets/images/empty.png similarity index 100% rename from admin/src/assets/images/empty.png rename to admin/src/app/assets/images/empty.png diff --git a/admin/src/assets/images/error.png b/admin/src/app/assets/images/error.png similarity index 100% rename from admin/src/assets/images/error.png rename to admin/src/app/assets/images/error.png diff --git a/admin/src/assets/images/icon-addon.png b/admin/src/app/assets/images/icon-addon.png similarity index 100% rename from admin/src/assets/images/icon-addon.png rename to admin/src/app/assets/images/icon-addon.png diff --git a/admin/src/assets/images/icon_folder.png b/admin/src/app/assets/images/icon_folder.png similarity index 100% rename from admin/src/assets/images/icon_folder.png rename to admin/src/app/assets/images/icon_folder.png diff --git a/admin/src/assets/images/icon_preview.png b/admin/src/app/assets/images/icon_preview.png similarity index 100% rename from admin/src/assets/images/icon_preview.png rename to admin/src/app/assets/images/icon_preview.png diff --git a/admin/src/assets/images/index/add_menu.png b/admin/src/app/assets/images/index/add_menu.png similarity index 100% rename from admin/src/assets/images/index/add_menu.png rename to admin/src/app/assets/images/index/add_menu.png diff --git a/admin/src/assets/images/index/administrator.png b/admin/src/app/assets/images/index/administrator.png similarity index 100% rename from admin/src/assets/images/index/administrator.png rename to admin/src/app/assets/images/index/administrator.png diff --git a/admin/src/assets/images/index/app.png b/admin/src/app/assets/images/index/app.png similarity index 100% rename from admin/src/assets/images/index/app.png rename to admin/src/app/assets/images/index/app.png diff --git a/admin/src/app/assets/images/index/app_default.png b/admin/src/app/assets/images/index/app_default.png new file mode 100644 index 000000000..4a22d9e47 Binary files /dev/null and b/admin/src/app/assets/images/index/app_default.png differ diff --git a/admin/src/assets/images/index/article.png b/admin/src/app/assets/images/index/article.png similarity index 100% rename from admin/src/assets/images/index/article.png rename to admin/src/app/assets/images/index/article.png diff --git a/admin/src/assets/images/index/article_list.png b/admin/src/app/assets/images/index/article_list.png similarity index 100% rename from admin/src/assets/images/index/article_list.png rename to admin/src/app/assets/images/index/article_list.png diff --git a/admin/src/assets/images/index/auth.png b/admin/src/app/assets/images/index/auth.png similarity index 100% rename from admin/src/assets/images/index/auth.png rename to admin/src/app/assets/images/index/auth.png diff --git a/admin/src/assets/images/index/balance.png b/admin/src/app/assets/images/index/balance.png similarity index 100% rename from admin/src/assets/images/index/balance.png rename to admin/src/app/assets/images/index/balance.png diff --git a/admin/src/assets/images/index/del_model.png b/admin/src/app/assets/images/index/del_model.png similarity index 100% rename from admin/src/assets/images/index/del_model.png rename to admin/src/app/assets/images/index/del_model.png diff --git a/admin/src/assets/images/index/edit.png b/admin/src/app/assets/images/index/edit.png similarity index 100% rename from admin/src/assets/images/index/edit.png rename to admin/src/app/assets/images/index/edit.png diff --git a/admin/src/assets/images/index/fitment.png b/admin/src/app/assets/images/index/fitment.png similarity index 100% rename from admin/src/assets/images/index/fitment.png rename to admin/src/app/assets/images/index/fitment.png diff --git a/admin/src/assets/images/index/member.png b/admin/src/app/assets/images/index/member.png similarity index 100% rename from admin/src/assets/images/index/member.png rename to admin/src/app/assets/images/index/member.png diff --git a/admin/src/assets/images/index/model_tag.png b/admin/src/app/assets/images/index/model_tag.png similarity index 100% rename from admin/src/assets/images/index/model_tag.png rename to admin/src/app/assets/images/index/model_tag.png diff --git a/admin/src/assets/images/index/new_site.png b/admin/src/app/assets/images/index/new_site.png similarity index 100% rename from admin/src/assets/images/index/new_site.png rename to admin/src/app/assets/images/index/new_site.png diff --git a/admin/src/assets/images/index/renovation.png b/admin/src/app/assets/images/index/renovation.png similarity index 100% rename from admin/src/assets/images/index/renovation.png rename to admin/src/app/assets/images/index/renovation.png diff --git a/admin/src/assets/images/index/site.png b/admin/src/app/assets/images/index/site.png similarity index 100% rename from admin/src/assets/images/index/site.png rename to admin/src/app/assets/images/index/site.png diff --git a/admin/src/assets/images/index/site_auth.png b/admin/src/app/assets/images/index/site_auth.png similarity index 100% rename from admin/src/assets/images/index/site_auth.png rename to admin/src/app/assets/images/index/site_auth.png diff --git a/admin/src/assets/images/index/site_balance.png b/admin/src/app/assets/images/index/site_balance.png similarity index 100% rename from admin/src/assets/images/index/site_balance.png rename to admin/src/app/assets/images/index/site_balance.png diff --git a/admin/src/assets/images/index/site_bg.png b/admin/src/app/assets/images/index/site_bg.png similarity index 100% rename from admin/src/assets/images/index/site_bg.png rename to admin/src/app/assets/images/index/site_bg.png diff --git a/admin/src/assets/images/index/site_class.png b/admin/src/app/assets/images/index/site_class.png similarity index 100% rename from admin/src/assets/images/index/site_class.png rename to admin/src/app/assets/images/index/site_class.png diff --git a/admin/src/assets/images/index/site_img.png b/admin/src/app/assets/images/index/site_img.png similarity index 100% rename from admin/src/assets/images/index/site_img.png rename to admin/src/app/assets/images/index/site_img.png diff --git a/admin/src/assets/images/index/site_member.png b/admin/src/app/assets/images/index/site_member.png similarity index 100% rename from admin/src/assets/images/index/site_member.png rename to admin/src/app/assets/images/index/site_member.png diff --git a/admin/src/assets/images/index/wework_qrcode.png b/admin/src/app/assets/images/index/wework_qrcode.png similarity index 100% rename from admin/src/assets/images/index/wework_qrcode.png rename to admin/src/app/assets/images/index/wework_qrcode.png diff --git a/admin/src/assets/images/index/wx_qrcode.jpg b/admin/src/app/assets/images/index/wx_qrcode.jpg similarity index 100% rename from admin/src/assets/images/index/wx_qrcode.jpg rename to admin/src/app/assets/images/index/wx_qrcode.jpg diff --git a/admin/src/assets/images/iphone_bg.png b/admin/src/app/assets/images/iphone_bg.png similarity index 100% rename from admin/src/assets/images/iphone_bg.png rename to admin/src/app/assets/images/iphone_bg.png diff --git a/admin/src/assets/images/login/admin_login_img.png b/admin/src/app/assets/images/login/admin_login_img.png similarity index 100% rename from admin/src/assets/images/login/admin_login_img.png rename to admin/src/app/assets/images/login/admin_login_img.png diff --git a/admin/src/assets/images/login/login_index_bg.png b/admin/src/app/assets/images/login/login_index_bg.png similarity index 100% rename from admin/src/assets/images/login/login_index_bg.png rename to admin/src/app/assets/images/login/login_index_bg.png diff --git a/admin/src/app/assets/images/login/login_index_left.png b/admin/src/app/assets/images/login/login_index_left.png new file mode 100644 index 000000000..f07432463 Binary files /dev/null and b/admin/src/app/assets/images/login/login_index_left.png differ diff --git a/admin/src/assets/images/login/site_bg.png b/admin/src/app/assets/images/login/site_bg.png similarity index 100% rename from admin/src/assets/images/login/site_bg.png rename to admin/src/app/assets/images/login/site_bg.png diff --git a/admin/src/assets/images/login/site_bg_1.png b/admin/src/app/assets/images/login/site_bg_1.png similarity index 100% rename from admin/src/assets/images/login/site_bg_1.png rename to admin/src/app/assets/images/login/site_bg_1.png diff --git a/admin/src/assets/images/login/site_code.png b/admin/src/app/assets/images/login/site_code.png similarity index 100% rename from admin/src/assets/images/login/site_code.png rename to admin/src/app/assets/images/login/site_code.png diff --git a/admin/src/assets/images/login_bg.png b/admin/src/app/assets/images/login_bg.png similarity index 100% rename from admin/src/assets/images/login_bg.png rename to admin/src/app/assets/images/login_bg.png diff --git a/admin/src/app/assets/images/login_logo_ico.png b/admin/src/app/assets/images/login_logo_ico.png new file mode 100644 index 000000000..59b30c0a9 Binary files /dev/null and b/admin/src/app/assets/images/login_logo_ico.png differ diff --git a/admin/src/assets/images/member_head.png b/admin/src/app/assets/images/member_head.png similarity index 100% rename from admin/src/assets/images/member_head.png rename to admin/src/app/assets/images/member_head.png diff --git a/admin/src/assets/images/no_perms.png b/admin/src/app/assets/images/no_perms.png similarity index 100% rename from admin/src/assets/images/no_perms.png rename to admin/src/app/assets/images/no_perms.png diff --git a/admin/src/app/assets/images/one_type.png b/admin/src/app/assets/images/one_type.png new file mode 100644 index 000000000..dff67135f Binary files /dev/null and b/admin/src/app/assets/images/one_type.png differ diff --git a/admin/src/app/assets/images/public_number.png b/admin/src/app/assets/images/public_number.png new file mode 100644 index 000000000..d0a6bfcba Binary files /dev/null and b/admin/src/app/assets/images/public_number.png differ diff --git a/admin/src/app/assets/images/register.png b/admin/src/app/assets/images/register.png new file mode 100644 index 000000000..d853cba54 Binary files /dev/null and b/admin/src/app/assets/images/register.png differ diff --git a/admin/src/app/assets/images/setting/QRcode.png b/admin/src/app/assets/images/setting/QRcode.png new file mode 100644 index 000000000..493edefcd Binary files /dev/null and b/admin/src/app/assets/images/setting/QRcode.png differ diff --git a/admin/src/app/assets/images/setting/alipay1.png b/admin/src/app/assets/images/setting/alipay1.png new file mode 100644 index 000000000..df5e7dae9 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay1.png differ diff --git a/admin/src/app/assets/images/setting/alipay2.png b/admin/src/app/assets/images/setting/alipay2.png new file mode 100644 index 000000000..107a67f30 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay2.png differ diff --git a/admin/src/app/assets/images/setting/alipay3.png b/admin/src/app/assets/images/setting/alipay3.png new file mode 100644 index 000000000..36755324b Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay3.png differ diff --git a/admin/src/app/assets/images/setting/alipay4.png b/admin/src/app/assets/images/setting/alipay4.png new file mode 100644 index 000000000..b546fc480 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay4.png differ diff --git a/admin/src/app/assets/images/setting/alipay4_1.jpg b/admin/src/app/assets/images/setting/alipay4_1.jpg new file mode 100644 index 000000000..66e4d2c94 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay4_1.jpg differ diff --git a/admin/src/app/assets/images/setting/alipay4_2.jpg b/admin/src/app/assets/images/setting/alipay4_2.jpg new file mode 100644 index 000000000..30e1728dc Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay4_2.jpg differ diff --git a/admin/src/app/assets/images/setting/alipay4_3.jpg b/admin/src/app/assets/images/setting/alipay4_3.jpg new file mode 100644 index 000000000..bf161fb6d Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay4_3.jpg differ diff --git a/admin/src/app/assets/images/setting/alipay4_4.jpg b/admin/src/app/assets/images/setting/alipay4_4.jpg new file mode 100644 index 000000000..448afc5ab Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay4_4.jpg differ diff --git a/admin/src/app/assets/images/setting/alipay5.png b/admin/src/app/assets/images/setting/alipay5.png new file mode 100644 index 000000000..6eb304333 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay5.png differ diff --git a/admin/src/app/assets/images/setting/alipay6.png b/admin/src/app/assets/images/setting/alipay6.png new file mode 100644 index 000000000..6526b2c0f Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay6.png differ diff --git a/admin/src/app/assets/images/setting/alipay7.png b/admin/src/app/assets/images/setting/alipay7.png new file mode 100644 index 000000000..8ae1d9f06 Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay7.png differ diff --git a/admin/src/app/assets/images/setting/alipay8.png b/admin/src/app/assets/images/setting/alipay8.png new file mode 100644 index 000000000..caba3e3dc Binary files /dev/null and b/admin/src/app/assets/images/setting/alipay8.png differ diff --git a/admin/src/app/assets/images/setting/weapp_1.png b/admin/src/app/assets/images/setting/weapp_1.png new file mode 100644 index 000000000..8aa33ebc5 Binary files /dev/null and b/admin/src/app/assets/images/setting/weapp_1.png differ diff --git a/admin/src/app/assets/images/setting/weapp_2.png b/admin/src/app/assets/images/setting/weapp_2.png new file mode 100644 index 000000000..bb6fc76b7 Binary files /dev/null and b/admin/src/app/assets/images/setting/weapp_2.png differ diff --git a/admin/src/app/assets/images/setting/weapp_3.png b/admin/src/app/assets/images/setting/weapp_3.png new file mode 100644 index 000000000..cd085d4f0 Binary files /dev/null and b/admin/src/app/assets/images/setting/weapp_3.png differ diff --git a/admin/src/app/assets/images/setting/weapp_4.png b/admin/src/app/assets/images/setting/weapp_4.png new file mode 100644 index 000000000..0fb16fe93 Binary files /dev/null and b/admin/src/app/assets/images/setting/weapp_4.png differ diff --git a/admin/src/app/assets/images/setting/wechat_1.png b/admin/src/app/assets/images/setting/wechat_1.png new file mode 100644 index 000000000..41b58a244 Binary files /dev/null and b/admin/src/app/assets/images/setting/wechat_1.png differ diff --git a/admin/src/app/assets/images/setting/wechat_2.png b/admin/src/app/assets/images/setting/wechat_2.png new file mode 100644 index 000000000..8c7b11c4f Binary files /dev/null and b/admin/src/app/assets/images/setting/wechat_2.png differ diff --git a/admin/src/app/assets/images/setting/wechat_3.png b/admin/src/app/assets/images/setting/wechat_3.png new file mode 100644 index 000000000..031025db3 Binary files /dev/null and b/admin/src/app/assets/images/setting/wechat_3.png differ diff --git a/admin/src/app/assets/images/setting/wechat_4.png b/admin/src/app/assets/images/setting/wechat_4.png new file mode 100644 index 000000000..c56f6ffc5 Binary files /dev/null and b/admin/src/app/assets/images/setting/wechat_4.png differ diff --git a/admin/src/assets/images/site_login.png b/admin/src/app/assets/images/site_login.png similarity index 100% rename from admin/src/assets/images/site_login.png rename to admin/src/app/assets/images/site_login.png diff --git a/admin/src/assets/images/site_login_bg.png b/admin/src/app/assets/images/site_login_bg.png similarity index 100% rename from admin/src/assets/images/site_login_bg.png rename to admin/src/app/assets/images/site_login_bg.png diff --git a/admin/src/assets/images/site_login_logo.png b/admin/src/app/assets/images/site_login_logo.png similarity index 100% rename from admin/src/assets/images/site_login_logo.png rename to admin/src/app/assets/images/site_login_logo.png diff --git a/admin/src/assets/images/site_logo.png b/admin/src/app/assets/images/site_logo.png similarity index 100% rename from admin/src/assets/images/site_logo.png rename to admin/src/app/assets/images/site_logo.png diff --git a/admin/src/app/assets/images/three_type.png b/admin/src/app/assets/images/three_type.png new file mode 100644 index 000000000..e0f2d5bf7 Binary files /dev/null and b/admin/src/app/assets/images/three_type.png differ diff --git a/admin/src/app/assets/images/two_type.png b/admin/src/app/assets/images/two_type.png new file mode 100644 index 000000000..507e1f802 Binary files /dev/null and b/admin/src/app/assets/images/two_type.png differ diff --git a/admin/src/assets/images/wechat-menu-head-bg.png b/admin/src/app/assets/images/wechat-menu-head-bg.png similarity index 100% rename from admin/src/assets/images/wechat-menu-head-bg.png rename to admin/src/app/assets/images/wechat-menu-head-bg.png diff --git a/admin/src/assets/images/wechat-menu-head-dark-bg.png b/admin/src/app/assets/images/wechat-menu-head-dark-bg.png similarity index 100% rename from admin/src/assets/images/wechat-menu-head-dark-bg.png rename to admin/src/app/assets/images/wechat-menu-head-dark-bg.png diff --git a/admin/src/app/assets/images/wechat_icon.png b/admin/src/app/assets/images/wechat_icon.png new file mode 100644 index 000000000..b8da2be62 Binary files /dev/null and b/admin/src/app/assets/images/wechat_icon.png differ diff --git a/admin/src/lang/en/403.json b/admin/src/app/lang/en/403.json similarity index 100% rename from admin/src/lang/en/403.json rename to admin/src/app/lang/en/403.json diff --git a/admin/src/lang/en/auth.menu.json b/admin/src/app/lang/en/auth.menu.json similarity index 100% rename from admin/src/lang/en/auth.menu.json rename to admin/src/app/lang/en/auth.menu.json diff --git a/admin/src/lang/en/index.json b/admin/src/app/lang/en/index.json similarity index 100% rename from admin/src/lang/en/index.json rename to admin/src/app/lang/en/index.json diff --git a/admin/src/lang/en/login.json b/admin/src/app/lang/en/login.json similarity index 100% rename from admin/src/lang/en/login.json rename to admin/src/app/lang/en/login.json diff --git a/admin/src/lang/en/member.member.json b/admin/src/app/lang/en/member.member.json similarity index 100% rename from admin/src/lang/en/member.member.json rename to admin/src/app/lang/en/member.member.json diff --git a/admin/src/lang/en/user.center.json b/admin/src/app/lang/en/user.center.json similarity index 100% rename from admin/src/lang/en/user.center.json rename to admin/src/app/lang/en/user.center.json diff --git a/admin/src/lang/zh-cn/403.json b/admin/src/app/lang/zh-cn/403.json similarity index 100% rename from admin/src/lang/zh-cn/403.json rename to admin/src/app/lang/zh-cn/403.json diff --git a/admin/src/lang/zh-cn/app.authorize.json b/admin/src/app/lang/zh-cn/app.authorize.json similarity index 54% rename from admin/src/lang/zh-cn/app.authorize.json rename to admin/src/app/lang/zh-cn/app.authorize.json index b18becf59..d3e428705 100644 --- a/admin/src/lang/zh-cn/app.authorize.json +++ b/admin/src/app/lang/zh-cn/app.authorize.json @@ -9,6 +9,9 @@ "authApp": "授权应用", "authAppKey": "应用标识", "siteAddressTips": "授权域名不匹配", - "authCodePlaceholder": "请输入核销码", - "authSecretPlaceholder": "请输入授权秘钥" + "authCodePlaceholder": "请输入授权码", + "authSecretPlaceholder": "请输入授权秘钥", + "updateCode": "重新绑定", + "notHaveAuth": "还没有授权？去购买", + "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看" } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/app.store.json b/admin/src/app/lang/zh-cn/app.store.json similarity index 100% rename from admin/src/lang/zh-cn/app.store.json rename to admin/src/app/lang/zh-cn/app.store.json diff --git a/admin/src/lang/zh-cn/auth.log.json b/admin/src/app/lang/zh-cn/auth.log.json similarity index 100% rename from admin/src/lang/zh-cn/auth.log.json rename to admin/src/app/lang/zh-cn/auth.log.json diff --git a/admin/src/lang/zh-cn/auth.menu.json b/admin/src/app/lang/zh-cn/auth.menu.json similarity index 75% rename from admin/src/lang/zh-cn/auth.menu.json rename to admin/src/app/lang/zh-cn/auth.menu.json index b8d33d6ef..58e683efb 100644 --- a/admin/src/lang/zh-cn/auth.menu.json +++ b/admin/src/app/lang/zh-cn/auth.menu.json @@ -1,7 +1,9 @@ { + "system":"系统菜单", + "application":"应用菜单", "menuName": "菜单名称", "menuType": "类型", - "authId": "权限标识", + "authId": "api路径", "menuTypeDir": "目录", "menuTypeMenu": "菜单", "menuTypeButton": "按钮", @@ -10,16 +12,17 @@ "updateMenu": "编辑菜单", "routePath": "路由路径", "viewPath": "组件路径", + "addon":"选择应用", "parentMenu": "父级菜单", "menuIcon": "菜单图标", "sort":"权重", - "menuKey":"菜单标识", + "menuKey":"权限标识", "menuNamePlaceholder": "请输入菜单名称", - "menuKeyPlaceholder": "请输入菜单标识", + "menuKeyPlaceholder": "请输入权限标识", "menuKeyValidata":"菜单标识只能使用字母数字下划线并且开头不能为数字", "routePathPlaceholder": "请输入路由路径", "viewPathPlaceholder": "请输入组件路径", - "authIdPlaceholder": "请输入权限标识", + "authIdPlaceholder": "请输入api路径", "selectIconPlaceholder": "请选择菜单图标", "topLevel": "顶级" } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/auth.role.json b/admin/src/app/lang/zh-cn/auth.role.json similarity index 100% rename from admin/src/lang/zh-cn/auth.role.json rename to admin/src/app/lang/zh-cn/auth.role.json diff --git a/admin/src/app/lang/zh-cn/auth.role_edit.json b/admin/src/app/lang/zh-cn/auth.role_edit.json new file mode 100644 index 000000000..041f1d90b --- /dev/null +++ b/admin/src/app/lang/zh-cn/auth.role_edit.json @@ -0,0 +1,12 @@ +{ + "roleName": "角色名称", + "roleNamePlaceholder": "请输入角色名称", + "system":"系统权限", + "application":"应用权限", + "rulesPlaceholder": "请选择权限", + "checkStrictly": "父子级不关联", + "permission": "权限", + "foldText":"展开/折叠", + "systemErr":"您还没有分配系统权限，请分配！", + "applicationErr":"您还没有分配应用权限，请分配！" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/auth.site_menu.json b/admin/src/app/lang/zh-cn/auth.site_menu.json similarity index 100% rename from admin/src/lang/zh-cn/auth.site_menu.json rename to admin/src/app/lang/zh-cn/auth.site_menu.json diff --git a/admin/src/lang/zh-cn/auth.user.json b/admin/src/app/lang/zh-cn/auth.user.json similarity index 100% rename from admin/src/lang/zh-cn/auth.user.json rename to admin/src/app/lang/zh-cn/auth.user.json diff --git a/admin/src/app/lang/zh-cn/channel.aliapp.access.json b/admin/src/app/lang/zh-cn/channel.aliapp.access.json new file mode 100644 index 000000000..ac6c3c96a --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.aliapp.access.json @@ -0,0 +1,23 @@ +{ + "weappAccessFlow": "接入流程", + "title": "支付宝小程序", + "weappInlet": "支付宝小程序接入流程", + "weappAttestation": "支付宝小程序认证", + "weappAttest": "点击注册打开支付宝小程序官方,注册支付宝小程序后点击企业认证，申请之后等待支付宝官方审核", + "clickAccess": "点击注册", + "clickAccess2":"扫描二维码进入支付宝小程序", + "clickAccess3": "没有小程序马上注册", + "weappSetting": "支付宝小程序配置", + "weappSettingBtn": "点击配置支付宝小程序", + "uploadVersion": "上传小程序", + "emplace": "支付宝小程序认证之后按照官方提供的手册进行配置", + "settingInfo": "配置信息", + "releaseCourse": "版本管理中存放上传的支付宝小程序历更版本，通过uniapp版本编译小程序然后打包上传提交", + "completeAccess": "提交审核", + "wechatAccess": "提交uniapp对应版本，可以通过支付宝小程序查看版本的审核进度，审核成功后就可以使用了", + "wechatAccessBtn": "查看审核进度", + "wechatSet": "小程序配置", + "subscribeMessage": "订阅消息", + "weappRelease": "版本管理", + "alert":"您正在体验通用版小程序，不发布你将不可用" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.aliapp.config.json b/admin/src/app/lang/zh-cn/channel.aliapp.config.json similarity index 100% rename from admin/src/lang/zh-cn/channel.aliapp.config.json rename to admin/src/app/lang/zh-cn/channel.aliapp.config.json diff --git a/admin/src/app/lang/zh-cn/channel.aliapp.course.json b/admin/src/app/lang/zh-cn/channel.aliapp.course.json new file mode 100644 index 000000000..d63cf9bbb --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.aliapp.course.json @@ -0,0 +1,10 @@ +{ + "alipayCourseTipsOne1": "登录", + "alipayCourseTipsOne2": "支付宝开放平台open.alipay.com", + "alipayCourseTipsOne3": "选择小程序应用，没有需先创建。点击进入小程序", + "alipayCourseTipsTwo1": "先在小程序内进行产品绑定和开发配置， 绑定下图内这些产品", + "alipayCourseTipsTwo2": "获取会员手机号需进行申请", + "alipayCourseTipsThree1": "配置开发配置，配置接口加签方式，接口加签方式选择证书", + "alipayCourseTipsThree2": "配置接口内容加密方式", + "alipayCourseTipsThree3": "配置服务器域名白名单可在商城后台支付宝配置中复制" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.h5.config.json b/admin/src/app/lang/zh-cn/channel.h5.config.json similarity index 100% rename from admin/src/lang/zh-cn/channel.h5.config.json rename to admin/src/app/lang/zh-cn/channel.h5.config.json diff --git a/admin/src/lang/zh-cn/channel.pc.config.json b/admin/src/app/lang/zh-cn/channel.pc.config.json similarity index 100% rename from admin/src/lang/zh-cn/channel.pc.config.json rename to admin/src/app/lang/zh-cn/channel.pc.config.json diff --git a/admin/src/app/lang/zh-cn/channel.weapp.access.json b/admin/src/app/lang/zh-cn/channel.weapp.access.json new file mode 100644 index 000000000..d3012f158 --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.weapp.access.json @@ -0,0 +1,23 @@ +{ + "weappAccessFlow": "接入流程", + "title": "微信小程序", + "weappInlet": "微信小程序接入流程", + "weappAttestation": "微信小程序认证", + "weappAttest": "点击注册打开微信小程序官方,注册微信小程序后点击企业认证，申请之后等待微信官方审核", + "clickAccess": "点击注册", + "clickAccess2": "扫描二维码进入小程序", + "clickAccess3": "没有小程序马上注册", + "weappSetting": "微信小程序配置", + "weappSettingBtn": "点击配置微信小程序", + "uploadVersion": "上传小程序", + "emplace": "微信小程序认证之后按照官方提供的手册进行配置", + "settingInfo": "配置信息", + "releaseCourse": "版本管理中存放上传的微信小程序历更版本，通过uniapp版本编译小程序然后打包上传提交", + "completeAccess": "提交审核", + "wechatAccess": "提交uniapp对应版本，可以通过微信小程序查看版本的审核进度，审核成功后就可以使用了", + "wechatAccessBtn": "查看审核进度", + "wechatSet": "小程序配置", + "subscribeMessage": "订阅消息", + "weappRelease": "版本管理", + "alert":"您正在体验通用版小程序，不发布你将不可用" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.weapp.code.json b/admin/src/app/lang/zh-cn/channel.weapp.code.json similarity index 59% rename from admin/src/lang/zh-cn/channel.weapp.code.json rename to admin/src/app/lang/zh-cn/channel.weapp.code.json index 076ddbf92..436ba3012 100644 --- a/admin/src/lang/zh-cn/channel.weapp.code.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.code.json @@ -18,5 +18,20 @@ "codeDownThreeDesc": "发布小程序", "codeDownThreeTips": "上传之后提交审核，审核通过发布小程序", "weappVersion": "小程序版本", - "close": "关闭" + "close": "关闭", + "code":"版本号", + "codePlaceholder":"请输入版本号", + "path":"小程序代码", + "pathPlaceholder":"请上传小程序代码", + "content":"版本说明", + "weappAccessFlow": "接入流程", + "subscribeMessage": "订阅消息", + "weappRelease": "版本管理", + "contentPlaceholder":"请输入版本说明", + "uploadingTips": "小程序代码上传中", + "status": "状态", + "preview": "预览", + "authTips": "上传代码需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作", + "toBind": "绑定授权", + "toNiucloud": "去niucloud官网" } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.weapp.config.json b/admin/src/app/lang/zh-cn/channel.weapp.config.json similarity index 90% rename from admin/src/lang/zh-cn/channel.weapp.config.json rename to admin/src/app/lang/zh-cn/channel.weapp.config.json index c736c8b7b..9a3d046ef 100644 --- a/admin/src/lang/zh-cn/channel.weapp.config.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.config.json @@ -30,5 +30,8 @@ "encodingAesKeyPlaceholder": "请输入EncodingAESKey", "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低", "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护", - "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高" + "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高", + "weappUpload": "小程序代码上传", + "uploadKey": "上传密钥", + "uploadKeyTips": "配置之后可实现在线上传小程序版本" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/channel.weapp.course.json b/admin/src/app/lang/zh-cn/channel.weapp.course.json new file mode 100644 index 000000000..ed02d562f --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.weapp.course.json @@ -0,0 +1,10 @@ +{ + "writingTipsOne1": "登录--", + "writingTipsOne2": "微信公众平台mp.weixin.qq.com", + "writingTipsOne3": "基本配置中，找到【设置--基本设置】,查看小程序是否认证，没有认证需要先进行认证", + "writingTipsTwo1": "再在【开发-开发管理-开发设置】中，配置开发者ID 里面的【IP白名单】，修改后保存。", + "writingTipsThree1": "在【开发-开发管理-开发设置】中，配置", + "writingTipsThree2": "request合法域名/ socket合法域名/ uploadFile合法域名/ downloadFile合法域名/ udp合法域名", + "writingTipsFour1": "在【开发-开发管理-开发设置】中，将", + "writingTipsFour2": "对应填写至服务器配置" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.weapp.template.json b/admin/src/app/lang/zh-cn/channel.weapp.template.json similarity index 85% rename from admin/src/lang/zh-cn/channel.weapp.template.json rename to admin/src/app/lang/zh-cn/channel.weapp.template.json index 8e82580fa..3153e3f72 100644 --- a/admin/src/lang/zh-cn/channel.weapp.template.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.template.json @@ -14,6 +14,9 @@ "close": "关闭", "open": "开启", "regain": "重新获取", + "weappAccessFlow": "接入流程", + "subscribeMessage": "订阅消息", + "weappRelease": "版本管理", "batchAcquisition": "一键获取" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/channel.wechat.access.json b/admin/src/app/lang/zh-cn/channel.wechat.access.json new file mode 100644 index 000000000..43dd5cc8a --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.wechat.access.json @@ -0,0 +1,19 @@ +{ + "wechatAccessFlow": "接入流程", + "title": "微信公众号", + "wechatInlet": "微信公众号接入流程", + "wechatAttestation": "微信公众号认证", + "wechatAttestation1": "点击接入打开微信公众号官方,注册微信公众号后申请服务号认证，申请之后等待微信官方审核", + "clickAccess": "点击接入", + "wechatSetting": "微信公众号配置", + "wechatSetting1": "微信公众号认证之后配置微信公众号连接，具体查看配置与发布教程", + "settingInfo": "点击配置", + "wechatAccess": "微信公众号发布", + "releaseCourse": "发布教程", + "completeAccess": "完成接入", + "wechatSet": "公众号配置", + "customMenu": "自定义菜单", + "wechatAccessBtn": "查看审核进度", + "clickAccess2":"扫描二维码进入微信公众号", + "wechatTemplate": "模板消息" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.wechat.config.json b/admin/src/app/lang/zh-cn/channel.wechat.config.json similarity index 100% rename from admin/src/lang/zh-cn/channel.wechat.config.json rename to admin/src/app/lang/zh-cn/channel.wechat.config.json diff --git a/admin/src/app/lang/zh-cn/channel.wechat.course.json b/admin/src/app/lang/zh-cn/channel.wechat.course.json new file mode 100644 index 000000000..75d182bf5 --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.wechat.course.json @@ -0,0 +1,10 @@ +{ + "writingTipsOne1": "登录", + "writingTipsOne2": "微信公众平台mp.weixin.qq.com", + "writingTipsOne3": "基本配置中，找到【服务器配置--修改配置】, 将", + "writingTipsOne4": "对应填写至服务器配置", + "writingTipsOne5": "填写完成之后提交。返回服务器配置，点击【启用】, 启用服务器配置。", + "writingTipsTwo1": "再在基本配置中，选择【IP白名单】，修改后保存。", + "writingTipsThree1": "进入【设置-公众号设置】，选择【功能设置】，", + "writingTipsThree2": "依次配置业务域名/ JS接口安全域名/网页授权域名" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/channel.wechat.menu.json b/admin/src/app/lang/zh-cn/channel.wechat.menu.json similarity index 88% rename from admin/src/lang/zh-cn/channel.wechat.menu.json rename to admin/src/app/lang/zh-cn/channel.wechat.menu.json index ba1be5a1f..f4886bf27 100644 --- a/admin/src/lang/zh-cn/channel.wechat.menu.json +++ b/admin/src/app/lang/zh-cn/channel.wechat.menu.json @@ -16,5 +16,8 @@ "webpageUrlPlaceholder": "请输入网页链接", "weappAppidPlaceholder": "请输入小程序Appid", "weappPagePlaceholder": "请输入小程序页面路径", + "wechatAccessFlow": "接入流程", + "customMenu": "自定义菜单", + "wechatTemplate": "模板消息", "menusEmptyTips": "空菜单，不能保存与发布。" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/channel.wechat.template.json b/admin/src/app/lang/zh-cn/channel.wechat.template.json new file mode 100644 index 000000000..24550d49a --- /dev/null +++ b/admin/src/app/lang/zh-cn/channel.wechat.template.json @@ -0,0 +1,25 @@ +{ + "name": "类型", + "messageType": "消息类型", + "isStart": "是否启用", + "serialNumber": "编号", + "operation": "操作", + "operationTip": "温馨提示", + "operationTipOne": "请将微信公众平台的服务类目选择为：商业服务——>软件/建站/技术开发，生活服务——>百货/超市/便利店，工具—>信息查询，所选行业不一致将会导致模板消息不可用。", + "operationTipTwo": "公众号可设置20个服务类目，每月只能修改5次,请谨慎选择。", + "operationTipThree": "公众号最多支持25个模板消息获取时请注意公众号剩余模板数量是否充足", + "operationTipFour": "所需跳转到的小程序必须与发模板消息的公众号是绑定关联关系，暂不支持小游戏", + "buyerNews": "买家消息", + "sellerMessage": "卖家消息", + "started": "启用", + "closed": "禁用", + "close": "关闭", + "open": "开启", + "response": "回复内容", + "regain": "重新获取", + "batchAcquisition": "一键获取", + "wechatAccessFlow": "接入流程", + "customMenu": "自定义菜单", + "wechatTemplate": "模板消息", + "id": "id" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/decorate.edit.json b/admin/src/app/lang/zh-cn/decorate.edit.json similarity index 80% rename from admin/src/lang/zh-cn/decorate.edit.json rename to admin/src/app/lang/zh-cn/decorate.edit.json index c80ec219b..c9527e55f 100644 --- a/admin/src/lang/zh-cn/decorate.edit.json +++ b/admin/src/app/lang/zh-cn/decorate.edit.json @@ -25,6 +25,7 @@ "leavePageTitleTips": "确定离开此页面？", "leavePageContentTips": "系统可能不会保存您所做的更改。", "decorating": "正在装修", + "preview": "保存并预览", "moveUpComponent": "上移", "moveDownComponent": "下移", "copyComponent": "复制", @@ -84,6 +85,9 @@ "graphicNavTips": "建议上传尺寸相同的图片，推荐尺寸60*60", "graphicNavTitle": "标题", "graphicNavTitlePlaceholder": "请输入标题", + "subGraphicNavTitle": "副标题", + "subGraphicNavTitlePlaceholder": "请输入副标题", + "subGraphicNavTitleLink": "副标题链接", "addGraphicNav": "添加导航", "blankHeightSet": "高度设置", "blankHeight": "空白高度", @@ -102,6 +106,7 @@ "fontWeightBold": "加粗", "fontWeightNormal": "常规", "textColor": "文字颜色", + "subTextColor": "副标题颜色", "subTitleContent": "标题内容", "subTitle": "副标题", "subTitlePlaceholder": "请输入副标题", @@ -113,11 +118,39 @@ "template": "模板", "imageGap": "图片间隙", "rubikCubeStyle": "魔方样式", + "rubikCubeLayout": "魔方布局", "hotArea": "热区", "hotAreaSet": "热区设置", "addHotArea": "添加热区", "selectedAfterHotArea": "个热区", "hotAreaManage": "热区管理", "selectedHotArea": "请选择热区", - "hotAreaLink": "的链接地址" + "hotAreaLink": "的链接地址", + "addonListSet": "应用设置", + "addonListTips": "应用选择", + "selectAddonTips": "请选择应用", + "addonTitle": "应用名称", + "addonDesc": "应用描述", + "addonIcon": "应用图标", + "selectAddon": "选择应用", + "addAddon": "添加应用", + "travel": "旅游", + "tickets": "门票", + "hotel": "酒店", + "travelNum": "线路数量", + "ticketsNum": "景点数量", + "hotelNum": "酒店数量", + "serve": "项目", + "serveNum": "项目数量", + "card": "卡项", + "cardNum": "卡项数量", + "isSet": "会员设置", + "isMemberCode": "会员码", + "show": "显示", + "hideen": "隐藏", + "nicknameStyle": "昵称样式", + "UIDStyle": "UID样式", + "accountStyle": "积分/余额样式", + "accountNumberColor": "数值颜色", + "accountNumberWeight": "数值粗细" } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/decorate.preview.json b/admin/src/app/lang/zh-cn/decorate.preview.json similarity index 100% rename from admin/src/lang/zh-cn/decorate.preview.json rename to admin/src/app/lang/zh-cn/decorate.preview.json diff --git a/admin/src/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json similarity index 78% rename from admin/src/lang/zh-cn/diy.edit.json rename to admin/src/app/lang/zh-cn/diy.edit.json index c80ec219b..45edf12c1 100644 --- a/admin/src/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -25,6 +25,7 @@ "leavePageTitleTips": "确定离开此页面？", "leavePageContentTips": "系统可能不会保存您所做的更改。", "decorating": "正在装修", + "preview": "保存并预览", "moveUpComponent": "上移", "moveDownComponent": "下移", "copyComponent": "复制", @@ -33,7 +34,7 @@ "tabbar": "底部导航", "tabbarSwitchTips": "此处控制当前页面底部导航菜单是否显示", "link": "链接地址", - "delComponentTips": "确定要删除吗？", + "delComponentTips": "确认要删除当前组件吗？", "notCopy": "无法复制", "componentCanOnlyAdd": "组件只能添加", "piece": "个", @@ -84,6 +85,9 @@ "graphicNavTips": "建议上传尺寸相同的图片，推荐尺寸60*60", "graphicNavTitle": "标题", "graphicNavTitlePlaceholder": "请输入标题", + "subGraphicNavTitle": "副标题", + "subGraphicNavTitlePlaceholder": "请输入副标题", + "subGraphicNavTitleLink": "副标题链接", "addGraphicNav": "添加导航", "blankHeightSet": "高度设置", "blankHeight": "空白高度", @@ -102,6 +106,7 @@ "fontWeightBold": "加粗", "fontWeightNormal": "常规", "textColor": "文字颜色", + "subTextColor": "副标题颜色", "subTitleContent": "标题内容", "subTitle": "副标题", "subTitlePlaceholder": "请输入副标题", @@ -113,11 +118,41 @@ "template": "模板", "imageGap": "图片间隙", "rubikCubeStyle": "魔方样式", + "rubikCubeLayout": "魔方布局", "hotArea": "热区", "hotAreaSet": "热区设置", + "hotAreaBackground": "热区背景", "addHotArea": "添加热区", + "clickSet": "点击设置", "selectedAfterHotArea": "个热区", "hotAreaManage": "热区管理", "selectedHotArea": "请选择热区", - "hotAreaLink": "的链接地址" + "hotAreaLink": "的链接地址", + "addonListSet": "应用设置", + "addonListTips": "应用选择", + "selectAddonTips": "请选择应用", + "addonTitle": "应用名称", + "addonDesc": "应用描述", + "addonIcon": "应用图标", + "selectAddon": "选择应用", + "addAddon": "添加应用", + "travel": "旅游", + "tickets": "门票", + "hotel": "酒店", + "travelNum": "线路数量", + "ticketsNum": "景点数量", + "hotelNum": "酒店数量", + "serve": "项目", + "serveNum": "项目数量", + "card": "卡项", + "cardNum": "卡项数量", + "isSet": "会员设置", + "isMemberCode": "会员码", + "show": "显示", + "hideen": "隐藏", + "nicknameStyle": "昵称样式", + "UIDStyle": "UID样式", + "accountStyle": "积分/余额样式", + "accountNumberColor": "数值颜色", + "accountNumberWeight": "数值粗细" } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/diy.index.json b/admin/src/app/lang/zh-cn/diy.index.json similarity index 72% rename from admin/src/lang/zh-cn/diy.index.json rename to admin/src/app/lang/zh-cn/diy.index.json index bac301df5..e5c543666 100644 --- a/admin/src/lang/zh-cn/diy.index.json +++ b/admin/src/app/lang/zh-cn/diy.index.json @@ -1,14 +1,16 @@ { "decorate": "装修", "pageDecorate": "页面装修", - "changeTemplate": "切换模板", + "changeTemplate": "选择页面", + "changePage": "切换", "templateName": "模板名称", "preview": "预览", "hopeBeforeTip": "我希望把", - "hopeAfterTip": "切换成其他样式", + "hopeAfterTip": "切换成其他页面", "changeTemplateTip": "选择", "template": "模板", - "changeMyPageTip": "选择微页面作为", + "changeMyPageTip": "将 微页面 设为", + "changeOtherPageTip": "将 其他页面 设为", "createPage": "创建微页面", "myPage": "我的微页面", "refreshPage": "刷新", diff --git a/admin/src/lang/zh-cn/diy.list.json b/admin/src/app/lang/zh-cn/diy.list.json similarity index 97% rename from admin/src/lang/zh-cn/diy.list.json rename to admin/src/app/lang/zh-cn/diy.list.json index c3ec6aa73..5325f7b53 100644 --- a/admin/src/lang/zh-cn/diy.list.json +++ b/admin/src/app/lang/zh-cn/diy.list.json @@ -1,11 +1,11 @@ { "title": "页面名称", "typeName": "页面模板", + "templateName": "模板名称", "addType": "页面类型", "addPageTips": "创建新页面", "pageTypePlaceholder": "请选择页面模板", "nameMax": "名称不能超过12个字符", - "templateName": "已有模板", "emptyTemplate": "空模板", "status": "状态", "updateTime": "更新时间", diff --git a/admin/src/lang/zh-cn/diy.preview.json b/admin/src/app/lang/zh-cn/diy.preview.json similarity index 100% rename from admin/src/lang/zh-cn/diy.preview.json rename to admin/src/app/lang/zh-cn/diy.preview.json diff --git a/admin/src/lang/zh-cn/diy.route.json b/admin/src/app/lang/zh-cn/diy.route.json similarity index 97% rename from admin/src/lang/zh-cn/diy.route.json rename to admin/src/app/lang/zh-cn/diy.route.json index e951cb26b..2077aa85a 100644 --- a/admin/src/lang/zh-cn/diy.route.json +++ b/admin/src/app/lang/zh-cn/diy.route.json @@ -1,5 +1,6 @@ { "title": "页面名称", + "forAddon": "所属插件", "typeName": "页面模板", "addPageTips": "创建新页面", "pageTemplatePlaceholder": "请选择页面模板", diff --git a/admin/src/lang/zh-cn/diy.tabbar.json b/admin/src/app/lang/zh-cn/diy.tabbar.json similarity index 96% rename from admin/src/lang/zh-cn/diy.tabbar.json rename to admin/src/app/lang/zh-cn/diy.tabbar.json index 548dece0b..75cd2e06e 100644 --- a/admin/src/lang/zh-cn/diy.tabbar.json +++ b/admin/src/app/lang/zh-cn/diy.tabbar.json @@ -1,12 +1,10 @@ { - "siteId":"站点id", "title":"页面名称", "name":"页面标识", "type":"页面模板", "value":"页面数据，json格式", "isDefault":"是否默认页面，1：是，0：否", "visitCount":"访问量", - "siteIdPlaceholder":"请输入站点id", "titlePlaceholder":"请输入页面名称", "namePlaceholder":"请输入页面标识", "typePlaceholder":"请输入页面模板", diff --git a/admin/src/lang/zh-cn/finance.account.json b/admin/src/app/lang/zh-cn/finance.account.json similarity index 100% rename from admin/src/lang/zh-cn/finance.account.json rename to admin/src/app/lang/zh-cn/finance.account.json diff --git a/admin/src/lang/zh-cn/finance.cash_out.json b/admin/src/app/lang/zh-cn/finance.cash_out.json similarity index 84% rename from admin/src/lang/zh-cn/finance.cash_out.json rename to admin/src/app/lang/zh-cn/finance.cash_out.json index fdd439cf4..202586541 100644 --- a/admin/src/lang/zh-cn/finance.cash_out.json +++ b/admin/src/app/lang/zh-cn/finance.cash_out.json @@ -43,6 +43,13 @@ "transferTime": "转账时间", "memberInfoPlaceholder":"请输入会员名称/会员昵称/手机号", "cashOutNumber": "提现单号", - "cashOutNumberPlaceholder": "请输入提现单号" + "cashOutNumberPlaceholder": "请输入提现单号", + "cashOutMethodType": "账户类型", + "money": "提现金额", + "transferAccount": "收款账号", + "refuseReason": "拒绝理由", + "transferTypeName": "转账方式名称", + "transferVoucher": "支付凭证", + "close": "关闭" } diff --git a/admin/src/lang/zh-cn/finance.offlinepay.json b/admin/src/app/lang/zh-cn/finance.offlinepay.json similarity index 100% rename from admin/src/lang/zh-cn/finance.offlinepay.json rename to admin/src/app/lang/zh-cn/finance.offlinepay.json diff --git a/admin/src/lang/zh-cn/finance.pay_detail.json b/admin/src/app/lang/zh-cn/finance.pay_detail.json similarity index 100% rename from admin/src/lang/zh-cn/finance.pay_detail.json rename to admin/src/app/lang/zh-cn/finance.pay_detail.json diff --git a/admin/src/lang/zh-cn/index.index.json b/admin/src/app/lang/zh-cn/index.index.json similarity index 100% rename from admin/src/lang/zh-cn/index.index.json rename to admin/src/app/lang/zh-cn/index.index.json diff --git a/admin/src/lang/zh-cn/index.site_index.json b/admin/src/app/lang/zh-cn/index.site_index.json similarity index 100% rename from admin/src/lang/zh-cn/index.site_index.json rename to admin/src/app/lang/zh-cn/index.site_index.json diff --git a/admin/src/lang/zh-cn/login.json b/admin/src/app/lang/zh-cn/login.json similarity index 100% rename from admin/src/lang/zh-cn/login.json rename to admin/src/app/lang/zh-cn/login.json diff --git a/admin/src/lang/zh-cn/member.balance.json b/admin/src/app/lang/zh-cn/member.balance.json similarity index 100% rename from admin/src/lang/zh-cn/member.balance.json rename to admin/src/app/lang/zh-cn/member.balance.json diff --git a/admin/src/lang/zh-cn/member.commission.json b/admin/src/app/lang/zh-cn/member.commission.json similarity index 100% rename from admin/src/lang/zh-cn/member.commission.json rename to admin/src/app/lang/zh-cn/member.commission.json diff --git a/admin/src/lang/zh-cn/member.label.edit.json b/admin/src/app/lang/zh-cn/member.label.edit.json similarity index 83% rename from admin/src/lang/zh-cn/member.label.edit.json rename to admin/src/app/lang/zh-cn/member.label.edit.json index ff8a0c71e..3604c0b08 100644 --- a/admin/src/lang/zh-cn/member.label.edit.json +++ b/admin/src/app/lang/zh-cn/member.label.edit.json @@ -1,9 +1,7 @@ { - "siteId":"站点id", "labelName":"标签名称", "memo":"备注", "sort":"排序", - "siteIdPlaceholder":"请输入站点id", "labelNamePlaceholder":"请输入标签名称", "memoPlaceholder":"请输入备注", "sortPlaceholder":"请输入排序", diff --git a/admin/src/lang/zh-cn/member.label.json b/admin/src/app/lang/zh-cn/member.label.json similarity index 93% rename from admin/src/lang/zh-cn/member.label.json rename to admin/src/app/lang/zh-cn/member.label.json index f70bf7350..0fa18f639 100644 --- a/admin/src/lang/zh-cn/member.label.json +++ b/admin/src/app/lang/zh-cn/member.label.json @@ -3,7 +3,6 @@ "memberNumber":"会员数量", "memo":"备注", "sort":"排序", - "siteIdPlaceholder":"请输入站点id", "labelNamePlaceholder":"请输入标签名称", "memoPlaceholder":"请输入备注", "sortPlaceholder":"请输入排序", diff --git a/admin/src/lang/zh-cn/member.member.json b/admin/src/app/lang/zh-cn/member.member.json similarity index 100% rename from admin/src/lang/zh-cn/member.member.json rename to admin/src/app/lang/zh-cn/member.member.json diff --git a/admin/src/lang/zh-cn/member.member_detail.json b/admin/src/app/lang/zh-cn/member.member_detail.json similarity index 100% rename from admin/src/lang/zh-cn/member.member_detail.json rename to admin/src/app/lang/zh-cn/member.member_detail.json diff --git a/admin/src/lang/zh-cn/member.point.json b/admin/src/app/lang/zh-cn/member.point.json similarity index 100% rename from admin/src/lang/zh-cn/member.point.json rename to admin/src/app/lang/zh-cn/member.point.json diff --git a/admin/src/lang/zh-cn/setting.adminlogin.json b/admin/src/app/lang/zh-cn/setting.adminlogin.json similarity index 100% rename from admin/src/lang/zh-cn/setting.adminlogin.json rename to admin/src/app/lang/zh-cn/setting.adminlogin.json diff --git a/admin/src/lang/zh-cn/setting.agreement.json b/admin/src/app/lang/zh-cn/setting.agreement.json similarity index 100% rename from admin/src/lang/zh-cn/setting.agreement.json rename to admin/src/app/lang/zh-cn/setting.agreement.json diff --git a/admin/src/lang/zh-cn/setting.agreement_edit.json b/admin/src/app/lang/zh-cn/setting.agreement_edit.json similarity index 100% rename from admin/src/lang/zh-cn/setting.agreement_edit.json rename to admin/src/app/lang/zh-cn/setting.agreement_edit.json diff --git a/admin/src/lang/zh-cn/setting.cash_out.json b/admin/src/app/lang/zh-cn/setting.cash_out.json similarity index 100% rename from admin/src/lang/zh-cn/setting.cash_out.json rename to admin/src/app/lang/zh-cn/setting.cash_out.json diff --git a/admin/src/lang/zh-cn/setting.copyright.json b/admin/src/app/lang/zh-cn/setting.copyright.json similarity index 100% rename from admin/src/lang/zh-cn/setting.copyright.json rename to admin/src/app/lang/zh-cn/setting.copyright.json diff --git a/admin/src/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json similarity index 100% rename from admin/src/lang/zh-cn/setting.login.json rename to admin/src/app/lang/zh-cn/setting.login.json diff --git a/admin/src/lang/zh-cn/setting.member.json b/admin/src/app/lang/zh-cn/setting.member.json similarity index 100% rename from admin/src/lang/zh-cn/setting.member.json rename to admin/src/app/lang/zh-cn/setting.member.json diff --git a/admin/src/lang/zh-cn/setting.notice.json b/admin/src/app/lang/zh-cn/setting.notice.json similarity index 94% rename from admin/src/lang/zh-cn/setting.notice.json rename to admin/src/app/lang/zh-cn/setting.notice.json index 2ce179c98..4424afc53 100644 --- a/admin/src/lang/zh-cn/setting.notice.json +++ b/admin/src/app/lang/zh-cn/setting.notice.json @@ -9,6 +9,7 @@ "title": "场景", "smsContent": "短信内容", "tempKey": "模板消息ID", + "keywordNameList": "类目模板", "first": "头部标题", "remark": "尾部描述", "firstPlaceholder": "请输入头部标题", diff --git a/admin/src/lang/zh-cn/setting.notice_records.json b/admin/src/app/lang/zh-cn/setting.notice_records.json similarity index 97% rename from admin/src/lang/zh-cn/setting.notice_records.json rename to admin/src/app/lang/zh-cn/setting.notice_records.json index fedfe2d46..61c49db31 100644 --- a/admin/src/lang/zh-cn/setting.notice_records.json +++ b/admin/src/app/lang/zh-cn/setting.notice_records.json @@ -1,5 +1,4 @@ { - "siteId":"站点id", "noticeKey":"消息模板", "noticeType":"消息类型", "noticeInfo":"消息详情", diff --git a/admin/src/lang/zh-cn/setting.pay.json b/admin/src/app/lang/zh-cn/setting.pay.json similarity index 100% rename from admin/src/lang/zh-cn/setting.pay.json rename to admin/src/app/lang/zh-cn/setting.pay.json diff --git a/admin/src/lang/zh-cn/setting.sms.json b/admin/src/app/lang/zh-cn/setting.sms.json similarity index 100% rename from admin/src/lang/zh-cn/setting.sms.json rename to admin/src/app/lang/zh-cn/setting.sms.json diff --git a/admin/src/lang/zh-cn/setting.sms_records.json b/admin/src/app/lang/zh-cn/setting.sms_records.json similarity index 95% rename from admin/src/lang/zh-cn/setting.sms_records.json rename to admin/src/app/lang/zh-cn/setting.sms_records.json index 3ad8e9638..d4fc3cf88 100644 --- a/admin/src/lang/zh-cn/setting.sms_records.json +++ b/admin/src/app/lang/zh-cn/setting.sms_records.json @@ -1,5 +1,4 @@ { - "siteId":"站点id", "noticeKey":"消息模板", "noticeType":"消息类型", "noticeInfo":"消息详情", @@ -17,6 +16,8 @@ "sms":"短信", "weapp":"微信小程序", "wechat":"微信公众号", + "aliyun":"阿里云", + "statusName":"发送状态", "noticeTypePlaceholder":"请选择消息类型", "uidPlaceholder":"请输入通知的用户id", "memberIdPlaceholder":"请输入消息的会员id", diff --git a/admin/src/lang/zh-cn/setting.storage.json b/admin/src/app/lang/zh-cn/setting.storage.json similarity index 100% rename from admin/src/lang/zh-cn/setting.storage.json rename to admin/src/app/lang/zh-cn/setting.storage.json diff --git a/admin/src/lang/zh-cn/setting.system.json b/admin/src/app/lang/zh-cn/setting.system.json similarity index 97% rename from admin/src/lang/zh-cn/setting.system.json rename to admin/src/app/lang/zh-cn/setting.system.json index 0658ee780..8d305f441 100644 --- a/admin/src/lang/zh-cn/setting.system.json +++ b/admin/src/app/lang/zh-cn/setting.system.json @@ -1,7 +1,7 @@ { "websiteInfo":"后台设置", "contactAddress":"联系地址", - "siteName": "站点名称", + "siteName": "网站设置", "keywords": "网站关键字", "logo": "长方形Logo", "desc": "网站简介", diff --git a/admin/src/lang/zh-cn/setting.transfer.json b/admin/src/app/lang/zh-cn/setting.transfer.json similarity index 100% rename from admin/src/lang/zh-cn/setting.transfer.json rename to admin/src/app/lang/zh-cn/setting.transfer.json diff --git a/admin/src/lang/zh-cn/setting.weapp.json b/admin/src/app/lang/zh-cn/setting.weapp.json similarity index 100% rename from admin/src/lang/zh-cn/setting.weapp.json rename to admin/src/app/lang/zh-cn/setting.weapp.json diff --git a/admin/src/lang/zh-cn/setting.wxoplatform.json b/admin/src/app/lang/zh-cn/setting.wxoplatform.json similarity index 100% rename from admin/src/lang/zh-cn/setting.wxoplatform.json rename to admin/src/app/lang/zh-cn/setting.wxoplatform.json diff --git a/admin/src/app/lang/zh-cn/tools.addon.edit.json b/admin/src/app/lang/zh-cn/tools.addon.edit.json new file mode 100644 index 000000000..5b4d950b8 --- /dev/null +++ b/admin/src/app/lang/zh-cn/tools.addon.edit.json @@ -0,0 +1,33 @@ +{ + "title":"插件名称", + "titlePlaceholder":"请输入插件名称", + "icon":"插件图标", + "iconPlaceholder":"请上传插件图标", + "iconPlaceholder1":"建议图片尺寸：200*200像素；图片格式：jpg、png、jpeg", + "key":"插件标识", + "keyPlaceholder":"请输入插件标识", + "keyPlaceholderErr":"插件标识格式不正确，只能以字母开头且只能输入字母、数字、下划线", + "keyPlaceholder1":"插件标识指开发插件的文件夹名称，申请之后不能修改(只能包括字母、数字和下划线，且只能以字母开头，格式如：f1111、f11_22)", + "keyPlaceholder2":"设置后要检测标识与niucloud应用是否重复，如果重复则无法进行上传发布", + "desc":"插件描述", + "descPlaceholder":"请输入插件描述", + "author":"作者", + "authorPlaceholder":"请输入作者", + "version":"版本号", + "versionPlaceholder":"请输入版本号", + "versionPlaceholderErr":"版本号格式不正确", + "versionPlaceholder1":"请注意版本号输入格式，例如: 1.1.1", + "cover":"插件封面", + "coverPlaceholder":"请上传插件封面", + "coverPlaceholder1":"建议图片尺寸：480*240像素；图片格式：jpg、png、jpeg", + "type":"插件类型", + "typePlaceholder":"请选择插件类型", + "typePlaceholder1":"应用：指独立开发的系统，比如商城，零售，erp等", + "typePlaceholder2":"插件:指不是独立的系统，可以是辅助应用的插件比如商城的拼团，也可以是独立的插件比如系统表单等", + "supportApp":"前置插件", + "supportAppPlaceholder":"请输入前置插件", + "GeneratePlugins":"生成插件", + "successText":"当前插件标识无重复", + "warningText":"当前插件标识重复，继续使用则无法进行上传发布", + "onSaveSuccessText":"插件生成成功" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/tools.addon.index.json b/admin/src/app/lang/zh-cn/tools.addon.index.json new file mode 100644 index 000000000..bcc99b4b1 --- /dev/null +++ b/admin/src/app/lang/zh-cn/tools.addon.index.json @@ -0,0 +1,30 @@ +{ + "developmentProcess":"开发流程", + "pluginList":"插件列表", + "addAddon":"新建插件", + "title":"插件名称", + "titlePlaceholder":"请输入插件名称", + "author":"作者", + "authorPlaceholder":"请输入作者", + "key":"插件标识", + "type":"插件类型", + "version":"版本号", + "stutas":"状态", + "codeDeleteTips":"删除插件后对应文件会一并删除，是否确认", + "step1":"新建一个插件", + "describe1":"点击新建插件，生成插件后系统会生成对应插件的基础代码", + "btn1":"新建插件", + "step2":"安装插件", + "describe2":"插件创建之后处于未安装状态，点击进入插件列表选择对应新建插件点击安装", + "btn2":"插件列表", + "step3":"开发插件", + "describe3":"插件安装成功之后就可以进行开发，具体查看开发教程", + "btn3":"查看教程", + "step4":"打包插件", + "describe4":"插件开发的前端代码是直接在对应开发环境运行的，并没有放入插件对应目录，点击打包后会将对应插件的代码整合到插件目录方便后期安装与打包发行版本", + "btn4":"插件列表", + "step5":"上传到云市场", + "describe5":"插件打包成功之后可以上传到官方云市场进行销售，可以打包后选择下载代码zip格式，然后在官网开发商引用选择上传版本", + "btn5":"官方市场", + "addonDownloadText":"插件打包成功，是否下载" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/tools.code.edit.json b/admin/src/app/lang/zh-cn/tools.code.edit.json new file mode 100644 index 000000000..64fc66798 --- /dev/null +++ b/admin/src/app/lang/zh-cn/tools.code.edit.json @@ -0,0 +1,109 @@ +{ + "basicSettings":"基础设置", + "fieldSettings":"字段设置", + "pageSettings":"页面设置", + "generationSettings":"生成配置", + "associatedConfiguration":"关联设置", + "tableName":"表名称", + "tableContent":"描述", + "addon":"所属插件", + "moduleName":"模块名", + "className":"类名", + "editType":"编辑方式", + "createTime":"创建时间", + "updateTime":"更新时间", + "popup":"弹出", + "page":"新页面", + "selectPlaceholder":"请选择", + "tableNamePlaceholder":"请输入表名", + "tableContentPlaceholder":"请输入描述", + "addonPlaceholder":"请选择插件", + "moduleNamePlaceholder":"请输入模块名", + "classNamePlaceholder":"请输入类名", + "editTypePlaceholder":"请选择编辑方式", + "columnNamePlaceholder":"请输入字段名", + "columnCommentPlaceholder":"请输入字段描述", + "tableNameValidata": "表名不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符", + "fieldNameValidata": "不符合规范，请以 字母、_ 开头，不能出现 字母、数字、下划线 以外的字符", + "addCode":"导入数据表", + "updateCode":"编辑代码生成", + "codeDeleteTips":"确定要删除吗？", + "tableComment":"表描述", + "tableCreateTime":"创建时间", + "tableUpdateTime":"修改时间", + "addBtn":"添加", + "searchPlaceholder":"请输入表名或表描述搜索", + "selectTableTips":"确认导入该数据表吗？", + "download":"下载", + "commentField":"常用字段", + "baseField":"公用字段", + "columnName": "字段列名", + "columnComment": "字段描述", + "columnType": "字段类型", + "fieldAttribute": "字段属性", + "addAndEdit":"添加编辑", + "listSearch":"列表查询", + "isPk":"主键", + "isRequired":"必填", + "isInsert":"添加", + "isUpdate":"编辑", + "isLists":"列表", + "isSearch":"搜索", + "isQuery":"查询", + "queryType":"搜索方式", + "formType": "表单类型", + "formInput":"文本框", + "formTextarea":"文本域", + "formSelect":"下拉框", + "formRadio":"单选框", + "formCheckbox":"复选框", + "formDateTime":"日期", + "formImageSelect":"图片上传", + "formEditor":"富文本", + "pk":"主键", + "status": "状态", + "string": "字符串", + "image": "图片", + "radio": "单选", + "checkbox": "复选", + "select": "下拉选择", + "editor": "富文本", + "dateTime": "日期", + "formValidation":"表单验证", + "deleteType":"删除类型", + "physicalDeletion":"物理删除", + "softDeletion":"软删除", + "deleteField":"删除字段", + "deleteFieldPlaceholder":"请选择删除字段", + "orderColumnName":"排序字段", + "orderColumnNamePlaceholder":"请选择排序字段", + "orderType":"排序方式", + "orderTypePlaceholder":"请选择排序方式", + "menuType":"上级菜单", + "autoBuild":"自动构建", + "manualAddition":"手动添加", + "controller":"控制器目录", + "dataModel":"模型目录", + "validator":"验证器目录", + "webView":"WEB端视图目录", + "routerView":"路由目录", + "insertAssociated":"新增关联", + "associatedType":"关联类型", + "associatedTypePlaceholder":"请选择关联类型", + "hasOne":"一对一", + "hasMany":"一对多", + "associatedName":"关联方法名称", + "associatedNamePlaceholder":"请输入关联方法名称", + "associatedModel":"关联模型", + "associatedModelPlaceholder":"请选择关联模型", + "localKey":"关联键", + "localKeyPlaceholder":"请选择关联键", + "foreignKey":"外键", + "foreignKeyPlaceholder":"请输入外键", + "addons":"关联应用", + "addonsPlaceholder":"请选择应用", + "saveAndSync":"保存并同步", + "saveAndDownload":"保存并下载", + "saveAndSyncText":"同步的代码与项目产生冲突，是否确认覆盖?", + "saveAndSyncText1":"同步的代码会加入到项目代码中，是否确认继续" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/tools.code.index.json b/admin/src/app/lang/zh-cn/tools.code.index.json new file mode 100644 index 000000000..cb48b961a --- /dev/null +++ b/admin/src/app/lang/zh-cn/tools.code.index.json @@ -0,0 +1,48 @@ +{ + "tableName":"表名称", + "tableContent":"描述", + "addon":"插件", + "moduleName":"模块名", + "className":"类名", + "editType":"编辑方式", + "createTime":"创建时间", + "updateTime":"更新时间", + "popup":"弹出", + "page":"新页面", + "tableNamePlaceholder":"请输入表名", + "tableContentPlaceholder":"请输入描述", + "addonPlaceholder":"请选择插件", + "moduleNamePlaceholder":"请输入模块名", + "classNamePlaceholder":"请输入类名", + "editTypePlaceholder":"请选择编辑方式", + "addCode":"导入数据表", + "updateCode":"编辑代码生成", + "codeDeleteTips":"确定要删除吗？", + "tableComment":"表描述", + "tableCreateTime":"创建时间", + "tableUpdateTime":"修改时间", + "addBtn":"添加", + "searchPlaceholder":"请输入表名或表描述搜索", + "selectTableTips":"确认导入该数据表吗？", + "download":"下载代码", + "codeGeneration":"代码生成", + "codeList":"生成列表", + "step1":"选择数据表生成代码", + "describe1":"点击添加，选择对应数据表，添加之后会跳转到对应生成代码的配置管理页面", + "btn1":"添加", + "step2":"基础设置", + "describe2":"代码生成查看基础设置，包括基础的表名、描述、所属插件设置", + "btn2":"插件列表", + "step3":"字段设置", + "describe3":"代码中字段的管理，包括字段是否进行增加、编辑、列表、查询展示等", + "btn3":"查看教程", + "step4":"页面设置", + "describe4":"正在开发中，会将字段进行展示管理配置，同时提供预览，真正实现自定义表单配置", + "btn4":"插件列表", + "step5":"生成配置", + "describe5":"针对代码中展示页面配置，包括单独页面编辑表单还是弹框，生成的代码穿插到系统中还是进行下载等", + "btn5":"官方市场", + "saveAndSync":"同步代码", + "saveAndSyncText":"同步的代码与项目产生冲突，是否确认覆盖?", + "saveAndSyncText1":"同步的代码会加入到项目代码中，是否确认继续" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/tools.detection.json b/admin/src/app/lang/zh-cn/tools.detection.json similarity index 100% rename from admin/src/lang/zh-cn/tools.detection.json rename to admin/src/app/lang/zh-cn/tools.detection.json diff --git a/admin/src/lang/zh-cn/tools.schedule.json b/admin/src/app/lang/zh-cn/tools.schedule.json similarity index 100% rename from admin/src/lang/zh-cn/tools.schedule.json rename to admin/src/app/lang/zh-cn/tools.schedule.json diff --git a/admin/src/lang/zh-cn/tools.updatecache.json b/admin/src/app/lang/zh-cn/tools.updatecache.json similarity index 100% rename from admin/src/lang/zh-cn/tools.updatecache.json rename to admin/src/app/lang/zh-cn/tools.updatecache.json diff --git a/admin/src/lang/zh-cn/user.center.json b/admin/src/app/lang/zh-cn/user.center.json similarity index 100% rename from admin/src/lang/zh-cn/user.center.json rename to admin/src/app/lang/zh-cn/user.center.json diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue new file mode 100644 index 000000000..a2790a6f1 --- /dev/null +++ b/admin/src/app/views/app/authorize.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue new file mode 100644 index 000000000..09711a979 --- /dev/null +++ b/admin/src/app/views/app/index.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/admin/src/views/app/store.vue b/admin/src/app/views/app/store.vue similarity index 62% rename from admin/src/views/app/store.vue rename to admin/src/app/views/app/store.vue index 889b0c5dd..56500dfda 100644 --- a/admin/src/views/app/store.vue +++ b/admin/src/app/views/app/store.vue @@ -3,46 +3,52 @@
- + {{ t('localAppText') }}
-
-
- +
+
-
- +
+
- +
-
+
- +
{{ item.title }} {{ item.desc }}
- {{ t('unload') }} + {{ t('unload') }}
-
+
- +
@@ -50,40 +56,55 @@

{{ item.desc }}

- {{ t('unload') }} + {{ t('unload') }}
- +
-
+
- +
{{ item.title }} {{ item.desc }}
- {{ t('install') }} - {{ t('down') }} + {{ t('install') }} + {{ t('down') }}
- +
-
+
- - - + + +
@@ -91,59 +112,83 @@

{{ item.desc }}

- {{ t('install') }} - {{ t('down') }} + {{ t('install') }} + {{ t('down') }}
- +
- -
- -
-
- - -
-
-
- {{ item.title }} - {{ item.desc }} -
- {{ t('unload') }} - {{ t('install') }} - {{ t('down') }} -
-
- -
-
-
- - - -
-
-
-

{{ item.title }}

-

{{ item.desc }}

-
-
- {{ t('unload') }} - {{ t('install') }} - {{ t('down') }} -
-
-
-
+ +
- -
- +
+
+ + +
+
+
+ {{ item.title }} + {{ item.desc }} +
+ {{ t('unload') }} + {{ t('install') }} + {{ t('down') }} +
+
+ +
+
+
+ + + +
+
+
+

{{ item.title }}

+

{{ item.desc }}

+
+
+ {{ t('unload') }} + {{ t('install') }} + {{ t('down') }} +
+
+
+
+ + +
+
@@ -171,7 +216,8 @@ - + @@ -181,7 +227,8 @@
- +

{{ t('dirPermission') }}

@@ -195,7 +242,8 @@ {{ t('status') }} - + {{ item.dir }} @@ -229,48 +277,6 @@
-
-

{{ t('packageManageTool') }}

-
- - - {{ t('name') }} - - - {{ t('demand') }} - - - {{ t('status') }} - - - - - {{ item.name }} - - - {{ t('installLabel') }} - - -