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

app/admin/controller/MessageController.php

@@ -128,8 +128,6 @@ class MessageController extends AdminBaseController{
                     ->alias('p1')
                     ->leftJoin('mobile_log p2','p1.`id`=p2.`msg_id`')
                     ->field($field)->where('p1.catid','in',$cates)->where($map2)->where('p2.user_id',$userid)->limit(0,$from)->select();
-
-
             }
 
         }
@@ -137,10 +135,11 @@ class MessageController extends AdminBaseController{
 
         return $data;
 
-
-
     }
-
+/**
+ * 替换已经查看的手机，使*号变为原来手机号码，二维数组
+ *
+ * */
     private function covermobile($lists,$data)
     {
         $j=0;
@@ -150,19 +149,15 @@ class MessageController extends AdminBaseController{
             $re_list[$j]=$val;
             foreach ($data as $arr)
             {
-
                if($val['id']==$arr['id'])
                {
                    $re_list[$j]['mobile']=$arr['mobile'];
                }
-
             }
             $j++;
-
         }
 
         return $re_list;
-
     }
 
 
@@ -183,14 +178,10 @@ class MessageController extends AdminBaseController{
             {
                 $data[$i]=$arr[$j];
                 $j++;
-
             }
-
         }
-
     return $data;
 
-
     }
 
 
@@ -322,7 +313,7 @@ class MessageController extends AdminBaseController{
             'C' => array('catname', '分类'),
             'D' => array('name', '姓名'),
             'E' => array('ip', 'IP'),
-           
+
             'F' => array('tzed', '投资额度'),
             'G' => array('mobile', '电话'),
             'H' => array('content', '留言内容'),
@@ -379,6 +370,21 @@ class MessageController extends AdminBaseController{
 				$param['jm_title'] = $info['title'];
 			}
 		}
+
+		if(!empty($param['jm_title']))
+        {
+            $info_title = Db::name('jiameng')->field('id')->where('title',$param['jm_title'])->find();
+            if(!$info_title)
+            {
+                $this->error('没有该品牌信息');
+            }
+
+
+            $param['jm_id']=$info_title['id'];
+
+
+
+        }
 		//mobile
 
         if(strlen($param['mobile']) == 11)
@@ -397,6 +403,22 @@ class MessageController extends AdminBaseController{
 
         }
 
+        //$week_time=time()-604800;
+
+//        $res_mobile=Db::name('category')->where('mobile',$param['mobile'])->where('create_time','>',$week_time)->find();
+//        if($res_mobile)
+//        {
+//            $this->error('手机号码一个周内只能留一次');
+//        }
+//        $ip=get_client_ip();
+//        $start_time=strtotime(date('Y-m-d') );
+//        $ip_count=Db::name('category')->where('ip',$ip)->where('create_time','>',$start_time)->count();
+//        if($ip_count>1)
+//        {
+//            $this->error('同一个ip一天只可以留言2次');
+//        }
+
+
 
             // ppppppppp
         if($param['catname']){

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

@@ -189,6 +189,12 @@
                 <input type="text" class="form-control" id="mendian" name="mendian">
             </div>
         </div>
+          <div class="form-group">
+            <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">
             <label for="yxjm" class="col-sm-2 control-label"> 意向加盟人数</label>
             <div class="col-md-6 col-sm-10">

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

@@ -192,6 +192,12 @@
                 <input type="text" class="form-control" id="mendian" name="mendian" value="{$info.mendian}">
             </div>
         </div>
+     <div class="form-group">
+            <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">
             <label for="yxjm" class="col-sm-2 control-label"> 意向加盟人数</label>
             <div class="col-md-6 col-sm-10">