From ce008f9f719c19d4f94257d511b79afd88c25199 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 7 Apr 2023 10:18:18 +0800
Subject: [PATCH] =?UTF-8?q?ref:=20=E9=80=82=E9=85=8D=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8F=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/Image.vue   |  2 +-
 src/utils/other.ts                |  2 +-
 src/views/mp/wx-account/index.vue |  4 +++-
 src/views/mp/wx-menu/index.vue    | 26 +++++++++++---------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue
index df587687..ebca9fa9 100644
--- a/src/components/Upload/Image.vue
+++ b/src/components/Upload/Image.vue
@@ -15,7 +15,7 @@
 			:accept="fileType.join(',')"
 		>
 			<template v-if="imageUrl">
-				<img :src="baseURL + imageUrl" class="upload-image" />
+				<img :src="imageUrl.indexOf('http') > 0 ? baseURL + imageUrl : imageUrl" class="upload-image" />
 				<div class="upload-handle" @click.stop>
 					<div class="handle-icon" @click="editImg" v-if="!self_disabled">
 						<el-icon><Edit /></el-icon>
diff --git a/src/utils/other.ts b/src/utils/other.ts
index b6fea7ef..454dbeb2 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -455,7 +455,7 @@ export function toUnderline(str: string) {
  *
  * @param originUrl 原始路径
  */
-const adaptationUrl = (originUrl?: string) => {
+const adaptationUrl = (originUrl: string) => {
 	// 微服务架构 不做路径转换,为空不做路径转换
 	const isMicro = import.meta.env.VITE_IS_MICRO;
 	if (validateNull(isMicro) || isMicro === 'true') {
diff --git a/src/views/mp/wx-account/index.vue b/src/views/mp/wx-account/index.vue
index 79df1343..e14589cf 100644
--- a/src/views/mp/wx-account/index.vue
+++ b/src/views/mp/wx-account/index.vue
@@ -120,6 +120,7 @@ import { clearQuota, delObjs, fetchList, generateQr } from '/@/api/mp/wx-account
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useI18n } from 'vue-i18n';
 import commonFunction from '/@/utils/commonFunction';
+import other from '/@/utils/other';
 
 const { copyText } = commonFunction();
 // 引入组件
@@ -187,7 +188,8 @@ const dialogFormVisible = ref(false);
 const wxurl = ref('');
 const access = (row: any) => {
 	dialogFormVisible.value = true;
-	wxurl.value = row.url + '/mp/' + row.appid + '/portal';
+	let url = baseUrl + row.url + '/mp/' + row.appid + '/portal';
+	wxurl.value = other.adaptationUrl(url);
 };
 
 const generate = (row: any) => {
diff --git a/src/views/mp/wx-menu/index.vue b/src/views/mp/wx-menu/index.vue
index 48084481..56ddd9c6 100644
--- a/src/views/mp/wx-menu/index.vue
+++ b/src/views/mp/wx-menu/index.vue
@@ -128,7 +128,7 @@
 </template>
 
 <script lang="ts" name="wx-menu" setup>
-import { saveObj, getObj } from '/@/api/mp/wx-menu';
+import { saveObj, getObj, publishObj } from '/@/api/mp/wx-menu';
 
 // 部门树使用的数据
 import { fetchAccountList } from '/@/api/mp/wx-account';
@@ -340,22 +340,18 @@ const deleteMenu = () => {
 		});
 };
 
-const handleSave = () => {
-	useMessageBox()
-		.confirm('确定要保存该菜单吗?')
-		.then(() => {
-			saveObj(accountId.value, {
-				button: menuList,
-			})
-				.then(() => {
-					useMessage().success('保存成功');
-				})
-				.catch((err) => {
-					useMessage().error(err.msg);
-				});
-		});
+const handleSave = async () => {
+  try {
+    await useMessageBox().confirm('确定要保存该菜单吗?');
+    await saveObj(accountId.value, { button: menuList });
+    await publishObj(accountId.value);
+    useMessage().error('发布成功');
+  } catch (err:any) {
+    useMessage().error(err.msg);
+  }
 };
 
+
 const deleteMaterial = () => {
 	tempObj.value.replyArticles = [];
 	tempObj.value.articleId = '';