diff --git a/admin/src/api/channel/wx_dev.ts b/admin/src/api/channel/wx_op.ts similarity index 61% rename from admin/src/api/channel/wx_dev.ts rename to admin/src/api/channel/wx_op.ts index a39ca962..fb1990a6 100644 --- a/admin/src/api/channel/wx_dev.ts +++ b/admin/src/api/channel/wx_op.ts @@ -2,10 +2,10 @@ import request from '@/utils/request' // 微信开发平台配置保存 export function setWxDevConfig(params: any) { - return request.post({ url: '/channel/wx/save', params }) + return request.post({ url: '/api/channel/op/save', params }) } // 微信开发平台配置详情 export function getWxDevConfig() { - return request.get({ url: '/channel/wx/detail' }) + return request.get({ url: '/channel/op/detail' }) } diff --git a/admin/src/main.ts b/admin/src/main.ts index 79cae314..73e1aa05 100644 --- a/admin/src/main.ts +++ b/admin/src/main.ts @@ -6,5 +6,6 @@ import './styles/index.scss' import 'virtual:svg-icons-register' const app = createApp(App) +console.log(app) app.use(install) app.mount('#app') diff --git a/admin/src/views/channel/wx_dev.vue b/admin/src/views/channel/wx_op.vue similarity index 79% rename from admin/src/views/channel/wx_dev.vue rename to admin/src/views/channel/wx_op.vue index d7c31e65..07fd7696 100644 --- a/admin/src/views/channel/wx_dev.vue +++ b/admin/src/views/channel/wx_op.vue @@ -3,14 +3,14 @@ -
APP应用
+
网站应用
@@ -23,20 +23,15 @@
- -
- 小程序账号登录微信公众平台,点击开发>开发设置->开发者ID,设置AppID和AppSecret -
-
- + 保存 + + diff --git a/admin/src/views/decoration/component/widgets/banner/attr.vue b/admin/src/views/decoration/component/widgets/banner/attr.vue index c57847df..c146bd0d 100644 --- a/admin/src/views/decoration/component/widgets/banner/attr.vue +++ b/admin/src/views/decoration/component/widgets/banner/attr.vue @@ -33,7 +33,15 @@ /> - + + @@ -63,6 +71,10 @@ const props = defineProps({ styles: { type: Object as PropType, default: () => ({}) + }, + type: { + type: String as PropType<'mobile' | 'pc'>, + default: 'mobile' } }) diff --git a/admin/src/views/decoration/component/widgets/banner/content.vue b/admin/src/views/decoration/component/widgets/banner/content.vue index 7633243a..6ac6053e 100644 --- a/admin/src/views/decoration/component/widgets/banner/content.vue +++ b/admin/src/views/decoration/component/widgets/banner/content.vue @@ -1,7 +1,12 @@ @@ -18,6 +23,10 @@ const props = defineProps({ styles: { type: Object as PropType, default: () => ({}) + }, + height: { + type: String, + default: '170px' } }) diff --git a/admin/src/views/decoration/image/pc_index.png b/admin/src/views/decoration/image/pc_index.png new file mode 100644 index 00000000..be3e5f94 Binary files /dev/null and b/admin/src/views/decoration/image/pc_index.png differ diff --git a/admin/src/views/decoration/pc.vue b/admin/src/views/decoration/pc.vue new file mode 100644 index 00000000..13c0566a --- /dev/null +++ b/admin/src/views/decoration/pc.vue @@ -0,0 +1,90 @@ + + + diff --git a/admin/src/views/setting/website/information.vue b/admin/src/views/setting/website/information.vue index 9a550fcd..1d991b4a 100644 --- a/admin/src/views/setting/website/information.vue +++ b/admin/src/views/setting/website/information.vue @@ -52,6 +52,44 @@ + +
PC端设置
+ +
+ +
建议尺寸:120*28px,支持jpg,jpeg,png格式
+
+
+ +
+ +
+
+ +
+ +
建议尺寸:100*100像素,支持jpg,jpeg,png格式
+
+
+ +
+ +
+
+ +
+ +
+
+
保存 @@ -73,7 +111,12 @@ const formData = reactive({ logo: '', // 网站logo backdrop: '', // 登录页广告图 shopName: '', - shopLogo: '' + shopLogo: '', + pcDesc: '', + pcIco: '', + pcKeywords: '', + pcLogo: '', + pcTitle: '' }) // 表单验证 @@ -119,6 +162,27 @@ const rules = { message: '请选择商城LOGO', trigger: ['change'] } + ], + pcLogo: [ + { + required: true, + message: '请选择PC端LOGO', + trigger: ['change'] + } + ], + pcTitle: [ + { + required: true, + message: '请输入PC端网站标题', + trigger: ['blur'] + } + ], + pcIco: [ + { + required: true, + message: '请选择PC端网站图标', + trigger: ['change'] + } ] }