diff --git a/admin/.eslintrc.json b/admin/.eslintrc.json index 0e838377a..33e63f39c 100644 --- a/admin/.eslintrc.json +++ b/admin/.eslintrc.json @@ -22,6 +22,7 @@ "rules": { "no-tabs":"off", "indent": [1, 4, { "SwitchCase": 1 }], - "eqeqeq":"off" + "eqeqeq":"off", + "vue/multi-word-component-names": "off" } } diff --git a/admin/publish.cjs b/admin/publish.cjs index 16fe5edec..6351d9566 100644 --- a/admin/publish.cjs +++ b/admin/publish.cjs @@ -33,6 +33,7 @@ const solve = () => { const fc = fs.readFileSync(fn, 'utf-8') let text = new String(fc) text = text.replaceAll('./assets/', '/admin/assets/') + text = text.replace('./niucloud.ico', '/admin/niucloud.ico') fs.writeFileSync(fn, text, 'utf8') } diff --git a/admin/src/app/assets/images/diy/notice/style_01.png b/admin/src/app/assets/images/diy/notice/style_1.png similarity index 100% rename from admin/src/app/assets/images/diy/notice/style_01.png rename to admin/src/app/assets/images/diy/notice/style_1.png diff --git a/admin/src/app/assets/images/diy/notice/style_2.png b/admin/src/app/assets/images/diy/notice/style_2.png new file mode 100644 index 000000000..5af1356b4 Binary files /dev/null and b/admin/src/app/assets/images/diy/notice/style_2.png differ diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index f5091c5eb..9ca8540ee 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -18,7 +18,7 @@ diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 75b7c2b86..a317326c7 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -14,11 +14,18 @@ "pageNamePlaceholder": "请输入页面名称", "pageBgColor": "页面颜色", "bgUrl": "背景图片", + "bgHeightScale": "高度比例", + "bgHeightScaleTip": "为0时背景高度自适应展示", "marginSet": "边距设置", "componentStyleTitle": "组件样式", "bottomBgColor": "底部背景", "bottomBgTips": "底部背景包含边距和圆角", - "componentBgColor": "组件背景", + "componentBgColor": "组件背景色", + "componentBgUrl": "组件背景图", + "componentBgAlpha": "透明度", + "bgGradientAngle": "渐变角度", + "topToBottom": "从上到下", + "leftToRight": "从左到右", "marginTop": "上边距", "marginBottom": "下边距", "marginBoth": "左右边距", @@ -41,6 +48,7 @@ "notCopy": "无法复制", "componentCanOnlyAdd": "组件只能添加", "piece": "个", + "componentNotMoved": "该组件禁止移动", "resetComponentTips": "确认要重置组件默认数据吗?", "image": "图片上传", "imageUpload": "图片上传", @@ -72,9 +80,10 @@ "graphicNavStyleSingleSlide": "单行滑动", "graphicNavStylePageSlide": "分页滑动", "graphicNavRowCount": "每行数量", - "graphicNavPageCount": "每行数量", + "graphicNavPageCount": "显示方式", "graphicNavSetLabel": "导航设置", - "line": "行", + "singleLine": "单行", + "multiline": "多行", "graphicNavTips": "建议上传尺寸相同的图片,推荐尺寸60*60", "graphicNavTitle": "标题", "graphicNavTitlePlaceholder": "请输入标题", @@ -87,6 +96,7 @@ "styleSet": "风格设置", "titleStyle": "标题样式", "selectStyle": "风格选择", + "styleLabel": "风格", "titleContent": "标题内容", "title": "标题名称", "titlePlaceholder": "请输入标题", @@ -99,7 +109,8 @@ "fontWeightBold": "加粗", "fontWeightNormal": "常规", "textColor": "文字颜色", - "subTextColor": "副标题颜色", + "subTitleStyle": "副标题样式", + "subTextBgColor": "背景色", "subTitleContent": "标题内容", "subTitle": "副标题", "subTitlePlaceholder": "请输入副标题", @@ -137,5 +148,93 @@ "selectCategory":"选择分类", "categoryName": "分类名称", "categoryImage": "分类图片", - "selectSource": "选择数据源" + "selectSource": "选择数据源", + "richTextContentSet": "内容设置", + "richTextPlaceholder": "请输入富文本内容", + "activeCubeBlockContent": "板块内容", + "activeCubeTitle": "标题", + "activeCubeTitlePlaceholder": "请输入标题", + "activeCubeSubTitle": "副标题", + "activeCubeSubTitlePlaceholder": "请输入副标题", + "activeCubeButton": "按钮", + "activeCubeButtonPlaceholder": "请输入按钮文字", + "activeCubeButtonColor": "按钮颜色", + "activeListFrameColor": "框体颜色", + "activeCubeSubTitleTextColor": "文字颜色", + "activeCubeSubTitleBgColor": "背景颜色", + "activeCubeAddItem": "添加一个板块", + "activeCubeBlockStyle": "板块样式", + "activeCubeBlockTextFontWeight": "标题粗细", + "noticeStyle": "公告风格", + "noticeType": "类型", + "noticeTypeImg": "图片", + "noticeTypeText": "文字", + "noticeTypeTextPlaceholder": "请输入公告标题", + "noticeTitle": "公告标题", + "addNotice": "添加公告", + "noticeText": "公告内容", + "noticeScrollWay": "滚动方式", + "noticeUpDown": "上下滚动", + "noticeHorizontal": "横向滚动", + "noticeShowType": "点击类型", + "noticeShowPopUp": "弹出公告内容", + "noticeShowLink": "跳转链接", + "dragMouseAdjustOrder": "鼠标拖拽可调整顺序", + "noticePlaceholderText": "请输入公告内容", + "carouselSearchShowPosition": "显示设置", + "carouselSearchOpen": "开启", + "carouselSearchClose": "关闭", + "carouselSearchBgGradient": "背景渐变", + "carouselSearchShowWay": "展示方式", + "carouselSearchShowWayStatic": "正常显示", + "carouselSearchShowWayFixed": "滚动至顶部固定", + "carouselSearchFixedBgColor": "置顶背景", + "carouselSearchSet": "搜索设置", + "carouselSearchText": "搜索内容", + "carouselSearchHotWordSet": "搜索热词", + "carouselSearchHotWordInterval": "显示时间 / 秒", + "carouselSearchHotWordText": "内容", + "carouselSearchHotWordTextPlaceholder": "请输入热词", + "carouselSearchAddHotWordItem": "添加一个热词", + "carouselSearchLogoTips": "建议尺寸,70px * 30px", + "carouselSearchPlaceholder": "请输入搜索内容", + "carouselSearchTabSet": "选项卡设置", + "carouselSearchTabControl": "展示开关", + "carouselSearchTabCategoryText": "分类名称", + "carouselSearchTabCategoryTextPlaceholder": "请输入分类名称", + "carouselSearchAddTabItem": "添加一个选项卡", + "selectSourcesDiyPage": "选择微页面", + "selectDiyPagePlaceholder": "请选择微页面", + "diyPageTitle": "页面名称", + "diyPageTypeName": "页面类型", + "diyPageForAddon": "所属应用", + "carouselSearchSwiperSet": "轮播图设置", + "carouselSearchSwiperControl": "展示开关", + "carouselSearchSwiperInterval": "切换间隔 / 秒", + "carouselSearchSwiperTips": "建议上传尺寸相同的图片,推荐尺寸750*350;鼠标拖拽可调整图片顺序", + "carouselSearchTabStyle": "选项卡样式", + "noColor": "常规颜色", + "selectColor": "选中颜色", + "fixedNoColor": "下滑常规颜色", + "fixedSelectColor": "下滑选中颜色", + "carouselSearchSwiperIndicatorSet": "指示器设置", + "carouselSearchSwiperIndicatorStyle": "指示器样式", + "carouselSearchSwiperStyle": "轮播样式", + "carouselSearchSwiperIndicatorStyle1": "样式1", + "carouselSearchSwiperIndicatorStyle2": "样式2", + "carouselSearchSwiperIndicatorAlign": "显示位置", + "alignLeft": "居左", + "alignCenter": "居中", + "alignRight": "居右", + "horzLineStyle": "线条风格", + "horzLineStyleSolid": "实线", + "horzLineStyleDashed": "虚线", + "horzLineBorderColor": "线条颜色", + "horzLineBorderWidth": "线条宽度", + "floatBtnBtton": "按钮位置", + "floatBtnOffset": "上下偏移", + "floatBtnImageSet": "图片设置", + "floatBtnImageSize": "图片大小", + "floatBtnAroundRadius": "图片圆角", + "floatBtnImageSuggest": "建议上传正方形图片" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/setting.sms_records.json b/admin/src/app/lang/zh-cn/setting.sms_records.json index 3ad8e9638..fd0ca79dc 100644 --- a/admin/src/app/lang/zh-cn/setting.sms_records.json +++ b/admin/src/app/lang/zh-cn/setting.sms_records.json @@ -28,5 +28,8 @@ "visitTimePlaceholder":"请输入访问时间", "createTimePlaceholder":"请输入消息时间", "buyerNotice": "会员消息", + "messageKey":"消息模版", + "messageInfo":"发送记录详情", + "smsType":"短信类型", "sellerNotice":"平台消息" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/site.info.json b/admin/src/app/lang/zh-cn/site.info.json index fcc7ea503..fd6bfa687 100644 --- a/admin/src/app/lang/zh-cn/site.info.json +++ b/admin/src/app/lang/zh-cn/site.info.json @@ -9,6 +9,7 @@ "siteLogo": "店铺LOGO", "expireTime":"到期时间", "groupName": "店铺套餐", + "statusExpire":"已到期", "siteNamePlaceholder":"请输入站点名称", "groupIdPlaceholder":"请输入套餐", "addSite":"添加站点", diff --git a/admin/src/app/views/channel/wechat/config.vue b/admin/src/app/views/channel/wechat/config.vue index f8cade9e0..48d410e06 100644 --- a/admin/src/app/views/channel/wechat/config.vue +++ b/admin/src/app/views/channel/wechat/config.vue @@ -15,12 +15,12 @@

