BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8600214532f811977110ab2003f59ac2a3ef094f

Authored by YunaiV
1 parent 3654afed

mp：优化【菜单】其它类型的处理

Inline Side-by-side
Showing 4 changed files with 39 additions and 3 deletions
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/mp/core/util/MpUtils.java
  View file @8600214
... ... @@ -72,6 +72,12 @@ public class MpUtils {
72 72 group = ScanCodeWaitMsgButtonGroup.class;
73 73 validateMessage(validator, messageType, button); // 需要额外校验回复的消息格式
74 74 break;
  75 + case WxConsts.MenuButtonType.SCANCODE_PUSH: // 不用校验，直接 return 即可
  76 + case WxConsts.MenuButtonType.PIC_SYSPHOTO:
  77 + case WxConsts.MenuButtonType.PIC_PHOTO_OR_ALBUM:
  78 + case WxConsts.MenuButtonType.PIC_WEIXIN:
  79 + case WxConsts.MenuButtonType.LOCATION_SELECT:
  80 + return;
75 81 default:
76 82 log.error("[validateButton][未知的按钮({})]", button);
77 83 throw new IllegalArgumentException("不支持的按钮类型：" + type);
... ...
yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
  View file @8600214
... ... @@ -39,9 +39,24 @@
39 39 <div v-else-if="item.type === 'event' && item.event === 'VIEW'">
40 40 <el-tag size="mini">点击菜单链接</el-tag>【{{ item.eventKey }}】
41 41 </div>
42   - <div v-else-if="item.type === 'event' && item.event === 'scancode_waitmsg'"> <!-- TODO 芋艿：需要测试下 -->
  42 + <div v-else-if="item.type === 'event' && item.event === 'scancode_waitmsg'">
43 43 <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
44 44 </div>
  45 + <div v-else-if="item.type === 'event' && item.event === 'scancode_push'">
  46 + <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
  47 + </div>
  48 + <div v-else-if="item.type === 'event' && item.event === 'pic_sysphoto'">
  49 + <el-tag size="mini">系统拍照发图</el-tag>
  50 + </div>
  51 + <div v-else-if="item.type === 'event' && item.event === 'pic_photo_or_album'">
  52 + <el-tag size="mini">拍照或者相册</el-tag>
  53 + </div>
  54 + <div v-else-if="item.type === 'event' && item.event === 'pic_weixin'">
  55 + <el-tag size="mini">微信相册</el-tag>
  56 + </div>
  57 + <div v-else-if="item.type === 'event' && item.event === 'location_select'">
  58 + <el-tag size="mini">选择地理位置</el-tag>
  59 + </div>
45 60 <div v-else-if="item.type === 'event'">
46 61 <el-tag type="danger" size="mini">未知事件类型</el-tag>
47 62 </div>
... ...
yudao-ui-admin/src/views/mp/menu/index.vue
  View file @8600214
... ... @@ -438,7 +438,7 @@ export default {
438 438 if (!item.children || item.children.length <= 0) {
439 439 return;
440 440 }
441   - item.children = [];
  441 + menu.children = [];
442 442 item.children.forEach(subItem => {
443 443 menu.children.push(this.convertMenuForm(subItem))
444 444 })
... ...
yudao-ui-admin/src/views/mp/message/index.vue
  View file @8600214
... ... @@ -63,9 +63,24 @@
63 63 <div v-else-if="scope.row.type === 'event' && scope.row.event === 'VIEW'">
64 64 <el-tag size="mini">点击菜单链接</el-tag>【{{ scope.row.eventKey }}】
65 65 </div>
66   - <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_waitmsg'"> <!-- TODO 芋艿：需要测试下 -->
  66 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_waitmsg'">
67 67 <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
68 68 </div>
  69 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_push'">
  70 + <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
  71 + </div>
  72 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_sysphoto'">
  73 + <el-tag size="mini">系统拍照发图</el-tag>
  74 + </div>
  75 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_photo_or_album'">
  76 + <el-tag size="mini">拍照或者相册</el-tag>
  77 + </div>
  78 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_weixin'">
  79 + <el-tag size="mini">微信相册</el-tag>
  80 + </div>
  81 + <div v-else-if="scope.row.type === 'event' && scope.row.event === 'location_select'">
  82 + <el-tag size="mini">选择地理位置</el-tag>
  83 + </div>
69 84 <div v-else-if="scope.row.type === 'event'">
70 85 <el-tag type="danger" size="mini">未知事件类型</el-tag>
71 86 </div>
... ...