Merge remote-tracking branch 'yudao/dev' into dev

# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue

src/components/Icon/src/IconSelect.vue

@@ -95,7 +95,7 @@ watch(
     return props.modelValue
   },
   () => {
-    if (props.modelValue && props.modelValue.contains(':')) {
+    if (props.modelValue && props.modelValue.indexOf(':') >= 0) {
       currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
       icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
     }