修复：批量开课上传数据错误一直loading

src/views/modules/reportList/FullYearCalendarCoin.vue

@@ -175,6 +175,11 @@ export default {
               val: "kecheng2",
               realTitle: "购买商品实物、课程"
             },
+            {
+              title: "购买VIP商品",
+              val: "vip",
+              realTitle: "购买商品VIP"
+            },
             {title:'报名培训班',val:'train',realTitle: "购买商品培训班"},
             // {title:'报名VIP',val:'vip'},
             { title: "后台扣费", val: "deduction" }

src/views/modules/reportList/FullYearCalendarCourse.vue

@@ -66,14 +66,11 @@
               <span style="margin-left: 10px;color: #333;letter-spacing: 0.5px;" v-if="index==0" :style="{
                   color: getAmount(item, index, month) == 0 ? '#888' : '#333'
                 }">
-            
-              {{ getAmount(item,index,month) }}
-            </span>
+                {{ getAmount(item,index,month) }}
+              </span>
               <span style="margin-left: 10px;color: #333;letter-spacing: 0.5px;" v-if="index==1">
-            
-              {{ month.total[0][item.val] }}
-            </span>
-            
+                {{ month.total[0][item.val] }}
+              </span>
             </li>
            
           </div>
@@ -136,31 +133,28 @@ export default {
       showCurrentMonthDate: "",
       allMonthData: [],
       list: [
-        { title: "收入", val: "jing",bg:'#1bff000a',
-        list: [
-            { title: "后台微信", val: "weixin", realTitle: "后台微信" },
-            { title: "后台支付宝", val: "alipay", realTitle: "后台支付宝" },
-            { title: "后台海外", val: "haiwai", realTitle: "后台海外支付" },
-            { title: "后台银行转账", val: "", realTitle: "后台银行支付" },
-            { title: "后台其他", val: "other", realTitle: "后台其他" },
-            { title: "App微信", val: "appweixin", realTitle: "微信" },
-            {
-              title: "App支付宝",
-              val: "appalipay",
-              realTitle: "支付宝"
-            },
-            { title: "App天医币", val: "appapple", realTitle: "天医币" }
+        { 
+          title: "收入", val: "jing",bg:'#1bff000a',
+          list: [
+              { title: "后台微信", val: "weixin", realTitle: "后台微信" },
+              { title: "后台支付宝", val: "alipay", realTitle: "后台支付宝" },
+              { title: "后台海外", val: "haiwai", realTitle: "后台海外支付" },
+              { title: "后台银行转账", val: "", realTitle: "后台银行支付" },
+              { title: "后台其他", val: "other", realTitle: "后台其他" },
+              { title: "后台天医币", val: "", realTitle: "后台天医币" },
+              { title: "App微信", val: "appweixin", realTitle: "微信" },
+              { title: "App支付宝", val: "appalipay", realTitle: "支付宝" },
+              { title: "App天医币", val: "appapple", realTitle: "天医币" }
           ]
-      
-      },
-        { title: "摊销", val: "chu",bg:'#ffc1070f',list:[
-          {title:'金额',val:'fee'},
-          {title:'已摊销',val:'alreadyTanxiao'},
-          {title:'月摊销',val:'currentTanxiao'},
-          {title:'剩余摊销',val:'surplusTanxiao'},
-         
-        ] },
-       
+        },
+        { title: "摊销", val: "chu",bg:'#ffc1070f',
+          list:[
+            {title:'金额',val:'fee'},
+            {title:'已摊销',val:'alreadyTanxiao'},
+            {title:'月摊销',val:'currentTanxiao'},
+            {title:'剩余摊销',val:'surplusTanxiao'},
+          ]
+        },
       ],
       weekDays: ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
       monthNames: [

src/views/modules/user/user-add-course.vue

@@ -267,15 +267,16 @@
             file: this.dataForm.file
           })
         }).then(({ data }) => {
+          this.dataListLoading = false;
           if (data && data.code === 0) {
             if(data.result&&data.result.has.length>0){
               this.resultStatus = true;
               this.resultData = data.result;
-              this.dataListLoading = false;
+            } else {
+              this.$message.warning(`没有有效的数据，请检查核对文件模板和数据后重新上传`);
             }
           }else{
             this.$message.error('文件解析有误');
-            this.dataListLoading = false;
           }
         });
       },

src/views/modules/user/user.vue

@@ -26,6 +26,7 @@
           <el-option label="中医VIP" value="4"></el-option>
           <el-option label="针灸VIP" value="5"></el-option>
           <el-option label="肿瘤VIP" value="6"></el-option>
+          <el-option label="中西汇通VIP" value="9"></el-option>
           <el-option label="国学VIP" value="7"></el-option>
           <el-option label="心理学VIP" value="8"></el-option>
         </el-select>
@@ -696,7 +697,8 @@ export default {
         5: "针灸VIP",
         6: "肿瘤VIP",
         7: "国学VIP",
-        8: "心理学VIP"
+        8: "心理学VIP",
+        9: "中西汇通VIP"
       };
 
       // 将 userVips 转为数组形式，以便处理（如果是数字则转为数字数组）
@@ -709,8 +711,8 @@ export default {
         vipTypes = userVips.map(vip => vip.type); // 如果是对象数组，获取每个对象的 type
       }
 
-      // 判断是否同时包含 4、5、6（医学SVIP）
-      const hasMedicalSVip = [4, 5, 6].every(type => vipTypes.includes(type));
+      // 判断是否同时包含 4、5、6、9（医学SVIP）
+      const hasMedicalSVip = [4, 5, 6, 9].every(type => vipTypes.includes(type));
       // 判断是否同时包含 7、8（心理学SVIP）
       const hasPsychologySVip = [7, 8].every(type => vipTypes.includes(type));
 
@@ -737,7 +739,7 @@ export default {
             vipMap[type] &&
             !(
               (
-                (hasMedicalSVip && [4, 5, 6].includes(type)) || // 医学SVIP已显示，排除 4、5、6
+                (hasMedicalSVip && [4, 5, 6, 9].includes(type)) || // 医学SVIP已显示，排除 4、5、6、9
                 (hasPsychologySVip && [7, 8].includes(type))
               ) // 心理学SVIP已显示，排除 7、8
             )