diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index a1e58ca..241e912 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -249,7 +249,7 @@
-
+
+
+
+ -
+
+
+
+
+
@@ -333,22 +341,22 @@
-->
-
+
- -
+ -
-
-
- 超级VIP
+
+
+
-
+
@@ -750,6 +758,45 @@
}
},
methods: {
+ computedVipType(userVips) {
+ if (!userVips || userVips.length === 0) return '';
+
+ const vipMap = {
+ 4: '中医',
+ 5: '针灸',
+ 6: '肿瘤',
+ 7: '国学',
+ 8: '心理学'
+ };
+
+ const vipTypes = userVips.map(vip => vip.type);
+ const isMedicalVip = vipTypes.some(type => [4, 5, 6].includes(type));
+ const isPsychologyVip = vipTypes.some(type => [7, 8].includes(type));
+
+ // 特殊情况:医学 + 心理学
+ if (isMedicalVip && isPsychologyVip) {
+ return `医学SVIP
+ 国学与心理学SVIP`;
+ }
+
+ // 只有医学VIP
+ if (isMedicalVip) {
+ return `医学超级VIP`;
+ }
+
+ // 只有心理学VIP
+ if (isPsychologyVip) {
+ return `国学与心理学超级VIP`;
+ }
+
+ // **普通情况**:单独展示所有 `type` 对应的内容
+ return vipTypes
+ .filter(type => vipMap[type]) // 过滤出有对应名称的类型
+ .map(type => `${vipMap[type]}`)
+ .join(' ');
+},
+
+
changeFilterPresale(){
this.pageIndex = 1
this.getDataList()
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index f4edaf4..ea881f3 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -60,11 +60,19 @@
{{
scope.row.nickname ? scope.row.nickname : "暂无用户名"
}}-
- 普通用户
+ >
+
+
+ -
+
+
+
+
+
+