Browse Source

修正 drawable.data

maa3606 2 năm trước cách đây
mục cha
commit
86d63d0ad5
2 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 3 2
      resources/js/src/views/lottery/Draw.vue
  2. 0 1
      routes/api.php

+ 3 - 2
resources/js/src/views/lottery/Draw.vue

@@ -130,7 +130,7 @@ export default {
     }
   },
   created() {
-    useJwt.postData('/api/activity/getActivity', { id: this.activityId }).then(res => {
+    useJwt.postData('/api/activity/show', { activity_id: this.activityId }).then(res => {
       this.activity = res.data;
     });
 
@@ -225,7 +225,7 @@ export default {
     draw() {
       useJwt.postData('/api/draw/draw_user', { deadline: this.activity.deadline, region: this.region, number: this.drawNumber }).then(res => {
         useJwt.postData('/api/prize/prizeDrawable', { prizeId: this.prizeId, number: this.drawNumber }).then(drawable => {
-          if (drawable) {
+          if (drawable.data) {
             var userIdList=[];
             res.data.forEach(element => {
               this.drawList.push({ userId: element.user_id, userName: element.name, department: this.departmentList[element.department_id] });
@@ -239,6 +239,7 @@ export default {
               this.count(this.drawList);
             });
           } else {
+            this.hideModal();
             console.log("prize is not available.");
           }
         });

+ 0 - 1
routes/api.php

@@ -97,7 +97,6 @@ Route::middleware(['auth:sanctum', 'abilities:Admin'])->group(function () {
     Route::post('/activity/claim', [ActivityController::class, 'claim']);
     Route::post('/activity/isClaimed', [RecipientsController::class, 'isClaimed']);
     Route::post('/activity/uploadFile', [ActivityController::class, 'uploadFile']);
-    Route::post('/activity/getActivity', [ActivityController::class, 'get_activity_by_id']);
     Route::post('/activity/show', [ActivityController::class, 'show']);
 
     // CheckIn