From b8a42265517a691e9ed3ce2788f860dd429ade1e Mon Sep 17 00:00:00 2001
From: yma16 <17685043634@163.com>
Date: Mon, 10 Jul 2023 21:19:45 +0800
Subject: [PATCH] perf:no cdn

---
 build/webpack.prod.conf.js               |  2 +-
 index.html                               |  4 ++++
 src/App.vue                              | 21 +++++++++++++++++----
 src/components/user/Login.vue            |  4 ++--
 src/components/weather/EchartWeather.vue |  2 +-
 src/components/weather/echarts/Map.vue   |  2 +-
 src/importElement.js                     |  4 +++-
 src/main.js                              | 22 +++++++++++-----------
 src/store/index.js                       |  5 ++---
 src/store/modules/user.js                |  4 ++--
 10 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index b68e7e1..ad81f73 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -20,7 +20,7 @@ const env =
 let externalModules = {}
 //cdn 配置
 let externalConfig = []
-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production' && false) {
   //生产环境
   externalModules = {
     vue: 'Vue',
diff --git a/index.html b/index.html
index 83668c4..ed8b38c 100644
--- a/index.html
+++ b/index.html
@@ -18,6 +18,10 @@
     <style>
       body {
         overflow: hidden;
+        background: url("https://yongma16.xyz/staticFile/common/img/blogScene.jpg");
+        background-position: center center;
+        background-clip: border-box;
+        background-repeat: no-repeat;
       }
     </style>
     <!--    cdn css-->
diff --git a/src/App.vue b/src/App.vue
index 59eeced..13ed6c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,9 +26,7 @@
               <el-submenu index="1-1">
                 <template slot="title"
                   >yma16
-                  <span v-if="currentUserName">{{
-                    currentUserName
-                  }}</span></template
+                  </template
                 >
                 <el-menu-item index="1-1-1">stay hungry</el-menu-item>
                 <a @click="jumpToEcharts">
@@ -82,6 +80,16 @@
 <!--            >&nbsp;&nbsp;在线聊天室</i-->
 <!--          >-->
           <div style="float: right; overflow: hidden;display: flex;justify-items: center;align-items:center;word-spacing: 16px;">
+            <span style="cursor: pointer; width: 80px" v-if="currentUserName">
+              <el-popover
+                trigger="click">
+                <span @click="loginOut" style="cursor: pointer; height: 16px">注销</span>
+  <template slot="reference">
+    <i class="el-icon-user" style="font-weight: 300">{{currentUserName}}</i>
+  </template>
+</el-popover>
+
+            </span>
             <a href="https://codechina.csdn.net/qq_38870145/myblogvue"
               ><img
                 src="@/assets/img/code-china.png"
@@ -93,6 +101,7 @@
                 src="@/assets/img/github-fill.png"
                 style="cursor: pointer; height: 16px"
             /></a>
+
           </div>
 
           <!-- <a v-on:click="changeNavigate"><i class="el-icon-menu"></i></a> -->
@@ -159,7 +168,7 @@ export default {
         currentUserName: function () {
             return store.state.user.userInfo && store.state.user.userInfo.name
                 ? store.state.user.userInfo.name
-                : '游客'
+                : ''
         }
     },
     mounted () {
@@ -285,6 +294,10 @@ export default {
                 .catch((error) => {
                     throw Error(error)
                 })
+        },
+        loginOut () {
+            localStorage.removeItem('yma16siteUserInfo')
+            window.location.reload()
         }
     }
 }
diff --git a/src/components/user/Login.vue b/src/components/user/Login.vue
index 0aa4fcc..46d7605 100644
--- a/src/components/user/Login.vue
+++ b/src/components/user/Login.vue
@@ -44,13 +44,13 @@
               <div style="width:50%;text-align: center">
                 <img src="https://ts2.cn.mm.bing.net/th?id=ODLS.f9daea21-9936-4164-815f-b5209459f3c6&w=32&h=32&qlt=90&pcl=fffffa&o=6&pid=1.2" style="width:10px;line-height: 56px"/>
                 <el-link type="primary" @click="thirdLogin('azure')"
