From 55665046e3d38ec59b786807ab5706b043d594d9 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Sun, 24 Sep 2023 13:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                 |  3 ++-
 .env.production                                  |  2 +-
 src/router/index.js                              |  2 +-
 src/views/volunteer/integralConversion/index.vue | 13 +++++++------
 vue.config.js                                    |  4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 397fb47..671bd08 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,8 @@ ENV = 'development'
 
 # 若依管理系统/开发环境
 # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
-VUE_APP_BASE_API = 'http://192.168.0.108:9034'
+# VUE_APP_BASE_API = 'http://192.168.0.108:9034'
+VUE_APP_BASE_API = 'http://39.101.188.84:9034'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index b4893b0..52cfbc7 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://39.101.188.84:9034'
diff --git a/src/router/index.js b/src/router/index.js
index 71907b6..413233f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -177,7 +177,7 @@ Router.prototype.replace = function push(location) {
 }
 
 export default new Router({
-  mode: 'history', // 去掉url中的#
+  // mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })
diff --git a/src/views/volunteer/integralConversion/index.vue b/src/views/volunteer/integralConversion/index.vue
index 9fd11ea..40cd86f 100644
--- a/src/views/volunteer/integralConversion/index.vue
+++ b/src/views/volunteer/integralConversion/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-22 14:15:06
+ * @LastEditTime: 2023-09-24 10:33:30
 -->
 <template>
   <div class="mainBox">
@@ -110,25 +110,26 @@ export default {
     padding: 20px 0 0 0;
   }
   .convert-content {
+    height: 100%;
     .integral-lists {
       // display: flex;
       // flex-wrap: wrap;
       margin-top: 30px;
       display: grid;
-      grid-template-columns: repeat(5, 230px);
+      grid-template-columns: repeat(5, 19%);
       grid-column-gap: 25px;
       grid-row-gap: 25px;
-      height: 491px;
+      height: 80%;
       .list {
-        width: 230px;
-        height: 233.2px;
+        width: 100%;
+        height: 100%;
         // background: linear-gradient(0deg, #EFE6D9, #DDC9AC);
         box-shadow: 0px 3px 15px 0px rgba(184,184,184,0.22);
         border-radius: 10px;
         .list-top {
           // background: url('../../../assets/images/icon1.png') no-repeat center center;
           background-size: 100% 100%;
-          height: 188px;
+          height: 80%;
           width: 100%;
         }
         // .top-two {
diff --git a/vue.config.js b/vue.config.js
index 3972068..b369899 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/demo/volunteer" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -42,7 +42,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.108:9034`,
+        target: `http://39.101.188.84:9034`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",