From 7bbd3a9e669332af15e9ce09da8ec64b1692fbde Mon Sep 17 00:00:00 2001 From: lwh <2679599887@qq.com> Date: Thu, 11 May 2023 21:36:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImageUpload.vue | 40 ++-- src/components/UploadVideo.vue | 190 ++++++++++++++++++ src/main.ts | 2 + .../components/AddContactScancodeDialog.vue | 16 +- .../contact_info/contact_scancode/index.vue | 2 +- .../home_env/components/AddHomeEnvDialog.vue | 33 +-- .../components/UploadHomeEnvDialog.vue | 116 +++++++++++ src/pages/index/home_data/home_env/index.vue | 13 +- src/pages/index/test/index.vue | 51 ++++- src/service/common.js | 26 ++- src/service/home_env.js | 38 +++- src/service/test.js | 25 +++ 12 files changed, 483 insertions(+), 69 deletions(-) create mode 100644 src/components/UploadVideo.vue create mode 100644 src/pages/index/home_data/home_env/components/UploadHomeEnvDialog.vue diff --git a/src/components/ImageUpload.vue b/src/components/ImageUpload.vue index 3a29085..69fb098 100644 --- a/src/components/ImageUpload.vue +++ b/src/components/ImageUpload.vue @@ -1,25 +1,10 @@ \ No newline at end of file diff --git a/src/components/UploadVideo.vue b/src/components/UploadVideo.vue new file mode 100644 index 0000000..581967e --- /dev/null +++ b/src/components/UploadVideo.vue @@ -0,0 +1,190 @@ + + + + + \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index cda6884..52dc0a8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,6 +17,7 @@ import RichText from '~/components/RichText.vue'; import Map from '~/components/Map.vue'; import ImageUpload from '~/components/ImageUpload.vue'; import FileUpload from '~/components/FileUpload.vue'; +import UploadVideo from '~/components/UploadVideo.vue'; import { guardian, topProgressBar } from './guardian'; async function bootstrap(): Promise { @@ -37,6 +38,7 @@ async function bootstrap(): Promise { app.component('Map', Map); app.component('UploadImage', ImageUpload); app.component('UploadFile', FileUpload); + app.component('UploadVideo', UploadVideo); Object.keys(ElIcons).forEach((icon: string) => { app.component(`ElIcon${icon}`, ElIcons[icon]); diff --git a/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue b/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue index a0267fa..ecec245 100644 --- a/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue +++ b/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue @@ -67,7 +67,9 @@ const props = defineProps({ }); const emits = defineEmits(['update:modelValue']); const dialogVisible = ref(props.modelValue); -const formData = reactive({}); +const formData = reactive({ + contact_scancode_order: 1 +}); const uoloadData = ref({ dirName: 'ContactScancode' @@ -78,12 +80,12 @@ watch(props, v => { }); const rules = reactive({ - contact_scancode_img: [ - { - required: true, - message: '联系扫码图片不能为空' - } - ] + // contact_scancode_img: [ + // { + // required: true, + // message: '联系扫码图片不能为空' + // } + // ] }); // --基础方法 diff --git a/src/pages/index/contact_us/contact_info/contact_scancode/index.vue b/src/pages/index/contact_us/contact_info/contact_scancode/index.vue index de65a28..a15bae5 100644 --- a/src/pages/index/contact_us/contact_info/contact_scancode/index.vue +++ b/src/pages/index/contact_us/contact_info/contact_scancode/index.vue @@ -211,7 +211,7 @@ async function handleEditOrder(data) { // 开关 async function handleEditShow(data) { loading.value = true - const { code } = await editinfoArticle(data); + const { code } = await editContactScancode(data); if (code == 0) { loading.value = false tableRef.value.reload() diff --git a/src/pages/index/home_data/home_env/components/AddHomeEnvDialog.vue b/src/pages/index/home_data/home_env/components/AddHomeEnvDialog.vue index f3623cc..414ba18 100644 --- a/src/pages/index/home_data/home_env/components/AddHomeEnvDialog.vue +++ b/src/pages/index/home_data/home_env/components/AddHomeEnvDialog.vue @@ -1,6 +1,6 @@