diff --git a/admin/src/app/assets/images/login/login_index_bg.jpg b/admin/src/app/assets/images/login/login_index_bg.jpg new file mode 100644 index 000000000..06c372ee0 Binary files /dev/null and b/admin/src/app/assets/images/login/login_index_bg.jpg differ diff --git a/admin/src/app/assets/images/login/login_index_bg.png b/admin/src/app/assets/images/login/login_index_bg.png deleted file mode 100644 index 9a0a4ec6a..000000000 Binary files a/admin/src/app/assets/images/login/login_index_bg.png and /dev/null differ diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 5fa16ee26..358978598 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -202,7 +202,12 @@ "carouselSearchShowWayStatic": "正常显示", "carouselSearchShowWayFixed": "滚动至顶部固定", "carouselSearchFixedBgColor": "置顶背景", + "carouselSearchStyleSelect": "风格选择", "carouselSearchSet": "搜索设置", + "carouselSearchSubTitle": "副标题", + "carouselSearchSubTitleStyle": "副标题样式", + "carouselSearchPositionStyle": "定位样式", + "carouselSearchSubTitlePlaceholder": "请输入副标题内容", "carouselSearchText": "搜索内容", "carouselSearchTextColor": "文字颜色", "carouselSearchBgColor": "背景颜色", diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json index 69bb3614a..8cdf72a5d 100644 --- a/admin/src/app/lang/zh-cn/setting.login.json +++ b/admin/src/app/lang/zh-cn/setting.login.json @@ -10,8 +10,10 @@ "agreement": "政策协议", "agreementTips": "注册时服务协议和隐私协议是否进行展示", "tripartiteSetting": "第三方设置", - "isAuthRegister": "快捷登录/注册", + "isAuthRegister": "自动注册会员", "isAuthRegisterTip": "开启之后,微信公众号、小程序等第三方平台可以自动注册会员或者快捷登录/注册会员,方便会员自动登录", + "isForceAccessUserInfo": "强制获取用户信息", + "isForceAccessUserInfoTip": "开启之后,将强制获取用户头像、昵称等信息,需要用户同意后,才能注册成功", "mobileOrUsernameNoEmpty": "普通注册方式至少需启用一种", "loginPageSet": "界面设置", "bgUrl": "背景图", diff --git a/admin/src/app/lang/zh-cn/setting.pay.json b/admin/src/app/lang/zh-cn/setting.pay.json index 69d1b3283..47f70cca9 100644 --- a/admin/src/app/lang/zh-cn/setting.pay.json +++ b/admin/src/app/lang/zh-cn/setting.pay.json @@ -63,5 +63,7 @@ "h5Domain": "H5支付域名", "h5DomainTips": "需在微信商户号>产品中心>开发配置>支付配置 H5支付域名中添加该域名", "nativeDomain": "Native支付回调链接", - "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接" + "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接", + "wechatpayPublicCert": "微信支付公钥", + "wechatpayPublicCertId": "微信支付公钥ID" } diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue index 411288b6e..20bdbcb26 100644 --- a/admin/src/app/views/diy/components/edit-active-cube.vue +++ b/admin/src/app/views/diy/components/edit-active-cube.vue @@ -374,8 +374,7 @@ const confirmBlockStyle = () => { showListDialog.value = false } -const initBlockStyle = (style)=>{ - // diyStore.editComponent. +const initBlockStyle = (style: any)=>{ if(style == 'style-1'){ diyStore.editComponent.blockStyle.fontWeight = "normal"; diyStore.editComponent.blockStyle.btnText = "normal"; 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 a170065dc..1cbfd91f1 100644 --- a/admin/src/app/views/diy/components/edit-carousel-search.vue +++ b/admin/src/app/views/diy/components/edit-carousel-search.vue @@ -26,9 +26,18 @@

{{ t('carouselSearchSet') }}

-
{{ t('carouselSearchLogoTips') }}
+ + {{ diyStore.editComponent.search.styleName }} + + + + + + + +
{{ t('carouselSearchLogoTips') }}
@@ -39,16 +48,34 @@ - -
-
+ + +
+ +
+ + + +
+
+ +

{{ t('carouselSearchHotWordSet') }}

- +

{{ t('dragMouseAdjustOrder') }}

@@ -70,108 +97,131 @@
- + - -
- - - - + +
+ + + + -

{{ t('dragMouseAdjustOrder') }}

+

{{ t('dragMouseAdjustOrder') }}

-
-
+
+
- - - + + + - - - - - + + + + + -
- -
+
+ +
-
- {{ t('carouselSearchAddTabItem') }} -
+
+ {{ t('carouselSearchAddTabItem') }} +
- - - - - - - - -
- -
-
- {{ t('confirm') }} - {{ t('cancel') }} -
-
+ + + + + + + + +
+ +
+
+ {{ t('confirm') }} + {{ t('cancel') }} +
+
-
-
-
- - - - - - - - + +
+
+ + + + + + + + -
{{ t('carouselSearchSwiperTips') }}
+
{{ t('carouselSearchSwiperTips') }}
-
-
- - - +
+
+ + + -
- -
+
+ +
- - - -
-
+ + + +
+
- {{ t('addImageAd') }} + {{ t('addImageAd') }} -
-
-
+
+ +
+
+

{{ t('carouselSearchPositionStyle') }}

+ + + + + +
+ +
+

{{ t('carouselSearchSubTitleStyle') }}

+ + + + + + + + + + +
+

{{ t('carouselSearchStyle') }}

@@ -219,10 +269,10 @@ - + - +
@@ -311,6 +361,46 @@ diyStore.editComponent.verify = (index: number) => { return res } +/************** 搜索框样式选择-start ********************/ +const selectSearchStyle = reactive({ + title: diyStore.editComponent.search.styleName, + value: diyStore.editComponent.search.style +}) + +const showSearchDialog = ref(false) + +const showSearchStyle = () => { + showSearchDialog.value = true + selectSearchStyle.title = diyStore.editComponent.search.styleName; + selectSearchStyle.value = diyStore.editComponent.search.style; +} + +const changeSearchStyle = (item:any) => { + selectSearchStyle.title = item.title; + selectSearchStyle.value = item.value; +} + +const confirmSearchStyle = () => { + diyStore.editComponent.search.styleName = selectSearchStyle.title; + diyStore.editComponent.search.style = selectSearchStyle.value; + showSearchDialog.value = false +} + +const searchStyleList = reactive([ + { + url: 'static/resource/images/diy/carousel_search/style_1.png', + title: '风格1', + value: 'style-1' + }, + { + url: 'static/resource/images/diy/carousel_search/style_2.png', + title: '风格2', + value: 'style-2' + } +]) + +/************** 搜索框样式选择-end ********************/ + diyStore.editComponent.search.hotWord.list.forEach((item: any) => { if (!item.id) item.id = diyStore.generateRandom() }) 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 9848e2612..e9bcdb557 100644 --- a/admin/src/app/views/diy/components/edit-float-btn.vue +++ b/admin/src/app/views/diy/components/edit-float-btn.vue @@ -41,7 +41,7 @@ - +
@@ -49,10 +49,10 @@

{{ t('floatBtnImageSet') }}

- + - +
{{t('floatBtnImageSuggest')}}
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 cee330763..b2e8b4d59 100644 --- a/admin/src/app/views/diy/components/edit-graphic-nav.vue +++ b/admin/src/app/views/diy/components/edit-graphic-nav.vue @@ -45,7 +45,6 @@ -
@@ -86,10 +85,10 @@

{{ t('graphicNavImageSet') }}

- + - +
@@ -97,7 +96,7 @@

{{ t('textSet') }}

- + @@ -111,6 +110,31 @@ +
+

{{ t('carouselSearchSwiperIndicatorSet') }}

+ + + + {{ t('carouselSearchSwiperIndicatorStyle1') }} + {{ t('carouselSearchSwiperIndicatorStyle2') }} + {{ t('carouselSearchSwiperIndicatorStyle3') }} + + + + + {{ t('alignLeft') }} + {{ t('alignCenter') }} + {{ t('alignRight') }} + + + + + + + + + +
@@ -130,7 +154,6 @@ import useDiyStore from '@/stores/modules/diy' const diyStore = useDiyStore() diyStore.editComponent.ignore = [] // 忽略公共属性 - // 组件验证 diyStore.editComponent.verify = (index: number) => { const res = { code: true, message: '' } @@ -215,19 +238,12 @@ const changePageCount = (value:any)=>{ }else if(value == '2'){ diyStore.editComponent.showStyle = 'fixed'; } -} +} 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 index 5e63840ec..232d4ee31 100644 --- a/admin/src/app/views/diy/components/edit-horz-line.vue +++ b/admin/src/app/views/diy/components/edit-horz-line.vue @@ -14,7 +14,7 @@ - + @@ -40,11 +40,4 @@ defineExpose({}) - diff --git a/admin/src/app/views/diy/components/edit-notice.vue b/admin/src/app/views/diy/components/edit-notice.vue index 210ea0824..b6fe0b5b6 100644 --- a/admin/src/app/views/diy/components/edit-notice.vue +++ b/admin/src/app/views/diy/components/edit-notice.vue @@ -80,7 +80,7 @@

{{ t('textSet') }}

- + diff --git a/admin/src/app/views/diy/components/edit-page.vue b/admin/src/app/views/diy/components/edit-page.vue index 0a45822de..7c68aa603 100644 --- a/admin/src/app/views/diy/components/edit-page.vue +++ b/admin/src/app/views/diy/components/edit-page.vue @@ -104,7 +104,7 @@ - +
{{ t('bgHeightScaleTip') }}
@@ -133,7 +133,7 @@

{{ t('marginSet') }}

- + diff --git a/admin/src/app/views/diy/components/edit-picture-show.vue b/admin/src/app/views/diy/components/edit-picture-show.vue index 570bcf0c1..1238435f7 100644 --- a/admin/src/app/views/diy/components/edit-picture-show.vue +++ b/admin/src/app/views/diy/components/edit-picture-show.vue @@ -104,10 +104,10 @@

{{ t('pictureShowBlockStyle') }}

- + - + diff --git a/admin/src/app/views/diy/components/edit-rubik-cube.vue b/admin/src/app/views/diy/components/edit-rubik-cube.vue index c1b208412..b59a86fe9 100644 --- a/admin/src/app/views/diy/components/edit-rubik-cube.vue +++ b/admin/src/app/views/diy/components/edit-rubik-cube.vue @@ -54,13 +54,13 @@

{{ t('rubikCubeStyle') }}

- + - + - + diff --git a/admin/src/app/views/diy/components/edit-text.vue b/admin/src/app/views/diy/components/edit-text.vue index 93072fa2c..5cdb33d55 100644 --- a/admin/src/app/views/diy/components/edit-text.vue +++ b/admin/src/app/views/diy/components/edit-text.vue @@ -37,7 +37,7 @@
- + @@ -91,7 +91,7 @@

{{ t('titleStyle') }}

- + diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue index b6d905cd1..85c03d0d8 100644 --- a/admin/src/app/views/diy/edit.vue +++ b/admin/src/app/views/diy/edit.vue @@ -165,7 +165,7 @@ - + @@ -182,19 +182,19 @@ - + - + - + - + - + @@ -679,6 +679,11 @@ const settingTips = () => { } } } +.diy-nav-slider { + .el-slider__input { + width: 100px; + } +}