diff --git a/admin/yarn.lock b/admin/yarn.lock
index b2d349fe..78f03853 100644
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -226,10 +226,10 @@
resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.10.tgz"
integrity sha512-ygEZ1mwPjcPo/OulhzLE7mtDrQBWI8vZzEWSNB2W/RNCRjoQGwbaK4N8lV4rid7Ts4qvySU3njMN7YCiSlSaTQ==
-"@esbuild/darwin-x64@0.16.17":
+"@esbuild/linux-x64@0.16.17":
version "0.16.17"
- resolved "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz"
- integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==
+ resolved "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz"
+ integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==
"@eslint/eslintrc@^1.4.1":
version "1.4.1"
@@ -2040,11 +2040,6 @@ fs.realpath@^1.0.0:
resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-fsevents@~2.3.2:
- version "2.3.3"
- resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz"
- integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
function-bind@^1.1.2:
version "1.1.2"
resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
diff --git a/uniapp/pages-market/clue/class_arrangement.vue b/uniapp/pages-market/clue/class_arrangement.vue
index b1211481..eafe5058 100644
--- a/uniapp/pages-market/clue/class_arrangement.vue
+++ b/uniapp/pages-market/clue/class_arrangement.vue
@@ -95,9 +95,9 @@
校区:{{ course.campus_name || '未设置' }}
教室:{{ course.venue ? course.venue.venue_name : '未设置' }}
- 班级:{{ course.class_id ? course.classmodel.class_name : '未设置' }}
+ 班级:{{ course.class_id && course.classmodel ? course.classmodel.class_name : '未设置' }}
人数:{{ course.available_capacity || 0 }}
- 安排情况:{{ course.student ? course.student.length : 0 }}/{{course.max_students ? course.max_students : '不限'}}
+ 安排情况:{{ course.student && Array.isArray(course.student) ? course.student.length : 0 }}/{{course.max_students ? course.max_students : '不限'}}
+
+
+ 新资源
+
-
-
+
+
- {{ v.customerResource.name }}
- {{ v.customerResource.phone_number }}
+
+ {{ v.customerResource.name }}
+ {{ v.customerResource.phone_number }}
+
所属校区:{{ v.customerResource.campus_name }}
@@ -127,18 +133,24 @@
+
+
+ 新资源
+
-
+
✓
-
+
- {{v.customerResource.name}}
+
+ {{v.customerResource.name}}
+
@@ -1570,6 +1582,41 @@
border-radius: 16rpx;
display: flex;
flex-direction: column;
+ position: relative;
+ overflow: hidden;
+ }
+
+ /* 状态水印样式 */
+ .status-watermark {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: linear-gradient(135deg, #ff6b35, #ff5722);
+ color: #fff;
+ font-size: 16rpx;
+ font-weight: 600;
+ padding: 4rpx 16rpx;
+ z-index: 10;
+ box-shadow: 0 2rpx 8rpx rgba(255, 107, 53, 0.4);
+ letter-spacing: 0.5rpx;
+ border-radius: 0 0 8rpx 0;
+ animation: watermarkGlow 2s ease-in-out infinite;
+ min-width: 60rpx;
+ text-align: center;
+ line-height: 1.3;
+ white-space: nowrap;
+ }
+
+ @keyframes watermarkGlow {
+ 0%, 100% {
+ box-shadow: 0 2rpx 8rpx rgba(255, 107, 53, 0.3);
+ }
+ 50% {
+ box-shadow: 0 4rpx 16rpx rgba(255, 107, 53, 0.5);
+ }
+ }
+
+ .card {
.card-content {
display: flex;
@@ -1671,8 +1718,9 @@
.card-text {
font-size: 32rpx;
- padding-left: 16rpx;
color: #fff;
+ margin: 0;
+ padding: 0;
}
.card-label {
@@ -1687,14 +1735,34 @@
.card-con {
font-size: 30rpx;
- padding: 8rpx 10rpx 8rpx 16rpx;
+ padding: 8rpx 16rpx 8rpx 8rpx;
color: #fff;
}
.card-con-span {
font-size: 24rpx;
color: #a47332;
- padding-left: 12rpx;
+ margin: 0;
+ padding: 0;
+ }
+
+ /* 用户信息行样式 */
+ .user-info-row {
+ display: flex !important;
+ align-items: center !important;
+ padding: 30rpx 16rpx 12rpx 8rpx !important;
+ gap: 12rpx;
+
+ .user-avatar {
+ flex-shrink: 0;
+ }
+
+ .user-details {
+ flex: 1;
+ display: flex !important;
+ align-items: center !important;
+ gap: 16rpx;
+ }
}
.drop-image-x {
@@ -1892,7 +1960,8 @@
}
.batch_checkbox {
- margin-right: 20rpx;
+ margin-right: 12rpx;
+ margin-left: -74rpx;
padding: 8rpx;
}