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
@@ -57,6 +57,7 @@ export default {
      withDesc: '展示描述信息',
      customIcon: '自定义图标',
      description: '描述信息',
+      weappQrcode: '小程序码',
    },
    'en-US': {
      qq: 'QQ',
@@ -72,6 +73,7 @@ export default {
      withDesc: 'Show Description',
      customIcon: 'Custom Icon',
      description: 'Description',
+      weappQrcode: 'Weapp Qrcode',
    },
  },

@@ -108,6 +110,7 @@ export default {
          { name: this.t('link'), icon: 'link' },
          { name: this.t('poster'), icon: 'poster' },
          { name: this.t('qrcode'), icon: 'qrcode' },
+          { name: this.t('weappQrcode'), icon: 'weapp-qrcode' },
        ],
      ];
    },