Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

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);
     }
 }

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);

template/uni-app/pages/users/wechat_login/index.vue

@@ -22,11 +22,11 @@
 				<!-- #endif -->
 				<!-- #ifdef MP -->
 				<button hover-class="none" v-if="mp_is_new" @tap="userLogin"
-					class="bg-green btn1">{{$t(`微信登录`)}}</button>
+					class="bg-green btn1">{{$t(`授权登录`)}}</button>
 				<button v-else-if="canUseGetUserProfile && code" hover-class="none" @tap="getUserProfile"
-					class="bg-green btn1">{{$t(`微信登录`)}}</button>
+					class="bg-green btn1">{{$t(`授权登录`)}}</button>
 				<button v-else hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo"
-					class="bg-green btn1">{{$t(`微信登录`)}}</button>
+					class="bg-green btn1">{{$t(`授权登录`)}}</button>
 				<!-- #endif -->
 				<!-- <button hover-class="none" @click="phoneLogin" class="btn2">{{$t(`手机号登录`)}}</button> -->
 			</view>