diff --git a/admin/src/addon/.gitignore b/admin/src/addon/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/admin/src/app/assets/images/login/site_bg.png b/admin/src/app/assets/images/login/site_bg.png deleted file mode 100644 index f755f3345..000000000 Binary files a/admin/src/app/assets/images/login/site_bg.png and /dev/null differ diff --git a/admin/src/app/assets/images/login/site_bg_1.png b/admin/src/app/assets/images/login/site_bg_1.png deleted file mode 100644 index c1056537f..000000000 Binary files a/admin/src/app/assets/images/login/site_bg_1.png and /dev/null differ diff --git a/admin/src/app/assets/images/login/site_code.png b/admin/src/app/assets/images/login/site_code.png deleted file mode 100644 index a41cd7b16..000000000 Binary files a/admin/src/app/assets/images/login/site_code.png and /dev/null differ diff --git a/admin/src/app/assets/images/login/admin_login_img.png b/admin/src/app/assets/images/login/site_login_bg.png similarity index 100% rename from admin/src/app/assets/images/login/admin_login_img.png rename to admin/src/app/assets/images/login/site_login_bg.png diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 358978598..3bf2c51ea 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -62,6 +62,8 @@ "imageUpload": "图片上传", "imageSet": "图片设置", "imageAdsTips": "建议上传尺寸相同的图片,推荐尺寸750*350", + "imageAdsSameScreenTips": "开启沉浸式样式,请确保该图片广告组件在页面中位于最顶端;为保证体验,请不要开导航栏;沉浸式样式仅在微信小程序中生效。", + "sameScreen": "沉浸式", "addImageAd": "添加图片", "imageUrlTip": "请上传图片", "imageHeight": "图片高度", diff --git a/admin/src/app/lang/zh-cn/member.member.json b/admin/src/app/lang/zh-cn/member.member.json index 035d26274..a6e3c00c4 100644 --- a/admin/src/app/lang/zh-cn/member.member.json +++ b/admin/src/app/lang/zh-cn/member.member.json @@ -29,8 +29,8 @@ "detaBirth": "出生日期", "sex": "性别", "wxUnionid": "微信unionid", - "weappOpenid": "微信用户openid", - "wxOpenid": "微信小程序openid", + "weappOpenid": "微信小程序openid", + "wxOpenid": "微信用户openid", "head": "会员头像", "username": "用户名", "usernamePlaceholder": "请输入用户名", diff --git a/admin/src/app/lang/zh-cn/setting.map.json b/admin/src/app/lang/zh-cn/setting.map.json index cf2273430..346d9fc75 100644 --- a/admin/src/app/lang/zh-cn/setting.map.json +++ b/admin/src/app/lang/zh-cn/setting.map.json @@ -4,8 +4,8 @@ "isOpen": "定位开关", "validTime": "定位有效期", "minutes": "分钟", - "validTimeTips": "过期后将重新获取定位信息,0为不过期", + "validTimeTips": "过期后将重新获取定位信息", "validTimePlaceholder": "请输入定位有效期", "validTimeFormatTips": "格式输入错误", - "validTimeNotZeroTips": "定位有效期不能小于0" + "validTimeNotZeroTips": "定位有效期不能小于5分钟" } \ No newline at end of file diff --git a/admin/src/app/views/auth/components/edit-menu.vue b/admin/src/app/views/auth/components/edit-menu.vue index dd86084ed..c6e4441f6 100644 --- a/admin/src/app/views/auth/components/edit-menu.vue +++ b/admin/src/app/views/auth/components/edit-menu.vue @@ -77,7 +77,7 @@ - + diff --git a/admin/src/app/views/channel/aliapp/config.vue b/admin/src/app/views/channel/aliapp/config.vue index 5a23a62a3..6ef5bb69a 100644 --- a/admin/src/app/views/channel/aliapp/config.vue +++ b/admin/src/app/views/channel/aliapp/config.vue @@ -3,7 +3,7 @@
- + @@ -98,6 +98,9 @@ import { useRoute, useRouter } from 'vue-router' const route = useRoute() const router = useRouter() const pageName = route.meta.title +const back = () => { + router.push('/channel/aliapp') +} const loading = ref(true) diff --git a/admin/src/app/views/channel/aliapp/course.vue b/admin/src/app/views/channel/aliapp/course.vue index 74b3157a5..7736af80b 100644 --- a/admin/src/app/views/channel/aliapp/course.vue +++ b/admin/src/app/views/channel/aliapp/course.vue @@ -3,7 +3,7 @@
- + @@ -99,6 +99,9 @@ import { useRoute, useRouter } from 'vue-router' const route = useRoute() const router = useRouter() +const back = () => { + router.push('/channel/aliapp') +} const pageName = route.meta.title const loading = ref(true) const formData = reactive>({ diff --git a/admin/src/app/views/channel/weapp/config.vue b/admin/src/app/views/channel/weapp/config.vue index 8fbf472ad..1f2834fb0 100644 --- a/admin/src/app/views/channel/weapp/config.vue +++ b/admin/src/app/views/channel/weapp/config.vue @@ -3,7 +3,7 @@
- + @@ -139,7 +139,9 @@ import { useRoute, useRouter } from 'vue-router' const route = useRoute() const router = useRouter() const pageName = route.meta.title - +const back = () => { + router.push('/channel/weapp') +} const loading = ref(true) const formData = reactive>({ diff --git a/admin/src/app/views/channel/weapp/course.vue b/admin/src/app/views/channel/weapp/course.vue index 098048907..bd381e983 100644 --- a/admin/src/app/views/channel/weapp/course.vue +++ b/admin/src/app/views/channel/weapp/course.vue @@ -3,7 +3,7 @@
- + @@ -63,7 +63,9 @@ import { useRoute, useRouter } from 'vue-router' const route = useRoute() const router = useRouter() const pageName = route.meta.title - +const back = () => { + router.push('/channel/weapp') +} const linkEvent = () => { window.open('https://mp.weixin.qq.com/', '_blank') } diff --git a/admin/src/app/views/channel/wechat/config.vue b/admin/src/app/views/channel/wechat/config.vue index 38ecded8b..85853850e 100644 --- a/admin/src/app/views/channel/wechat/config.vue +++ b/admin/src/app/views/channel/wechat/config.vue @@ -3,7 +3,7 @@
- + @@ -129,7 +129,9 @@ import { useRoute, useRouter } from 'vue-router' const route = useRoute() const router = useRouter() const pageName = route.meta.title - +const back = () => { + router.push('/channel/wechat') +} const loading = ref(true) const formData = reactive>({ diff --git a/admin/src/app/views/channel/wechat/course.vue b/admin/src/app/views/channel/wechat/course.vue index 0ba78e867..f85025d04 100644 --- a/admin/src/app/views/channel/wechat/course.vue +++ b/admin/src/app/views/channel/wechat/course.vue @@ -3,7 +3,7 @@
- + @@ -60,6 +60,9 @@ import { useRouter, useRoute } from 'vue-router' const route = useRoute() const pageName = route.meta.title const router = useRouter() +const back = () => { + router.push('/channel/wechat') +} const loading = ref(true) const formData = reactive>({ wechat_name: '', diff --git a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue index a13c5bd31..6643b3dc4 100644 --- a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue +++ b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue @@ -3,7 +3,7 @@
- + @@ -92,6 +92,10 @@ import NewsCard from '@/app/views/channel/wechat/components/news-card.vue' const route = useRoute() const router = useRouter() const pageName = route.meta.title +const back = () => { + router.push('/channel/wechat/reply') +} + const showDialog = ref(false) const formData: any = reactive({ 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 20bdbcb26..b341b1973 100644 --- a/admin/src/app/views/diy/components/edit-active-cube.vue +++ b/admin/src/app/views/diy/components/edit-active-cube.vue @@ -185,6 +185,12 @@ {{t('btnTextItalics')}} + + + + + +
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 e9bcdb557..4809f81cd 100644 --- a/admin/src/app/views/diy/components/edit-float-btn.vue +++ b/admin/src/app/views/diy/components/edit-float-btn.vue @@ -94,7 +94,7 @@ import { img } from '@/utils/common' import { range } from 'lodash-es' const diyStore = useDiyStore() -diyStore.editComponent.ignore = ['pageBgColor','marginTop','marginBottom','marginBoth'] // 忽略公共属性 +diyStore.editComponent.ignore = ['pageBgColor','marginTop','marginBottom','marginBoth','componentBgUrl'] // 忽略公共属性 // 组件验证 diyStore.editComponent.verify = (index: number) => { @@ -222,5 +222,5 @@ defineExpose({}) \ No newline at end of file + + diff --git a/admin/src/app/views/diy/components/edit-hot-area.vue b/admin/src/app/views/diy/components/edit-hot-area.vue index b7900cefb..dddb56388 100644 --- a/admin/src/app/views/diy/components/edit-hot-area.vue +++ b/admin/src/app/views/diy/components/edit-hot-area.vue @@ -38,7 +38,7 @@ import useDiyStore from '@/stores/modules/diy' import { img } from '@/utils/common' const diyStore = useDiyStore() -diyStore.editComponent.ignore = [] // 忽略公共属性 +diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 // 组件验证 diyStore.editComponent.verify = (index: number) => { 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 acece2eaf..d7272e98e 100644 --- a/admin/src/app/views/diy/components/edit-image-ads.vue +++ b/admin/src/app/views/diy/components/edit-image-ads.vue @@ -4,6 +4,11 @@

{{ t('imageSet') }}

+ + + +
{{ t('imageAdsSameScreenTips') }}
+
@@ -52,7 +57,7 @@ import { range } from 'lodash-es' import useDiyStore from '@/stores/modules/diy' const diyStore = useDiyStore() -diyStore.editComponent.ignore = [] // 忽略公共属性 +diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 // 组件验证 diyStore.editComponent.verify = (index: number) => { diff --git a/admin/src/app/views/diy/components/edit-member-level.vue b/admin/src/app/views/diy/components/edit-member-level.vue index 8756856f9..7346de754 100644 --- a/admin/src/app/views/diy/components/edit-member-level.vue +++ b/admin/src/app/views/diy/components/edit-member-level.vue @@ -102,9 +102,31 @@ const changeStyle = (item:any) => { const confirmStyle = () => { diyStore.editComponent.styleName = selectStyle.title; diyStore.editComponent.style = selectStyle.value; + initStyle(diyStore.editComponent.style); showDialog.value = false } + +const initStyle = (style: any) => { + if (style == 'style-1') { + diyStore.editComponent.bottomRounded = 0; + diyStore.editComponent.topRounded = 12; + } else if (style == 'style-2') { + diyStore.editComponent.bottomRounded = 0; + diyStore.editComponent.topRounded = 12; + } else if (style == 'style-3') { + diyStore.editComponent.bottomRounded = 12; + diyStore.editComponent.topRounded = 12; + } else if (style == 'style-4') { + diyStore.editComponent.bottomRounded = 12; + diyStore.editComponent.topRounded = 12; + } else if (style == 'style-5') { + diyStore.editComponent.bottomRounded = 12; + diyStore.editComponent.topRounded = 12; + } + +} + defineExpose({}) 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 1238435f7..ed1589423 100644 --- a/admin/src/app/views/diy/components/edit-picture-show.vue +++ b/admin/src/app/views/diy/components/edit-picture-show.vue @@ -8,7 +8,7 @@ - + @@ -125,7 +125,7 @@ import { img } from '@/utils/common' import { ref, reactive } from 'vue' const diyStore = useDiyStore() -diyStore.editComponent.ignore = [] // 忽略公共属性 +diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 // 组件验证 diyStore.editComponent.verify = (index: number) => { diff --git a/admin/src/app/views/diy/list.vue b/admin/src/app/views/diy/list.vue index 9d4d28146..6dc9ad0ea 100644 --- a/admin/src/app/views/diy/list.vue +++ b/admin/src/app/views/diy/list.vue @@ -129,6 +129,7 @@ import { t } from '@/lang' import { getApps,getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage } from '@/app/api/diy' import { ElMessageBox, FormInstance } from 'element-plus' import { useRoute, useRouter } from 'vue-router' +import { setTablePageStorage,getTablePageStorage } from "@/utils/common"; const route = useRoute() const router = useRouter() @@ -234,12 +235,13 @@ const loadDiyPageList = (page: number = 1) => { diyPageTableData.loading = false diyPageTableData.data = res.data.data diyPageTableData.total = res.data.total + setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam); }).catch(() => { diyPageTableData.loading = false }) } -loadDiyPageList() +loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page); // 编辑自定义页面 const editEvent = (data: any) => { diff --git a/admin/src/app/views/diy/tabbar_edit.vue b/admin/src/app/views/diy/tabbar_edit.vue index 194313b4d..ff7498764 100644 --- a/admin/src/app/views/diy/tabbar_edit.vue +++ b/admin/src/app/views/diy/tabbar_edit.vue @@ -1,7 +1,7 @@