feat: 字体和题卡

card/components/CardView.vue

@@ -125,10 +125,11 @@ export default {
   },
   methods: {
     getPreviewTemp(htmlContent) {
-      const { fontName } = this.$ls.get("user", {
-        fontResult: {},
-      }).fontResult;
-      return previewTemp(htmlContent, fontName);
+      const { attachmentId, fontName } =
+        this.$ls.get("user", {
+          fontResult: {},
+        }).fontResult || {};
+      return previewTemp(htmlContent, attachmentId !== "-1" ? fontName : null);
     },
   },
 };

card/modules/free/components/CardFreeView.vue

@@ -116,10 +116,11 @@ export default {
       return getPageModel(cardData);
     },
     getPreviewTemp(htmlContent) {
-      const { fontName } = this.$ls.get("user", {
-        fontResult: {},
-      }).fontResult;
-      return previewTemp(htmlContent, fontName);
+      const { attachmentId, fontName } =
+        this.$ls.get("user", {
+          fontResult: {},
+        }).fontResult || {};
+      return previewTemp(htmlContent, attachmentId !== "-1" ? fontName : null);
     },
   },
 };

src/modules/admin/components/school/SchoolSetFont.vue

@@ -56,7 +56,7 @@
           fixed="right"
           width="120"
         >
-          <template slot-scope="scope" v-if="scope.row.attachmentId !== '-1'">
+          <template slot-scope="scope">
             <el-button
               class="btn-primary"
               type="text"
@@ -67,6 +67,7 @@
             <el-button
               class="btn-danger"
               type="text"
+              :disabled="scope.row.attachmentId === '-1'"
               @click="toDelete(scope.row)"
               >删除</el-button
             >

src/modules/login/fontMixins.js

@@ -1,12 +1,16 @@
 export default {
   methods: {
     setSchoolFont() {
-      const { fontName } = this.$ls.get("user", {
-        fontResult: {},
-      }).fontResult;
+      const { attachmentId, fontName } =
+        this.$ls.get("user", {
+          fontResult: {},
+        }).fontResult || {};
 
       const defaultFonts = '"宋体","宋体-简",Arial,sans-serif';
-      const ff = fontName ? `${fontName},${defaultFonts}` : defaultFonts;
+      const ff =
+        attachmentId !== "-1" && fontName
+          ? `${fontName},${defaultFonts}`
+          : defaultFonts;
       const fontStyleCont = `.page-box{font-family:${ff}}`;
 
       const fontStyle = document.querySelector('style[class="fontStyle"]');