commit

app/admin/controller/many/Many.php

@@ -233,7 +233,7 @@ class Many extends AuthController
         $details['stage'] += 1;
         $details['status'] = 1;
         $details['number'] = 0;//重置额度
-        $details['money'] = $details['money'] * 1.3;//提搞额度130%
+        $details['money'] = intval($details['money'] * 1.3);//提搞额度130%
         $details['suc'] = 0;
         $details['add_time'] = strtotime($data['add_time']);
         $details['end_time'] = strtotime($data['end_time']);

app/api/controller/PublicController.php

@@ -15,6 +15,7 @@ use app\models\user\UserBill;
 use app\models\user\WechatUser;
 use app\Request;
 use crmeb\services\CacheService;
+use crmeb\services\SystemConfigService;
 use crmeb\services\UtilService;
 use crmeb\services\workerman\ChannelService;
 use think\db\exception\DataNotFoundException;
@@ -330,4 +331,25 @@ class PublicController
         return app('json')->successful($list);
     }
 
+    /**
+     * 版本更新
+     * @param Request $request
+     * @return void
+     */
+    public function version(Request $request)
+    {
+        $config = SystemConfigService::more(['version', 'apk']);
+        $data = [
+            'version' => $config['version'],
+            'url' =>   $request->domain().'/'.$config['apk']
+        ];
+        $msg = [
+            'status' => 200,
+            'msg' => 'ok',
+            'data' => $data
+        ];
+        return json_encode($msg, JSON_UNESCAPED_SLASHES);
+
+    }
+
 }

app/api/controller/many/ManyController.php

@@ -96,12 +96,12 @@ class ManyController
                 $user['white_integral'] = 0;
                 $user['purple_integral'] -= ($data['price'] - $white);
                 if ($white > 0){
-                    UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet', $white, 0,0,'使用白积分,投注场次'.$many['name'].'成功');
+                    UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet', $white, 0,0,'使用白积分,投注场次'.$many['name'].'期数'.$many['stage'].'成功');
                 }
-                UserBill::expend('扣除紫积分', $user['uid'], 'purple_integral', 'bet', $data['price']-$white, 0,$user['purple_integral'],'使用紫积分,投注场次'.$many['name'].'成功');
+                UserBill::expend('扣除紫积分', $user['uid'], 'purple_integral', 'bet', $data['price']-$white, 0,$user['purple_integral'],'使用紫积分,投注场次'.$many['name'].'期数'.$many['stage'].'成功');
             }else{
                 $user['white_integral'] -= $data['price'];
-                UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet', $data['price'], 0,$user['white_integral'],'使用白积分,投注场次'.$many['name'].'成功');
+                UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet', $data['price'], 0,$user['white_integral'],'使用白积分,投注场次'.$many['name'].'期数'.$many['stage'].'成功');
             }
             $many['number'] += $data['price'];
             if ($many['number'] >= $many['money']){

app/api/controller/order/StoreOrderController.php

@@ -332,7 +332,6 @@ class StoreOrderController
             if (in_array($order->is_channel, [0, 2]))
                 $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id'];
         }
-
         $order['pay_type'] = $paytype; //重新支付选择支付方式
         switch ($order['pay_type']) {
             case 'weixin':

app/api/controller/user/UserBillController.php

@@ -206,12 +206,12 @@ class UserBillController
                             array(
                                 'url' => $urlCode,     //二维码资源
                                 'stream' => 0,
-                                'left' => 114,
-                                'top' => 790,
+                                'left' => 225,
+                                'top' => 913,
                                 'right' => 0,
                                 'bottom' => 0,
-                                'width' => 120,
-                                'height' => 120,
+                                'width' => 300,
+                                'height' => 300,
                                 'opacity' => 100
                             )
                         ),
