Home Esplora Aiuto
Accedi
waibao
/
NN2021012701
2
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

分销记录功能增加

bbylq 5 anni fa
parent
1d263d8531
commit
9a21d8d905
5 ha cambiato i file con 191 aggiunte e 22 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 1 1
      public/themes/admin_simpleboot3/admin/market/marketexamine.html
  2. 113 0
      public/themes/admin_simpleboot3/admin/market/marketrecord.html
  3. 1 1
      public/themes/admin_simpleboot3/admin/market/markettrans.html
  4. 7 20
      public/themes/admin_simpleboot3/admin/market/transinfo.html
  5. 69 0
      vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

+ 1 - 1
public/themes/admin_simpleboot3/admin/market/marketexamine.html
Vedi File 

@@ -374,7 +374,7 @@
 
                                  <php> $adminId = cmf_get_current_admin_id(); </php>
 
                                  <php> $adminId = cmf_get_current_admin_id(); </php>
 
            
            
                              <if condition="$adminId eq 1">
 
                              <if condition="$adminId eq 1">
 
-                                <a class="btn btn-xs btn-danger" href="{:url('adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
 
+                                <a class="btn btn-xs btn-danger" href="{:url('user/adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
 
                              </if>
 
                              </if>
 
                           </if>
 
                           </if>

+ 113 - 0
public/themes/admin_simpleboot3/admin/market/marketrecord.html
Vedi File 

@@ -0,0 +1,113 @@
 
+<include file="public@header" />
 
+</head>
 
+<body>
 
+	<div class="wrap js-check-wrap">
 
+		<ul class="nav nav-tabs">
 
+			<li class="active"><a href="{:url('love/index')}">分销记录</a></li>
 
+		<!-- 	<li ><a href="{:url('activity/add')}">添加活动</a></li> --> 
+		</ul>
 
+        <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="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>
 
+		<table class="table table-hover table-bordered">
 
+			<thead>
 
+				<tr>
 
+				    <th width="16">
 
+                    <label>
 
+                        <input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
 
+                    </label>
 
+                    </th>
 
+					<th width="50">ID</th>
 
+                    <th>昵称</th>
 
+					<th>交易日期</th>
 
+					<th>来源</th>
 
+					<th>金额</th>
 
+					<th>变动类型</th>
 
+                    <th>操作类型</th>
 
+					<th>{:lang('STATUS')}</th>
 
+					<th width="120">{:lang('ACTIONS')}</th>
 
+				</tr>
 
+			</thead>
 
+             
+             <tbody>
 
+				<php>$user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));</php>
 
+				<foreach name="account_logs" item="vo">
 
+				<tr>
 
+
 
+					 <td>
 
+                        <input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
 
+                               value="{$vo.id}">
 
+                    </td>
 
+                    
+					<td>{$vo.id}</td>
 
+					<td>{$vo.user_nickname}</td>
 
+					<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
 
+					<td>{$vo.source_uid}</td>
 
+					<td>{$vo.balance}</td>
 
+					
+					<td>
 
+						<switch name="vo.type">
 
+							<case value="1">提现</case>
 
+							<case value="2">开通VIP分成</case>
 
+							<case value="3">人工牵线分成</case>
 
+							<case value="4">邀请注册分成</case>
 
+							<case value="5">邀请用户实名分成</case>
 
+							<case value="6">邀请用户学历认证分成</case>
 
+							<case value="7">邀请用户工作认证分成</case>
 
+							<case value="8">邀请用户充值分成</case>
 
+							<case value="31">平台奖励</case>
 
+							<case value="32">平台扣除</case>
 
+						</switch>
 
+					</td>
 
+			
+					<td>
 
+						<switch name="vo.change_type">
 
+							<case value="1">收入</case>
 
+							<case value="2">支出</case>
 
+						</switch>
 
+					</td>
 
+					
+					<td>
 
+					  <!--    <switch name="vo.status">
 
+							<case value="1"><font style="color: red"> 待支付 </font></case>
 
+							<case value="2"><font style="color: green"> 正常 </font></case>
 
+					     </switch> -->
 
+
 
+					     <font style="color: green"> 正常 </font>
 
+						
+					</td>
 
+					<td>
 
+						<a class="btn btn-xs btn-primary" onclick="getPaike({$vo['id']})" >查看</a>
 
+					</td>
 
+					
+				</tr>
 
+				</foreach>
 
+			</tbody>           
+                        
+		</table>
 
+		
+		<div class="pagination">{$page}</div>
 
+
 
+	</div>
 
+	<script src="__STATIC__/js/admin.js"></script>
 
+
 
+	<script >
 
+
 
+		function getPaike(id){
 
+	        openIframeLayer("{:url('Market/transinfo')}?id=" + id , "", {
 
+	            area: ['880px', '600px'],
 
+	            btn: ['确定', '取消'],
 
+	        })
 
+	    }
 
+	</script>
 
+	
+</body>
 
+</html>

+ 1 - 1
public/themes/admin_simpleboot3/admin/market/markettrans.html
Vedi File 

@@ -48,7 +48,7 @@
 
                     
                     
 					<td>{$vo.id}</td>
 
 					<td>{$vo.id}</td>
 
 					<td>{$vo.user_nickname}</td>
 
 					<td>{$vo.user_nickname}</td>
 
