From b021bc6660a8adf688fd231bd923b0813169f300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Mon, 10 Mar 2025 14:07:44 +0800 Subject: [PATCH] up --- admin/src/app/api/addon.ts | 1 + admin/src/app/api/diy.ts | 23 + admin/src/app/api/diy_form.ts | 10 +- admin/src/app/api/member.ts | 8 + admin/src/app/api/pay.ts | 22 + admin/src/app/api/sys.ts | 7 + admin/src/app/api/weapp.ts | 30 +- .../src/app/components/cloud-build/index.vue | 1 + admin/src/app/components/upgrade/index.vue | 16 +- .../app/lang/zh-cn/channel.weapp.code.json | 3 +- .../app/lang/zh-cn/channel.weapp.config.json | 25 +- admin/src/app/lang/zh-cn/diy.edit.json | 3 +- admin/src/app/lang/zh-cn/diy_form.edit.json | 104 +- admin/src/app/lang/zh-cn/diy_form.list.json | 79 +- .../src/app/lang/zh-cn/finance.cash_out.json | 6 +- .../app/lang/zh-cn/marketing.sign_list.json | 2 +- admin/src/app/lang/zh-cn/setting.login.json | 4 +- .../lang/zh-cn/setting.transfer_scene.json | 10 + .../src/app/lang/zh-cn/tools.updatecache.json | 11 +- admin/src/app/views/app/index.vue | 2 - admin/src/app/views/channel/weapp/code.vue | 3 + .../weapp/components/modify-domain.vue | 164 + .../components/modify-privacy-agreement.vue | 223 + .../channel/weapp/components/setting-list.vue | 221 + admin/src/app/views/channel/weapp/config.vue | 126 +- .../diy/components/edit-carousel-search.vue | 1 + .../views/diy/components/edit-float-btn.vue | 9 +- .../app/views/diy/components/edit-theme.vue | 309 +- .../app/views/diy/components/theme-list.vue | 244 +- admin/src/app/views/diy/edit.vue | 2 - admin/src/app/views/diy/index.vue | 2 +- admin/src/app/views/diy/theme_style.vue | 22 +- .../components/edit-form-checkbox.vue | 26 +- .../components/edit-form-date-scope.vue | 144 +- .../diy_form/components/edit-form-date.vue | 12 +- .../components/edit-form-identity.vue | 14 +- .../diy_form/components/edit-form-image.vue | 70 +- .../diy_form/components/edit-form-input.vue | 8 +- .../components/edit-form-location.vue | 14 +- .../diy_form/components/edit-form-mobile.vue | 14 +- .../diy_form/components/edit-form-number.vue | 10 +- .../diy_form/components/edit-form-radio.vue | 26 +- .../diy_form/components/edit-form-submit.vue | 34 +- .../components/edit-form-textarea.vue | 6 +- .../components/edit-form-time-scope.vue | 32 +- .../diy_form/components/edit-form-time.vue | 8 +- .../components/form-select-content.vue | 177 + .../diy_form/components/form-spread-popup.vue | 12 +- .../diy_form/components/form-submit-popup.vue | 88 +- .../diy_form/components/form-write-popup.vue | 34 +- admin/src/app/views/diy_form/edit.vue | 48 +- admin/src/app/views/diy_form/list.vue | 26 +- admin/src/app/views/diy_form/records.vue | 47 +- admin/src/app/views/finance/cash_out.vue | 170 +- admin/src/app/views/index/index.vue | 8 +- admin/src/app/views/index/tools.vue | 9 + admin/src/app/views/marketing/sign_config.vue | 67 +- admin/src/app/views/marketing/sign_list.vue | 2 +- admin/src/app/views/marketing/verifier.vue | 2 +- admin/src/app/views/member/balance.vue | 2 +- admin/src/app/views/member/commission.vue | 2 +- .../views/member/components/gift-balance.vue | 2 +- .../views/member/components/gift-point.vue | 2 +- .../member/components/member-balance-edit.vue | 2 +- admin/src/app/views/member/growth.vue | 2 +- admin/src/app/views/member/member.vue | 4 +- admin/src/app/views/member/point.vue | 2 +- admin/src/app/views/poster/edit.vue | 107 +- admin/src/app/views/poster/list.vue | 2 +- admin/src/app/views/setting/cash_out.vue | 4 +- admin/src/app/views/setting/growth_rule.vue | 17 +- admin/src/app/views/setting/layout.vue | 4 +- admin/src/app/views/setting/point_rule.vue | 2 +- .../src/app/views/setting/transfer_scene.vue | 149 + .../app/views/site/components/edit-site.vue | 4 +- .../app/views/site/components/user-edit.vue | 7 +- admin/src/app/views/site/group_edit.vue | 87 +- admin/src/app/views/site/list.vue | 4 +- admin/src/app/views/tools/updatecache.vue | 56 + admin/src/components/diy-link/index.vue | 196 +- admin/src/components/editor/index.vue | 34 +- admin/src/components/heat-map/index.vue | 2 +- .../upload-attachment/attachment.vue | 22 +- admin/src/lang/zh-cn/common.json | 12 +- .../layout/admin/components/aside/index.vue | 2 +- .../layout/admin/components/header/index.vue | 4 +- .../components/header/index.vue | 4 +- admin/src/styles/icon/iconfont.css | 5447 +++++++++-------- admin/src/styles/icon/official-iconfont.css | 3043 ++++----- 89 files changed, 6878 insertions(+), 5150 deletions(-) create mode 100644 admin/src/app/lang/zh-cn/setting.transfer_scene.json create mode 100644 admin/src/app/views/channel/weapp/components/modify-domain.vue create mode 100644 admin/src/app/views/channel/weapp/components/modify-privacy-agreement.vue create mode 100644 admin/src/app/views/channel/weapp/components/setting-list.vue create mode 100644 admin/src/app/views/diy_form/components/form-select-content.vue create mode 100644 admin/src/app/views/setting/transfer_scene.vue create mode 100644 admin/src/app/views/tools/updatecache.vue diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index 217e8c679..87daa9abe 100644 --- a/admin/src/app/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -90,3 +90,4 @@ export function cancelInstall(addon: string) { export function getInstalledAddonList() { return request.get('addon/list/install') } + diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts index 9398e14ac..1888d262c 100644 --- a/admin/src/app/api/diy.ts +++ b/admin/src/app/api/diy.ts @@ -219,6 +219,29 @@ export function getDiyTheme(params: Record) { return request.get(`diy/theme`, {params}) } +/** + * 添加配色 + * @param params + */ +export function addTheme(params: Record) { + return request.post(`diy/theme/add`, params) +} + +/** + * 编辑配色 + * @param params + */ +export function editTheme(params: Record) { + return request.put(`diy/theme/edit/${params.id}`, params, {showSuccessMessage: true}) +} + +/** + * 删除配色 + * @param params + */ +export function deleteTheme(id: number) { + return request.delete(`diy/theme/delete/${id}`, {showSuccessMessage: true}) +} /** * 设置主题配色 diff --git a/admin/src/app/api/diy_form.ts b/admin/src/app/api/diy_form.ts index b1629b40f..7d1aa3fb8 100644 --- a/admin/src/app/api/diy_form.ts +++ b/admin/src/app/api/diy_form.ts @@ -19,6 +19,14 @@ export function getDiyFormPageList(params: Record) { export function getDiyFormList(params: Record) { return request.get(`diy/form/list`, { params }) } +/** + * 获取万能表单分页列表（用于弹框选择） + * @param params + * @returns + */ +export function getDiyFormSelectPageList(params: Record) { + return request.get(`diy/form/select`, { params }) +} /** * 获取万能表单详情 @@ -225,4 +233,4 @@ export function getFormRecordsMember(params: Record) { */ export function copyForm(params: Record) { return request.post(`diy/form/copy`, params, { showSuccessMessage: true }) -} \ No newline at end of file +} diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts index 7ac2ba2c3..e08247547 100644 --- a/admin/src/app/api/member.ts +++ b/admin/src/app/api/member.ts @@ -359,6 +359,14 @@ export function getCashOutDetail(id: number) { export function memberAudit(params: Record) { return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showSuccessMessage: true }) } +/** + * 会员取消提现 + * @param params + */ +export function memberCancel(params: Record) { + return request.put(`member/cash_out/cancel/${params.id}`, params, { showSuccessMessage: true,showErrorMessage: true }) +} + /** * 会员提现转账 diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts index 8b48e0e31..5df0b2837 100644 --- a/admin/src/app/api/pay.ts +++ b/admin/src/app/api/pay.ts @@ -99,3 +99,25 @@ export function pay(params: Record) { export function getFriendsPay(tradeType : string, tradeId : number, channel: string) { return request.get(`pay/friendspay/info/${tradeType}/${tradeId}/${channel}`, { showErrorMessage: false }) } + + +/** + *转账场景 + */ +export function getTransferScene() { + return request.get(`pay/transfer_scene`) +} + +/** + * 更改场景id + */ +export function setSceneId(params: Record) { + return request.post(`pay/transfer_scene/set_scene_id/${params.scene}`, params, { showSuccessMessage: true }) +} + +/** + * 设置业务场景配置 + */ +export function setTradeScene(params: Record) { + return request.post(`pay/transfer_scene/set_trade_scene/${params.type}`, params) +} \ No newline at end of file diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index ecd6e109b..5d9576c2b 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -604,6 +604,13 @@ export function clearSchemaCache(params: Record) { return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true }) } +/** + * 清理缓存 + */ +export function clearCache(params: Record) { + return request.post(`sys/cache/clear`, {}, { showSuccessMessage: true }) +} + /***************************************************** 获取应用 ****************************************************/ /** * 获取应用 diff --git a/admin/src/app/api/weapp.ts b/admin/src/app/api/weapp.ts index 235611760..921629eaa 100644 --- a/admin/src/app/api/weapp.ts +++ b/admin/src/app/api/weapp.ts @@ -61,8 +61,8 @@ export function getWeappVersionList(params: Record) { /** * 获取微信小程序上传日志 - * @param key - * @returns + * @param key + * @returns */ export function getWeappUploadLog(key: string) { return request.get(`weapp/upload/${key}`) @@ -130,4 +130,28 @@ export function deleteVersion(id: string) { */ export function getIsTradeManaged() { return request.get('weapp/delivery/getIsTradeManaged') -} \ No newline at end of file +} + +/** + * 设置服务器域名 + * @param params + */ +export function setWeappDomain(params: Record) { + return request.put('weapp/domain', params, { showSuccessMessage: true }) +} + +/** + * 设置小程序隐私协议 + * @param params + */ +export function setWeappPrivacySetting(params: Record) { + return request.put('weapp/privacysetting', params, { showSuccessMessage: true }) +} + +/** + * 获取小程序隐私协议 + * @param params + */ +export function getWeappPrivacySetting() { + return request.get('weapp/privacysetting') +} diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue index 00f99c789..6f2678d03 100644 --- a/admin/src/app/components/cloud-build/index.vue +++ b/admin/src/app/components/cloud-build/index.vue @@ -194,6 +194,7 @@ const open = async () => { } else { loading.value = false cloudBuildCheck.value = data + showDialog.value = true } }).catch(() => { showDialog.value = false diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index f37c29bcf..fb2019786 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -134,6 +134,7 @@ const emits = defineEmits(['complete', 'cloudbuild']) const upgradeTipsShowDialog = ref(false) let upgradeLog: any = [] +let errorLog: any = [] /** * 查询升级任务 */ @@ -158,12 +159,18 @@ const getUpgradeTaskFn = () => { }) // 安装失败 if (data.error) { - upgradeTask.value = data - ElMessage({ message: '升级失败', type: 'error' }) - terminalRef.value.pushMessage({ content: data.error, class: 'error' }) + data.error.forEach(item => { + if (!errorLog.includes(item)) { + terminalRef.value.pushMessage({ content: item, class: 'error' }) + errorLog.push(item) + } + }) + } + // 恢复完毕 + if (data.step == 'restoreComplete') { return } - // 安装完成 + // 升级完成 if (data.step == 'upgradeComplete') { active.value = 'complete' notificationEl && notificationEl.close() @@ -316,6 +323,7 @@ const clearUpgradeTaskFn = () => { uploading.value = false upgradeTask.value = null upgradeLog = [] + errorLog = [] flashInterval && clearInterval(flashInterval) clearUpgradeTask().then(() => {}).catch() } diff --git a/admin/src/app/lang/zh-cn/channel.weapp.code.json b/admin/src/app/lang/zh-cn/channel.weapp.code.json index 1038dfac7..8ccfc17d0 100644 --- a/admin/src/app/lang/zh-cn/channel.weapp.code.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.code.json @@ -42,5 +42,6 @@ "uploadSuccessTips": "小程序上传成功后还需到微信公众平台提交审核，审核通过后发布才算正式上线。", "knownToKnow": "我已知晓，不需要再次提示", "siteAuthTips": "上传代码需先绑定授权码，请联系平台管理员进行绑定", - "againUpload": "重新上传" + "againUpload": "重新上传", + "uploadWeapp": "上传小程序" } diff --git a/admin/src/app/lang/zh-cn/channel.weapp.config.json b/admin/src/app/lang/zh-cn/channel.weapp.config.json index cbc531796..3d27eeff2 100644 --- a/admin/src/app/lang/zh-cn/channel.weapp.config.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.config.json @@ -34,5 +34,26 @@ "weappUpload": "小程序代码上传", "uploadKey": "上传密钥", "uploadKeyTips": "配置之后可实现在线上传小程序版本", - "uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip：" -} \ No newline at end of file + "uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip：", + "update": "修改", + "udpUrl": "udp合法域名", + "tcpUrl": "tcp合法域名", + "requestdomainPlaceholder": "以 https:// 开头。域名间请用 ; 分割", + "wsrequestdomainPlaceholder": "以 wss:// 开头。域名间请用 ; 分割", + "uploaddomainPlaceholder": "以 https:// 开头。域名间请用 ; 分割", + "downloaddomainPlaceholder": "以 https:// 开头。域名间请用 ; 分割", + "udpdomainPlaceholder": "以 udp:// 开头。域名间请用 ; 分割", + "tcpdomainPlaceholder": "以 tcp:// 开头。域名间请用 ; 分割", + "domainError": "该域名协议头非法", + "serviceContentStatement": "服务内容声明", + "privacyAgreement": "用户隐私保护指引", + "privacyAgreementTips": "基于微信提供的 标准化用户隐私保护指引，根据小程序实际情况更新并展示给用户。", + "setting": "设置", + "privacyAgreementTitle": "用户隐私保护指引设置", + "settingPlaceholder": "请填写用途", + "addSettingType": "增加信息类型", + "settingTypeTitle": "使用用户信息类型", + "addContact": "增加联系方式", + "addSdkInfo": "增加第三方SDK信息", + "addSdkSettingList": "增加SDK提供方的隐私信息" +} diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 3bf2c51ea..37f626e6e 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -257,8 +257,9 @@ "horzLineStyleDashed": "虚线", "horzLineBorderColor": "线条颜色", "horzLineBorderWidth": "线条宽度", - "floatBtnBtton": "按钮位置", + "floatBtnButton": "按钮位置", "floatBtnOffset": "上下偏移", + "lateralBtnOffset": "左右偏移", "floatBtnImageSet": "图片设置", "floatBtnImageSize": "图片大小", "floatBtnAroundRadius": "图片圆角", diff --git a/admin/src/app/lang/zh-cn/diy_form.edit.json b/admin/src/app/lang/zh-cn/diy_form.edit.json index d0b7705e9..910e14b6c 100644 --- a/admin/src/app/lang/zh-cn/diy_form.edit.json +++ b/admin/src/app/lang/zh-cn/diy_form.edit.json @@ -258,8 +258,9 @@ "horzLineStyleDashed": "虚线", "horzLineBorderColor": "线条颜色", "horzLineBorderWidth": "线条宽度", - "floatBtnBtton": "按钮位置", + "floatBtnButton": "按钮位置", "floatBtnOffset": "上下偏移", + "lateralBtnOffset": "左右偏移", "floatBtnImageSet": "图片设置", "floatBtnImageSize": "图片大小", "floatBtnAroundRadius": "图片圆角", @@ -291,5 +292,104 @@ "formPlaceholder": "提示语", "formPlaceholderTips": "请输入提示语", "isRequired": "是否必填", - "optionPlaceholder": "请输入选项内容" + "optionPlaceholder": "请输入选项内容", + "formLayout": "表单布局", + "layoutStyle": "排版风格", + "singleTiling": "单列平铺‌", + "singleTilingTipsOne": "将所有需要填写的表单内容项直接罗列在页面上。", + "singleTilingTipsTwo": "适用于表单内容项较少且项目之间无逻辑关系的情况。", + "singleTilingTipsThree": "其优势在于相对简洁、便于操作", + "singleTilingTipsFour": "但当表单项数量较大时，一次性展示全部信息会增加用户的操作负担，填写效率较低", + "arrangeSideBySide": "左右排列‌", + "arrangeSideBySideTipsOne": "将表单分为左右两部分，左侧为标题和描述，右侧为输入区域。", + "arrangeSideBySideTipsTwo": "这种布局适用于标题和描述内容较少的情况，能够提高表单的紧凑性和用户体验。", + "layoutStyleTips": "切换后将同步所有表单组件的展示形式", + "borderControl": "边框开关", + "fieleContent": "字段内容", + "fieldName": "字段名称", + "filedRemark": "字段说明", + "otherSetting": "其他设置", + "hideControl": "隐藏该组件", + "hideControlTipsOne": "勾选后填表人填表时看不到该字段。", + "hideControlTipsTwo": "适用于你不再收集该字段又不希望删除已收集的数据。", + "textStyle": "文字样式", + "filedRemarkStyle": "字段说明样式", + + "style": "样式", + "listStyle": "列表", + "dropDownStyle": "下拉", + "option": "选项", + "addSingleOption": "添加单个选项", + "addMultipleOption": "批量添加选项", + "addOptionTips": "每个选项之间用英文“,” 隔开，自动过滤重复内容", + "errorTipsOne": "存在重复选项，请检查内容", + "errorTipsTwo": "选项已存在，请重新输入", + + "dataFormat": "日期格式", + "startDate": "开始日期", + "startTime": "开始时间", + "startDataTips": "开始日期不能为空", + "startTimeTips": "开始时间不能为空", + "startDataPlaceholder": "请选择开始日期", + "dataPlaceholder": "请选择日期", + "timePlaceholder": "请选择时间", + "startTimePlaceholder": "请选择开始时间", + "endDate": "结束日期", + "endTime": "结束时间", + "endDataPlaceholder": "请选择结束日期", + "endTimePlaceholder": "请选择结束时间", + "endDataTips": "结束日期不能为空", + "endTimeTips": "结束时间不能为空", + "startEndDataTips": "开始日期不能大于结束日期", + "startEndTimeTips": "开始时间不能大于结束时间", + "currentDate": "当天日期", + "diyDate": "指定日期", + "currentTime": "当天时间", + "diyTime": "指定时间", + + "preventDuplication":"内容防重复", + "preventDuplicationTipsOne":"该组件填写的内容不能与已提交的数据重复。", + "preventDuplicationTipsTwo":"极端情况下可能存在延时导致限制失效。", + "privacyProtection":"隐私保护", + "privacyProtectionTipsOne":"会自动将提交的个人信息做加密展示。", + "privacyProtectionTipsTwo":"适用于公开展示收集的数据且不暴露用户隐私。", + "privacyProtectionTipsThree":"提交后自动隐藏中间11位数字，仅管理员可查看", + "privacyProtectionTipsFour":"提交后自动隐藏文本，仅管理员可查看", + "privacyProtectionTipsFive":"提交后自动隐藏中间5位数字，仅管理员可查看", + + "imageLimit":"限制数量", + "imageLimitPlaceholder":"请输入限制数量", + "imageLimitErrorTips":"限制数量格式输入错误", + "imageLimitErrorTipsTwo":"限制数量不能小于0", + "imageLimitErrorTipsThree":"限制数量必须大于0", + "imafeLimitErrorTipsFour":"限制数量最大不能超过9", + + "defaultValueTips":"设置后，默认值会自动填充到输入框，填表人可在此基础上进行修改。", + "defaultErrorTips":"默认值格式输入错误", + "defaultMustZeroTips":"默认值不能小于0", + + "access":"获取方式", + "authorizeWeChatLocation":"授权微信定位", + "manuallySelectPositioning":"手动选择定位", + + "unit":"单位", + "unitPlaceholder":"请输入单位", + + "followContent":"跟随内容", + "hoverScreenBottom":"悬浮屏幕底部", + "btnTips":"当表单内容多时，只有滚动页面至最底部才会显示提交按钮", + "btnTipsTwo":"当表单内容多时，滚动页面至最底部时，提交按钮会自动按钮悬浮在屏幕底部，方便填表人快速提交显示在屏幕底部", + "btnTipsThree":"若前端以嵌入形式调用表单，提交按钮组件将不显示，相关业务由该页面负责处理", + "submitBtn":"提交按钮", + "submitBtnName":"按钮名称", + "btnNamePlaceholder":"请输入按钮名称", + "submitBtnNamePlaceholder":"请输入提交按钮名称", + "resetBtn":"重置按钮", + "btnStyle":"按钮样式", + "resetBtnNamePlaceholder":"请输入重置按钮名称", + + "rowCount":"显示行数", + "rowCountPlaceholder":"请输入显示行数" + + } diff --git a/admin/src/app/lang/zh-cn/diy_form.list.json b/admin/src/app/lang/zh-cn/diy_form.list.json index 4793f89a7..935fc6c59 100644 --- a/admin/src/app/lang/zh-cn/diy_form.list.json +++ b/admin/src/app/lang/zh-cn/diy_form.list.json @@ -45,5 +45,82 @@ "batchDeletion": "批量删除", "batchEmptySelectedFormsTips": "请选择要删除的表单", - "batchFormsDeleteTips": "确定要删除选中的表单吗？" + "batchFormsDeleteTips": "确定要删除选中的表单吗？", + "promotion":"推广", + "submitSuccess":"提交成功页", + "writeSet":"填写设置", + "export":"导出", + "detail":"详情", + "more":"更多", + + "formPromotion":"表单推广", + "promoteUrl":"推广链接", + "downLoadQRCode":"下载二维码", + "configureFailed":"配置失败", + + "writeSuccess":"填写成功", + "viewFillingDetails":"查看填写详情", + "finish":"完成", + "finishTips":"点击后进入首页", + "back":"返回", + "backTips":"点击后返回表单", + "afterSubmission":"填表人提交后", + "displayTextMessages":"显示文字消息", + "displayTextMessagesTips":"提交后页面显示文字信息。", + "promptText":"提示文字", + "defaultPrompt":"默认提示", + "defaultPromptTips":"将显示： 填写成功", + "diyPrompt":"自定义提示", + "tipsTextPlaceholder":"感谢你的填写", + "subsequentPperationButtons":"后续操作按钮", + + "validityPeriodOfVoucher":"凭证有效期", + "noLimit":"不限制", + "specifyTime":"设置固定有效期", + "specifyTimeTips":"每条记录的凭证有效期都是一样的，例如：会议凭证可设置有效期为会议举行时间。", + "submissionTime":"按提交时间设置有效期", + "submissionTimeTips":"每条记录的凭证有效期按照提交时间来计算，例如：优惠凭证的有效期可以设置为领取后3天内有效。", + "afterSubmissionRecords":"提交记录后", + "effective":"有效", + + "voucherStyle":"凭证样式", + "titleAboveTheCode":"码上方标题", + "titleAboveTheCodePlaceholder":"请妥善保存你的核销凭证", + "contentAboveTheCode":"码上方内容", + "contentAboveTheCodePlaceholder":"请输入码上方内容", + "addLinefeeds":"添加换行符", + "addFields":"添加字段", + "contentBelowTheCode":"码下方内容", + "submissionRecordTime":"展示提交记录时间", + "currentTime":"展示当前时间", + "currentTimeTips":"会以秒进行跳动，可起到防作假的功能", + "voucherDeadline":"展示凭证截止时间", + "saveVoucher":"支持填表人保存凭证", + "dispalyPromptText":"展示提示文字", + + "diy":"自定义", + "apieceFillQuantity":"每人可填写次数", + "fillQuantityTotal":"表单可填写总数", + "writeTips":"填写限制的校验在极端情况下可能存在延时，从而导致限制失效，不建议商品限时抢购等场景使用该功能", + "fillInTheTimePeriod":"可填写时间段", + "setSpecifyTime":"设置开始/停止时间", + "openDayTime":"设置每日开启时间", + "timeLimitRuleOne":"开始/停止时间不能为空", + "timeLimitRuleTwo":"开启时间不能为空", + "timeLimitRuleThree":"开始时间不能等于结束时间", + "numCannotNull":"次数不能为空", + + "dataAndStatistics":"数据与统计", + "detailData":"明细数据", + "fillInFormPerson":"填表人", + "fillInFormPersonplaceholder":"请输入填表人", + "fillInFormDate":"填表时间", + "fillInFormPersonInfo":"填表人信息", + "fillInFormPersonStatics":"填表人统计", + "fillInFormTotal":"总计(表单填写数)", + "fieldStatistics":"字段统计", + "viewInformation":"查看信息", + + "deleteTips":"确定删除该条数据吗" + } diff --git a/admin/src/app/lang/zh-cn/finance.cash_out.json b/admin/src/app/lang/zh-cn/finance.cash_out.json index 46d5a0539..67faf2dfc 100644 --- a/admin/src/app/lang/zh-cn/finance.cash_out.json +++ b/admin/src/app/lang/zh-cn/finance.cash_out.json @@ -41,7 +41,7 @@ "cashOutMoney": "转账金额", "auditTime": "审核时间", "transferTime": "转账时间", - "memberInfoPlaceholder": "请输入会员名称/会员昵称/手机号", + "memberInfoPlaceholder": "请输入会员编号/昵称/手机号搜索", "cashOutNumber": "提现单号", "cashOutNumberPlaceholder": "请输入提现单号", "alipayAccount": "支付宝账号", @@ -60,5 +60,7 @@ "transferRemark":"转账补充说明", "transferRemarkPlaceholder":"请输入转账补充说明", "notes":"备注", - "check":"检查打款进度" + "check":"检查打款进度", + "cancelWithdrawal":"取消", + "cancelTips":"确定要取消提现吗？" } diff --git a/admin/src/app/lang/zh-cn/marketing.sign_list.json b/admin/src/app/lang/zh-cn/marketing.sign_list.json index ae5384ed3..7618140b2 100644 --- a/admin/src/app/lang/zh-cn/marketing.sign_list.json +++ b/admin/src/app/lang/zh-cn/marketing.sign_list.json @@ -1,6 +1,6 @@ { "memberId":"会员编号", - "memberInfoPlaceholder":"请输入会员信息", + "memberInfoPlaceholder":"请输入会员编码/昵称/手机号搜索", "memberInfo":"会员信息", "mobile":"手机号码", "nickName":"会员昵称", diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json index 8cdf72a5d..1eec51781 100644 --- a/admin/src/app/lang/zh-cn/setting.login.json +++ b/admin/src/app/lang/zh-cn/setting.login.json @@ -6,7 +6,7 @@ "isMobile": "手机验证码登录", "isMobileTip": "开启之后可以使用手机+验证码进行注册和登录或者快捷登录/注册", "isBindMobile": "强制绑定手机", - "isBindMobileTip": "开启之后，会员注册时会强制绑定手机号，并且在相关页面也会引导会员强制绑定手机账号，否则将影响功能正常使用，方便会员在不同端口统一账号，也方便商家进行管理", + "isBindMobileTip": "开启之后，会员注册时会强制绑定手机号，并且在相关页面也会引导会员强制绑定手机账号，否则将影响功能正常使用，方便会员在不同端口统一账号，也方便商家进行管理，已注册会员不受影响", "agreement": "政策协议", "agreementTips": "注册时服务协议和隐私协议是否进行展示", "tripartiteSetting": "第三方设置", @@ -20,4 +20,4 @@ "bgUrlPlaceholder": "建议图片尺寸：750*669像素；图片格式：jpg、png、jpeg", "desc": "描述", "descPlaceholder": "请输入描述" -} \ No newline at end of file +} diff --git a/admin/src/app/lang/zh-cn/setting.transfer_scene.json b/admin/src/app/lang/zh-cn/setting.transfer_scene.json new file mode 100644 index 000000000..b690a16ab --- /dev/null +++ b/admin/src/app/lang/zh-cn/setting.transfer_scene.json @@ -0,0 +1,10 @@ +{ + "transferSceneId":"转账场景ID", + "transferType":"业务类型", + "recvPerception":"收款感知", + "recvPerceptionTips":"请选择收款感知", + "reportInfos":"报备背景", + "operation":"操作", + "deploy":"配置", + "noData":"暂无数据" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/tools.updatecache.json b/admin/src/app/lang/zh-cn/tools.updatecache.json index bd94c7908..e44c2f3c7 100644 --- a/admin/src/app/lang/zh-cn/tools.updatecache.json +++ b/admin/src/app/lang/zh-cn/tools.updatecache.json @@ -1,7 +1,6 @@ { - "refresh":"刷新", - "refreshMenu":"刷新菜单", - "refreshMenuDesc":"新增/修改插件菜单后，需要刷新插件菜单", - "dataCache":"数据缓存", - "dataCacheDesc":"新增/修改数据表后，需要清除数据表缓存" -} \ No newline at end of file + "dataCache":"清除缓存", + "dataCacheDesc":"清除系统的所有缓存", + "refresh": "立即清除", + "clearCacheTips": "确定要清除缓存吗？" +} diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue index 765eb00df..7dc3303dd 100644 --- a/admin/src/app/views/app/index.vue +++ b/admin/src/app/views/app/index.vue @@ -62,10 +62,8 @@ const getAppList = async () => { // loading.value = false const res = await getShowApp(); - console.log('app',res) appList.value = res.data loading.value = false - console.log('appList.value',appList.value,appList.value.length) } getAppList() diff --git a/admin/src/app/views/channel/weapp/code.vue b/admin/src/app/views/channel/weapp/code.vue index 8c4243369..9834ff8df 100644 --- a/admin/src/app/views/channel/weapp/code.vue +++ b/admin/src/app/views/channel/weapp/code.vue @@ -17,6 +17,9 @@ {{ t('cloudRelease') }} {{ t('localRelease') }} +
+ {{ t('uploadWeapp') }} +
diff --git a/admin/src/app/views/diy/components/edit-carousel-search.vue b/admin/src/app/views/diy/components/edit-carousel-search.vue index 5c659866b..3813f4967 100644 --- a/admin/src/app/views/diy/components/edit-carousel-search.vue +++ b/admin/src/app/views/diy/components/edit-carousel-search.vue @@ -10,6 +10,7 @@ {{ t('carouselSearchShowWayStatic') }} {{ t('carouselSearchShowWayFixed') }} +
滑动页面查看效果
diff --git a/admin/src/app/views/diy/components/edit-float-btn.vue b/admin/src/app/views/diy/components/edit-float-btn.vue index 4809f81cd..8c224859a 100644 --- a/admin/src/app/views/diy/components/edit-float-btn.vue +++ b/admin/src/app/views/diy/components/edit-float-btn.vue @@ -28,9 +28,9 @@ --> -

{{ t('floatBtnBtton') }}

+

{{ t('floatBtnButton') }}

- + {{ selectTemplate.name }}