Browse Source

充值提现

zac3533 1 year ago
parent
commit
a5e316282a

+ 9 - 8
application/admin/controller/Dashboard.php

@@ -31,8 +31,8 @@ class Dashboard extends Backend
         $column = [];
         $starttime = Date::unixtime('day', -6);
         $endtime = Date::unixtime('day', 0, 'end');
-        $joinlist = Db("user")->where('jointime', 'between time', [$starttime, $endtime])
-            ->field('jointime, status, COUNT(*) AS nums, DATE_FORMAT(FROM_UNIXTIME(jointime), "%Y-%m-%d") AS join_date')
+        $joinlist = Db("users")->where('create_time', 'between time', [$starttime, $endtime])
+            ->field('create_time, status, COUNT(*) AS nums, DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m-%d") AS join_date')
             ->group('join_date')
             ->select();
         for ($time = $starttime; $time <= $endtime;) {
@@ -53,17 +53,18 @@ class Dashboard extends Backend
                 $totalworkingaddon += 1;
             }
         }
+        // prevtime
         $this->view->assign([
             'totaluser'         => User::count(),
             'totaladdon'        => $totaladdon,
             'totaladmin'        => Admin::count(),
             'totalcategory'     => \app\common\model\Category::count(),
-            'todayusersignup'   => User::whereTime('jointime', 'today')->count(),
-            'todayuserlogin'    => User::whereTime('logintime', 'today')->count(),
-            'sevendau'          => User::whereTime('jointime|logintime|prevtime', '-7 days')->count(),
-            'thirtydau'         => User::whereTime('jointime|logintime|prevtime', '-30 days')->count(),
-            'threednu'          => User::whereTime('jointime', '-3 days')->count(),
-            'sevendnu'          => User::whereTime('jointime', '-7 days')->count(),
+            'todayusersignup'   => User::whereTime('create_time', 'today')->count(),
+            'todayuserlogin'    => User::whereTime('create_time', 'today')->count(),
+            'sevendau'          => User::whereTime('create_time', '-7 days')->count(),
+            'thirtydau'         => User::whereTime('create_time', '-30 days')->count(),
+            'threednu'          => User::whereTime('create_time', '-3 days')->count(),
+            'sevendnu'          => User::whereTime('create_time', '-7 days')->count(),
             'dbtablenums'       => count($dbTableList),
             'dbsize'            => array_sum(array_map(function ($item) {
                 return $item['Data_length'] + $item['Index_length'];

+ 2 - 0
application/admin/controller/general/Config.php

@@ -44,6 +44,8 @@ class Config extends Backend
     {
         $siteList = [];
         $groupList = ConfigModel::getGroupList();
+
+        //dump($groupList);die;
         foreach ($groupList as $k => $v) {
             $siteList[$k]['name'] = $k;
             $siteList[$k]['title'] = $v;

+ 2 - 2
application/admin/controller/user/Group.php

@@ -38,8 +38,8 @@ class Group extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $list = $this->model
-                //->with('group')
-                ->where($where)
+           
+                ->where($where)->where('is_agent', 1)
                 ->order($sort, $order)
                 ->paginate($limit);
             // foreach ($list as $k => $v) {

+ 8 - 6
application/admin/lang/zh-cn/goods/goods.php

@@ -1,10 +1,12 @@
 <?php
 
 return [
-    'Title'   => '标题',
-    'Price'   => '价格',
-    'Img_url' => '产品图片',
-    'Status'  => '启用状态',
-    'Createtime'      => '添加时间',
-    'Updatetime'      => '更新时间',
+    'Title'             => '标题',
+    'Price'             => '价格',
+    'Img_url'           => '产品图片',
+    'Status'            => '启用状态',
+    'Createtime'        => '添加时间',
+    'Updatetime'        => '更新时间',
+    'Enable'            => '启用',
+    'Off shelf'         => '下架',
 ];

+ 9 - 9
application/admin/lang/zh-cn/user/group.php

@@ -5,13 +5,13 @@ return [
     'Invitation_code'           => '邀请码',
     'Agent_in_usdt'             => 'USDT充值开关',
     'Agent_in_bank'             => '银行卡充值开关',
-    'Agent_in_bank'             => '银行卡充值开关',
-
-
-    
-    'Change service_link'       => '客服链接',
-    'Team'                      => '团队',
-    'Createtime'      => '添加时间',
-    'Updatetime'      => '更新时间',
-    'Status'          => '状态'
+    'Agent_out_usdt'            => 'USDT提现开关',
+    'Agent_out_bank'            => '银行卡提现开关',
+    'Service_link'              => '客服链接',
+    'Team'                      => '团队人数',
+    'Createtime'                => '添加时间',
+    'Updatetime'                => '更新时间',
+    'Status'                    => '状态',
+    'Open'                      => '开启',
+    'Close'                     => '关闭'
 ];

+ 10 - 1
application/admin/lang/zh-cn/user/user.php

@@ -7,7 +7,7 @@ return [
     'Parent_id'             => '上级',
     'Balance'               => '余额',
     'Freeze'                => '冻结金额',
-    'Task'                  => '任务',
+    'Task'                  => '本轮已做任务',
     'Invitation_code'       => '邀请码',
     'Is_agent'              => '代理',
     'User_type'             => '用户类型',
@@ -16,5 +16,14 @@ return [
     'Withdrawal'            => '提现',
     'Income'                => '收益',
     
+    'Yes'                   => '是',
+    'No'                    => '否',
+    'Dummy'                 => '假人',
+    'Real person'           => '真人',
+    'Locking'               => '锁定',
+
+
+
+
 
 ];

+ 18 - 11
application/admin/view/goods/goods/add.html

@@ -1,5 +1,5 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+<form id="add-form" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-horizontal">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -12,22 +12,29 @@
             <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">
         </div>
     </div>
+
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Img_url')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-img_url" class="form-control" name="row[img_url]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label for="c-img_url" class="control-label col-xs-12 col-sm-2">{:__('Img_url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-status" class="form-control" name="row[status]" type="number">
+            <div class="input-group">
+                <input id="c-img_url" data-rule="" class="form-control" size="50" name="row[img_url]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-img_url" class="btn btn-danger faupload" data-input-id="c-img_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-img_url"><i class="fa fa-upload"></i> 上传</button></span>
+                    <span><button type="button" id="fachoose-img_url" class="btn btn-primary fachoose" data-input-id="c-img_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 选择</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-img_url"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-img_url"></ul>
         </div>
     </div>
+
+
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
         </div>
-    </div>
+    </div></div>
 </form>

+ 14 - 11
application/admin/view/goods/goods/edit.html

@@ -1,5 +1,5 @@
-<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+<form id="edit-form" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-horizontal">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -13,21 +13,24 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Img_url')}:</label>
+        <label for="c-img_url" class="control-label col-xs-12 col-sm-2">{:__('Img_url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-img_url" class="form-control" name="row[img_url]" type="text" value="{$row.img_url|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+            <div class="input-group">
+                <input id="c-img_url" data-rule="" class="form-control" size="50" name="row[img_url]" type="text" value="{$row.img_url|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-img_url" class="btn btn-danger faupload" data-input-id="c-img_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-img_url"><i class="fa fa-upload"></i> 上传</button></span>
+                    <span><button type="button" id="fachoose-img_url" class="btn btn-primary fachoose" data-input-id="c-img_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 选择</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-img_url"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-img_url"></ul>
         </div>
     </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
         </div>
-    </div>
+    </div> </div>
 </form>

+ 2 - 8
application/admin/view/user/group/index.html

@@ -6,14 +6,8 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh,add,edit,del')}
-                        <div class="dropdown btn-group {:$auth->check('user/group/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
-                        </div>
+                 
+              
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('user/group/edit')}"

+ 4 - 3
application/extra/site.php

@@ -23,10 +23,11 @@ return array (
   'configgroup' => 
   array (
     'basic' => 'Basic',
+    'user'  => '充值配置',
+    'example' => '提现配置',
     'email' => 'Email',
-    'dictionary' => 'Dictionary',
-    'user' => 'User',
-    'example' => 'Example',
+    //'dictionary' => 'Dictionary',
+  
   ),
   'attachmentcategory' => 
   array (

+ 2 - 2
public/assets/js/backend/goods/goods.js

@@ -28,8 +28,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
-                        {field: 'img_url', title: __('Img_url'), operate: 'LIKE', formatter: Table.api.formatter.url},
-                        {field: 'status', title: __('Status')},
+                        {field: 'img_url', title: __('Img_url'), events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('Enable'),"0":__('Off shelf')}, formatter: Table.api.formatter.toggle},
                         {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

+ 8 - 9
public/assets/js/backend/user/group.js

@@ -21,10 +21,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
             Table.api.init({
                 extend: {
                     index_url: 'user/group/index',
-                    add_url: 'user/group/add',
-                    edit_url: 'user/group/edit',
-                    del_url: 'user/group/del',
-                    multi_url: 'user/group/multi',
                     table: 'user_group',
                 }
             });
@@ -40,11 +36,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'name', title: __('Name')},
-                        {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                        
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+                        {field: 'mobile', title: __('Mobile')},
+                        {field: 'invitation_code', title: __('Invitation_code')},
+                        {field: 'agent_in_usdt', title: __('Agent_in_usdt'), searchList: {0: __('Close'), 1: __('Open')} , formatter: Table.api.formatter.status},
+                        {field: 'agent_in_bank', title: __('Agent_in_bank'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
+                        {field: 'agent_out_usdt', title: __('Agent_out_usdt'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
+                        {field: 'agent_out_bank', title: __('Agent_out_bank'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
+                        {field: 'service_link', title: __('Service_link')},
+                        {field: 'team_num', title: __('Team')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 4 - 4
public/assets/js/backend/user/user.js

@@ -31,16 +31,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'parent_id', title: __('Parent_id'), operate: 'BETWEEN', sortable: true},
                         {field: 'balance', title: __('Balance'), operate: 'BETWEEN', sortable: true},
                         {field: 'freeze', title: __('Freeze'), operate: 'BETWEEN', sortable: true},
-                        {field: 'lock_task', title: __('Task'), formatter: Table.api.formatter.search},
+                        {field: 'task_num', title: __('Task'), formatter: Table.api.formatter.search},
 
                         {field: 'id', title: __('Recharge'), operate: 'BETWEEN', sortable: true},
                         {field: 'id', title: __('Withdrawal'), operate: 'BETWEEN', sortable: true},
                         {field: 'id', title: __('Income'), operate: 'BETWEEN', sortable: true},
 
                         {field: 'invitation_code', title: __('Invitation_code'), formatter: Table.api.formatter.search},
-                        {field: 'is_agent', title: __('Is_agent'), searchList: {1: __('Male'), 0: __('Female')}},
-                        {field: 'user_type', title: __('User_type'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}},
+                        {field: 'is_agent', title: __('Is_agent'), searchList: {1: __('Yes'), 0: __('No')}, formatter: Table.api.formatter.status},
+                        {field: 'user_type', title: __('User_type'), formatter: Table.api.formatter.status, searchList: {0: __('Dummy'), 1: __('Real person')}},
+                        {field: 'is_lock', title: __('Status'), formatter: Table.api.formatter.status, searchList: {0: __('Normal'), 1: __('Locking')}},