-					<td>{$vo.create_time}</td>
 
+					<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
 
 					<td>{$vo.balance}</td>
 
 					<td>{$vo.balance}</td>
 
 					<td>
 
 					<td>
 
 						<switch name="vo.type">
 
 						<switch name="vo.type">

+ 7 - 20
public/themes/admin_simpleboot3/admin/market/transinfo.html
Vedi File 

@@ -30,7 +30,7 @@
 
                         <th style="width:120px;">交易时间</th>
 
                         <th style="width:120px;">交易时间</th>
 
                         <td>
 
                         <td>
 
                             <input class="form-control" type="text" name="act_nums"
 
                             <input class="form-control" type="text" name="act_nums"
 
-                                   id="title" required value="{$create_time}" readonly="readonly" placeholder=""/>
 
+                                   id="title" required value="{:date('Y-m-d H:i:s',$create_time)}" readonly="readonly" placeholder=""/>
 
                         </td>
 
                         </td>
 
                     </tr>
 
                     </tr>
 
                     
                     
@@ -49,29 +49,16 @@
 
 
 
                          <input class="form-control js-bootstrap-datetime" type="text" readonly="readonly" name="starttime"
 
                          <input class="form-control js-bootstrap-datetime" type="text" readonly="readonly" name="starttime"
 
                                 value="<switch name="type">
 
                                 value="<switch name="type">
 
-                                    <case value="1">充值</case>
 
-                                    <case value="2">支付</case>
 
-                                    <case value="3">退款</case>
 
-                                    <case value="4">奖励</case>
 
-                                    <case value="5">后台充值</case>
 
+                                    <case value="31">平台奖励</case>
 
+                                    <case value="32">平台扣除</case>
 
+                                 
                             </switch>">
 
                             </switch>">
 
                             
                             
                         
                         
                                 
                                 
                          </td>
 
                          </td>
 
                     </tr>
 
                     </tr>
 
-                    
-                    <tr>
 
-                        <th>账户类型</th>
 
-                        <td> <input class="form-control js-bootstrap-datetime" readonly="readonly" type="text" name="endtime"
 
-                                   value="<switch name="account_type">
 
-                            <case value="1">爱心</case>
 
-                            <case value="2">余额</case>
 
-                            <case value="3">积分</case>
 
-                            <case value="4">微信</case>
 
-                        </switch>"></td>
 
-                    </tr>
 
-                    
+                      
                     <tr>
 
                     <tr>
 
                         <th style="width:120px;">操作类型</th>
 
                         <th style="width:120px;">操作类型</th>
 
                         <td>
 
                         <td>
 
@@ -95,10 +82,10 @@
 
                     </tr>
 
                     </tr>
 
 
 
                     <tr>
 
                     <tr>
 
-                        <th>备注</th>
 
+                        <th>描述</th>
 
                         <td >
 
                         <td >
 
                               <textarea class="form-control" name="act_flow" readonly="readonly" style="height: 80px;"
 
                               <textarea class="form-control" name="act_flow" readonly="readonly" style="height: 80px;"
 
-                                      placeholder="" >{$remark}</textarea>
 
+                                      placeholder="" >{$description}</textarea>
 
                         </td>
 
                         </td>
 
                     </tr>
 
                     </tr>

+ 69 - 0
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php
Vedi File 

@@ -799,6 +799,75 @@ class MarketController extends AdminBaseController
 
 
 
     }
 
     }
 
 
 
+    /**
 
+     * 分销记录
 
+     */
 
+
 
+    public function marketrecord(){
 
+
 
+         /**搜索条件**/
 
+        $trans_name = $this->request->param('user_nickname'); 
+        $money = $this->request->param('money'); 
+        //$userEmail = trim($this->request->param('user_email'));
 
+        //账户明细表（包含用户名称,爱心，余额） 
+        $account_logs = Db::name('user_balance_log')
 
+            ->alias('blog')
 
+            ->join('user u','blog.user_id=u.id','left')
 
+            ->whereIn('blog.type',[31,32])
 
+            ->where(function (Query $query) use ($trans_name,$money) {
 
+                if ($trans_name) {
 
+                    $query->where('u.user_nickname', 'like', "%$trans_name%");
 
+                }
 
+                if ($money) {
 
+                    $query->where('blog.balance', $money);
 
+                }
 
+
 
+            })
 
+            ->field('blog.*,u.user_nickname')
 
+            ->order("blog.id DESC")
 
+            ->paginate(10,false,['query'=>request()->param()])
 
+            ->each(function($item,$key){
 
+
 
+               $userarray = Db::name('user')->where(['id'=> $item['source_uid'], 'user_type'=> 2])->field('real_name,user_nickname');
 
+
 
+               return $userarray;
 
+
 
+
 
+            })
 
+            ;
 
+
 
+       //echo  Db::name('user_balance_log')->getLastSql();die();
 
+
 
+        $account_logs->appends(['title' => $trans_name]);
 
+        // 获取分页显示
 
+        $page = $account_logs->render();
 
+
 
+       
+        $this->assign("page", $page);
 
+        $this->assign("account_logs", $account_logs);
 
+        return $this->fetch();
 
+
 
+    }
 
+
 
+
 
+    /**
 
+    *
 
+    *
 
+    */
 
+
 
+
 
+    
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+