修正多处问题

gym-manage-uniapp/components/index/QuickEntry.vue

@@ -12,26 +12,12 @@
       <text class="entry-title">{{ item.title }}</text>
       <text class="entry-desc">{{ item.desc }}</text>
     </view>
-
-    <view v-if="showCheckInMenu" class="checkin-menu-overlay" @tap="showCheckInMenu = false">
-      <view class="checkin-menu" @tap.stop>
-        <view class="menu-item" @tap="handleStoreCheckIn">
-          <image src="https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/icons/checkIn.png" mode="aspectFit" class="menu-icon" />
-          <text class="menu-text">到店签到</text>
-        </view>
-        <view class="menu-item" @tap="handleGroupCourseCheckIn">
-          <image src="https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/icons/course.png" mode="aspectFit" class="menu-icon" />
-          <text class="menu-text">团课签到</text>
-        </view>
-      </view>
-    </view>
   </view>
 </template>
 
 <script setup>
-import { ref } from 'vue'
-
-const showCheckInMenu = ref(false)
+import { qrSignInGroupCourse } from '@/api/groupCourse.js'
+import { getMemberId } from '@/utils/request.js'
 
 const handleEntryClick = (item) => {
   if (item.title === '签到') {
@@ -53,7 +39,8 @@ const handleEntryClick = (item) => {
       })
       return
     }
-    showCheckInMenu.value = !showCheckInMenu.value
+    // 直接调用扫码签到
+    qrScanSignIn()
   } else if (item.path) {
     if (item.isTabBar) {
       uni.switchTab({
@@ -67,30 +54,57 @@ const handleEntryClick = (item) => {
   }
 }
 
-const handleStoreCheckIn = () => {
-  showCheckInMenu.value = false
-  uni.navigateTo({
-    url: '/pages/checkIn/checkIn'
-  })
-}
-
-const handleGroupCourseCheckIn = () => {
-  showCheckInMenu.value = false
+const qrScanSignIn = () => {
   uni.scanCode({
     onlyFromCamera: true,
-    success: (res) => {
+    success: async (res) => {
       console.log('扫码结果:', res)
-      uni.showToast({
-        title: '扫码成功',
-        icon: 'success'
-      })
+      const qrContent = res.result
+      
+      // 解析二维码内容获取 courseId
+      let courseId = null
+      try {
+        const parsed = JSON.parse(qrContent)
+        courseId = Number(parsed.courseId)
+      } catch {
+        const num = Number(qrContent)
+        if (!isNaN(num)) {
+          courseId = num
+        }
+      }
+
+      if (!courseId) {
+        uni.showToast({ title: '无效的签到二维码', icon: 'none' })
+        return
+      }
+
+      const memberId = getMemberId()
+      if (!memberId) {
+        uni.showToast({ title: '请先登录', icon: 'none' })
+        return
+      }
+
+      uni.showLoading({ title: '签到中...' })
+      try {
+        const result = await qrSignInGroupCourse(courseId, memberId)
+        uni.hideLoading()
+        if (result.success) {
+          uni.showToast({ title: '签到成功', icon: 'success' })
+          setTimeout(() => {
+            uni.navigateTo({ url: '/pages/memberInfo/myCourses' })
+          }, 1200)
+        } else {
+          uni.showToast({ title: result.message || '签到失败', icon: 'none', duration: 3000 })
+        }
+      } catch (e) {
+        uni.hideLoading()
+        console.error('团课签到失败:', e)
+        const errMsg = e?.message || e?.data?.message || '签到失败'
+        uni.showToast({ title: errMsg, icon: 'none', duration: 3000 })
+      }
     },
     fail: (err) => {
       console.error('扫码失败:', err)
-      uni.showToast({
-        title: '扫码失败',
-        icon: 'none'
-      })
     }
   })
 }
@@ -118,15 +132,10 @@ const entries = [
   display: flex;
   justify-content: space-between;
   padding: 32rpx 24rpx;
-  background: rgba(255, 255, 255, 0.55);
-  backdrop-filter: blur(24px);
-  -webkit-backdrop-filter: blur(24px);
+  background: #FFFFFF;
   margin: 24rpx;
   border-radius: 28rpx;
-  box-shadow: 0 8rpx 32rpx var(--shadow-blue-light);
-  border: 1rpx solid rgba(255, 255, 255, 0.7);
-  position: relative;
-  z-index: 3;
+  box-shadow: 0 8rpx 32rpx rgba(45,74,90,0.08);
 }
 
 .entry-item {
@@ -182,93 +191,4 @@ const entries = [
   font-size: 22rpx;
   color: var(--tabbar-text-inactive);
 }
-
-.checkin-menu-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-end;
-  padding-top: 280rpx;
-  padding-right: 60rpx;
-  animation: fadeIn 0.2s ease;
-}
-
-@keyframes fadeIn {
-  from { opacity: 0; }
-  to { opacity: 1; }
-}
-
-@keyframes pulse {
-  0%, 100% { opacity: 1; }
-  50% { opacity: 0.5; }
-}
-
-.checkin-menu {
-  position: absolute;
-  right: 0;
-  top: 140rpx;
-  background: white;
-  border-radius: 24rpx;
-  box-shadow: 0 16rpx 48rpx rgba(0, 0, 0, 0.15);
-  padding: 16rpx;
-  min-width: 320rpx;
-  animation: slideDown 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-  
-  &::before {
-    content: '';
-    position: absolute;
-    top: -24rpx;
-    right: 60rpx;
-    width: 0;
-    height: 0;
-    border-left: 24rpx solid transparent;
-    border-right: 24rpx solid transparent;
-    border-bottom: 24rpx solid white;
-  }
-}
-
-@keyframes slideDown {
-  from {
-    opacity: 0;
-    transform: translateY(-40rpx) scale(0.95);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0) scale(1);
-  }
-}
-
-.menu-item {
-  display: flex;
-  align-items: center;
-  padding: 24rpx 32rpx;
-  border-radius: 16rpx;
-  transition: all 0.2s ease;
-  
-  &:active {
-    background: rgba(0, 0, 0, 0.04);
-    transform: scale(0.98);
-  }
-  
-  & + .menu-item {
-    margin-top: 8rpx;
-  }
-}
-
-.menu-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 20rpx;
-}
-
-.menu-text {
-  font-size: 30rpx;
-  font-weight: 600;
-  color: #2D4A5A;
-}
 </style>