diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts index df66a57a2..83d258115 100644 --- a/admin/src/app/api/diy.ts +++ b/admin/src/app/api/diy.ts @@ -149,13 +149,4 @@ export function getDecoratePage(params: Record) { */ export function changeTemplate(params: Record) { return request.put(`diy/change`, params, {showSuccessMessage: true}) -} - -/** - * 获取预览数据 - * @param params - * @returns - */ -export function getPreviewData(params: Record) { - return request.put(`diy/preview`, params, {showSuccessMessage: false}) } \ No newline at end of file diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts index c85f6a2ac..426d0fbe9 100644 --- a/admin/src/app/api/pay.ts +++ b/admin/src/app/api/pay.ts @@ -33,4 +33,39 @@ export function getAccountStat() { */ export function getAccountType() { return request.get(`pay/account/type`) +} + +/***************************************************** 退款信息 **************************************************/ + +/** + * 退款列表 + * @param params + * @returns + */ +export function getPayRefundPages(params: Record) { + return request.get(`pay/refund`, {params}) +} + +/** + * 获取退款详情 + * @param id + */ +export function getPayRefundInfo(refund_no: string) { + return request.get(`pay/refund/${refund_no}`) +} + +/** + * 退款方式 + * @param id + */ +export function getRefundType() { + return request.get(`pay/refund/type`) +} + +/** + * 退款转账 + * @param id + */ +export function getRefundTransfer(params: Record) { + return request.post(`pay/refund/transfer`, params, {showSuccessMessage: true}) } \ No newline at end of file diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 70252f192..978dd5779 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -323,6 +323,16 @@ export function getIconList(params: Record) { return request.get(`sys/attachment/icon`, {params}) } + +/** + * 获取evn + * @param params + * @returns + */ +export function getEnv() { + return request.get(`sys/env`) +} + /***************************************************** 地址管理 ****************************************************/ /** diff --git a/admin/src/app/assets/images/login_logo_ico_white.png b/admin/src/app/assets/images/login_logo_ico_white.png new file mode 100644 index 000000000..4c5b95aad Binary files /dev/null and b/admin/src/app/assets/images/login_logo_ico_white.png differ diff --git a/admin/src/app/assets/images/nc_logo.jpg b/admin/src/app/assets/images/nc_logo.jpg new file mode 100644 index 000000000..ec17c5ea0 Binary files /dev/null and b/admin/src/app/assets/images/nc_logo.jpg differ diff --git a/admin/src/app/assets/images/one_type.png b/admin/src/app/assets/images/one_type.png index dff67135f..a3816e842 100644 Binary files a/admin/src/app/assets/images/one_type.png and b/admin/src/app/assets/images/one_type.png differ diff --git a/admin/src/app/assets/images/three_type.png b/admin/src/app/assets/images/three_type.png index e0f2d5bf7..b15557bd2 100644 Binary files a/admin/src/app/assets/images/three_type.png 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 index 507e1f802..ee55536da 100644 Binary files a/admin/src/app/assets/images/two_type.png and b/admin/src/app/assets/images/two_type.png differ diff --git a/admin/src/app/lang/zh-cn/auth.menu.json b/admin/src/app/lang/zh-cn/auth.menu.json index c3fc4292f..846bd3b08 100644 --- a/admin/src/app/lang/zh-cn/auth.menu.json +++ b/admin/src/app/lang/zh-cn/auth.menu.json @@ -7,7 +7,7 @@ "menuTypeDir": "目录", "menuTypeMenu": "菜单", "menuTypeButton": "按钮", - "menuDeleteTips": "确定要删除该菜单吗？", + "menuDeleteTips": "删除菜单会删除当前菜单以及该菜单下所有子菜单，是否确认删除？", "addMenu": "添加菜单", "updateMenu": "编辑菜单", "routePath": "路由路径", diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 45edf12c1..9b15e6361 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -154,5 +154,36 @@ "UIDStyle": "UID样式", "accountStyle": "积分/余额样式", "accountNumberColor": "数值颜色", - "accountNumberWeight": "数值粗细" + "accountNumberWeight": "数值粗细", + "goodsCategoryTitle":"商品分类", + "customGoods":"手动选择", + "goodsNum":"商品数量", + "selectCategory":"选择分类", + "categoryName": "分类名称", + "categoryImage": "分类图片", + "selectSource": "选择数据源", + "goodsSelectPopupSelectGoodsButton": "选择商品", + "goodsSelectPopupSelect": "已选", + "goodsSelectPopupPiece": "个", + "goodsSelectPopupSelectGoodsDialog": "商品选择", + "goodsSelectPopupAllGoods": "全部商品", + "goodsSelectPopupSelectedGoods": "已选商品", + "goodsSelectPopupGoodsName": "商品名称", + "goodsSelectPopupGoodsNamePlaceholder": "请输入商品名称", + "goodsSelectPopupGoodsCategory": "商品分类", + "goodsSelectPopupGoodsCategoryPlaceholder": "全部", + "goodsSelectPopupGoodsType": "商品类型", + "goodsSelectPopupGoodsTypePlaceholder": "请选择商品类型", + "goodsSelectPopupGoodsInfo": "商品", + "goodsSelectPopupPrice": "价格", + "goodsSelectPopupStock": "库存", + "goodsSelectPopupBeforeTip": "已选择", + "goodsSelectPopupAfterTip": "个商品", + "goodsSelectPopupClearGoods": "取消选择", + "goodsSelectPopupGoodsMinTip": "所选商品数量不能少于", + "goodsSelectPopupGoodsMaxTip": "所选商品数量不能超过", + "confirm": "确定", + "cancel": "取消" + + } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/finance.account.json b/admin/src/app/lang/zh-cn/finance.account.json index 5e170e57c..11b19fcb8 100644 --- a/admin/src/app/lang/zh-cn/finance.account.json +++ b/admin/src/app/lang/zh-cn/finance.account.json @@ -1,26 +1,27 @@ { - "id":"主键", - "accountDetail":"账单详情", - "detail":"详情", - "type":"账单类型", - "money":"账单金额", - "moneyPlaceholder":"请输入账单金额", - "tradeNo":"账单编号", - "tradeNoPlaceholder":"请输入账单编号", - "createTime":"账单日期", - "totalPay":"累计收款（元）", - "totalRefund":"累计退款（元）", - "totalTransfer":"累计转账（元）", - "accountType": "请选择退款类型", - "startDate": "开始时间", - "endDate": "结束时间", - "transferNo" : "转账单号", - "transferTime": "转账时间", - "transferType": "转账类型", - "transferMoney": "转账金额", - "transferRemark": "转账说明", - "outTradeNo": "单号", - "refundMoney": "退款金额", - "failReason": "退款说明", - "body": "说明" + "id": "主键", + "accountDetail": "账单详情", + "detail": "详情", + "type": "账单类型", + "money": "账单金额", + "moneyPlaceholder": "请输入账单金额", + "tradeNo": "账单编号", + "tradeNoPlaceholder": "请输入账单编号", + "createTime": "账单日期", + "totalPay": "累计收款（元）", + "totalRefund": "累计退款（元）", + "totalTransfer": "累计转账（元）", + "accountType": "请选择退款类型", + "startDate": "开始时间", + "endDate": "结束时间", + "transferNo": "转账单号", + "transferTime": "转账时间", + "transferType": "转账类型", + "transferMoney": "转账金额", + "transferRemark": "转账说明", + "outTradeNo": "单号", + "refundMoney": "退款金额", + "failReason": "退款说明", + "body": "说明", + "payType": "支付方式" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/finance.pay_refund.json b/admin/src/app/lang/zh-cn/finance.pay_refund.json new file mode 100644 index 000000000..0b186faee --- /dev/null +++ b/admin/src/app/lang/zh-cn/finance.pay_refund.json @@ -0,0 +1,10 @@ +{ + "refundNo": "退款编号", + "refundMoney": "退款金额", + "payType": "支付类型", + "status": "退款状态", + "createTime": "申请时间", + "refundNoPlaceholder": "请输入退款编号", + "startDate": "开始时间", + "endDate": "结束时间" +} diff --git a/admin/src/app/lang/zh-cn/finance.refund_detail.json b/admin/src/app/lang/zh-cn/finance.refund_detail.json new file mode 100644 index 000000000..a3c072a57 --- /dev/null +++ b/admin/src/app/lang/zh-cn/finance.refund_detail.json @@ -0,0 +1,16 @@ +{ + "refundNo": "退款编号", + "refundMoney": "退款金额", + "payType": "支付类型", + "status": "退款状态", + "createTime": "申请时间", + "refundNoPlaceholder": "请输入退款编号", + "startDate": "开始时间", + "endDate": "结束时间", + "outTradeNo": "交易流水号", + "refundTypeName": "退款方式", + "statusName": "退款状态", + "transfer": "转账", + "transferType": "转账方式", + "voucher": "凭证" +} diff --git a/admin/src/app/lang/zh-cn/index.app_manage.json b/admin/src/app/lang/zh-cn/index.app_manage.json new file mode 100644 index 000000000..ab065c762 --- /dev/null +++ b/admin/src/app/lang/zh-cn/index.app_manage.json @@ -0,0 +1,8 @@ +{ + "app": "应用管理", + "descriptionLeft": "暂无安装任何应用，马上去", + "link": "插件管理", + "descriptionRight": "逛逛", + "niucloud": "Niucloud官网", + "appStore": "插件管理" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/index.index.json b/admin/src/app/lang/zh-cn/index.index.json index 32dedfad2..d259c324e 100644 --- a/admin/src/app/lang/zh-cn/index.index.json +++ b/admin/src/app/lang/zh-cn/index.index.json @@ -1,4 +1,5 @@ { + "changeApp": "切换应用", "dataSummarize": "数据概况", "todayData": "今日数据", "memberNumb": "新增会员数", diff --git a/admin/src/app/lang/zh-cn/index.preview.json b/admin/src/app/lang/zh-cn/index.preview.json new file mode 100644 index 000000000..b706dee11 --- /dev/null +++ b/admin/src/app/lang/zh-cn/index.preview.json @@ -0,0 +1,12 @@ +{ + "preview": "预览", + "weapp": "微信小程序", + "wechat": "微信公众号", + "link": "链接", + "copy": "复制", + "copySuccess": "复制成功", + "weappNotSet": "小程序未配置", + "developTitle": "开发环境配置", + "wapDomain": "wap域名（WAP_DOMAIN）", + "wapDomainPlaceholder": "请输入wap域名" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/index.store.json b/admin/src/app/lang/zh-cn/index.store.json new file mode 100644 index 000000000..c35243f5c --- /dev/null +++ b/admin/src/app/lang/zh-cn/index.store.json @@ -0,0 +1,59 @@ +{ + "noPlug":"暂无应用", + "install":"安装", + "unload":"卸载", + "installLabel":"已安装", + "uninstalledLabel":"未安装", + "version":"版本", + "title":"名称", + "desc":"描述", + "plugDetail": "插件信息", + "author": "作者", + "addonInstall": "插件安装", + "dirPermission": "目录读写权限", + "path": "路径", + "demand": "要求", + "readable": "可读", + "write": "可写", + "packageManageTool": "包管理工具", + "name": "名称", + "addonInstallSuccess": "插件安装成功", + "envCheck": "环境检查", + "installProgress": "安装进度", + "installComplete": "安装完成", + "localAppText":"插件管理", + "marketAppText":"官方市场", + "installShowDialogCloseTips": "安装任务尚未完成，关闭任务仍会执行，确定要继续关闭吗？", + "marketDevelopMessage":"官方市场正在开发中！", + "jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen", + "conflictFiles": "冲突文件", + "process": "启动进程", + "open": "开启", + "down": "下载", + "addonVersion": "插件版本", + "versionCode": "版本号", + "createTime": "发布时间", + "buyLabel": "已购买", + "installTips": "安装后需手动更新插件引用的依赖和编译各个端口的前端源码", + "localInstall":"本地安装", + "cloudInstall": "一键云安装", + "cloudInstallTips": "云安装可实现一键安装，安装后无需手动更新依赖和编译前端源码", + "installingTips": "有插件正在安装中请等待安装完成之后再进行其他操作，点击查看", + "installPercent": "安装进度", + "downloading": "下载中", + "authTips": "云安装需先绑定授权码，如果已有授权请先进行绑定，没有授权可到niucloud官网购买云服务之后再进行操作", + "toBind": "绑定授权", + "toNiucloud": "去niucloud官网", + + "descriptionLeft": "暂无任何应用，马上去", + "link": "官方应用市场", + "descriptionRight": "逛逛", + "installed-empty": "暂无安装任何应用，请先安装", + + "siteAddressTips": "授权域名不匹配", + "authCodePlaceholder": "请输入授权码", + "authSecretPlaceholder": "请输入授权秘钥", + "updateCode": "重新绑定", + "notHaveAuth": "还没有授权？去购买", + "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/user.center.json b/admin/src/app/lang/zh-cn/user.center.json index f0b853a85..6905b7905 100644 --- a/admin/src/app/lang/zh-cn/user.center.json +++ b/admin/src/app/lang/zh-cn/user.center.json @@ -1,17 +1,6 @@ { + "personal": "个人中心", + "editPersonal": "编辑", "headImg": "头像", - "realName": "名称", - "originalPassword": "原始密码", - "password": "新密码", - "passwordCopy": "确认密码", - "passwordTip": "修改密码时必填.不修改密码时留空", - "realNamePlaceholder": "请输入用户名称", - "headImgPlaceholder": "请输入用户头像", - "originalPasswordPlaceholder": "请输入原始密码", - "passwordPlaceholder": "请输入新密码", - "save": "保存", - "cancel": "取消", - "originalPasswordHint": "原始密码不能为空", - "newPasswordHint": "请输入确认密码", - "doubleCipherHint": "两次新密码不同" + "realName": "名称" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/user.edit_center.json b/admin/src/app/lang/zh-cn/user.edit_center.json new file mode 100644 index 000000000..7b41f3a88 --- /dev/null +++ b/admin/src/app/lang/zh-cn/user.edit_center.json @@ -0,0 +1,18 @@ +{ + "editPersonal": "编辑个人中心", + "headImg": "头像", + "realName": "名称", + "originalPassword": "原始密码", + "password": "新密码", + "passwordCopy": "确认密码", + "passwordTip": "修改密码时必填.不修改密码时留空", + "realNamePlaceholder": "请输入用户名称", + "headImgPlaceholder": "请输入用户头像", + "originalPasswordPlaceholder": "请输入原始密码", + "passwordPlaceholder": "请输入新密码", + "save": "保存", + "cancel": "返回", + "originalPasswordHint": "原始密码不能为空", + "newPasswordHint": "请输入确认密码", + "doubleCipherHint": "两次新密码不同" +} \ No newline at end of file diff --git a/admin/src/app/views/app/store.vue b/admin/src/app/views/app/store.vue index a87f446b5..ec1e723b7 100644 --- a/admin/src/app/views/app/store.vue +++ b/admin/src/app/views/app/store.vue @@ -4,7 +4,7 @@ {{ t('localAppText') }}
-
+
@@ -14,8 +14,8 @@
- +
+
@@ -379,6 +380,7 @@ const localList = ref({ all: [], error: '' }) + const localListFn = () => { loading.value = true getAddonLocal({}).then(res => { @@ -402,6 +404,7 @@ const localListFn = () => { loading.value = false }) } + localListFn() const handleClick = (tab: TabsPaneContext, event: Event) => { @@ -415,10 +418,13 @@ const handleClick = (tab: TabsPaneContext, event: Event) => { } const currAddon = ref('') + // 安装面板弹窗 const installShowDialog = ref(false) + // 安装步骤 const installStep = ref(1) + // 安装检测结果 const installCheckResult = ref({}) @@ -479,6 +485,7 @@ const getInstallTask = (first: boolean = true) => { } }) } + getInstallTask() const checkInstallTask = () => { @@ -506,6 +513,7 @@ const handleInstall = () => { } const cloudInstalling = ref(false) + /** * 云安装插件 */ diff --git a/admin/src/app/views/diy/components/edit-addon-list.vue b/admin/src/app/views/diy/components/edit-addon-list.vue index bf814f5c4..cd9c8af4b 100644 --- a/admin/src/app/views/diy/components/edit-addon-list.vue +++ b/admin/src/app/views/diy/components/edit-addon-list.vue @@ -74,10 +74,10 @@ // 组件验证 diyStore.editComponent.verify = (index: number) => { var res = {code: true, message: ''}; - if (diyStore.value[index].list.length === 0) { - res.code = false; - res.message = t('selectAddonTips'); - } + // if (diyStore.value[index].list.length === 0) { + // res.code = false; + // res.message = t('selectAddonTips'); + // } return res; }; diff --git a/admin/src/app/views/diy/components/edit-goods-list.vue b/admin/src/app/views/diy/components/edit-goods-list.vue deleted file mode 100644 index 4e9f68052..000000000 --- a/admin/src/app/views/diy/components/edit-goods-list.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue index b2ce3d825..39740e598 100644 --- a/admin/src/app/views/diy/edit.vue +++ b/admin/src/app/views/diy/edit.vue @@ -1,578 +1,627 @@ \ No newline at end of file diff --git a/admin/src/app/views/diy/index.vue b/admin/src/app/views/diy/index.vue index 80a783be9..b742bc8e6 100644 --- a/admin/src/app/views/diy/index.vue +++ b/admin/src/app/views/diy/index.vue @@ -1,10 +1,13 @@