commit

app/admin/view/user/user/index.php

@@ -330,10 +330,10 @@
             {field: 'pay_count', title: '购买次数',align:'center'},
             {field: 'extract_count_price', title: '累计提现',align:'center'},
             {field: 'integral', title: '商城积分',sort:true,event:'integral',align:'center'},
-            {field: 'white_integral', title: '白积分',sort:true,event:'white_integral',align:'center'},
-            {field: 'purple_integral', title: '紫积分',sort:true,event:'purple_integral',align:'center'},
-            {field: 'green_integral', title: '绿积分',sort:true,event:'green_integral',align:'center'},
-            {field: 'business_integral', title: '商家积分',sort:true,event:'business_integral',align:'center'},
+            {field: 'white_integral', title: '红积分',sort:true,event:'white_integral',align:'center'},
+            {field: 'purple_integral', title: '阳光积分',sort:true,event:'purple_integral',align:'center'},
+            {field: 'green_integral', title: '吉祥积分',sort:true,event:'green_integral',align:'center'},
+            {field: 'business_integral', title: '喜嗨积分',sort:true,event:'business_integral',align:'center'},
             {field: 'paper_ticket', title: '文票',sort:true,event:'paper_ticket',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},

app/api/controller/many/ManyController.php

@@ -85,7 +85,7 @@ class ManyController
         Db::startTrans();
         if ($many['add_time'] > time()){
             $green = ManyGreen::where('uid', $user['uid'])->where('status', 0)->find();
-            if (!$green) return app('json')->fail('你无法提前投注');
+            if (!$green) return app('json')->fail('你无法提前打怪');
             $green['status'] = 1;
         }
         $integral = $user['white_integral'] + $user['purple_integral'];// 白积分加紫积分的总积分