Merge branch '2.x' into dev

2020-11-25 22:01:09 +08:00
parent a8eb4f5452 76e80ee8a1
commit 9708ab53f6
14 changed files with 259 additions and 14 deletions
@@ -4,7 +4,15 @@ import { createNamespace, pick } from '../utils';
 // Components
 import Popup, { popupSharedProps } from '../popup';

-const PRESET_ICONS = ['qq', 'weibo', 'wechat', 'link', 'qrcode', 'poster'];
+const PRESET_ICONS = [
+  'qq',
+  'link',
+  'weibo',
+  'wechat',
+  'poster',
+  'qrcode',
+  'weapp-qrcode',
+];

 function getIconURL(icon) {
  if (PRESET_ICONS.indexOf(icon) !== -1) {