diff --git a/README.md b/README.md index ab8af0f7..0a944bd6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![输入图片说明](%E8%A3%85%E4%BF%AE-%E6%A0%87%E9%A2%981-%E9%A1%B5%E9%9D%A2%E8%AE%BE%E7%BD%AE.png) +![输入图片说明](md-demo.png) # vue3-vite This template should help get you started developing with Vue 3 in Vite. diff --git a/md-demo.png b/md-demo.png new file mode 100644 index 00000000..faf8eeef Binary files /dev/null and b/md-demo.png differ diff --git a/src/api/coupon.ts b/src/api/coupon.ts index 788f865b..3dc62264 100644 --- a/src/api/coupon.ts +++ b/src/api/coupon.ts @@ -4,7 +4,7 @@ class CouponAPI { /** 领取优惠券列表 */ static getCoupon(data: any) { return request({ - url: `?s=plugins/index/pluginsname/coupon/pluginscontrol/diyapi/pluginsaction/receivecouponlist`, + url: `plugins/index/pluginsname/coupon/pluginscontrol/diyapi/pluginsaction/receivecouponlist`, method: 'post', data, }); diff --git a/src/api/url-value.ts b/src/api/url-value.ts index a06ec62b..6a38c303 100644 --- a/src/api/url-value.ts +++ b/src/api/url-value.ts @@ -53,7 +53,7 @@ class UrlValueAPI { /** 获取优惠券列表 */ static getCouponList(data: any) { return request({ - url: `?s=plugins/index/pluginsname/coupon/pluginscontrol/diyapi/pluginsaction/couponlist`, + url: `plugins/index/pluginsname/coupon/pluginscontrol/diyapi/pluginsaction/couponlist`, method: 'post', data, }); diff --git a/src/components/base/maps/index.vue b/src/components/base/maps/index.vue index d9331dfa..4b38445c 100644 --- a/src/components/base/maps/index.vue +++ b/src/components/base/maps/index.vue @@ -5,6 +5,7 @@ - diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue index dac3fbdd..0ec9a29f 100644 --- a/src/views/layout/components/navbar/index.vue +++ b/src/views/layout/components/navbar/index.vue @@ -57,11 +57,21 @@ const modelValue = defineModel({ type: Object, default: {} }); // #region 变量 --------------------start const is_custom_dialog = ref(false); const dialog_visible = ref(false); +watch(dialog_visible, (val) => { + if (val) { + form.value = { + logo: modelValue.value.logo.length > 0 ? [{ url: modelValue.value.logo }] : [], + name: modelValue.value.name, + describe: modelValue.value.describe, + is_enable: modelValue.value.is_enable, + }; + } +}); const form = ref({ - logo: modelValue.value.logo.length > 0 ? [{ url: modelValue.value.logo }] : [], - name: modelValue.value.name, - describe: modelValue.value.describe, - is_enable: modelValue.value.is_enable, + logo: [] as any[], + name: '', + describe: '', + is_enable: '', }); const ruleFormRef = ref(); const rules = reactive({ diff --git a/vite.config.ts b/vite.config.ts index 6d61d4b2..192aca0b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -113,11 +113,11 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { rollupOptions: { output: { // 自定义 chunk 文件的输出路径和文件名格式 - chunkFileNames: 'static/admin/default/diy/js/chunk/[name]-[hash].js', + chunkFileNames: 'diy/js/chunk/[name]-[hash].js', // 自定义 entry chunk 的输出路径和文件名格式 - entryFileNames: 'static/admin/default/diy/js/entry/[name]-[hash].js', + entryFileNames: 'diy/js/entry/[name]-[hash].js', //非js文件夹,按照文件类型分类css,png,jpg - assetFileNames: 'static/admin/default/diy/[ext]/[name]-[hash].[ext]', + assetFileNames: 'diy/[ext]/[name]-[hash].[ext]', }, }, },