-                >微软登录(测试中)</el-link
+                >微软登录(alpha)</el-link
                 >
               </div>
               <div style="width:50%;text-align: center">
                 <img src="https://sola.gtimg.cn/aoi/sola/20210118201807_hzF9zYwEBj.png" style="width:10px;line-height: 56px"/>
                 <el-link type="primary" @click="thirdLogin('qq')"
-                >QQ登录(测试中)</el-link
+                >QQ登录(alpha)</el-link
                 >
               </div>
               </div>
diff --git a/src/components/weather/EchartWeather.vue b/src/components/weather/EchartWeather.vue
index d683444..804d1a4 100644
--- a/src/components/weather/EchartWeather.vue
+++ b/src/components/weather/EchartWeather.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-// import * as echarts from 'echarts/index'
+import * as echarts from 'echarts/index'
 export default {
     name: 'EchartWeather',
     data () {
diff --git a/src/components/weather/echarts/Map.vue b/src/components/weather/echarts/Map.vue
index df6c15a..f352b3d 100644
--- a/src/components/weather/echarts/Map.vue
+++ b/src/components/weather/echarts/Map.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-// import * as echarts from 'echarts'
+import * as echarts from 'echarts'
 
 export default {
     name: 'Map',
diff --git a/src/importElement.js b/src/importElement.js
index 7bd062f..de3b801 100644
--- a/src/importElement.js
+++ b/src/importElement.js
@@ -26,7 +26,8 @@ import {
     Select,
     Divider,
     Row,
-    Col
+    Col,
+    Popover
 } from 'element-ui'
 
 const importElementComponents = (Vue) => {
@@ -56,6 +57,7 @@ const importElementComponents = (Vue) => {
     Vue.use(Pagination)
     Vue.use(Alert)
     Vue.use(Select)
+    Vue.use(Popover)
     Vue.prototype.$message = Message
     Vue.prototype.$notify = Notification
 }
diff --git a/src/main.js b/src/main.js
index 7c6b31b..bf82bd6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,11 +1,11 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 // vue cdn
-// import Vue from 'vue'
-// import axios from 'axios'
-// import hljs from 'highlight.js'
-// import importElementComponents from './importElement'
-// import importEchartsComponents from './importEchartsComponents'
+import Vue from 'vue'
+import axios from 'axios'
+import hljs from 'highlight.js'
+import importElementComponents from './importElement'
+import importEchartsComponents from './importEchartsComponents'
 // 样式cnd
 import 'github-markdown-css/github-markdown.css'
 import 'nprogress/nprogress.css'
@@ -38,7 +38,7 @@ Vue.prototype.$cookies.set('user_session', 'null')
 // 路由
 const router = useRouter(Vue, VueRouter)
 // 生产环境
-if (env === 'production') {
+if (env === 'production'&& false) {
     try {
         // 全局引入
         Vue.config.productionTip = false
@@ -53,11 +53,11 @@ if (env === 'production') {
         throw Error(e)
     }
 } else {
-    // // 按需引入elementui
-    // importElementComponents(Vue)
-    //
-    // // 按需引入echarts
-    // importEchartsComponents(Vue)
+    // 按需引入elementui
+    importElementComponents(Vue)
+
+    // 按需引入echarts
+    importEchartsComponents(Vue)
     Vue.config.productionTip = false
 
     new Vue({
diff --git a/src/store/index.js b/src/store/index.js
index 3207cd3..b356d36 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,5 @@
-// import Vue from 'vue'
-// import Vuex from 'vuex'
-
+import Vue from 'vue'
+import Vuex from 'vuex'
 
 // import createLogger from '../../../src/plugins/logger'
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 03c7d21..958aa4e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,8 +5,8 @@ export default {
     state: {
     // 用户账号密码
         userInfo: {
-            name: '游客',
-            password: null
+            name: '',
+            password: ''
         }
     },
     getters: {
-- 
GitLab