Merge branch 'master' of http://10.1.1.202:3030/steve07s/lottery

resources/js/src/libs/acl/ability.js

@@ -33,11 +33,17 @@ export const defineRulesFor = (user) => {
             break;
         case 'User':
             can('read', 'all');
-            can('upload','blog')
+            can('upload', 'blog')
             cannot('read', 'permission');
             cannot('read', '模板');
             cannot('read', '管理功能');
             break;
+        case 'Draw':
+        case 'Checkin':
+            can('read', 'all');
+            cannot('read', '管理功能');
+            cannot('read', 'permission');
+            break;
         case 'Trainer':
             break;
         default:

resources/js/src/views/lottery/Activities/ActivityPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <b-row class="match-height">
-            <b-col md="6" :lg="lg">
+            <b-col v-if="checkinPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -9,7 +9,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col md="6" :lg="lg">
+            <b-col v-if="drawPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -17,7 +17,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col md="6" :lg="lg">
+            <b-col v-if="drawPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -26,7 +26,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col md="6" :lg="lg">
+            <b-col v-if="checkinPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -34,7 +34,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col md="6" :lg="lg">
+            <b-col v-if="checkinPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -43,7 +43,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col v-if="this.userData.role == 'Admin'" md="6" :lg="lg">
+            <b-col v-if="drawPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -51,7 +51,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col v-if="this.userData.role == 'Admin'" md="6" :lg="lg">
+            <b-col  v-if="checkinPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -59,7 +59,7 @@
                     </b-card-body>
                 </b-card>
             </b-col>
-            <b-col v-if="this.userData.role == 'Admin'" md="6" :lg="lg">
+            <b-col  v-if="checkinPage.includes(this.userData.role)" md="6" :lg="lg">
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
@@ -103,6 +103,9 @@ export default {
         return {
             userData: getUserData(),
             lg: 0,
+            adminPage: ['Admin'],
+            drawPage: ['Admin', 'Draw'],
+            checkinPage: ['Admin', 'Draw', 'Checkin'],
         }
     },
     created() {

resources/js/src/views/lottery/Slot.vue

@@ -519,7 +519,7 @@ body {
 
 body {
 	background-color: white;
-	background-image: url('/MAA02a.jpg');
+	background-image: url('http://127.0.0.1:3000/MAA03.jpg');
 	background-size: 100%;
 	background-repeat: no-repeat;
 	background-position: left top;
@@ -544,20 +544,20 @@ body::-webkit-scrollbar {
 }
 
 .slot {
-	width: 780px;
+	width: 970px;
 	height: 250px;
 	position: absolute;
-	top: 410px;
+	top: 425px;
 	color: black;
-	left: 491px;
+	left: 380px;
 }
 
 .slot-text-dep {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	height: 250px;
-	width: 340px;
+	height: 260px;
+	width: 330px;
 	font-size: 46px;
 	-webkit-text-stroke: 1px white;
 	font-weight: bold;
@@ -567,18 +567,18 @@ body::-webkit-scrollbar {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	height: 250px;
-	width: 230px;
-	font-size: 56px;
+	height: 260px;
+	width: 330px;
+	font-size: 80px;
 	-webkit-text-stroke: 1px white;
 	font-weight: bold;
 }
 
 .prize {
 	position: absolute;
-	left: 524px;
-	top: 252px;
-	width: 746px;
+	left: 390px;
+	top: 280px;
+	width: 950px;
 }
 
 .prize-text {
@@ -640,15 +640,15 @@ body::-webkit-scrollbar {
 	height: 123px;
 	background-color: rgba(0, 0, 0, 0);
 	position: absolute;
-	right: 380px;
-	top: 261px;
+	right: 330px;
+	top: 288px;
 	border: 0px;
 }
 
 .func-group {
 	position: absolute;
-	bottom: 10px;
-	left: 500px;
+	bottom: 95px;
+	left: 460px;
 	width: 800px;
 }
 
@@ -664,8 +664,8 @@ body::-webkit-scrollbar {
 
 .counter {
 	position: absolute;
-	bottom: 5px;
-	left: 5px;
+	top: 75px;
+	left: 100px;
 }
 
 .counter-text {

routes/api.php

@@ -92,12 +92,10 @@ Route::middleware('auth:sanctum')->group(function () {
 Route::middleware(['auth:sanctum', 'abilities:Admin'])->group(function () {
 
     //activity
-    Route::post('/activity/list', [ActivityController::class, 'index']);
     Route::post('/activity/store', [ActivityController::class, 'store']);
     Route::post('/activity/update', [ActivityController::class, 'update']);
     Route::post('/activity/sql', [ActivityController::class, 'sql']);
     Route::post('/activity/uploadFile', [ActivityController::class, 'uploadFile']);
-    Route::post('/activity/show', [ActivityController::class, 'show']);
 
     // CheckIn
     Route::post('/check_in/update', [CheckInController::class, 'update']);
@@ -110,7 +108,6 @@ Route::middleware(['auth:sanctum', 'abilities:Admin'])->group(function () {
     Route::post('/draw/store', [DrawController::class, 'store']);
     Route::post('/draw/donate', [DrawController::class, 'donate']);
     Route::post('/draw/test', [DrawController::class, 'test']);
-    Route::post('/draw/search_user_status', [DrawController::class, 'search_user_status']);
 
     // Prize
     Route::post('/prize/store', [PrizeController::class, 'store']);
@@ -129,4 +126,7 @@ Route::post('/prize/index_by_activity', [PrizeController::class, 'index_by_activ
 Route::post('/check_in/index_by_activity', [CheckInController::class, 'index_by_activity']);
 Route::post('/recipients/index_by_activity', [RecipientsController::class, 'index_by_activity']);
 
-Route::post('/recipients/export', [RecipientsController::class, 'export']);
+Route::post('/recipients/export', [RecipientsController::class, 'export']);
+Route::post('/draw/search_user_status', [DrawController::class, 'search_user_status']);
+Route::post('/activity/list', [ActivityController::class, 'index']);
+Route::post('/activity/show', [ActivityController::class, 'show']);