Merge branch 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

.env.normal

-VUE_APP_MODE=normal
\ No newline at end of file
+VUE_APP_MODE=normal
+NODE_ENV=production
\ No newline at end of file

.env.platform

-VUE_APP_MODE=platform
\ No newline at end of file
+VUE_APP_MODE=platform
+NODE_ENV=production
\ No newline at end of file

package.json

@@ -6,8 +6,8 @@
     "serve": "vue-cli-service serve",
     "platform": "vue-cli-service serve --mode platform",
     "normal": "vue-cli-service serve --mode normal",
-    "buildPlatform": "vue-cli-service build --mode platform",
-    "buildNormal": "vue-cli-service build --mode normal",
+    "buildPlatform": "vue-cli-service build --mode platform --report",
+    "buildNormal": "vue-cli-service build --mode normal --report",
     "buildLive": "vue-cli-service build --mode live",
     "bdPlatform": "npm run buildPlatform & bash deployPlatform.sh",
     "bdNormal": "npm run buildNormal & bash deployNormal.sh",

public/index.html

@@ -13,7 +13,7 @@
     </noscript>
     <div id="app"></div>
     <script>
-      console.log('v.0.1.2');
+      console.log('v.0.1.6');
     </script>
     <!-- built files will be auto injected -->
   </body>

src/App.vue

@@ -54,3 +54,26 @@ export default Vue.extend({
   },
 })
 </script>
+<style lang="less">
+
+.vhtml{
+  h1 {
+   font-size: 1.4rem !important;
+   font-weight: 300 !important;
+   line-height: 1.5rem !important;
+   letter-spacing: -0.01562em !important;
+ }
+ h2 {
+   font-size: 1.2rem !important;
+   font-weight: 300 !important;
+   line-height: 1.5rem !important;
+   letter-spacing: -0.01562em !important;
+ }
+ h3 {
+   font-size: 1rem !important;
+   font-weight: 300 !important;
+   line-height: 1.5rem !important;
+   letter-spacing: -0.01562em !important;
+ }
+}
+</style>
\ No newline at end of file

src/assets/sass/editor.scss

+
+
 .editor {
   .ProseMirror{
     min-height: 400px;
@@ -6,8 +8,6 @@
     outline: 3px solid #68cef8;
   }
   position: relative;
-  max-width: 70%;
-  margin: 0 auto 5rem auto;
 
   &__content {
     overflow-wrap: break-word;

src/components/Editor/index.vue

 <template>
   <div class="border border-gray-300 p-3 rounded" >
     <EditorMenuBar :editor="editor" />
-    <editor-content :editor="editor" class="editor__content" />
+    <editor-content :editor="editor" class="editor__content vhtml" />
   </div>
 </template>
 

src/views/Login/index.vue

@@ -325,6 +325,6 @@ export default Vue.extend({
   background-image: url(../../assets/login_background.png);
 }
 .adminlogin_background {
-  background-image: url(../../assets/adminLogin_bg.png);
+  background-image: url(../../assets/adminLogin_bg.jpeg);
 }
 </style>
\ No newline at end of file

src/views/Root/Activity/detail.vue

@@ -4,7 +4,7 @@
     {{ $route.query.id }}
     <p class="text-gray-400">操作时间：{{ time | formatDate }}</p>
     <img v-if="imageUrl" :src="imageUrl" class="mx-auto my-5" />
-    <p class="text-left p-5" v-html="content">{{ content }}</p>
+    <div class="text-left p-5 vhtml" v-html="content">{{ content }}</div>
   </div>
 </template>
 

src/views/Root/Home/const.ts

 export enum eBarChart{
   login_dau="login_dau",
-  not_login_dau="total_dau "
+  not_login_dau="total_dau"
 }
\ No newline at end of file

src/views/Root/Home/index.vue

@@ -131,6 +131,9 @@ export default Vue.extend({
     this.initEchart();
     this.queryRealtime();
   },
+  beforeDestroy(){
+    this.myChart && echarts.dispose(this.myChart)
+  },
   methods: {
     handleChangeTimeRange(e: any) {
       this.timeRange = e.target!.value;
@@ -170,7 +173,7 @@ export default Vue.extend({
           ret.data.map((data) => {
             // 真实数据
             this.option.series[0].data.push(data.value);
-            this.option.xAxis.data.push(formatDate(data.time));
+            this.option.xAxis.data.push(formatDate(data.time * 1000));
           });
           console.log('y',this.option.series[0].data,'x',this.option.xAxis.data);
           

src/views/Root/News/detail.vue

@@ -2,8 +2,7 @@
   <div>
     <p class=" text-2xl font-bold mb-5 ">{{ title }}</p>
     <p class=" text-gray-400">新增时间：{{ time | format }} <span class=" ml-2">作者：{{ name }}</span></p>
-    <div class="text-left p-5" v-html="content"></div>
-    <!-- <p class="text-left p-5">{{content}}</p> -->
+    <div class="text-left p-5 vhtml" v-html="content"></div>
   </div>
 </template>
 

tailwind.config.js

 const colors = require('tailwindcss/colors')
 
 module.exports = {
-  purge: [],
+  purge: [
+    './src/**/*.html',
+    './src/**/*.js',
+    './src/**/*.vue',
+  ],
   presets: [],
   darkMode: false, // or 'media' or 'class'
   theme: {