Q-ABAB 2 gadi atpakaļ
vecāks
revīzija
a1189fa820

+ 1 - 0
src/views/activityManage/makerActvity.vue

@@ -464,6 +464,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
             page:this.Page.nowPage,
             lim:this.Page.lim,
           }).then(res=>{
+            console.log(res.data)
             let data = res.data;
             if(data[0].length==0&&data[4][0]['total']!=0){
               this.Page.nowPage = 1;

+ 2 - 1
src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,8 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload=="0");
+                    console.log(res.data[0])
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.endProject==0);
 
                 }).catch(err=>{
                     this.$message.error(err.message)

+ 1 - 5
src/views/activityManage/makerActvityDetails.vue

@@ -563,12 +563,8 @@ export default {
         this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
+          this.selectInput.project = res.data[0].filter(item=>item.endProject==0);
           this.loading = false
-          this.selectInput.project = res.data[0].filter(item=>{
-            if(item.courseId==this.tableData.pid)return true;
-            if(item.isupload=="0")return true;
-            return false
-          });
         }).catch(err=>{
             this.$message.error(err.message)
         })