Merge branch 'master' of http://git.dongerkj.com:9095/derkj/NN2020042801

app/admin/controller/JiamengController.php

@@ -6,6 +6,18 @@ use tree\Tree;
 use app\admin\model\CategoryModel;
 
 class JiamengController extends AdminBaseController{
+
+    public function initialize(){
+        parent::initialize();
+        $username = $_SESSION['think']['name'];
+        $userid = $_SESSION['think']['ADMIN_ID'];
+        //判断是否是编辑管理员
+        $iseditor = 0;
+        $iseditor = Db::name('role_user')->where('role_id',3)->where('user_id',$userid)->count();
+        $this->iseditor = $iseditor;
+        $this->uname = $username;
+        $this->assign('iseditor',$iseditor);
+    }
     public function index(){
         set_time_limit(0);
         $param = $this->request->param();
@@ -19,6 +31,7 @@ class JiamengController extends AdminBaseController{
         $lists = array();
         $map = array();
         
+       
         
         if($param['cate_id']){
             //分类信息
@@ -36,7 +49,11 @@ class JiamengController extends AdminBaseController{
             }
             
         }
-     
+
+        //增加作者的条件进行区分只能是编辑员可以看到自己的发布
+        if($this->iseditor){
+           $map['author'] =$this->uname;
+        }
         $query = array(
             'cate_id' => $param['cate_id'],
             'title' => $title
@@ -141,6 +158,11 @@ class JiamengController extends AdminBaseController{
         //2020-5-22 进行增加加盟支持
         $param['jm_support']=implode(',',$param['supports']);unset($param['supports']);
         
+        //增加字段以便给与指定是谁的。显示列表
+        if($this->iseditor){
+            $param['author']=$this->uname;
+        }
+
         $res = Db::name('Jiameng')->insertGetId($param);
         $data['id'] = $res;
         Db::name('Jiameng_data')->insert($data);

app/admin/controller/NewsController.php

@@ -52,7 +52,7 @@ class NewsController extends AdminBaseController{
         foreach($article_list as $k=>$v){
             $article_cates[$v['id']] = $v['catname'];
         }
-
+       // var_dump($this->iseditor);die;
         $this->assign('iseditor',$this->iseditor);
         $this->assign('article_cates',$article_cates);
         $this->assign('keywords',$keywords);
@@ -74,7 +74,7 @@ class NewsController extends AdminBaseController{
 
 
             $cates = Db::name('user')->field('category')->where('id',$user['user_id'])->find();
-            $category=unserialize($cates['category']);
+            $category=explode(',',$cates['category']);
             
             $categorys='';
             //遍历数组成字符串，然后再进行循环读取。
@@ -187,7 +187,8 @@ class NewsController extends AdminBaseController{
         $info['content'] = $content['content'];
         if(empty($info['id'])){
             $this->error('未找到信息');
-        }
+        }  
+          $this->assign('iseditor',$this->iseditor);
         $this->assign('info',$info);
         return $this->fetch();
     }

public/themes/admin_simpleboot3/admin/jiameng/add.html

@@ -95,11 +95,11 @@
         <div class="form-group">
             <label for="logo-2" class="col-sm-2 control-label"><span class="form-required">*</span>品牌logo</label>
             <div class="col-md-6 col-sm-10">
-                <input id="logo-2" type="hidden" name="logo" >
-                <input id="logo-2-name" type="text" title="图片名称" size="40">
-                <a href="javascript:uploadOneImage('图片上传','#logo-2','jiameng/');">上传</a>
+                <input id="photo-6" type="hidden" name="logo" >
+                <input id="photo-6-url" type="text" title="图片名称" size="40">
+                <a href="javascript:uploadOneImage('图片上传','#photo-6','jiameng/');">上传</a>
                 <br>
-                <img id="logo-2-preview" width="200">
+                <img id="photo-6-preview" width="200">
             </div>
         </div>
         
@@ -177,12 +177,12 @@
                 <input type="text" class="form-control" id="fromyear" name="fromyear">
             </div>
         </div> -->
-        <div class="form-group">
+       <!--  <div class="form-group">
             <label for="tags" class="col-sm-2 control-label"> 标签(多个标签|分隔)</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="tags" name="tags">
             </div>
-        </div>
+        </div> -->
         <div class="form-group">
             <label for="mendian" class="col-sm-2 control-label"> 门店数</label>
             <div class="col-md-6 col-sm-10">
@@ -190,17 +190,17 @@
             </div>
         </div>
           <div class="form-group">
-            <label for="mendian" class="col-sm-2 control-label"> 直营店数量</label>
+            <label for="mendian" class="col-sm-2 control-label"> <!-- 直营店数量 -->意向加盟人数</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="zhiying" name="zhiying">
             </div>
         </div>
-        <div class="form-group">
+       <!--  <div class="form-group">
             <label for="yxjm" class="col-sm-2 control-label"> 意向加盟人数</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="yxjm" name="yxjm">
             </div>
-        </div>
+        </div> -->
         <div class="form-group">
             <label for="title" class="col-sm-2 control-label"><span class="form-required">*</span>项目详情</label>
             <div class="col-md-6 col-sm-10">

public/themes/admin_simpleboot3/admin/jiameng/edit.html

@@ -97,11 +97,11 @@
         <div class="form-group">
             <label for="logo-2" class="col-sm-2 control-label"><span class="form-required">*</span>品牌logo</label>
             <div class="col-md-6 col-sm-10">
-                <input id="logo-2" type="hidden" name="logo" value="{$info.logo}">
-                <input id="logo-2-name" type="text" title="图片名称" size="40">
-                <a href="javascript:uploadOneImage('图片上传','#logo-2','jiameng/');">上传</a>
+                <input id="photo-6" type="hidden" name="logo" value="{$info.logo}">
+                <input id="photo-6-name" type="text" title="图片名称" size="40">
+                <a href="javascript:uploadOneImage('图片上传','#photo-6','jiameng/');">上传</a>
                 <br>
-                <img id="logo-2-preview" width="200" src="/upload/{$info.logo}">
+                <img id="photo-6-preview" width="200" src="/upload/{$info.logo}">
             </div>
         </div>
         
@@ -180,12 +180,12 @@
                 <input type="text" class="form-control" id="fromyear" name="fromyear" value="{$info.fromyear}">
             </div>
         </div> -->
-        <div class="form-group">
+     <!--    <div class="form-group">
             <label for="tags" class="col-sm-2 control-label"> 标签(多个标签|分隔)</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="tags" name="tags" value="{$info.tags}">
             </div>
-        </div>
+        </div> -->
         <div class="form-group">
             <label for="mendian" class="col-sm-2 control-label"> 门店数</label>
             <div class="col-md-6 col-sm-10">
@@ -193,17 +193,17 @@
             </div>
         </div>
      <div class="form-group">
-            <label for="mendian" class="col-sm-2 control-label"> 直营店数量</label>
+            <label for="mendian" class="col-sm-2 control-label"> <!-- 直营店数量 -->意向加盟人数</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="zhiying" name="zhiying" value="{$info.zhiying}">
             </div>
         </div>
-        <div class="form-group">
+        <!-- <div class="form-group">
             <label for="yxjm" class="col-sm-2 control-label"> 意向加盟人数</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="yxjm" name="yxjm" value="{$info.yxjm}">
             </div>
-        </div>
+        </div> -->
         <div class="form-group">
             <label for="title" class="col-sm-2 control-label"><span class="form-required">*</span>项目详情</label>
             <div class="col-md-6 col-sm-10">
@@ -244,6 +244,20 @@
             </div>
         </div>
 
+        <if condition="$iseditor==0">
+        <div class="form-group">
+            <label for="status" class="col-sm-2 control-label"><span class="form-required">*</span>状态</label>
+            <div class="col-md-6 col-sm-10">
+                <select name="status" id="status" class="form-control">
+                    <option <if condition="$info.status==1">selected</if> value="1">审核通过</option>
+                    <option <if condition="$info.status==0">selected</if> value="0">未审核</option>
+                
+                    <option <if condition="$info.status==2">selected</if> value="2">审核不通过</option>
+                </select>
+            </div>
+        </div>
+        </if>
+
          <div class="form-group">
             <label for="title" class="col-sm-2 control-label">加盟支持</label>
             <div class="col-md-6 col-sm-10">
@@ -268,7 +282,14 @@
 
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
-                <button type="submit" class="btn btn-primary js-ajax-submit" id="tijiao">{:lang('EDIT')}</button>
+                   <if condition="$iseditor==1 && $info.status==1">
+
+                   <button type="submit" class="btn btn-primary js-ajax-submit" disabled id="tijiao">{:lang('EDIT')}</button>
+
+                <else/>
+                     <button type="submit" class="btn btn-primary js-ajax-submit"  id="tijiao">{:lang('EDIT')}</button>
+                 </if>
+               <!--  <bbutton type="submit" class="btn btn-primary js-ajax-submit" id="tijiao">{:lang('EDIT')}</button> -->
             </div>
         </div>
     </form>

public/themes/admin_simpleboot3/admin/jiameng/index.html

@@ -59,6 +59,7 @@
                 <th width="80">投资额度</th>
                 <th width="80">排序</th>
                 <th>添加时间</th>
+                <th width="80">状态</th>
                 <th width="200">操作</th>
 
             </tr>
@@ -76,17 +77,28 @@
                     <td>{$vo.touzi}</td>
                     <td>{$vo.list_order}</td>
                     <td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td>
+                  <td>
+                    <if condition="$vo.status==1">审核通过</if>
+                    <if condition="$vo.status==0"><span style="color:red;">未审核</span></if>
+                    <if condition="$vo.status==2"><span style="color:red;">审核不通过</span></if>
+                  </td>
                     <td>
                         <a class="btn btn-xs btn-info" href='{:url("admin/Jiameng/show",array("id"=>$vo["id"]))}'>详情</a>
-                        <a class="btn btn-xs btn-primary" href='{:url("admin/Jiameng/edit",array("id"=>$vo["id"]))}'>{:lang('EDIT')}</a>
-                        <a class="btn btn-xs btn-danger js-ajax-delete" href="{:url('admin/Jiameng/delete',array('id'=>$vo['id']))}">{:lang('DELETE')}</a>
+                
+                 <if condition="$vo.status==1 && $iseditor==1">
+
+                <else/>
+                 <a class="btn btn-xs btn-danger js-ajax-delete" href="{:url('admin/Jiameng/delete',array('id'=>$vo['id']))}">{:lang('DELETE')}</a>
+                      
+                   </if>      
+                         <a class="btn btn-xs btn-primary" href='{:url("admin/Jiameng/edit",array("id"=>$vo["id"]))}'>{:lang('EDIT')}</a>
                         <a class="btn btn-xs btn-primary" href='{:url("admin/News/add",array("pid"=>$vo["id"]))}'>发布资讯</a>
                     </td>
                 </tr>
             </foreach>
             </tbody>
             <tr>
-            	<td colspan="11">
+            	<td colspan="12">
             		<input class="btn btn-sm btn-primary js-ajax-submit" type="submit" name="pc" value="pc百度提交">
             		<input class="btn btn-sm btn-primary js-ajax-submit" type="submit" name="mobile" value="手机百度提交">
             		<input class="btn btn-sm btn-primary js-ajax-submit" type="submit" name="xiongzhang" value="熊掌号提交">

public/themes/admin_simpleboot3/admin/login.html

@@ -31,7 +31,7 @@
     <div class="container">
         <div class="row">
             <div class="col-md-4 col-md-offset-4">
-                <h1 class="text-center">51加盟</h1>
+                <h1 class="text-center">1688创业平台</h1>
                 <form class="js-ajax-form" action="{:url('public/doLogin')}" method="post">
                     <div class="form-group">
                         <input type="text" id="input_username" class="form-control" name="username"

public/themes/admin_simpleboot3/admin/news/add.html

@@ -84,23 +84,27 @@
          
 
         <div class="form-group">
-            <label for="title" class="col-sm-2 control-label"><span class="form-required">*</span>关键词</label>
+            <label for="title" class="col-sm-2 control-label">
+            <!-- <span class="form-required">*</span> -->
+            关键词
+            </label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="keywords" name="keywords">
             </div>
         </div>
         <div class="form-group">
-            <label for="seo_title" class="col-sm-2 control-label"><span class="form-required">*</span>seo标题</label>
+            <label for="seo_title" class="col-sm-2 control-label">
+            <span class="form-required">*</span>seo标题</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="seo_title" name="seo_title">
             </div>
         </div>
-        <div class="form-group">
+        <!-- <div class="form-group">
             <label for="seo_keywords" class="col-sm-2 control-label"><span class="form-required">*</span>seo关键词</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="seo_keywords" name="seo_keywords">
             </div>
-        </div>
+        </div> -->
          <div class="form-group">
             <label for="seo_description" class="col-sm-2 control-label">资讯描述</label>
             <div class="col-md-6 col-sm-10">

public/themes/admin_simpleboot3/admin/news/edit.html

@@ -90,12 +90,12 @@
                 <input type="text" class="form-control" id="seo_title" name="seo_title" value="{$info.seo_title}">
             </div>
         </div>
-        <div class="form-group">
+       <!--  <div class="form-group">
             <label for="seo_keywords" class="col-sm-2 control-label"><span class="form-required">*</span>seo关键词</label>
             <div class="col-md-6 col-sm-10">
                 <input type="text" class="form-control" id="seo_keywords" name="seo_keywords" value="{$info.seo_keywords}">
             </div>
-        </div>
+        </div> -->
         <div class="form-group">
             <label for="photo-1" class="col-sm-2 control-label"><span class="form-required">*</span>标题图片</label>
             <div class="col-md-6 col-sm-10">
@@ -177,7 +177,14 @@
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
-                <button type="submit" class="btn btn-primary js-ajax-submit" id="tijiao">{:lang('EDIT')}</button>
+                 <if condition="$iseditor==1 && $info.status==1">
+                 
+                   <button type="submit" class="btn btn-primary js-ajax-submit" disabled id="tijiao">{:lang('EDIT')}</button>
+
+                <else/>
+                
+                     <button type="submit" class="btn btn-primary js-ajax-submit"  id="tijiao">{:lang('EDIT')}</button>
+                 </if>
             </div>
         </div>
     </form>

public/themes/admin_simpleboot3/admin/user/edit.html

@@ -41,7 +41,7 @@
 			 <div class="form-group" id="showcategory" style="display: none;">
 				<label for="input-user_email" class="col-sm-2 control-label"><span class="form-required"></span>类目</label>
 				<div class="col-md-6 col-sm-10">
-			       <?php $categorys = unserialize($category);?>
+			       <?php $categorys = explode(',',$category);?>
 					<foreach name="catelist" item="vo" key="k">
 						<label class="checkbox-inline">
 							<input value="{$k}" type="checkbox" name="category[]" <?php if(in_array($k,$categorys)){ echo "checked";}?> >{$vo}

vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php

@@ -146,7 +146,7 @@ class UserController extends AdminBaseController
                     $this->error($result);
                 } else {   
                     $_POST['user_pass'] = cmf_password($_POST['user_pass']);
-                    $_POST['category'] = serialize($_POST['category']); 
+                    $_POST['category'] = implode(',',$_POST['category']); 
                    // $_POST['user_type'] =$role_ids[0]; 
 
                     $result             = DB::name('user')->insertGetId($_POST);
@@ -245,7 +245,7 @@ class UserController extends AdminBaseController
                     // 验证失败 输出错误信息
                     $this->error($result);
                 } else {
-                    $_POST['category'] = serialize($_POST['category']); 
+                    $_POST['category'] = implode(',',$_POST['category']); 
                     
                     $result = DB::name('user')->update($_POST);
                     if ($result !== false) {