anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 b6944cb2a791009bab69f19d5528db3b06b2af50 1 个父辈 5cd6cfce
1 个管道 的构建 通过 耗费 1 秒

后台修改

内嵌 并排对比
正在显示 12 个修改的文件 包含 124 行增加 和 17 行删除
... ... @@ -14,7 +14,7 @@ class SalesmanController extends AdminBaseController{
if($this -> request -> isPost()){
$where = [
'status' => 2
'a.status' => 2
];
if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
$start_time = strtotime($_POST['start_time']);
... ... @@ -25,9 +25,10 @@ class SalesmanController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['b.phone'] = $keyword;
}
$data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where($where) -> paginate(12);
$data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where($where) -> group('a.id') -> paginate(12);
}else{
$data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where('status',2) -> paginate(12);
$data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where('a.status',2) -> group('a.id') -> paginate(12);
}
$data_arr = $data -> toArray();
... ... @@ -316,6 +317,14 @@ class SalesmanController extends AdminBaseController{
}
}
foreach ($data_arr['data'] as $key => $val){
$money_income = Db::name('money_income') -> where('uid',$val['uid']) -> select();
$m_money = 0;
foreach ($money_income as $key1 => $val1){
$m_money += $val1['money'];
}
$data_arr['data'][$key]['money'] = $m_money;
}
$this -> assign('data',$data);
$this -> assign('data_arr',$data_arr['data']);
return $this -> fetch();
... ... @@ -350,6 +359,7 @@ class SalesmanController extends AdminBaseController{
$salesman_id = $id['salesman_id'];
$data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where("a.status = 4 and a.pid =".$teacher_id) -> paginate(12);
}
$this -> assign('salesman_id',$salesman_id);
$this -> assign('teacher_id',$teacher_id);
$this -> assign('data',$data);
... ... @@ -357,6 +367,17 @@ class SalesmanController extends AdminBaseController{
}
/**
* 业务员余额明细表
*/
public function salesman_money(){
$uid = $this -> request -> param();
$data = Db::name('money_income') -> where('uid',$uid['uid']) -> select();
$this -> assign('data',$data);
return $this -> fetch();
}
... ...
... ... @@ -85,6 +85,15 @@ class UsersController extends AdminBaseController{
}
}
foreach ($data_arr['data'] as $key => $val){
$money_income = Db::name('money_income') -> where('uid',$val['uid']) -> select();
$m_money = 0;
foreach ($money_income as $key1 => $val1){
$m_money += $val1['money'];
}
$data_arr['data'][$key]['money'] = $m_money;
}
$this -> assign('data',$data);
$this -> assign('data_arr',$data_arr['data']);
return $this -> fetch();
... ... @@ -124,8 +133,17 @@ class UsersController extends AdminBaseController{
}
/**
* 显示余额明细页
*/
public function users_money(){
$uid = $this -> request -> param();
$data = Db::name('money_income') -> where('uid',$uid['uid']) -> select();
$this -> assign('data',$data);
return $this -> fetch();
}
... ...
... ... @@ -56,7 +56,9 @@
<a href="{:url('Salesman/salesman_goods_list',array('uid'=>$vo.uid))}"><button type="button" class="btn btn-default">商品管理</button></a>
<a href="{:url('Salesman/teacher_list',array('id'=>$vo.id))}"><button type="button" class="btn btn-default">下线名单</button></a>
<button type="button" class="btn btn-default">余额明细</button>
<a href="{:url('Salesman/salesman_money',array('uid'=>$vo.uid))}">
<button type="button" class="btn btn-default">余额明细</button>
</a>
</td>
</tr>
</volist>
... ...
<include file="public@header"/>
</head>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li><a href="{:url('Salesman/salesman_list')}">业务员列表</a></li>
<li class="active"><a href="#">余额明细列表</a></li>
</ul>
<table class="table table-bordered">
<thead>
<tr>
<th>收入时间</th>
<th>金额</th>
</tr>
</thead>
<tbody>
<volist name="data" id="vo">
<tr>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
<td>{$vo.money}</td>
</tr>
</volist>
</tbody>
</table>
</div>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -34,7 +34,6 @@
<tr>
<th>序号</th>
<th>学生</th>
<th>累计收益</th>
<th>创建时间</th>
</tr>
</thead>
... ... @@ -43,7 +42,6 @@
<tr>
<td>{$vo.id}</td>
<td>{$vo.user_nickname}</td>
<td>560001</td>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
</tr>
</volist>
... ...
... ... @@ -42,7 +42,7 @@
<tr>
<td>{$vo.id}</td>
<td>{$vo.user_nickname}</td>
<td>560001</td>
<td>{$vo.money}</td>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
<td style="width: 100px;">
<a href="{:url('Salesman/student_list',array('teacher_id'=>$vo.id,'salesman_id'=>$salesman_id))}"><button type="button" class="btn btn-default">下线名单</button></a>
... ...
... ... @@ -28,6 +28,7 @@
<option value="3">已完成</option>
<option value="2">未完成</option>
<option value="4">待付款</option>
<option value="5">已发货</option>
</select>
业务员:
<select name="uid" class="form-control">
... ... @@ -94,6 +95,8 @@
<td>未完成</td>
<elseif condition="$vo.state eq 3"/>
<td>已完成</td>
<elseif condition="$vo.state eq 5"/>
<td>已发货</td>
</if>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
<td style="width: 130px;">
... ...
... ... @@ -32,7 +32,6 @@
<tr>
<th>序号</th>
<th>学生</th>
<th>累计收益</th>
<th>创建时间</th>
</tr>
</thead>
... ... @@ -41,7 +40,6 @@
<tr>
<td>{$vo.id}</td>
<td>{$vo.user_nickname}</td>
<td>560001</td>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
</tr>
</volist>
... ...
... ... @@ -41,7 +41,7 @@
<tr>
<td>{$vo.id}</td>
<td>{$vo.user_nickname}</td>
<td>560001</td>
<td>{$vo.money}</td>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
</tr>
</volist>
... ...
... ... @@ -90,9 +90,13 @@
<button type="button" class="btn btn-default" style="background-color: red;">没有下线</button>
</if>
<if condition="$val.status eq 2">
<button type="button" class="btn btn-default">余额明细</button>
<a href="{:url('Users/users_money',array('uid'=>$val.uid))}">
<button type="button" class="btn btn-default">余额明细</button>
</a>
<elseif condition="$val.status eq 3"/>
<button type="button" class="btn btn-default">余额明细</button>
<a href="{:url('Users/users_money',array('uid'=>$val.uid))}">
<button type="button" class="btn btn-default">余额明细</button>
</a>
<else/>
<button type="button" class="btn btn-default" style="background-color: red;">没有余额</button>
</if>
... ...
<include file="public@header"/>
</head>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li><a href="{:url('Users/user_list')}">用户列表</a></li>
<li class="active"><a href="#">余额明细列表</a></li>
</ul>
<table class="table table-bordered">
<thead>
<tr>
<th>收入时间</th>
<th>金额</th>
</tr>
</thead>
<tbody>
<volist name="data" id="vo">
<tr>
<td>{$vo.create_time|date="Y-m-d H:i:s",###}</td>
<td>{$vo.money}</td>
</tr>
</volist>
</tbody>
</table>
</div>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -240,21 +240,30 @@
var price = parseFloat($(this).parents(".order_newsTxt3").children(".de_topTxt1_1").text().split("￥")[1]);
calcTotal();
});
// 单选
$(".sh_cartround img").each(function() {
$(this).on("click", function() {
$('.order_newsUl li').each(function() {
var length = $(".sh_cartround img").length;
$(this).find('.sh_cartround img').click(function() {
var flag = 1;
for (var i = 0; i < $(".sh_cartround img").length; i++) {
flag += Number($(".sh_cartround img").eq(i).attr('src') == "__TMPL__/public/assets/images/39.png");
}
if (length === flag) {
$(".shop_carts1 img").attr('src', "__TMPL__/public/assets/images/39.png");
} else {
$(".shop_carts1 img").attr('src', "__TMPL__/public/assets/images/39_1.png");
}
if ($(this).attr("src") == "__TMPL__/public/assets/images/39_0.png") {
$(this).attr("src", "__TMPL__/public/assets/images/39.png");
$(this).parent().addClass('add');
calcTotal();
} else {
$(this).attr("src", "__TMPL__/public/assets/images/39_0.png");
$(this).parent().removeClass('add');
$(".shop_carts1 img").attr('src', "__TMPL__/public/assets/images/39_1.png");
calcTotal();
}
});
});
// 全选
$(".shop_carts1 img").click(function() {
if ($(this).attr("src") == "__TMPL__/public/assets/images/39_1.png") {
... ...