提交代码

src/app/admin/activate/activate-list/activate-list.component.html

@@ -70,12 +70,13 @@
         <thead nzSingleSort>
         <tr>
             <th nzWidth="50px">编号</th>
-            <th nzWidth="80px">活动标题</th>
+            <th nzWidth="150px">活动标题</th>
-            <th nzWidth="80px">活动类型</th>
+            <th nzWidth="70px">活动类型</th>
+            <th nzWidth="100px">开始时间</th>
+            <th nzWidth="100px">结束时间</th>
             <th nzWidth="100px">创建时间</th>
-            <th nzWidth="100px">更新时间</th>
+            <th nzWidth="80px" nzRight>活动状态</th>
-            <th nzWidth="70px" nzRight>活动状态</th>
+            <th nzWidth="120px" nzRight>操作</th>
-            <th nzWidth="80px" nzRight>操作</th>
         </tr>
         </thead>
         <tbody>
@@ -83,15 +84,20 @@
             <td>{{i+1}}</td>
             <td>{{data.title}}</td>
             <td>{{data.type | type}}</td>
+            <td>{{data.startTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{data.endTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
-            <td>{{data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td nzRight>{{data.status | status}}</td>
             <td nzRight class="table-td-operation">
-                <a (click)="getEdit(data.id)">编辑</a>
+                <a *ngIf="data.status != 3" (click)="getEdit(data.id)">编辑</a>
-                <nz-divider nzType="vertical"></nz-divider>
+                <a (click)="startActivity(data.id)" *ngIf="data.status == 1">发布</a>
-                <a (click)='getForbiddenUser(data.id , data.status)'>{{data.status === 1 ? '禁用': '启用'}}</a>
+                <a (click)="endActivity(data.id)" *ngIf="data.status == 2">结束</a>
-                <nz-divider nzType="vertical"></nz-divider>
+                <a nz-dropdown [nzDropdownMenu]="menu">更多操作<i nz-icon nzType="down"></i></a>
-                <a (click)='jumpLotteryRecord(data.id )'>中奖记录</a>
+                <nz-dropdown-menu #menu="nzDropdownMenu">
+                    <ul nz-menu nzSelectable>
+                       <li nz-menu-item><a (click)='jumpLotteryRecord(data.id )'>中奖记录</a></li>
+                    </ul>
+                </nz-dropdown-menu>
             </td>
         </tbody>
     </nz-table>

src/app/admin/activate/activate-list/activate-list.component.scss

@@ -0,0 +1,3 @@
+.table-td-operation a {
+  margin-right: 8px;
+}

src/app/admin/activate/activate-list/activate-list.component.ts

@@ -72,16 +72,26 @@ export class ActivateListComponent implements OnInit {
     this.searchForm.reset();
   }
 
-  public getForbiddenUser(id, status: any): void {
+  // 活动开始
-    const message = (status === 1 ? '是否禁用当前公司' : '是否启用当前公司');
+  public startActivity(id: number): void {
-
+    this.activate.startActivity({activityId : id}, data => {
-    const s = status === 1 ? 0 : 1;
+      if (data['return_code'] === '000000') {
+        this.message.success(data['return_msg']);
+        this.getRequest(true, this.searchForm.value);
+      } else  {
+        this.message.error(data['return_msg']);
+      }
+    });
+  }
 
-    this.common.showConfirm(message, data => {
+  // 活动结束
-      if (data) {
+  public endActivity(id: number): void {
-        this.company.editStatus(id, s , dataUser => {
+    this.activate.endActivity({activityId : id}, data => {
-          this.getRequest(false , this.searchForm.value);
+      if (data['return_code'] === '000000') {
-        });
+        this.message.success(data['return_msg']);
+        this.getRequest(true, this.searchForm.value);
+      } else  {
+        this.message.error(data['return_msg']);
       }
     });
   }

src/app/services/activate.service.ts

@@ -60,7 +60,29 @@ export class ActivateService {
    * @param callBack
    */
   public getWinLotteryList(param: object, callBack) {
-    this.http.get(environment.baseUrl + 'activity/getWinLotteryList?' + this.common.getWhereCondition(param)).subscribe(data => {
+    this.http.get(environment.baseUrl + 'activityAward/getWinLotteryList?' + this.common.getWhereCondition(param)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 活动开始
+   * @param param 参数
+   * @param callBack
+   */
+  public startActivity(param: object, callBack) {
+    this.http.post(environment.baseUrl + 'activity/startActivity', param).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+  /**
+   * 活动结束
+   * @param param 参数
+   * @param callBack
+   */
+  public endActivity(param: object, callBack) {
+    this.http.post(environment.baseUrl + 'activity/endActivity', param).subscribe(data => {
       callBack(data);
     });
   }