wyk/juipphp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代理商界面修改

Browse Source
This commit is contained in:
“wanyongkang”
2023-11-01 18:04:25 +08:00
parent 8f9cbbf6bb
commit 0f1ffa68d0
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/agent/controller/Account.php
View File

@@ -19,8 +19,10 @@ class Account extends Controller
if (isset($_GET['PageIndex'])) { if (isset($_GET['PageIndex'])) {
$page = ($_GET['PageIndex'] - 1) * 50; $page = ($_GET['PageIndex'] - 1) * 50;
} }
$where = []; $where['DeleteTag'] = 0;
$where_str = ' (UserCode='.$agent_phone.' OR agent_id='.$agent_id.') '; $where['agent_id']=$agent_id;
$where_str = '';
//处理筛选 //处理筛选
if($get_data['UserId'] != 0){ if($get_data['UserId'] != 0){
@@ -38,7 +40,11 @@ class Account extends Controller
if (!empty($_GET['Btime'])){ if (!empty($_GET['Btime'])){
$date1 = date('Y-m-d', strtotime($_GET['Btime'])); $date1 = date('Y-m-d', strtotime($_GET['Btime']));
$date2 = date('Y-m-d', strtotime($_GET['Etime'])); $date2 = date('Y-m-d', strtotime($_GET['Etime']));
$where_str .= " AND EndTime>='" . $date1 . "' and EndTime<='" . $date2 . "' ";
if (mb_strlen($where_str)>0){
$where_str .= ' AND ';
}
$where_str .= " EndTime>='" . $date1 . "' and EndTime<='" . $date2 . "' ";
} }
if (!empty($_GET['Bktime'])){ if (!empty($_GET['Bktime'])){
if (mb_strlen($where_str)>0){ if (mb_strlen($where_str)>0){
@@ -56,7 +62,7 @@ class Account extends Controller
$account_model = new ProductAccountModel; $account_model = new ProductAccountModel;
$list = $account_model->getAgentListPage($where,$where_str, '*', 'id desc', "$page,50"); $list = $account_model->getAgentListPage($where,$where_str, '*', 'id desc', "$page,50");
foreach ($list as &$info){ foreach ($list as &$info){
$endtime = strtotime($info['EndTime']); $endtime = strtotime($info['EndTime']);
if($endtime <= time()){ if($endtime <= time()){
@@ -68,7 +74,6 @@ class Account extends Controller
$info['UserCode'] = $info['UserPhone']?$info['UserPhone']:$info['UserCode']; $info['UserCode'] = $info['UserPhone']?$info['UserPhone']:$info['UserCode'];
} }
$data = [ $data = [
'Code' => 10000, 'Code' => 10000,
'Data' => $list, 'Data' => $list,

2
app/agent/controller/Order.php
View File

@@ -21,7 +21,7 @@ class Order extends Controller
} }
$where = []; $where = [];
$where_str = ''; $where_str = '';
$where_str = ' (UserName='.$agent_phone.' OR agent_id='.$agent_id.') '; $where['agent_id']=$agent_id;
if(!empty($get_data['ProductIds'])){ if(!empty($get_data['ProductIds'])){
$where['ProductId'] = $get_data['ProductIds']; $where['ProductId'] = $get_data['ProductIds'];

4
app/agent/controller/Userinfo.php
View File

@@ -137,8 +137,7 @@ class Userinfo extends Controller
$where['agent_id'] = $this->userinfo['OperaterID']; $where['agent_id'] = $this->userinfo['OperaterID'];
$user_model = new UserModel; $user_model = new UserModel;
$discount_model = new ProductPriceScheme; $discount_model = new ProductPriceScheme;
$user_list = $user_model->getListPage($where, '*', 'id desc', "$page,50"); $user_list = $user_model->getListPage($where, '`LoginCode`,`RestAmount`,`discount_id`,`CreateTime`,`QQ`,`Wx`,`TaoBao`,`Email`,`Id`,`id_code`,`is_verify`', 'id desc', "$page,50");
//折扣列表 //折扣列表
$discount_data = $discount_model->getList(); $discount_data = $discount_model->getList();
@@ -150,7 +149,6 @@ class Userinfo extends Controller
} }
foreach ($user_list as &$info){ foreach ($user_list as &$info){
$info['Password'] = '';
if(empty($info['id_code'])){ if(empty($info['id_code'])){
$info['is_verify'] = '未认证'; $info['is_verify'] = '未认证';
} else { } else {