Начало Каталог Помощ
Вход
waibao
/
NN2021012701
2
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

交易明细

binbinyouli преди 5 години
родител
bbded8229e
ревизия
793a55e672
променени са 3 файла, в които са добавени 65 реда и са изтрити 6 реда
Обединен изглед Покажи статистика за разликите
  1. 19 4
      public/themes/admin_simpleboot3/admin/love/index.html
  2. 44 0
      vendor/thinkcmf/cmf-app/src/admin/controller/LoveController.php
  3. 2 2
      vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

+ 19 - 4
public/themes/admin_simpleboot3/admin/love/index.html
Целия файл 

@@ -3,20 +3,35 @@
 
 <body>
 
 <body>
 
 	<div class="wrap js-check-wrap">
 
 	<div class="wrap js-check-wrap">
 
 		<ul class="nav nav-tabs">
 
 		<ul class="nav nav-tabs">
 
-			<li class="active"><a href="{:url('love/index')}">爱心明细</a></li>
 
-		<!-- 	<li ><a href="{:url('activity/add')}">添加活动</a></li> --> 
+		   <if condition="$Request.action eq 'indexall'">
 
+				<li class="active"><a href="{:url('love/indexall')}">交易明细</a></li>
 
+				<else/>
 
+				<li class="active"><a href="{:url('love/index')}">爱心明细</a></li>
 
+		   </if>
 
+			
 		</ul>
 
 		</ul>
 
+		<if condition="$Request.action eq 'index'">
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
             昵称:
 
             昵称:
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
              爱心数量:
 
              爱心数量:
 
             <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量">
 
             <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量">
 
-<!--            邮箱:
 
-            <input type="text" class="form-control" name="user_email" style="width: 120px;" value="{:input('request.user_email/s','')}" placeholder="请输入">-->
 
+
 
+            <input type="submit" class="btn btn-primary" value="搜索" />
 
+            <a class="btn btn-warning" href="{:url('Love/export',array('user_nickname'=>$Request.param.user_nickname,'money'=>$Request.param.money))}">导出</a>
 
+            <a class="btn btn-danger" href="{:url('Love/index')}">清空</a>
 
+        </form>
 
+        <else/>
 
+         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
+            昵称:
 
+            <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
+           
+
 
             <input type="submit" class="btn btn-primary" value="搜索" />
 
             <input type="submit" class="btn btn-primary" value="搜索" />
 
             <a class="btn btn-warning" href="{:url('Love/export',array('user_nickname'=>$Request.param.user_nickname,'money'=>$Request.param.money))}">导出</a>
 
             <a class="btn btn-warning" href="{:url('Love/export',array('user_nickname'=>$Request.param.user_nickname,'money'=>$Request.param.money))}">导出</a>
 
             <a class="btn btn-danger" href="{:url('Love/index')}">清空</a>
 
             <a class="btn btn-danger" href="{:url('Love/index')}">清空</a>
 
         </form>
 
         </form>
 
+        </if>
 
 		<table class="table table-hover table-bordered">
 
 		<table class="table table-hover table-bordered">
 
 			<thead>
 
 			<thead>
 
 				<tr>
 
 				<tr>

+ 44 - 0
vendor/thinkcmf/cmf-app/src/admin/controller/LoveController.php
Целия файл 

@@ -53,6 +53,7 @@ class LoveController extends AdminBaseController
 
                 }
 
                 }
 
 
 
             })
 
             })
 
+            ->where('alog.account_type',1)
 
             ->field('alog.*,u.user_nickname')
 
             ->field('alog.*,u.user_nickname')
 
             ->order("alog.id DESC")
 
             ->order("alog.id DESC")
 
             ->paginate(10,false,['query'=>request()->param()]);
 
             ->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');
 
+       
+       
+   }
 
+
 
+
 
+
 
     /*
 
     /*
 
      * 爱心明细导出
 
      * 爱心明细导出
 
      */
 
      */

+ 2 - 2
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php
Целия файл 

@@ -766,7 +766,7 @@ class MarketController extends AdminBaseController
 
                     $checkTime = date('Y.m.d H:i');
 
                     $checkTime = date('Y.m.d H:i');
 
                     $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看分销中心";
 
                     $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看分销中心";
 
                     $msgParams = [
 
                     $msgParams = [
 
-                        'title' => "您的推广红娘账号已审核通过！",
 
+                        'title' => "恭喜!!,您的推广红娘账号已审核通过！",
 
                         'remark' => $remark,
 
                         'remark' => $remark,
 
                         'type' => 'confirm',
 
                         'type' => 'confirm',
 
                         'keywords' => [
 
                         'keywords' => [
 
@@ -852,7 +852,7 @@ class MarketController extends AdminBaseController
 
         $account_logs = Db::name('user_balance_log')
 
         $account_logs = Db::name('user_balance_log')
 
             ->alias('blog')
 
             ->alias('blog')
 
             ->join('user u','blog.user_id=u.id','left')
 
             ->join('user u','blog.user_id=u.id','left')
 
-            ->whereIn('blog.type',[31,32])
 
+            ->where('blog.type','neq',1)
 
             ->where(function (Query $query) use ($trans_name,$money) {
 
             ->where(function (Query $query) use ($trans_name,$money) {
 
                 if ($trans_name) {
 
                 if ($trans_name) {
 
                     $query->where('u.user_nickname', 'like', "%$trans_name%");
 
                     $query->where('u.user_nickname', 'like', "%$trans_name%");