{{ t('wechatInfo') }}

- - @@ -35,13 +35,13 @@

{{ t('wechatDevelopInfo') }}

-
{{ t('wechatAppidTips') }}
-
{{ t('wechatAppsecretTips') }}
@@ -61,13 +61,13 @@ -
{{ t('tokenTips') }}
-
{{ t('encodingAESKeyTips') }}
diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue new file mode 100644 index 000000000..b097f93ad --- /dev/null +++ b/admin/src/app/views/diy/components/edit-active-cube.vue @@ -0,0 +1,383 @@ + + + + + diff --git a/admin/src/app/views/diy/components/edit-carousel-search.vue b/admin/src/app/views/diy/components/edit-carousel-search.vue new file mode 100644 index 000000000..6f3d5819a --- /dev/null +++ b/admin/src/app/views/diy/components/edit-carousel-search.vue @@ -0,0 +1,526 @@ + + + + + + + diff --git a/admin/src/app/views/diy/components/edit-float-btn.vue b/admin/src/app/views/diy/components/edit-float-btn.vue new file mode 100644 index 000000000..504a6a45a --- /dev/null +++ b/admin/src/app/views/diy/components/edit-float-btn.vue @@ -0,0 +1,157 @@ + + + + + \ No newline at end of file diff --git a/admin/src/app/views/diy/components/edit-graphic-nav.vue b/admin/src/app/views/diy/components/edit-graphic-nav.vue index dff613f63..f64915419 100644 --- a/admin/src/app/views/diy/components/edit-graphic-nav.vue +++ b/admin/src/app/views/diy/components/edit-graphic-nav.vue @@ -12,18 +12,6 @@ - - - - - - - - - - - - {{t('graphicNavModeGraphic')}} @@ -34,8 +22,15 @@ + + + {{t('singleLine')}} + {{t('multiline')}} + + + - + {{t('graphicNavStyleFixed')}} {{t('graphicNavStyleSingleSlide')}} {{t('graphicNavStylePageSlide')}} @@ -49,13 +44,6 @@ 5{{t('piece')}} - - - - 1{{t('line')}} - 2{{t('line')}} - - @@ -73,7 +61,7 @@ - +
@@ -120,9 +108,6 @@ - - -
@@ -224,6 +209,14 @@ onMounted(() => { }) }) +const changePageCount = (value:any)=>{ + if(value == '1'){ + diyStore.editComponent.showStyle = 'singleSlide'; + }else if(value == '2'){ + diyStore.editComponent.showStyle = 'fixed'; + } +} + defineExpose({}) diff --git a/admin/src/app/views/diy/components/edit-horz-blank.vue b/admin/src/app/views/diy/components/edit-horz-blank.vue index 277dbc793..2991425f8 100644 --- a/admin/src/app/views/diy/components/edit-horz-blank.vue +++ b/admin/src/app/views/diy/components/edit-horz-blank.vue @@ -25,7 +25,7 @@ import { t } from '@/lang' import useDiyStore from '@/stores/modules/diy' const diyStore = useDiyStore() -diyStore.editComponent.ignore = ['pageBgColor', 'topRounded', 'bottomRounded', 'marginTop', 'marginBottom', 'marginBoth'] // 忽略公共属性 +diyStore.editComponent.ignore = ['pageBgColor', 'componentBgUrl'] // 忽略公共属性 defineExpose({}) diff --git a/admin/src/app/views/diy/components/edit-horz-line.vue b/admin/src/app/views/diy/components/edit-horz-line.vue new file mode 100644 index 000000000..5e63840ec --- /dev/null +++ b/admin/src/app/views/diy/components/edit-horz-line.vue @@ -0,0 +1,50 @@ + + + + + + diff --git a/admin/src/app/views/diy/components/edit-image-ads.vue b/admin/src/app/views/diy/components/edit-image-ads.vue index e8c3ba1d2..f372eb34c 100644 --- a/admin/src/app/views/diy/components/edit-image-ads.vue +++ b/admin/src/app/views/diy/components/edit-image-ads.vue @@ -6,7 +6,7 @@ - +
{{ t('imageAdsTips') }}
@@ -115,7 +115,7 @@ const handleHeight = (isCalcHeight:boolean = false)=> { // 计算第一张图片高度 if (isCalcHeight && index == 0) { const ratio = item.imgHeight / item.imgWidth - item.width = 375 + item.width = 375 - (diyStore.editComponent.margin.both*2) item.height = item.width * ratio diyStore.editComponent.imageHeight = parseInt(item.height) } diff --git a/admin/src/app/views/diy/components/edit-member-info.vue b/admin/src/app/views/diy/components/edit-member-info.vue index b0c260d34..8bff4235b 100644 --- a/admin/src/app/views/diy/components/edit-member-info.vue +++ b/admin/src/app/views/diy/components/edit-member-info.vue @@ -32,7 +32,7 @@ import { t } from '@/lang' import useDiyStore from '@/stores/modules/diy' const diyStore = useDiyStore() -diyStore.editComponent.ignore = [] // 忽略公共属性 +diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 defineExpose({}) diff --git a/admin/src/app/views/diy/components/edit-notice.vue b/admin/src/app/views/diy/components/edit-notice.vue index b7e40487e..1769850b5 100644 --- a/admin/src/app/views/diy/components/edit-notice.vue +++ b/admin/src/app/views/diy/components/edit-notice.vue @@ -1,45 +1,83 @@