@@ -258,24 +258,16 @@ class UserBillController
                     SystemAttachment::where(['name' => $name])->delete();
                 }
                 if (!$imageInfo) {
-                    try {
-                        $qr_code = QrcodeService::getForeverQrcode('spread', $user['uid']);
-                        if (isset($qr_code['url'])) {
-                            $urlCode = $qr_code['url'];
-                        } else {
-                            $codeUrl = set_http_type($siteUrl . '?spread=' . $user['uid'], 1);//二维码链接
-                            $imageInfo = UtilService::getQRCodePath($codeUrl, $name);
-                            if (is_string($imageInfo)) return app('json')->fail('二维码生成失败', ['error' => $imageInfo]);
-                            SystemAttachment::attachmentAdd($imageInfo['name'], $imageInfo['size'], $imageInfo['type'], $imageInfo['dir'], $imageInfo['thumb_path'], 1, $imageInfo['image_type'], $imageInfo['time'], 2);
-                            $urlCode = $imageInfo['dir'];
-                        }
-                    } catch (\Exception $e) {
-                        $codeUrl = set_http_type($siteUrl . '?spread=' . $user['uid'], 1);//二维码链接
-                        $imageInfo = UtilService::getQRCodePath($codeUrl, $name);
-                        if (is_string($imageInfo)) return app('json')->fail('二维码生成失败', ['error' => $imageInfo]);
-                        SystemAttachment::attachmentAdd($imageInfo['name'], $imageInfo['size'], $imageInfo['type'], $imageInfo['dir'], $imageInfo['thumb_path'], 1, $imageInfo['image_type'], $imageInfo['time'], 2);
-                        $urlCode = $imageInfo['dir'];
-                    }
+//                    $qr_code = QrcodeService::getForeverQrcode('spread', $user['uid']);
+//                    if (isset($qr_code['url'])) {
+//                        $urlCode = $qr_code['url'];
+//                    } else {
+                    $codeUrl = set_http_type($siteUrl . '/register?spread=' . $user['uid'], 1);//二维码链接
+                    $imageInfo = UtilService::getQRCodePath($codeUrl, $name);
+                    if (is_string($imageInfo)) return app('json')->fail('二维码生成失败', ['error' => $imageInfo]);
+                    SystemAttachment::attachmentAdd($imageInfo['name'], $imageInfo['size'], $imageInfo['type'], $imageInfo['dir'], $imageInfo['thumb_path'], 1, $imageInfo['image_type'], $imageInfo['time'], 2);
+                    $urlCode = $imageInfo['dir'];
+//                    }
                 } else $urlCode = $imageInfo['att_dir'];
                 if ($imageInfo['image_type'] == 1) $urlCode = $siteUrl . $urlCode;
                 $siteUrl = set_http_type($siteUrl, 1);

app/models/many/ManyOrder.php

@@ -73,7 +73,7 @@ class ManyOrder extends BaseModel
         if ($order){
             foreach ($order as $item)
             {
-                if (strtotime($item['create_time'])+(86400*7) < time()){
+                if (strtotime($item['create_time'])+1800 < time()){
                     $user = User::where('uid', $item['uid'])->find();//用户
                     $user1 = [];
                     $user2 = [];

app/models/store/StoreProduct.php

@@ -58,7 +58,7 @@ class StoreProduct extends BaseModel
         return htmlspecialchars_decode($value);
     }
 
-    public static function getValidProduct($productId, $field = 'add_time,browse,cate_id,code_path,cost,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link')
+    public static function getValidProduct($productId, $field = 'add_time,browse,cate_id,code_path,cost,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link,white_integral,business_integral')
     {
         $Product = self::where('is_del', 0)->where('is_show', 1)->where('id', $productId)->field($field)->find();
         if ($Product) return $Product->toArray();

app/register/view/index/index.html

@@ -52,7 +52,6 @@
         var loginPass = document.getElementById("loginPass").value;
         var code = document.getElementById("code").value;
         var invitation = document.getElementById("invitation").value;
-        var payment_pas = document.getElementById("payment_pas").value;
         if (phone == '') {
             window.alert("请输入账号");
             return false;
@@ -72,7 +71,7 @@
         $.ajax({
             type: "post",
             url: "http://xhg.duolio.cn/api/register",
-            data: {account: phone, captcha: code, password: loginPass, spread: invitation,payment_pas:payment_pas},
+            data: {account: phone, captcha: code, password: loginPass, spread: invitation},
             dataType: "json",
             success: function (data) {
                 window.alert(data.msg);

config/upload.php

@@ -9,9 +9,9 @@ return [
     //上传文件大小
     'filesize' => 2097152,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4','zip'],
     //上传文件类型
-    'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg'],
+    'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg','application/x-zip-compressed'],
     //驱动模式
     'stores' => [
         //本地上传配置

route/api/route.php

@@ -251,7 +251,7 @@ Route::group(function () {
     //获取城市列表
     Route::get('city_list', 'PublicController/city_list')->name('cityList');
     Route::any('alipay/notify', 'AlipayController/notify');//支付支付回调
-
+    Route::get('version', 'PublicController/version')->name('version'); // 版本更新
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);