wesmiler 5 лет назад
Родитель
Сommit
d4706780cb

+ 1 - 0
app/api/controller/MarketController.php

@@ -232,6 +232,7 @@ class MarketController extends MarketBaseController
                 'real_name' => isset($params['realname']) ? trim($params['realname']) : '',
                 'user_nickname' => isset($params['nickname']) ? trim($params['nickname']) : '',
                 'user_type' => 2,
+                'agent_status' => 2,
                 'user_status' => 1,
                 'user_pass' => $userPass,
                 'pay_password' => $userPass,

+ 8 - 7
app/weixin/service/Member.php

@@ -23,7 +23,7 @@ class Member
      * @param string $failRemark 审核失败原因
      * @return array|int
      */
-    public static function checkAuth($userId, $status, $scene='idcard', $failRemark=''){  
+    public static function checkAuth($userId, $status, $scene='idcard', $failRemark=''){
         try {
             // 验证认证信息是否存在
             $field = 'id,userid,idcard,idcard_check,education_check,position_check';
@@ -198,7 +198,7 @@ class Member
      * @throws \think\exception\PDOException
      */
     public static function checkComplain($userId, $info = [])
-    {   
+    {
         $cid = isset($info['id'])? $info['id'] : 0;
         if(empty($cid) || Complain::where(['id'=> $cid])->value('status') != 1){
             return false;
@@ -216,7 +216,7 @@ class Member
 
         $siteInfo = cmf_get_site_info();
         $awardNum = isset($siteInfo['complain_award_redheart']) ? intval($siteInfo['complain_award_redheart']) : 0;
-        if ($awardNum > 0) { 
+        if ($awardNum > 0) {
             $cuid = isset($info['c_uid'])? $info['c_uid'] : 0;
             $cUserInfo = MemberModel::alias('u')
                 ->leftJoin('sg_user_profile sp','sp.userid=u.id')
@@ -232,11 +232,12 @@ class Member
             //Db::startTrans();
             // 冻结被举报用户,2021,加多一个字段,顺便放入冻结选项
             $freezing = isset($info['remark'])? $info['remark'] : '被人举报';
-            $result1=MemberModel::where(['id'=> $cuid,'user_type'=> 2])->update(['user_status'=> 0,'freezing'=> $freezing,'freezing_choose'=>$info['freezing_choose']]);
+            $freezingChoose = isset($info['freezing_choose'])? $info['freezing_choose'] : '';
+            $result1=MemberModel::where(['id'=> $cuid,'user_type'=> 2])->update(['user_status'=> 0,'freezing'=> $freezing,'freezing_choose'=>$freezingChoose]);
 
             // 奖励入账
-           $result2= MemberModel::where(['id' => $userId])->update(['redheart' => moneyFormat($redheart + $awardNum), 'updated_at' => date('Y-m-d H:i:s')]);
-           // echo $cuid.'::'.$userId;die();
+            $result2= MemberModel::where(['id' => $userId])->update(['redheart' => moneyFormat($redheart + $awardNum), 'updated_at' => date('Y-m-d H:i:s')]);
+            // echo $cuid.'::'.$userId;die();
             // 账户明细
             $dateTime = date('Y-m-d H:i:s');
             $cNickname = isset($cUserInfo['user_nickname']) ? $cUserInfo['user_nickname'] : '';
@@ -278,7 +279,7 @@ class Member
 
             // 被举报用户通知
             $cOpenid = isset($cUserInfo['openid'])? $cUserInfo['openid'] : '';
-           $cnickname = isset($cUserInfo['user_nickname'])? $cUserInfo['user_nickname'] : '';
+            $cnickname = isset($cUserInfo['user_nickname'])? $cUserInfo['user_nickname'] : '';
             if($cOpenid){
                 $params = [
                     'title' => "尊敬的{$cnickname}用户,由于您的账号被多人举报经平台已经将您的账号冻结,若有疑问请联系平台客服\n\n举报原因:\t{$freezing}",

+ 115 - 101
public/themes/admin_simpleboot3/admin/activity/index.html

@@ -1,76 +1,90 @@
 <include file="public@header" />
+<style type="text/css" media="all">
+	.table .img p {
+		display: inline-block;
+		float: left;
+		height: 100px;
+	}
+	.table .img img {
+		width: 80px;
+		height: 50px;
+		float: right;
+		display: block;
+		margin-top: 30px;
+	}
+</style>
 </head>
 <body>
-	<div class="wrap js-check-wrap">
-		<ul class="nav nav-tabs">
-			<li class="active"><a href="{:url('activity/index')}">{:lang('ADMIN_ACTIVITY_LIST')}</a></li>
-			<li ><a href="{:url('activity/add')}">添加活动</a></li>
-		</ul>
-        <form class="well form-inline margin-top-20" method="get" action="{:url('Activity/index')}">
-            活动名称:
-            <input type="text" class="form-control" name="act_name" style="width: 150px;" value="{:input('request.user_login/s','')}" 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-danger" href="{:url('Activity/index')}">清空</a>
-
-			
-           
-        </form>
-         <form class="js-ajax-form" action="" method="post">
-        <div class="table-actions">
-        
-         
-            <button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
-                    data-action="{:url('Activity/top',array('yes'=>1))}" data-subcheck="true">置顶
-            </button>
-            <button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
-                    data-action="{:url('Activity/top',array('no'=>1))}" data-subcheck="true">取消置顶
-            </button>
-
-              <button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
-                    data-action="{:url('Activity/issort',array('yes'=>1))}" data-subcheck="true">排序
-            </button>
-            <button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
-                    data-action="{:url('Activity/issort',array('no'=>1))}" data-subcheck="true">取消排序
-            </button>
-             <button class="btn btn-primary btn-sm js-ajax-submit" style="   background-color: #d9534f; width: 38px; border-color: #d9534f;" type="submit"
-                    data-action="{:url('Activity/delactivity',array('yes'=>1))}" onclick="return confirm('确定要删除该活动吗?')" data-subcheck="true">删除
-            </button>
-           
-        </div>
+<div class="wrap js-check-wrap">
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="{:url('activity/index')}">{:lang('ADMIN_ACTIVITY_LIST')}</a></li>
+		<li ><a href="{:url('activity/add')}">添加活动</a></li>
+	</ul>
+	<form class="well form-inline margin-top-20" method="get" action="{:url('Activity/index')}">
+		活动名称:
+		<input type="text" class="form-control" name="act_name" style="width: 150px;" value="{:input('request.user_login/s','')}" 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-danger" href="{:url('Activity/index')}">清空</a>
+
+
+
+	</form>
+	<form class="js-ajax-form" action="" method="post">
+		<div class="table-actions">
+
+
+			<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
+					data-action="{:url('Activity/top',array('yes'=>1))}" data-subcheck="true">置顶
+			</button>
+			<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
+					data-action="{:url('Activity/top',array('no'=>1))}" data-subcheck="true">取消置顶
+			</button>
+
+			<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
+					data-action="{:url('Activity/issort',array('yes'=>1))}" data-subcheck="true">排序
+			</button>
+			<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
+					data-action="{:url('Activity/issort',array('no'=>1))}" data-subcheck="true">取消排序
+			</button>
+			<button class="btn btn-primary btn-sm js-ajax-submit" style="   background-color: #d9534f; width: 38px; border-color: #d9534f;" type="submit"
+					data-action="{:url('Activity/delactivity',array('yes'=>1))}" onclick="return confirm('确定要删除该活动吗?')" data-subcheck="true">删除
+			</button>
+
+		</div>
 		<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 style="text-align: center;">参与名额</th>
-                    <th>是否置顶</th>
-					<th>{:lang('STATUS')}</th>
-					<th width="180">{:lang('ACTIONS')}</th>
-				</tr>
+			<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 style="text-align: center;">参与名额</th>
+				<th>是否置顶</th>
+				<th>{:lang('STATUS')}</th>
+				<th width="180">{: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="activitys" item="vo">
+
+			<tbody>
+			<php>$user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));</php>
+			<foreach name="activitys" 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>
+						<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><img src="/upload/{$vo.cover_img}" style="width: 80px;height: 50px;"></td>
+					<td class="img"><p></p><img src="/upload/{$vo.cover_img}" style="width: 80px;height: 50px;"></td>
 					<td>{$vo.title}</td>
 					<td>{:date('Y-m-d H:i:s',$vo['starttime'])}</td>
 					<td>{:date('Y-m-d H:i:s',$vo['endtime'])}</td>
@@ -78,57 +92,57 @@
 						<span style="color:red">{$vo.bks}</span>/{$vo.act_nums}
 					</td>
 					<td>
-					   <switch name="vo.is_top">
-						    <case value="0"><font style="color: red"> 未置顶</font></case>
+						<switch name="vo.is_top">
+							<case value="0"><font style="color: red"> 未置顶</font></case>
 							<case value="1"><font style="color: green"> 已置顶 </font></case>
-							
-					     </switch>
-					 </td>
+
+						</switch>
+					</td>
 					<td>
-					     <switch name="vo.act_status">
-						    <case value="0"><font style="color: red"> 未开始 </font></case>
+						<switch name="vo.act_status">
+							<case value="0"><font style="color: red"> 未开始 </font></case>
 							<case value="1"><font style="color: green"> 进行中 </font></case>
 							<case value="2"><font style="color: blue"> 已结束 </font></case>
-					     </switch>
-						
+						</switch>
+
 					</td>
 					<td>
 						<a class="btn btn-xs btn-primary" href="{:url('activity/edit',array('id'=>$vo['id']))}">{:lang('EDIT')}</a>
 
-						  
-                 <!--        <a class="btn btn-xs btn-danger" onclick="if(!confirm('删除后将不可恢复,确定删除吗?')) return false;" href="{:url('activity/delete',array('id'=>$vo['id']))}" class="js-ajax-delete">
-                            {:lang('DELETE')}
-                        </a> -->
-                        <a class="btn btn-xs btn-success"  href="{:url('books/index',array('id'=>$vo['id']))}">报名记录</a>
 
-                        <a class="btn btn-xs btn-primary" style="margin-top:5px; border-color:#E161F3;background-color:#E161F3"  onclick="getPaike({$vo['id']})">时间提醒</a>
+						<!--        <a class="btn btn-xs btn-danger" onclick="if(!confirm('删除后将不可恢复,确定删除吗?')) return false;" href="{:url('activity/delete',array('id'=>$vo['id']))}" class="js-ajax-delete">
+                                   {:lang('DELETE')}
+                               </a> -->
+						<a class="btn btn-xs btn-success"  href="{:url('books/index',array('id'=>$vo['id']))}">报名记录</a>
 
-                        <a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#7349B8;background-color:#7349B8" onclick="if (!confirm('确定要进行互动匹配发送吗?')) return false;" href="{:url('books/matching',array('id'=>$vo['id']))}">互动匹配</a>
+						<a class="btn btn-xs btn-primary" style="margin-top:5px; border-color:#E161F3;background-color:#E161F3"  onclick="getPaike({$vo['id']})">时间提醒</a>
 
-                        <a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#d9534f;;background-color:#d9534f;" onclick="if (!confirm('确定要进行互动匹配发送吗?')) return false;" href="{:url('books/twomatching',array('id'=>$vo['id']))}">重新匹配</a>
+						<a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#7349B8;background-color:#7349B8" onclick="if (!confirm('确定要进行互动匹配发送吗?')) return false;" href="{:url('books/matching',array('id'=>$vo['id']))}">互动匹配</a>
+
+						<a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#d9534f;;background-color:#d9534f;" onclick="if (!confirm('确定要进行互动匹配发送吗?')) return false;" href="{:url('books/twomatching',array('id'=>$vo['id']))}">重新匹配</a>
+
+						<a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#7349B8;background-color:#7349B8"  href="{:url('books/allhuxuan',array('id'=>$vo['id']))}">互选情况</a>
 
-						  <a class="btn btn-xs btn-primary" style="margin-top:5px;border-color:#7349B8;background-color:#7349B8"  href="{:url('books/allhuxuan',array('id'=>$vo['id']))}">互选情况</a>
-                       
 
 					</td>
-					
+
 				</tr>
-				</foreach>
-			</tbody>           
-                        
+			</foreach>
+			</tbody>
+
 		</table>
-		
+
 		<div class="pagination">{$page}</div>
-	  </form>
-	</div>
-	<script src="__STATIC__/js/admin.js"></script>
-	<script src="__STATIC__/js/layer/layer.js"></script>
+	</form>
+</div>
+<script src="__STATIC__/js/admin.js"></script>
+<script src="__STATIC__/js/layer/layer.js"></script>
 
-	<script >
+<script >
 
-	   function getPaike(id){
-	   	var addUrl = "{:url('Books/reminder')}?id="+id;
-	   	layer.open({
+	function getPaike(id){
+		var addUrl = "{:url('Books/reminder')}?id="+id;
+		layer.open({
 			type: 2, //1:页面层,2:iframe层,3:加载层,4:tips层。
 			title: '时间提醒设置',
 			shadeClose: false, //不开启遮罩关闭,也就是说,点击弹出层其它地方不会关闭弹出框
@@ -136,12 +150,12 @@
 			area: ['470px', '470px'],
 			content: addUrl,
 			end: function () { //最后执行reload
-	                location.reload();
-	            }
-			});
+				location.reload();
+			}
+		});
 
-	   }
-	</script>
+	}
+</script>
 
 </body>
 </html>

+ 2 - 1
public/themes/admin_simpleboot3/user/admin_index/ban.html

@@ -27,7 +27,8 @@
             <div class="col-sm-offset-2 col-sm-10">
                 <input type="hidden" name="id" value="{$id}" />
                 <button type="submit" class="btn btn-primary js-ajax-submit" onclick="return condtion()">冻结</button>
-           
+              <!--   <a class="btn btn-default" href="{:url('/User/admin_index/index',['history'=> 1])}">{:lang('BACK')}</a> -->
+                <!--<a class="btn btn-default" href="javascript:history.back(-1);">{:lang('BACK')}</a>-->
             </div>
         </div>
     </form>

+ 0 - 77
public/themes/admin_simpleboot3/user/admin_index/bant.html

@@ -1,77 +0,0 @@
-<include file="public@header" />
-</head>
-<body>
-<div class="wrap">
-   
-    <form method="post" class="form-horizontal js-ajax-form margin-top-20" action="">
-
-      <input type = "hidden" id="uid" value="{$uid}">
-      <input type = "hidden" id="c_uid" value="{$c_uid}">
-       <div class="form-group">
-            <label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>冻结原因选项</label>
-            <div class="col-md-6 col-sm-10">
-                  <select class="form-control" name="freezing_choose" id="freezing_choose" style="float:left;">
-                    <option value="none">--请选择--</option>
-                    <option value="1" >头像及资料违规</option>
-                    <option value="2" >用户投诉实锤违规</option>
-                    <option value="3" >封号拉黑、违规</option>
-                </select>
-            </div>
-        </div>
-
-   <!--      <div class="form-group">
-            <label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>冻结备注</label>
-            <div class="col-md-6 col-sm-10">
-                  <textarea class="form-control" name="freezing" style="height: 94px;" id="freezing" ></textarea>
-            </div>
-        </div> -->
-
-         <div class="form-group">
-            <div class="col-sm-offset-2 col-sm-10">
-                <input type="hidden" name="id" value="{$id}" />
-                <button type="submit" class="btn btn-primary js-ajax-submit" onclick="return condtion()">冻结</button>
-           
-            </div>
-        </div>
-    </form>
-</div>
-<link href="__STATIC__/js/city/layui/css/layui.css" rel="stylesheet" />
-
-<script src="__STATIC__/js/city/layui/layui.js" type="text/javascript"></script>
-<script src="__STATIC__/js/admin.js"></script>
-<script type="text/javascript">
-    function condtion(){
-
-        if($('#freezing_choose').val()=='none'){alert('请选择冻结原因选项!');return false;}
-        // if($('#freezing').val()==''){alert('冻结备注不能为空!');return false;}
-       //var freezing = $('#freezing').val();
-        if(confirm('确定要冻结吗?')){
-             $.ajax({ 
-
-                url: "{:url('/User/admin_index/bant',array('dobant'=>1,'id'=>$id))}",
-                data:{uid:$('#uid').val(),cuid:$('#c_uid').val(),freezing:$('#freezing').val(),freezing_choose:$('#freezing_choose').val()},
-                success: function(data){
-                    console.log(data);
-                    if(data==1){
-
-                      alert('冻结成功!');
-
-                  }else{
-                      alert('冻结失败!');
-                  }
-                      var index = parent.layer.getFrameIndex(window.name);
-                            parent.layer.close(index);
-
-                }
-
-              });
-           return true;
-        }else{
-           return false;         
-        }
-
-        
-    }
-</script>
-</body>
-</html>

+ 8 - 35
public/themes/admin_simpleboot3/user/admin_index/complain.html

@@ -3,16 +3,10 @@
 <body>
 <div class="wrap js-check-wrap">
     <ul class="nav nav-tabs">
+        <li class="active"><a> 举报用户
 
-    <if condition="$Request.action eq 'complain'">
-      <li class="active"><a> 举报用户</a> </li>
-  <else/>
-    <li class="active"><a> 已处理用户</a> </li>
-    </if>
-       
-
-        
-       
+        </a>
+        </li>
     </ul>
 <if condition="$Request.action eq 'custom' || $Request.param.u eq 2 || $Request.param.u eq 4">
     <div class="qrcode">
@@ -265,9 +259,9 @@
                             <case value="1">
                                <span style="color:red">待处理</span>
                             </case>
-                  <!--           <case value="2">
+                            <case value="2">
                               <span style="color:green">已处理</span>
-                            </case> -->
+                            </case>
                             
                         </switch>
 
@@ -275,28 +269,7 @@
                   
                   <td>
                <!--    <a class="btn btn-xs btn-primary" href="{:url('adminIndex/edit',array('id'=>$vo['id']))}">编辑</a> -->
-                  <if condition="$Request.action eq 'complain'">
-
-                        
-
-                         <switch name="vo.user_nicknamet.user_status">
-                            <case value='0'> 
-
-                            <a class="btn btn-xs btn-warning"  style="background-color: #177716;border-color:#177716" disabled>已冻结</a>
-
-                            </case>
-                            <default/>
-                                 <a class="btn btn-xs btn-warning js-ajax-dialog-btn" style="background-color: #5c0d8e;border-color:#5c0d8e"  href="{:url('adminIndex/tohandle',array('yes'=>1,'ids'=>$vo['id']))}" data-msg="确认处理该用户?">处理</a>&nbsp;
-                               <a class="btn btn-xs btn-warning" onclick="getPaike({$vo['id']},{$vo['ids']},{$vo['c_uid']})" >冻结</a>
-                         </switch>
-                   
-                  <else/>            
-
-                      <a class="btn btn-xs btn-warning js-ajax-dialog-btn" style="background-color: #5c0d8e;border-color:#5c0d8e"  href="{:url('adminIndex/unshelf',array('yes'=>1,'ids'=>$vo['id'],'c_uid'=>$vo['c_uid']))}" data-msg="确认下架该用户?">下架</a>&nbsp;
-              
-                    
-                  </if>
-                 
+                    <a class="btn btn-xs btn-warning js-ajax-dialog-btn" style="background-color: #5c0d8e;border-color:#5c0d8e"  href="{:url('adminIndex/tohandle',array('yes'=>1,'ids'=>$vo['id']))}" data-msg="确认处理该用户?">处理</a>
                   </td>
 
                         
@@ -400,8 +373,8 @@
         // });
     }
 
-    function getPaike(id,uid,cuid){ 
-        var addUrl = "{:url('AdminIndex/bant')}?id="+id+"&uid="+uid+"&cuid="+cuid;
+    function getPaike(id){ 
+        var addUrl = "{:url('AdminIndex/ban')}?id="+id;
         layer.open({
             type: 2, //1:页面层,2:iframe层,3:加载层,4:tips层。
             title: '条件筛选',

+ 0 - 72
public/themes/admin_simpleboot3/user/admin_index/feedback.html

@@ -1,72 +0,0 @@
-<include file="public@header"/>
-</head>
-<body>
-<div class="wrap js-check-wrap">
-    <ul class="nav nav-tabs">
-        <li class="active"><a href="#">反馈列表</a></li>
-        <!-- <li><a href="{:url('kefu/add')}">添加客服</a></li> -->
-    </ul>
-    <form method="post" class="js-ajax-form margin-top-20" action="{:url('Kefu/index')}">
-        <div class="table-actions">
-     
-        </div>
-        <php>$status=array("1"=>lang('DISPLAY'),"0"=>lang('HIDDEN'));</php>
-        <table class="table table-hover table-bordered table-list">
-            <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 width="90">用户昵称</th>
-                <th>类型</th>
-                <th>反馈内容</th>
-                <th>照片</th>
-                <th>创建时间</th>
-                <th>状态</th>
-                <th>操作</th>
-            </tr>
-            </thead>
-            <tbody>
-            <foreach name="list" 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_nicknamet.user_nickname}</td>
-                    <php>$advicearray=config('weixin.adviceTypes');</php>
-                    <td>
-                        {$advicearray[$vo.type]}
-                    </td>
-                    <td>{$vo.remark}</td>   
-                    <td><img src="/upload/{$vo.image}" style="width: 80px;height: 50px;"></img></td>
-                    <td>{:date('Y-m-d i:m:s',$vo.created_time)}</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>
-                    </td>
-                    <td>
-                        <a class="btn btn-xs btn-primary" href="{:url('admin_index/feedbackedit',array('id'=>$vo['id']))}">审核</a>
-                    
-                    </td>
-                </tr>
-            </foreach>
-            </tbody>
-        
-        </table>
-            
-            <div class="pagination">{$page}</div>
-
-        
-    </form>
-</div>
-<script src="__STATIC__/js/admin.js"></script>
-</body>
-</html>

+ 4 - 0
public/themes/default/weixin/public/assets/js/market.js

@@ -42,6 +42,10 @@ var app = new Vue({
                 $.hideLoading();
                 if (res.code == 'success') {
                     _this.memberInfo = res.data
+                    if(!_this.memberInfo.id){
+                        $.showLoading('账号未注册为推广号,请先扫码注册', 'text');
+                        return false;
+                    }
                     if (_this.memberInfo.agent_status == 2) {
                         $.showLoading('账号正在审核中,请耐心等候处理', 'text');
                     }else if (_this.memberInfo.agent_status == 0) {

+ 9 - 10
public/themes/default/weixin/public/assets/js/match.js

@@ -97,7 +97,6 @@ var app = new Vue({
         this.getInfo();
         this.getParams();
         this.initShare();
-        this.timeLockTips();
     },
     updated: function () {
         var _this = this;
@@ -119,6 +118,8 @@ var app = new Vue({
 
         _this.initSwiper()
 
+        _this.timeLockTips();
+
         // 分类导航切换
         $(".top_lieb li").click(function () {
             var type = $(this).index() + 1;
@@ -198,18 +199,12 @@ var app = new Vue({
         timeLockTips(){
             var _this = this;
             clearInterval(_this.tipsLoadTimerId)
-
             _this.getTips()
-            /*setInterval(function(){
-                _this.tipParams.page ++;
-                _this.getTips()
-            }, 20000)*/
         },
         // 初始化提示
         initTips: function(index){
             var _this = this
             var num = _this.tipsArr.length
-
             if(num>0){
                 var data = typeof(_this.tipsArr[index]) != 'undefined'? _this.tipsArr[index] : {};
                 if(!data){
@@ -225,12 +220,13 @@ var app = new Vue({
                 if(strs.length>9){
                     width = (strs.length-9)*13.5
                 }
-                console.log(content)
+
                 $(".tips").show();
                 $(".tips").css({width:width+'px'});
                 $(".tips a span").html(content);
                 _this.tipsTimerId = setInterval(function(){
-                   if(left>=100){
+                    //console.log(left+'++'+index)
+                    if(left>=100){
                        left = -100;
                        content = '';
                        index = index+1>=num? 0 : index+1;
@@ -242,7 +238,10 @@ var app = new Vue({
                    }
 
                     left += 0.25;
+                    $(".tips").css({width:width+'px'});
                     $(".tips").css({right:left+'%'});
+                    $(".tips a span ").html(content);
+                    $(".tips").show();
                 }, 20);
             }
 
@@ -588,7 +587,7 @@ var app = new Vue({
                                     if(lat && lng){
                                         _this.params.lng = lng
                                         _this.params.lat = lat
-                                        _this.getDataList(false);
+                                        //_this.getDataList(false);
 
                                     }
                                 }

+ 1 - 1
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

@@ -948,7 +948,7 @@ class MarketController extends AdminBaseController
         if(isset($param['no']) && isset($param['id'])){
              //开始进行调用成功发送
 
-           $data['agent_status'] = 3;   //审核未通过
+           $data['agent_status'] = 0;   //审核未通过
            $data['agent_type'] = 0;    //分销用户无
            $result=Db::name('user')->where('id',$param['id'])->update($data);
 

+ 2 - 213
vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php

@@ -22,7 +22,6 @@ use app\admin\model\AccountLogModel;
 use app\admin\model\UserModel;
 use app\weixin\service\Member;
 
-
 /**
  * Class AdminIndexController
  * @package app\user\controller
@@ -353,68 +352,6 @@ class AdminIndexController extends AdminBaseController
     }
 
     /**
-     * 本站用户拉黑
-     * @adminMenu(
-     *     'name'   => '本站用户拉黑',
-     *     'parent' => 'index',
-     *     'display'=> false,
-     *     'hasView'=> false,
-     *     'order'  => 10000,
-     *     'icon'   => '',
-     *     'remark' => '本站用户拉黑',
-     *     'param'  => ''
-     * )
-     */
-    public function bant()
-    {
-        $doban=input('dobant');
-        if(isset($doban)){ 
-           $param   = $this->request->param();
-
-        if (isset($param['id'])) {
-          
-            //通过id来获取举报页面
-        // Db::startTrans();
-            $result=Db::name('complain')->where('id',$param['id'])->find(); 
-          
-            // var_dump($result);die;
-            if($result){
-                  $result['freezing_choose']=$param['freezing_choose'];
-                //进行奖励
-                // $result = Db::name("user")->where(["id" => $id, "user_type" => 2])->setField(array('user_status'=>0,'freezing'=>input('freezing'),'freezing_choose'=>input('freezing_choose')));
-                $result=Member::checkComplain($result['uid'],$result);
-
-                if ($result) {
-                    
-                      if($param['freezing_choose']==3){
-                            $complain=Db::name('complain')->where('id', 'in', $param['id'])->update(['status' => 2]);     
-                      }              
-                    
-                    //发送给客户具体冻结的原因。
-                  //  $this->success("会员冻结成功!", "adminIndex/index");
-                   echo 1;die;
-                } else {
-                    //$this->error('会员冻结失败,会员不存在,或者是管理员!');
-                   echo 0;die;
-                }
-            } else {
-                // $this->error('数据传入失败!');
-                    echo 0;die;
-            }
-        }
-
-        }else{
-
-           $this->assign('id',input('id'));
-           $this->assign('uid',input('uid'));
-           $this->assign('c_uid',input('cuid'));
-           return $this->fetch('bant');
-        }
-
-        
-    }
-
-    /**
      * 本站用户启用
      * @adminMenu(
      *     'name'   => '本站用户启用',
@@ -799,87 +736,6 @@ class AdminIndexController extends AdminBaseController
     }
 
     /**
-     * 已处理完的举报用户
-     * 
-     */
-    
-    public function docomplain(){
-
-        $data = $this->request->param();
-        session('search',[
-            'uid' => isset($data['uid'])? intval($data['uid']) : 0,
-            'keyword' => isset($data['keyword'])? trim($data['keyword']) : '',
-        ]);
-        // 添加返回历史修改 by  wesmiler 2020-02-16
-        $history = isset($data['history'])? intval($data['history']) : 0;
-        if($history){
-            $data = session('user_search');
-        }else{
-            session('user_search', $data);
-        }
-
-        // 修改 end
-
-        //var_dump($data);die;
-        $list = Db::name('complain')->field('u.id as ids,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,u.last_login_time,c.id,c.type,c.c_uid,
-            c.remark,c.image,c.created_time,c.status')
-            ->alias('c')
-            ->join('user u','u.id=c.uid','left')
-            
-            ->where(function (Query $query) use($data){
-                $query->where('u.user_type', 2);
-                $query->where('u.openid', 'not in','');
-                $query->where('c.status', 2);
-
-                //代表是否付费定制
-                ($this->request->action()=='custom' || $this->request->param('u')==2)?$query->where('u.is_vip', 1):$query->where('u.is_vip', 0);
-
-                //代表是否冻结
-                if($this->request->action()!='userlogout' && $this->request->param('u')!=5){
-                    ($this->request->action()=='userban' || $this->request->param('u')==3)?$query->where('u.user_status', 0):$query->where('u.user_status', 1);
-                }
-
-                //代表是否筛选
-                 ($this->request->action()=='screen' || $this->request->param('u')==4)?$query->where('u.is_screen', 1):$query->where('u.is_screen', 0);
-
-                  //代表是否注销
-                if($this->request->action()!='userban' && $this->request->param('u')!=3){
-                  ($this->request->action()=='userlogout' || $this->request->param('u')==5)?$query->where('u.user_status', -1):$query->where('u.user_status', 1);
-                }
-
-                $this->screenpublic();
-                
-
-
-            })
-
-            //待审核
-            ->order("u.create_time DESC")
-            ->paginate(10,false,['query'=>request()->param()])
-            ->each(function($item,$key){
-                //查询出报名人数,通过活动id
-                $item['user_nicknamet']=Db::name('user')
-                ->where(['id'=> $item['c_uid']])
-                ->field('user_nickname')
-                ->find();
-                ;
-
-                return $item;
-
-            })
-            ;
-
-           // var_dump($data);die;
-       //echo Db::name('user')->getLastSql();die;
-        // 获取分页显示
-        $page = $list->render();
-        $this->assign('list', $list);
-        $this->assign('page', $page);
-         return $this->fetch('complain');
-
-    }
-
-    /**
      * 职位认证
      *
      */
@@ -1765,72 +1621,6 @@ class AdminIndexController extends AdminBaseController
         $this->fetch();
     }
 
-    //下架处理
-    public function unshelf(){
-        $data=$this->request->param();
-        if($data){
-            Db::startTrans();
-            $result1=Db::name('complain')->where("id",$data['ids'])->update(['status'=>1]);
-            if($result1){
-
-                $result2=Db::name('user')->where('id',$data['c_uid'])->update(['user_status'=>1]);
-                if($result2){
-                    Db::commit();
-                    $this->success("下架成功!", url('/user/Admin_index/complain'));
-                }else{
-                    Db::rollback();     
-                     $this->error("下架失败!"); 
-                }
-
-            }else{
-                Db::rollback();
-                 $this->error("下架失败!"); 
-            }
-            
-        }
-        
-    }
-
-    //进行显示反馈显示用户。
-    public function feedback(){
-       
-         $list=Db::name('advices')
-            ->alias('ad')
-            // ->where('status',1)
-            ->order("ad.created_time DESC")
-            ->paginate(10,false,['query'=>request()->param()])
-            ->each(function($item,$key){
-                //查询出被举报名人昵称和状态。
-                $item['user_nicknamet']=Db::name('user')
-                ->where(['id'=> $item['uid']])
-                ->field('user_nickname,user_status')
-                ->find();
-                ;
-
-                return $item;
-
-            })
-            ;
-
-         
-    
-        // 获取分页显示
-        $page = $list->render();
-        $this->assign('list', $list);
-        $this->assign('page', $page);
-       return $this->fetch('feedback');
-    }
-
-    //处理审核
-    public function feedbackedit(){
-        $result=Db::name('advices')->where("id",input('id'))->update(['status'=>2]);
-        if($result){
-            $this->success("审核处理成功!");
-        }else{
-            $this->error("审核处理失败!");
-        }
-    }
-
     //投诉举报页面
     public function complain(){
         $data = $this->request->param();
@@ -1857,7 +1647,6 @@ class AdminIndexController extends AdminBaseController
             ->where(function (Query $query) use($data){
                 $query->where('u.user_type', 2);
                 $query->where('u.openid', 'not in','');
-                $query->where('c.status', 1);
 
                 //代表是否付费定制
                 ($this->request->action()=='custom' || $this->request->param('u')==2)?$query->where('u.is_vip', 1):$query->where('u.is_vip', 0);
@@ -1885,10 +1674,10 @@ class AdminIndexController extends AdminBaseController
             ->order("u.create_time DESC")
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
-                //查询出被举报名人昵称和状态。
+                //查询出报名人数,通过活动id
                 $item['user_nicknamet']=Db::name('user')
                 ->where(['id'=> $item['c_uid']])
-                ->field('user_nickname,user_status')
+                ->field('user_nickname')
                 ->find();
                 ;