Merge branch 'lhd'

src/views/book/courseware/create/components/question/article/CheckStyle.vue

@@ -136,21 +136,33 @@ export default {
       toneList: [' ', 'ˉ', 'ˊ', 'ˇ', 'ˋ'],
       fontFamilyList: [
         {
-          value: '楷体',
-          name: '中文',
+          value: '楷体, 微软雅黑',
+          name: '楷体',
         },
         {
-          value: 'Sans-GBNPC',
-          name: '拼音',
+          value: '黑体, 微软雅黑',
+          name: '黑体',
+        },
+        {
+          value: '宋体, 微软雅黑',
+          name: '宋体',
         },
         {
-          value: 'robot',
-          name: '英文',
+          value: 'arial, helvetica, sans-serif',
+          name: 'Arial',
         },
         {
-          value: 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo',
-          name: '系统字体',
+          value: 'times new roman, times, serif',
+          name: 'Times New Roman',
+        },
+        {
+          value: 'League',
+          name: '拼音',
         },
+        // {
+        //   value: 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo',
+        //   name: '系统字体',
+        // },
       ],
     };
   },

src/views/book/courseware/create/components/question/image_text/CheckStyle.vue

@@ -90,21 +90,33 @@ export default {
       toneList: [' ', 'ˉ', 'ˊ', 'ˇ', 'ˋ'],
       fontFamilyList: [
         {
-          value: '楷体',
-          name: '中文',
+          value: '楷体, 微软雅黑',
+          name: '楷体',
         },
         {
-          value: 'Sans-GBNPC',
-          name: '拼音',
+          value: '黑体, 微软雅黑',
+          name: '黑体',
+        },
+        {
+          value: '宋体, 微软雅黑',
+          name: '宋体',
         },
         {
-          value: 'robot',
-          name: '英文',
+          value: 'arial,helvetica,sans-serif',
+          name: 'Arial',
         },
         {
-          value: 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo',
-          name: '系统字体',
+          value: 'times new roman,times,serif',
+          name: 'Times New Roman',
+        },
+        {
+          value: 'League',
+          name: '拼音',
         },
+        // {
+        //   value: 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo',
+        //   name: '系统字体',
+        // },
       ],
     };
   },