Просмотр исходного кода

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

wesmiler 6 лет назад
Родитель
Сommit
36b4f046e4

+ 3 - 2
app/admin/controller/NewsController.php

@@ -30,7 +30,7 @@ class NewsController extends AdminBaseController{
         $catid = isset($param['catid'])?intval($param['catid']):0;
         $query = array(
             'catid' => $catid,
-            'title' => $keywords
+            'keywords' => $keywords
         );
         $map = array();
         if($this->iseditor){
@@ -203,7 +203,8 @@ class NewsController extends AdminBaseController{
         Db::name('news_data')->update($data);
         if($res){
             // $this->success('编辑成功','news/index?page='.$page);
-            $this->success('编辑成功','news/index');
+           // $this->success('编辑成功','news/index');
+		   $this->success('编辑成功',$page);
         }else{
             $this->error('编辑失败');
         }

+ 22 - 16
public/themes/admin_simpleboot3/admin/jiameng/add.html

@@ -1,16 +1,16 @@
 <include file="public@header" />
 <script>
-	$(function(){
-		
-		$("#title").blur(function(){
-			var zhi = $("#title").val();
-			$.post('/admin/jiameng/chongfu',{title:zhi},function(data){
-				if(data=='1'){
-					alert('标题重复');
-				}
-			})
-		})
-	})
+    $(function(){
+        
+        $("#title").blur(function(){
+            var zhi = $("#title").val();
+            $.post('/admin/jiameng/chongfu',{title:zhi},function(data){
+                if(data=='1'){
+                    alert('标题重复');
+                }
+            })
+        })
+    })
 </script>
 </head>
 <body>
@@ -104,12 +104,18 @@
         </div>
         
         <div class="form-group">
+           <php>$level=array('1'=>'今日之星','2'=>'品牌精选','3'=>'品牌推荐','4'=>'品牌严选','5'=>'默认','6'=>'推荐专题品牌','7'=>'品牌聚焦','8'=>'最新品牌')</php>
             <label for="level" class="col-sm-2 control-label"><span class="form-required">*</span>信息等级</label>
             <div class="col-md-6 col-sm-10">
                 <select name="level" id="" class="form-control">
-                    <?php for($i=0;$i<10;$i++){ ?>
+                  <!--  sdfsd <?php for($i=0;$i<10;$i++){ ?>
                     <option value="{$i}">{$i}级</option>
-                    <?php } ?>
+                    <?php } ?> -->
+
+                    <foreach name="level" item="vo">
+                            <php>$sexselected=$key==5?"selected":"";</php>
+                            <option value="{$key}" {$sexselected}>{$vo}</option>
+                    </foreach>
                     
                 </select>
             </div>
@@ -159,9 +165,9 @@
             <label for="area" class="col-sm-2 control-label">所在地区</label>
             <div class="col-md-6 col-sm-10">
                 <select class="form-control" name="area_id">
-                	<foreach name="$area_list" id="vo">
-                		<option value="{$key}">{$vo}</option>
-                	</foreach>
+                    <foreach name="$area_list" id="vo">
+                        <option value="{$key}">{$vo}</option>
+                    </foreach>
                 </select>
             </div>
         </div>

+ 2 - 1
public/themes/admin_simpleboot3/admin/news/edit.html

@@ -44,8 +44,9 @@
         <li class="active"><a href="#">编辑资讯</a></li>
     </ul>
     <form method="post" class="form-horizontal js-ajax-form margin-top-20" action="{:url('News/editPost')}">
+	  <input type="hidden" name="page" value="{$_SERVER['HTTP_REFERER']}">
         <input type="hidden" name="id" value="{$info.id}">
-        <input type="hidden" name="page" value="{$page}" />
+      <!--  <input type="hidden" name="page" value="{$page}" /> -->
         <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">