maa3520 1 жил өмнө
parent
commit
c8741152e0

+ 1 - 0
.env.example

@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=base64:P4gjA5cdsnqEJqTIZo6y5pYz8GgNVsTGdGMgBDxK1U0=
 APP_DEBUG=true
 APP_URL=http://localhost
+APP_TIMEZONE=
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

+ 3 - 1
app/Http/Controllers/DrawController.php

@@ -51,7 +51,9 @@ class DrawController extends Controller
                     'success' => true,
                     'drawList' => $output,
                 ];
-                event(new SetPrizeEvent($remote));
+                if($request->draw_one){
+                    event(new SetPrizeEvent($remote));
+                }
                 return $output;
             } else {
                 return "user not enough";

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 61 - 341
database/MAA.json


+ 2 - 2
database/seeders/CheckInSeeder.php

@@ -39,10 +39,10 @@ class CheckInSeeder extends Seeder
                     'name' => $value->name,
                     'department_id' => $value->department_id,
                     'region' => $region,
-                    'is_checked_in' => false, 
+                    'is_checked_in' => true,
                     'children_count' => $children_count,
                     'is_awarded' => false,
-                    'activity_id' => 1,
+                    'activity_id' => 2,
                     'created_at' => now(),
                     'updated_at' => now(),
                 ]);

+ 56 - 0
database/staff.json

@@ -0,0 +1,56 @@
+[{
+    "user_id": "northdept1",
+    "name": "北區1",
+    "department_id": "xxx"
+},
+{
+    "user_id": "northdept2",
+    "name": "北區2",
+    "department_id": "xxx"
+},
+{
+    "user_id": "northdept3",
+    "name": "北區3",
+    "department_id": "xxx"
+},
+{
+    "user_id": "northdept4",
+    "name": "北區4",
+    "department_id": "xxx"
+},
+{
+    "user_id": "centerdept1",
+    "name": "中區1",
+    "department_id": "xxx"
+},
+{
+    "user_id": "centerdept2",
+    "name": "中區2",
+    "department_id": "xxx"
+},
+{
+    "user_id": "centerdept3",
+    "name": "中區3",
+    "department_id": "xxx"
+},
+{
+    "user_id": "southdept1",
+    "name": "南區1",
+    "department_id": "xxx"
+},
+{
+    "user_id": "southdept2",
+    "name": "南區2",
+    "department_id": "xxx"
+},
+{
+    "user_id": "southdept3",
+    "name": "南區3",
+    "department_id": "xxx"
+},
+{
+    "user_id": "host",
+    "name": "主持人",
+    "department_id": "xxx"
+}
+]

+ 1 - 0
resources/js/src/views/lottery/Draw.vue

@@ -231,6 +231,7 @@ export default {
       }
     },
     draw() {
+        console.log(this.drawOption)
       useJwt.postData('/api/draw/draw', this.drawOption).then(res => {
         if (res.data[0]["user_id"]) {
           this.drawList = res.data;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно