Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd

frontend/src/pages.json

@@ -3,7 +3,7 @@
     {
       "path": "pages/index/index",
       "style": {
-        "navigationBarTitleText": "uni-app"
+        "navigationBarTitleText": "趣味运动会"
       }
     },
     {
@@ -101,7 +101,7 @@
   ],
   "globalStyle": {
     "navigationBarTextStyle": "#000000",
-    "navigationBarTitleText": "uni-app",
+    "navigationBarTitleText": "趣味运动会",
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#F8F8F8"
   },
@@ -118,7 +118,7 @@
     "list": [
       {
         "pagePath": "pages/index/index",
-        "text": "组件",
+        "text": "首页",
         "iconfont": {
           "text": "\ue64d",
           "selectedText": "\ue64d",

frontend/src/pages/activity/wonderfulMoment/index.vue

@@ -24,6 +24,7 @@ const viewData = ref(null);
 function getWonderfulMoment() {
   request.post('/platform/activity/wonderfulMoment/getWonderfulMomentById/' + momentId.value).then(res=>{
     if(res.code === 0){
+      res.data.content = res?.data?.content.replaceAll('/open/file/upload/download?filepath=','')
       viewData.value = res.data
     }else{
       Toast({message: res.msg, theme: 'error'});

frontend/src/pages/index/index.vue

@@ -106,6 +106,7 @@
 
 <script setup>
 import {onMounted, ref} from "vue";
+import {onLoad, onShow} from "@dcloudio/uni-app";
 import {Toast} from "tdesign-mobile-vue";
 import {useRequest} from "@/utils/request";
 import moment from "moment";
@@ -152,14 +153,9 @@ function handleWonderfulMoment(row) {
   })
 }
 
-onMounted(() => {
+onShow(() => {
   getActivity()
   getWonderfulMoment()
-  uni.showToast({
-    title: '欢迎使用',
-    icon: 'none',
-    duration: 2000
-  })
 })
 
 

frontend/src/pages/login/index.vue

@@ -52,7 +52,7 @@
       </div>
 
       <view class="title-content">
-        <text class="main-title">HELLO,</text>
+        <text class="main-title">第二届“钟声杯”直属工会趣味运动会</text>
         <view class="sub-title-container">
           <text class="sub-title">欢迎使用</text>
         </view>

frontend/src/pages/login/register.vue

@@ -53,7 +53,7 @@
       </div>
 
       <view class="title-content">
-        <text class="main-title">JOIN US</text>
+        <text class="main-title">第二届“钟声杯”直属工会趣味运动会</text>
         <view class="sub-title-container">
           <text class="sub-title">用户注册</text>
         </view>

frontend/src/utils/config.js

@@ -1,3 +1,3 @@
 export const config = {
- fileDomain: 'http://localhost',
+ fileDomain: 'https://3skj.ltd',
 }

frontend/src/utils/routerInterceptor.js

@@ -90,7 +90,7 @@ async function routeInterceptor(args, whiteList) {
         } else {
             console.log('拦截导航，跳转到登录页')
             // 保存用户尝试访问的页面，以便登录后跳回
-            uni.setStorageSync('REDIRECT_URL', targetUrl + args.query)
+            uni.setStorageSync('REDIRECT_URL', targetUrl)
 
             Dialog.confirm({
                 title: '提示',
@@ -122,6 +122,7 @@ export const getDefaultWhiteList = () => {
     return [
         '/pages/index/index',
         '/pages/login/index',
-        '/pages/login/register'
+        '/pages/login/register',
+        '/pages/activity/list/index'
     ]
 }

frontend/vite.config.js

@@ -28,13 +28,13 @@ export default defineConfig({
     }
   },
   server: {
-    https: {
+  /*  https: {
       cert: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2.pem')),
       key: fs.readFileSync(path.join(__dirname, 'src/ssl/localhost+2-key.pem'))
-    },
+    },*/
     proxy: {
       '/api': {
-        target: 'http://192.168.41.118:9090',
+        target: 'http://119.91.224.39:9090/',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, '')
       }