Bladeren bron

Merge branch 'develop_oycj' of Server_Service/17pdf_front_end into master

ouyangchengjun 2 jaren geleden
bovenliggende
commit
d46f964801
3 gewijzigde bestanden met toevoegingen van 8 en 10 verwijderingen
  1. 3 3
      layouts/default.vue
  2. 3 3
      layouts/userCenter.vue
  3. 2 4
      nuxt.config.js

+ 3 - 3
layouts/default.vue

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-10-17 15:11:18
- * @LastEditTime: 2022-10-31 17:58:22
+ * @LastEditTime: 2022-11-10 15:20:31
 -->
 <template>
   <div class="font-primary">
@@ -14,6 +14,6 @@
 </template>
 
 <script lang="ts" setup>
-import Navbar from './components/navbar.vue'
-import FooterBar from './components/FooterBar.vue'
+import Navbar from './components/NavBar.vue'
+import FooterBar from './components/Footerbar.vue'
 </script>

+ 3 - 3
layouts/userCenter.vue

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-11-01 20:18:40
- * @LastEditTime: 2022-11-02 11:08:22
+ * @LastEditTime: 2022-11-10 15:20:36
 -->
 <template>
   <div class="font-primary">
@@ -66,8 +66,8 @@
 
 <script>
 import { mapState } from 'vuex'
-import Navbar from './components/navbar.vue'
-import FooterBar from './components/FooterBar.vue'
+import Navbar from './components/NavBar.vue'
+import FooterBar from './components/Footerbar.vue'
 
 export default {
   components: {

+ 2 - 4
nuxt.config.js

@@ -3,11 +3,9 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-10-17 11:06:52
- * @LastEditTime: 2022-11-09 13:33:17
+ * @LastEditTime: 2022-11-10 15:18:13
  */
 export default {
-  dev: process.env.NODE_ENV !== 'production',
-
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
     title: '17PDF',
@@ -57,7 +55,7 @@ export default {
   axios: {
     timeout: 3000,
     prefix: '/17pdf-backend-core/',
-    proxy: !!dev
+    proxy: process.env.NODE_ENV !== 'production'
   },
   proxy: {
     '/17pdf-backend-core': { target: 'http://81.68.234.235:8999',}