From edf3b3d8ef3a8ece275970fa9245ee99af61a702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=B8=9C=E9=98=B3?= <15147476661@163.com>
Date: Tue, 6 May 2025 16:17:07 +0800
Subject: [PATCH] chore: v3.0.0-4030620241128001

---
 package.json                  |  3 +-
 src/pages/shangke/shangke.vue | 57 ++++++++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index f609ee8..9fbc6d6 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,8 @@
     "dayjs": "^1.11.13",
     "pinia": "^3.0.2",
     "vue": "^3.4.21",
-    "vue-i18n": "^9.1.9"
+    "vue-i18n": "^9.1.9",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
     "@dcloudio/types": "^3.4.8",
diff --git a/src/pages/shangke/shangke.vue b/src/pages/shangke/shangke.vue
index fc1e3ed..d57aeaf 100644
--- a/src/pages/shangke/shangke.vue
+++ b/src/pages/shangke/shangke.vue
@@ -16,7 +16,14 @@
             />
           </view>
           <view v-else-if="item.lx=='activity'">
-
+            <view :style="{backgroundColor:item.color,width:'90vw',height:'70px'}">
+                <view :style="{fontSize:'30px'}">
+              <text :style="{color:'white'}">{{item.showname}}</text>
+               </view>
+              <view :style="{fontSize:'15px'}">
+                <text :style="{color:'white'}">{{item.title}}</text>
+              </view>
+              </view>
           </view>
         </li>
       </ul>
@@ -30,13 +37,15 @@
 
 <script setup>
 import { onMounted, onUnmounted } from 'vue'
+
 import io from '@hyoga/uni-socket.io'
 import { ref } from 'vue'
+import {onLoad} from "@dcloudio/uni-app";
 
 // 课堂活动and PPT
 const kctivityAndPPT = ref([
   {lx:'ppt',id:1,name:'PPT展示1',src:'https://img11.360buyimg.com/n1/s720x720_jfs/t1/303510/33/1806/82651/6815a7a6F2e5d77b6/08d231a86927b0ce.jpg'},
-  {lx :'activity',id:2,name:'课堂活动1',src:'https://img11.360buyimg.com/n1/s720x720_jfs/t1/303510/33/1806/82651/6815a7a6F2e5d77b6/08d231a86927b0ce.jpg'}
+  {lx :'activity',id:2,name:'课堂活动1',lxA:'讨论',color:'green',showname:'课程讨论',title:'历史为什么选择了中国共产党'}
 ])
 
 
@@ -45,19 +54,33 @@ const kctivityAndPPT = ref([
 let socket
 
 // 初始化连接
-onMounted((options) => {
-  console.log(options)
-  socket = io('ws://localhost:3400', { 
-    transports: ['websocket'],
-    auth: {
-      xuehao: "202413501062",
-      sf: "stu",
-      kch: options.kch,
-      kctime: options.kctime,
-      k_id: options.uuid,
-    } 
-  })
-
+onLoad((options) => {
+console.log('load',options)
+  console.log(kctivityAndPPT.value)
+  socket = null;
+  if(options) {
+   socket= io('ws://localhost:3400', {
+      transports: ['websocket'],
+      auth: {
+        xuehao: "202413501062",
+        sf: "stu",
+        kch: options.kch,
+        kctime: options.kctime,
+        k_id: options.uuid,
+      }
+    })
+  }else {
+    socket= io('ws://localhost:3400', {
+      transports: ['websocket'],
+      auth: {
+        xuehao: "202413501062",
+        sf: "stu",
+        kch: "nokch",
+        kctime: "nokctime",
+        k_id: "nouuid",
+      }
+    })
+  }
   // 监听事件
   socket.on('connect', () => console.log('Socket 已连接'))
   socket.on('server', (data) => {
@@ -92,4 +115,8 @@ const sendData = () => {
 .container {
   padding: 20rpx;
 }
+.classactivetitle{
+  font-size: 32rpx
+;
+}
 </style>