y595705120 преди 2 години
родител
ревизия
3ceda66a6c
променени са 5 файла, в които са добавени 7 реда и са изтрити 8 реда
  1. 1 1
      src/App.vue
  2. 2 1
      src/components/image.vue
  3. 1 2
      src/components/text.vue
  4. 1 1
      src/tailwind.css
  5. 2 3
      src/views/page.vue

+ 1 - 1
src/App.vue

@@ -60,7 +60,7 @@ export default {
 
 <style lang="less">
 #app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
+  font-family: STXinwei;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   text-align: center;

+ 2 - 1
src/components/image.vue

@@ -5,6 +5,7 @@
       <span :style="options.marksStyle" v-html="options.marks"></span>
     </div>
   </div>
+  
   <div v-else class="image mb-6 last:mb-0 mx-auto">
     <img class="mb-1" :style="options.style" :src="options.image" @click="handleClick" />
     <v-text :options="descOptions"></v-text>
@@ -48,7 +49,7 @@ export default {
     right: 0;
     bottom: 0;
     color: #fff;
-    font-family: 'Times New Roman', Times, serif;
+    font-family: 'STXinwei', Times, serif;
     font-size: 20px;
     font-weight: 600;
     letter-spacing: 2px;

+ 1 - 2
src/components/text.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="text-center mb-4 last:mb-0" :style="styles" @click="click">
-    <div v-if="options.html" v-html="options.html"></div>
-    <template v-else>{{ options.text }}</template>
+    <div v-if="options.text" v-html="options.text"></div>
   </div>
 </template>
 <script>

+ 1 - 1
src/tailwind.css

@@ -183,7 +183,7 @@ input,
 optgroup,
 select,
 textarea {
-  font-family: inherit;
+  font-family: STXinwei;
   /* 1 */
   font-size: 100%;
   /* 1 */

+ 2 - 3
src/views/page.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page" :class="{ isPCWeb: !isMobile }">
+  <div class="page" :class="{ isPCWeb: !isMobile }" :style="style">
     <template v-if="isMobile">
       <template v-if="!error">
         <v-view v-if="page" :options="page"></v-view>
@@ -30,6 +30,7 @@ export default {
       interval: 3000,
       logo: "",
       uuid:'',
+      style:'',
       nodeList: [],
       itemList: [],
       paperId: 1,
@@ -70,7 +71,6 @@ export default {
   methods: {
     getPageInfo() {
       const { data } = this.$store.state.pages;
-      console.log("getinfo", data)
       const { pages, main } = data;
       const { id = 'main'} = this.$route.params;
       let page = pages[id]||{};
@@ -81,7 +81,6 @@ export default {
     },
     init(){
       let {uuid} = this.$route.params;
-      console.log("loadData", uuid);
       if(this.loading) return;
       this.loading = true;
       fetch("paper.getpaper", {uuid}).then((res) => {