From fd447dc7a3c3ce4b582cd254d563ef2d2acef984 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 11 Apr 2023 23:28:59 +0800
Subject: [PATCH] =?UTF-8?q?REVIEW=20=E5=85=AC=E4=BC=97=E5=8F=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.front                                         | 2 +-
 .vscode/launch.json                                | 2 +-
 src/views/mp/autoReply/index.vue                   | 3 ++-
 src/views/mp/components/WxMpSelect.vue             | 5 ++---
 src/views/mp/components/wx-account-select/main.vue | 6 +++---
 src/views/mp/draft/index.vue                       | 3 ++-
 src/views/mp/freePublish/index.vue                 | 1 +
 src/views/mp/material/index.vue                    | 5 +----
 src/views/mp/menu/index.vue                        | 3 ++-
 src/views/mp/tag/index.vue                         | 3 ++-
 src/views/mp/user/index.vue                        | 1 +
 11 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.env.front b/.env.front
index a63b6379..1629ff9f 100644
--- a/.env.front
+++ b/.env.front
@@ -19,7 +19,7 @@ VITE_API_URL=/admin-api
 VITE_BASE_PATH=/
 
 # 项目本地运行端口号, 与.vscode/launch.json配合
-VITE_PORT=5173
+VITE_PORT=80
 
 # 是否删除debugger
 VITE_DROP_DEBUGGER=false
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e4093b3a..f43edc03 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
       "type": "msedge",
       "request": "launch",
       "name": "Launch Edge against localhost",
-      "url": "http://localhost:5173",
+      "url": "http://localhost",
       "webRoot": "${workspaceFolder}/src",
       "sourceMaps": true
     }
diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue
index 4877ec76..9208d1e7 100644
--- a/src/views/mp/autoReply/index.vue
+++ b/src/views/mp/autoReply/index.vue
@@ -3,7 +3,8 @@
 
   <!-- 搜索工作栏 -->
   <ContentWrap>
-    <WxAccountSelect @change="(accountId) => accountChanged(accountId)" />
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
+    <WxAccountSelect @change="accountChanged" />
   </ContentWrap>
 
   <!-- tab 切换 -->
diff --git a/src/views/mp/components/WxMpSelect.vue b/src/views/mp/components/WxMpSelect.vue
index 6dc6809b..e39bbf96 100644
--- a/src/views/mp/components/WxMpSelect.vue
+++ b/src/views/mp/components/WxMpSelect.vue
@@ -19,13 +19,12 @@ const emit = defineEmits<{
   (e: 'change', id: number | undefined): void
 }>()
 
-onMounted(async () => {
+onMounted(() => {
   handleQuery()
 })
 
 const handleQuery = async () => {
-  const data = await MpAccountApi.getSimpleAccountList()
-  accountList.value = data
+  accountList.value = await MpAccountApi.getSimpleAccountList()
   // 默认选中第一个
   if (accountList.value.length > 0) {
     accountId.value = accountList.value[0].id
diff --git a/src/views/mp/components/wx-account-select/main.vue b/src/views/mp/components/wx-account-select/main.vue
index f75bc7d6..4eb99615 100644
--- a/src/views/mp/components/wx-account-select/main.vue
+++ b/src/views/mp/components/wx-account-select/main.vue
@@ -1,6 +1,7 @@
 <template>
   <el-form class="-mb-15px" ref="queryFormRef" :inline="true" label-width="68px">
     <el-form-item label="公众号" prop="accountId">
+      <!-- TODO 芋艿：需要将 el-form 和 el-select 解耦 -->
       <el-select
         v-model="accountId"
         placeholder="请选择公众号"
@@ -24,13 +25,12 @@ const queryFormRef = ref()
 
 const emit = defineEmits(['change'])
 
-onMounted(async () => {
+onMounted(() => {
   handleQuery()
 })
 
 const handleQuery = async () => {
-  const data = await MpAccountApi.getSimpleAccountList()
-  accountList.value = data
+  accountList.value = await MpAccountApi.getSimpleAccountList()
   // 默认选中第一个
   if (accountList.value.length > 0) {
     accountId.value = accountList.value[0].id
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
index 0f2aa254..299ec68a 100644
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
@@ -3,7 +3,8 @@
 
   <!-- 搜索工作栏 -->
   <ContentWrap>
-    <WxAccountSelect @change="(accountId) => accountChanged(accountId)">
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
+    <WxAccountSelect @change="accountChanged">
       <template #actions>
         <el-button type="primary" plain @click="handleAdd" v-hasPermi="['mp:draft:create']">
           <Icon icon="ep:plus" />新增
diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue
index bb42b6a2..0d370f4a 100644
--- a/src/views/mp/freePublish/index.vue
+++ b/src/views/mp/freePublish/index.vue
@@ -3,6 +3,7 @@
 
   <!-- 搜索工作栏 -->
   <ContentWrap>
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
     <WxAccountSelect @change="(accountId) => accountChanged(accountId)" />
   </ContentWrap>
 
diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue
index ec9077f1..e4382b69 100644
--- a/src/views/mp/material/index.vue
+++ b/src/views/mp/material/index.vue
@@ -4,10 +4,7 @@
   <ContentWrap>
     <el-form class="-mb-15px" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
-        <WxMpSelect @change="(accountId) => accountChange(accountId)" />
-      </el-form-item>
-      <el-form-item>
-        <slot name="actions"></slot>
+        <WxMpSelect @change="accountChange" />
       </el-form-item>
     </el-form>
   </ContentWrap>
diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
index 249f3a7c..a6a08c97 100644
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
@@ -2,7 +2,8 @@
   <doc-alert title="公众号菜单" url="https://doc.iocoder.cn/mp/menu/" />
   <!-- 搜索工作栏 -->
   <ContentWrap>
-    <WxAccountSelect @change="(accountId) => accountChanged(accountId)" />
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
+    <WxAccountSelect @change="accountChanged" />
   </ContentWrap>
 
   <!-- 列表 -->
diff --git a/src/views/mp/tag/index.vue b/src/views/mp/tag/index.vue
index 04366e88..44578519 100644
--- a/src/views/mp/tag/index.vue
+++ b/src/views/mp/tag/index.vue
@@ -3,7 +3,8 @@
 
   <!-- 搜索工作栏 -->
   <ContentWrap>
-    <WxAccountSelect @change="(accountId) => accountChanged(accountId)">
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
+    <WxAccountSelect @change="accountChanged">
       <template #actions>
         <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mp:tag:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
diff --git a/src/views/mp/user/index.vue b/src/views/mp/user/index.vue
index d5d2e4dc..91fd7dff 100644
--- a/src/views/mp/user/index.vue
+++ b/src/views/mp/user/index.vue
@@ -3,6 +3,7 @@
 
   <!-- 搜索工作栏 -->
   <ContentWrap>
+    <!-- TODO @芋艿：调整成 el-form 和 WxAccountSelect  -->
     <WxAccountSelect @change="(accountId) => accountChanged(accountId)">
       <template #actions>
         <el-button type="success" plain @click="handleSync" v-hasPermi="['mp:user:sync']">