1

src/pages/activity/activeSignUpList.vue

@@ -171,16 +171,16 @@
             <span v-if="props.row.ApplyForCancelStatus===2">拒绝</span>
           </q-td>
         </template>
-        <!-- <template v-slot:body-cell-optioned="props">
-          <q-td :props="props">
+        <template v-slot:body-cell-optioned="props">
+          <q-td :props="props"  v-if="props.row.IsApplyForCancel==1">
             <div>
               <q-btn  flat size="xs" icon="edit"
-                color="accent" style="font-weight:400" label="编辑" @click="editQuotation(props.row)" />
+                color="accent" style="font-weight:400" label="同意" @click="editQuotation(props.row)" />
                  <q-btn  flat size="xs" icon="edit"
-                color="accent" style="font-weight:400" label="删除" @click="delType(props.row)" />
+                color="accent" style="font-weight:400" label="拒绝" @click="delType(props.row)" />
             </div>
           </q-td>
-        </template> -->
+        </template>
         <template v-slot:bottom>
           <!-- <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" /> -->
@@ -202,8 +202,8 @@
         msg: {
           pageIndex: 1,
           pageSize: 10,
-         ActivityName:"",
-         ActivityId:0
+          ActivityId:0,
+          EnrollState:3
         },
         pageCount: 0,
         columns: [
@@ -276,11 +276,11 @@
             field:"Remark",
             align: "left"
           },            
-        //   {
-        //     name: 'optioned',
-        //     label: '操作',
-        //     align: "left"
-        //   }
+          {
+            name: 'optioned',
+            label: '操作',
+            align: "left"
+          }
         ],
         showForm:false,
         typeObj:{}

src/pages/activity/activityList.vue

@@ -136,15 +136,14 @@
 </style>
 <template>
   <div class="page-body activeType">
-    <div class="page-search row items-center">
+    <div class="page-search row items-center flex">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
-        <div class="col-12">
+        <div class="col-3">
           <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ActivityName" label="活动名称"
             @clear="resetSearch" maxlength="20" />
         </div>
-      </div>
-      <div class="col row wrap q-mr-lg q-col-gutter-md">
-         <div class="col-12 Sysuser_Date">
+       
+         <div class="col-3 Sysuser_Date">
           <q-field filled>
              <template v-slot:control>
               <el-date-picker
@@ -157,9 +156,7 @@
             </template>
           </q-field>
          </div>
-      </div>
-       <div class="col row wrap q-mr-lg q-col-gutter-md">
-         <div class="col-12 Sysuser_Date">
+         <div class="col-3 Sysuser_Date">
           <q-field filled>
              <template v-slot:control>
               <el-date-picker
@@ -173,7 +170,17 @@
             </template>
           </q-field>
          </div>
+           <div class="col-3 ">
+           <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.SelectIsEnd" class="col-6 q-pr-lg q-pr-lg" :options="statusOpts"
+            emit-value map-options label="状态" @change="resetSearch"/>
+         </div>
       </div>
+      <!-- <div class="col row wrap q-mr-lg q-col-gutter-md">
+        
+      </div>
+       <div class="col row wrap q-mr-lg q-col-gutter-md">
+         
+      </div> -->
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
@@ -236,13 +243,13 @@
               </div>
           </q-td>
         </template>
-        <template v-slot:body-cell-JoinNum="props">
+        <!-- <template v-slot:body-cell-JoinNum="props">
           <q-td :props="props">
               <div>
                         {{props.row.JoinNum}} 人
               </div>
           </q-td>
-        </template>
+        </template> -->
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <div>
@@ -347,9 +354,29 @@ import ActiveForm from '../../components/activity/active-from'
           ActivityName: '',
           SelectStartTimeStr:"",
           SelectEndTimeStr:"",
+          SelectIsEnd:-1,
         },
         pageCount: 0,
         activityTypeList:[],
