From 817ccc751179acab656bda44d99686bbc4f37394 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Apr 2023 20:52:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mp=E6=A8=A1=E5=9D=97=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=B0=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 036c9b33663b8aa82b0bd0a25b714348a23e32db)
---
 src/views/mp/components/wx-music/main.vue     |  4 ++--
 src/views/mp/draft/components/CoverSelect.vue |  6 +++---
 src/views/mp/draft/components/NewsForm.vue    |  2 +-
 src/views/mp/draft/index.vue                  | 17 ++++-------------
 src/views/mp/menu/index.vue                   |  2 +-
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/views/mp/components/wx-music/main.vue b/src/views/mp/components/wx-music/main.vue
index 70f4c58b..f528359d 100644
--- a/src/views/mp/components/wx-music/main.vue
+++ b/src/views/mp/components/wx-music/main.vue
@@ -55,6 +55,6 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-/* 因为 joolun 实现依赖 avue 组件，该页面使用了 card.scc  */
-@import url('../wx-msg/card.scss');
+/* 因为 joolun 实现依赖 avue 组件，该页面使用了 card.scss  */
+@import '../wx-msg/card.scss';
 </style>
diff --git a/src/views/mp/draft/components/CoverSelect.vue b/src/views/mp/draft/components/CoverSelect.vue
index 944b7d96..bbb2b44c 100644
--- a/src/views/mp/draft/components/CoverSelect.vue
+++ b/src/views/mp/draft/components/CoverSelect.vue
@@ -51,7 +51,7 @@
       >
         <WxMaterialSelect
           type="image"
-          :account-id="accountId"
+          :account-id="accountId!"
           @select-material="onMaterialSelected"
         />
       </el-dialog>
@@ -93,11 +93,11 @@ const showImageDialog = ref(false)
 const fileList = ref<UploadFiles>([])
 interface UploadData {
   type: UploadType
-  accountId: number | undefined
+  accountId: number
 }
 const uploadData: UploadData = reactive({
   type: UploadType.Image,
-  accountId: accountId
+  accountId: accountId!
 })
 
 /** 素材选择完成事件*/
diff --git a/src/views/mp/draft/components/NewsForm.vue b/src/views/mp/draft/components/NewsForm.vue
index a2b88a5b..97166a4b 100644
--- a/src/views/mp/draft/components/NewsForm.vue
+++ b/src/views/mp/draft/components/NewsForm.vue
@@ -125,7 +125,7 @@
   </el-container>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="NewsForm">
 import { Editor } from '@/components/Editor'
 import { createEditorConfig } from '../editor-config'
 import CoverSelect from './CoverSelect.vue'
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
index d8e771a0..6b40bc35 100644
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
@@ -76,7 +76,7 @@ import {
 
 const message = useMessage() // 消息
 
-const accountId = ref<number>(0)
+const accountId = ref<number>(-1)
 provide('accountId', accountId)
 
 const loading = ref(true) // 列表的加载中
@@ -90,16 +90,7 @@ interface QueryParams {
 const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: 0
-})
-
-interface UploadData {
-  type: 'image' | 'video' | 'audio'
-  accountId: number
-}
-const uploadData: UploadData = reactive({
-  type: 'image',
-  accountId: 0
+  accountId: accountId
 })
 
 // ========== 草稿新建 or 修改 ==========
@@ -126,8 +117,8 @@ const onBeforeDialogClose = async (onDone: () => {}) => {
 // ======================== 列表查询 ========================
 /** 设置账号编号 */
 const setAccountId = (id: number) => {
-  queryParams.accountId = id
-  uploadData.accountId = id
+  accountId.value = id
+  // queryParams.accountId = id
 }
 
 /** 查询列表 */
diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
index 442e33b5..cbec87dc 100644
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
@@ -339,7 +339,7 @@ div {
 
   .left {
     position: relative;
-    display: inline-block;
+    display: block;
     float: left;
     width: 350px;
     height: 715px;