From 8600214532f811977110ab2003f59ac2a3ef094f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 15 Jan 2023 19:52:59 +0800
Subject: [PATCH] =?UTF-8?q?mp=EF=BC=9A=E4=BC=98=E5=8C=96=E3=80=90=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E3=80=91=E5=85=B6=E5=AE=83=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/framework/mp/core/util/MpUtils.java      |  6 ++++++
 .../src/views/mp/components/wx-msg/main.vue     | 17 ++++++++++++++++-
 yudao-ui-admin/src/views/mp/menu/index.vue      |  2 +-
 yudao-ui-admin/src/views/mp/message/index.vue   | 17 ++++++++++++++++-
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/mp/core/util/MpUtils.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/mp/core/util/MpUtils.java
index 3a1c20b044..74199f124c 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/mp/core/util/MpUtils.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/mp/core/util/MpUtils.java
@@ -72,6 +72,12 @@ public class MpUtils {
                 group = ScanCodeWaitMsgButtonGroup.class;
                 validateMessage(validator, messageType, button); // 需要额外校验回复的消息格式
                 break;
+            case WxConsts.MenuButtonType.SCANCODE_PUSH: // 不用校验，直接 return 即可
+            case WxConsts.MenuButtonType.PIC_SYSPHOTO:
+            case WxConsts.MenuButtonType.PIC_PHOTO_OR_ALBUM:
+            case WxConsts.MenuButtonType.PIC_WEIXIN:
+            case WxConsts.MenuButtonType.LOCATION_SELECT:
+                return;
             default:
                 log.error("[validateButton][未知的按钮({})]", button);
                 throw new IllegalArgumentException("不支持的按钮类型：" + type);
diff --git a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
index b458a4a303..56b999e526 100644
--- a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
+++ b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
@@ -39,9 +39,24 @@
               <div v-else-if="item.type === 'event' && item.event === 'VIEW'">
                 <el-tag size="mini">点击菜单链接</el-tag>【{{ item.eventKey }}】
               </div>
-              <div v-else-if="item.type === 'event' && item.event === 'scancode_waitmsg'"> <!-- TODO 芋艿：需要测试下 -->
+              <div v-else-if="item.type === 'event' && item.event === 'scancode_waitmsg'">
                 <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
               </div>
+              <div v-else-if="item.type === 'event' && item.event === 'scancode_push'">
+                <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
+              </div>
+              <div v-else-if="item.type === 'event' && item.event === 'pic_sysphoto'">
+                <el-tag size="mini">系统拍照发图</el-tag>
+              </div>
+              <div v-else-if="item.type === 'event' && item.event === 'pic_photo_or_album'">
+                <el-tag size="mini">拍照或者相册</el-tag>
+              </div>
+              <div v-else-if="item.type === 'event' && item.event === 'pic_weixin'">
+                <el-tag size="mini">微信相册</el-tag>
+              </div>
+              <div v-else-if="item.type === 'event' && item.event === 'location_select'">
+                <el-tag size="mini">选择地理位置</el-tag>
+              </div>
               <div v-else-if="item.type === 'event'">
                 <el-tag type="danger" size="mini">未知事件类型</el-tag>
               </div>
diff --git a/yudao-ui-admin/src/views/mp/menu/index.vue b/yudao-ui-admin/src/views/mp/menu/index.vue
index 9fe5975837..3f377c72c7 100644
--- a/yudao-ui-admin/src/views/mp/menu/index.vue
+++ b/yudao-ui-admin/src/views/mp/menu/index.vue
@@ -438,7 +438,7 @@ export default {
         if (!item.children || item.children.length <= 0) {
           return;
         }
-        item.children = [];
+        menu.children = [];
         item.children.forEach(subItem => {
           menu.children.push(this.convertMenuForm(subItem))
         })
diff --git a/yudao-ui-admin/src/views/mp/message/index.vue b/yudao-ui-admin/src/views/mp/message/index.vue
index 4766ffeef3..52daca6fb3 100644
--- a/yudao-ui-admin/src/views/mp/message/index.vue
+++ b/yudao-ui-admin/src/views/mp/message/index.vue
@@ -63,9 +63,24 @@
           <div v-else-if="scope.row.type === 'event' && scope.row.event === 'VIEW'">
             <el-tag size="mini">点击菜单链接</el-tag>【{{ scope.row.eventKey }}】
           </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_waitmsg'"> <!-- TODO 芋艿：需要测试下 -->
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_waitmsg'">
             <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
           </div>
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_push'">
+            <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
+          </div>
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_sysphoto'">
+            <el-tag size="mini">系统拍照发图</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_photo_or_album'">
+            <el-tag size="mini">拍照或者相册</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_weixin'">
+            <el-tag size="mini">微信相册</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'location_select'">
+            <el-tag size="mini">选择地理位置</el-tag>
+          </div>
           <div v-else-if="scope.row.type === 'event'">
             <el-tag type="danger" size="mini">未知事件类型</el-tag>
           </div>