+         statusOpts:[
+          {
+            label: "全部",
+            value: -1
+          },
+          {
+            label: "未开始",
+            value: 0
+          },
+          {
+            label: "已结束",
+            value: 1
+          },
+          {
+            label: "进行中",
+            value: 2
+          },
+         ],
+      
         columns: [{
             name: "Id",
             label: "编号",
@@ -397,12 +424,12 @@ import ActiveForm from '../../components/activity/active-from'
             field:"ActivityStatusStr",
             align: "left"
           },
-           {
-            name: "JoinNum",
-            label: "报名人数",
-            field:"JoinNum",
-            align: "left"
-          },
+          //  {
+          //   name: "JoinNum",
+          //   label: "报名人数",
+          //   field:"JoinNum",
+          //   align: "left"
+          // },
           {
             name: 'optioned',
             label: '操作',

src/pages/activity/materialMan.vue

@@ -109,7 +109,8 @@
                       :content="item.Name" placement="top-start">
                       <div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''"
                         class="el-tooltip item material-item ">
-                        <img :src="getIconLink(item.Image)" class="material-img" style="width: 140px; height: 140px;">
+                        <!-- <img :src="getIconLink(item.Image)" class="material-img" style="width: 140px; height: 140px;"> -->
+                         <img src="../../assets/images/active/bofang.jpg" class="material-img" style="width: 140px; height: 140px;">
                         <div class="material-video-info"><i class="el-icon-video-play"></i>
                           <span>{{Time(item.VideoTime)}}</span></div>
                         <div flex="dir:left" style="margin-top: 5px;display:flex">
@@ -526,7 +527,6 @@
         });
       },
       UploadImage(file) {
-
         this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
             this.Success('上传成功')
@@ -555,17 +555,18 @@
       //   })
       // },
       UploadVideo(file) {
-
+        var that = this;
         this.UploadFileToTencent(this.FileType().Video, file.file, res => {
           if (res.resultCode == 1) {
-            this.Success('上传成功')
+           this.Success('上传成功')
             console.log(561,res)
-            // if (this.addpageMsg.Type == 2) {
-            //   this.addpageMsg.Image = res.FileUrl;
-            // }
-            // this.addpageMsg.Path = res.FileUrl;
-            // this.addpageMsg.Name = res.FileName;
-            // this.addPageList();
+            if (this.addpageMsg.Type == 2) {
+              this.addpageMsg.Image = "";
+            }
+            this.addpageMsg.Path = res.FileUrl;
+            this.addpageMsg.Name = res.FileName;
+            this.addPageList();
+            this.$forceUpdate();
           }
         })
       },
@@ -639,82 +640,9 @@
           );
         }).catch(() => {});
       },
-      // HYGroup(item) {
-      //   let that = this;
-      //   that.$confirm('是否还原?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.apipostDS('/api/product/SetMaterialGroupRestore', {
-      //         GroupId: item.Id
-      //       },
-      //       res => {
-      //         if (res.data.resultCode === 1) {
-      //           this.GetMemberGradeList();
-      //           this.Success(res.data.message)
-      //         } else {
-      //           this.Error(res.data.message);
-      //         }
-      //       },
-      //       null
-      //     );
-      //   }).catch(() => {});
-      // },
-      HsGroup(item) {
-        // let that = this;
-        // that.$confirm('是否删除?', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   this.apipostDS('/api/product/SetMaterialGroupRecycled', {
-        //       GroupId: item.Id
-        //     },
-        //     res => {
-        //       if (res.data.resultCode === 1) {
-        //         this.GetMemberGradeList();
-        //         this.Success(res.data.message)
-
-        //       } else {
-        //         this.Error(res.data.message);
-        //       }
-        //     },
-        //     null
-        //   );
-        // }).catch(() => {});
-      },
-      DeleteGroup(item) {
-        // let that = this;
-        // that.$confirm('是否删除?', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   this.apipostDS('/api/product/DelMaterialGroupInfo', {
-        //       GroupId: item.Id
-        //     },
-        //     res => {
-        //       if (res.data.resultCode === 1) {
-        //         this.GetMemberGradeList();
-        //         this.Success(res.data.message)
-
-        //       } else {
-        //         this.Error(res.data.message);
-        //       }
-        //     },
-        //     null
-        //   );
-        // }).catch(() => {});
-      },
+     
       addGroup() {
         this.addGroupMsgDig = true;
-        // this.addGroupMsg = {
-        //   Id: 0,
-        //   Name: '',
-        //   Type: this.commonType,
-        //   Sort: '',
-        // }
         this.addGroupMsg.Id = 0
         this.addGroupMsg.Name = ""
         this.addGroupMsg.Type = this.commonType
@@ -800,13 +728,16 @@
         }
         return num;
       },
+      //截取视频第一帧
        captureImage(video) {
          let canvas = document.createElement('canvas')
         //  canvas.width = video.videoWidth
         //  canvas.height = video.videoHeight
          canvas.width = '140px'
          canvas.height = '140px'
-         canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height)
+          let ctx=canvas.getContext('2d')
+          console.log(816,ctx)
+          ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
          return canvas.toDataURL('image/png')
        }
     },