diff --git a/crmeb/app/adminapi/controller/PublicController.php b/crmeb/app/adminapi/controller/PublicController.php
index 1bc31e70f..d13091ba9 100644
--- a/crmeb/app/adminapi/controller/PublicController.php
+++ b/crmeb/app/adminapi/controller/PublicController.php
@@ -68,7 +68,7 @@ class PublicController
if ($service->cacheDriver()->get('scan_upload') != $uploadToken) {
return app('json')->fail(410086);
}
- $service->upload($pid, $file, $upload_type, $type, '', $uploadToken);
+ $service->upload((int)$pid, $file, $upload_type, $type, '', $uploadToken);
return app('json')->success(100032);
}
}
diff --git a/crmeb/app/services/activity/lottery/LuckLotteryServices.php b/crmeb/app/services/activity/lottery/LuckLotteryServices.php
index a5114ede3..0bd1f2d36 100644
--- a/crmeb/app/services/activity/lottery/LuckLotteryServices.php
+++ b/crmeb/app/services/activity/lottery/LuckLotteryServices.php
@@ -210,7 +210,9 @@ class LuckLotteryServices extends BaseServices
$luckPrizeServices = app()->make(LuckPrizeServices::class);
$data = [];
$sort = 1;
+ $prizeStatus = false;
foreach ($prizes as $prize) {
+ if (isset($prize['type']) && $prize['type'] == 1) $prizeStatus = true;
$prize = $luckPrizeServices->checkPrizeData($prize);
$prize['lottery_id'] = $lottery->id;
unset($prize['id']);
@@ -219,6 +221,9 @@ class LuckLotteryServices extends BaseServices
$data[] = $prize;
$sort++;
}
+ if (!$prizeStatus) {
+ throw new AdminException('必须设置至少一个未中奖');
+ }
if (!$luckPrizeServices->saveAll($data)) {
throw new AdminException(400536);
}
@@ -261,7 +266,9 @@ class LuckLotteryServices extends BaseServices
$insert = [];
$time = time();
$sort = 1;
+ $prizeStatus = false;
foreach ($newPrizes as $prize) {
+ if (isset($prize['type']) && $prize['type'] == 1) $prizeStatus = true;
$prize = $luckPrizeServices->checkPrizeData($prize);
$prize['sort'] = $sort;
if (isset($prize['id']) && $prize['id']) {
@@ -280,6 +287,9 @@ class LuckLotteryServices extends BaseServices
}
$sort++;
}
+ if (!$prizeStatus) {
+ throw new AdminException('必须设置至少一个未中奖');
+ }
if ($insert) {
if (!$luckPrizeServices->saveAll($insert)) {
throw new AdminException(100022);
diff --git a/template/uni-app/pages/users/wechat_login/index.vue b/template/uni-app/pages/users/wechat_login/index.vue
index b0e010a20..dd0b978f1 100644
--- a/template/uni-app/pages/users/wechat_login/index.vue
+++ b/template/uni-app/pages/users/wechat_login/index.vue
@@ -22,11 +22,11 @@
+ class="bg-green btn1">{{$t(`授权登录`)}}
+ class="bg-green btn1">{{$t(`授权登录`)}}
+ class="bg-green btn1">{{$t(`授权登录`)}}