From d1b5ec590718bddec22e04586d05a8129ad090e4 Mon Sep 17 00:00:00 2001
From: lihan <3398341942@qq.com>
Date: Fri, 9 Nov 2018 10:07:51 +0800
Subject: [PATCH] 赠送积分和角色管理
---
app/admin/controller/ZjOrderController.php | 8 ++++++--
public/themes/admin_simpleboot3/admin/zj_order/index.html | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/admin/controller/ZjOrderController.php b/app/admin/controller/ZjOrderController.php
index 4b20199..1954c99 100644
--- a/app/admin/controller/ZjOrderController.php
+++ b/app/admin/controller/ZjOrderController.php
@@ -53,8 +53,12 @@ class ZjOrderController extends AdminBaseController
$where1['o.create_time'] = ['elt', strtotime($arr['end_time'])];
}
}
- $all = Db::name('zj_order')->alias('o')->join('user u', 'o.uid=u.id', 'left')
- ->where($where)->where($where1)->order('create_time', 'desc')->field('o.*,u.user_nickname')->paginate(15);
+ $all = Db::name('zj_order')->alias('o')
+ ->join('user u', 'o.uid=u.id', 'left')
+ ->where($where)->where($where1)
+ ->order('create_time', 'desc')
+ ->field('o.*,u.user_nickname,sum(whole_num) as whole_num')
+ ->paginate(15);
$all->appends($arr);
//查询商品分类
diff --git a/public/themes/admin_simpleboot3/admin/zj_order/index.html b/public/themes/admin_simpleboot3/admin/zj_order/index.html
index e3ee83b..73bf210 100644
--- a/public/themes/admin_simpleboot3/admin/zj_order/index.html
+++ b/public/themes/admin_simpleboot3/admin/zj_order/index.html
@@ -52,7 +52,7 @@
<input type="submit" class="btn btn-primary" value="搜索"/>
<a class="btn btn-danger" href="{:url('index',array('uid'=>$uid))}">清空</a>
- <div style="float: right; margin-right: 20px"><font size="+1">总消费积分： 总消费金额：￥</font></div>
+ <div style="float: right; margin-right: 20px"><font size="+1">总消费积分：{$all.0.whole_num} 总消费金额：￥</font></div>
</form>
<form method="post" class="js-ajax-form">
--
libgit2 0.24.0