|
|
@@ -53,6 +53,7 @@ class LoveController extends AdminBaseController
|
|
|
}
|
|
|
|
|
|
})
|
|
|
+ ->where('alog.account_type',1)
|
|
|
->field('alog.*,u.user_nickname')
|
|
|
->order("alog.id DESC")
|
|
|
->paginate(10,false,['query'=>request()->param()]);
|
|
|
@@ -71,6 +72,49 @@ class LoveController extends AdminBaseController
|
|
|
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 爱心,余额,积分,列表
|
|
|
+ */
|
|
|
+ public function indexall(){
|
|
|
+
|
|
|
+ /**搜索条件**/
|
|
|
+ $love_name = $this->request->param('user_nickname');
|
|
|
+ $money = $this->request->param('money');
|
|
|
+ //$userEmail = trim($this->request->param('user_email'));
|
|
|
+ //账户明细表(包含用户名称,爱心,余额)
|
|
|
+ $account_logs = Db::name('account_log')
|
|
|
+ ->alias('alog')
|
|
|
+ ->join('user u','alog.user_id=u.id','left')
|
|
|
+ ->where(function (Query $query) use ($love_name,$money) {
|
|
|
+ if ($love_name) {
|
|
|
+ $query->where('u.user_nickname', 'like', "%$love_name%");
|
|
|
+ }
|
|
|
+ if ($money) {
|
|
|
+ $query->where('alog.money', $money);
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+ ->field('alog.*,u.user_nickname')
|
|
|
+ ->order("alog.id DESC")
|
|
|
+ ->paginate(10,false,['query'=>request()->param()]);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ $account_logs->appends(['title' => $love_name]);
|
|
|
+ // 获取分页显示
|
|
|
+ $page = $account_logs->render();
|
|
|
+
|
|
|
+
|
|
|
+ $this->assign("page", $page);
|
|
|
+ $this->assign("account_logs", $account_logs);
|
|
|
+ return $this->fetch('index');
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/*
|
|
|
* 爱心明细导出
|
|
|
*/
|