活动商家

application/admin/controller/Project.php

@@ -47,13 +47,17 @@ class Project extends AuthBase
         if ($catalog_id) {
         if ($catalog_id) {
             $condition['catalog_id'] = $catalog_id;
             $condition['catalog_id'] = $catalog_id;
         }
         }
+        if(input('order')==2){
+            $order = ['sort'=>'desc','id'=>'desc'];
+        }else{
+            $order = ['id'=>'desc'];
+        }
         $catalog_list = $this->catalog_model->order('sort', 'asc')->select();
         $catalog_list = $this->catalog_model->order('sort', 'asc')->select();
         $this->assign('catalog_list', $catalog_list);
         $this->assign('catalog_list', $catalog_list);
         $project_list =
         $project_list =
             $this->project_model
             $this->project_model
                 ->where($condition)
                 ->where($condition)
-                ->order('sort', 'desc')
-                ->order('id desc')
+                ->order($order)
                 ->paginate(10, false, ['query' => ['title' => $title, 'type' => $type, 'catalog_id' => $catalog_id]]);
                 ->paginate(10, false, ['query' => ['title' => $title, 'type' => $type, 'catalog_id' => $catalog_id]]);
         $this->assign('project_list', $project_list);
         $this->assign('project_list', $project_list);
         return $this->fetch('');
         return $this->fetch('');

application/admin/view/project/index.html

@@ -33,7 +33,12 @@
     <div class="row margin-bottom">
     <div class="row margin-bottom">
         <div class="col-md-12">
         <div class="col-md-12">
             <form class="form-inline pull-left" method="GET" action="{:url('admin/project/index')}" >
             <form class="form-inline pull-left" method="GET" action="{:url('admin/project/index')}" >
-
+                <div class="form-group margin-right">
+                    <select name="order" class="form-control">
+                        <option value="1">最新(排序)</option>
+                        <option value="2">火爆(排序)</option>
+                    </select>
+                </div>
                 <div class="form-group margin-right">
                 <div class="form-group margin-right">
                     <select name="catalog_id" class="form-control">
                     <select name="catalog_id" class="form-control">
                         <option value="">所有分类</option>
                         <option value="">所有分类</option>
@@ -144,7 +149,7 @@
                             <input type="number" size="4" style="width:50px" onchange="setSort(this.value,{$vo.id})" value="{$vo.sort}">
                             <input type="number" size="4" style="width:50px" onchange="setSort(this.value,{$vo.id})" value="{$vo.sort}">
                         </td>
                         </td>
                         <td>
                         <td>
-                            <a href="{:url('admin/project/updateProject',['id'=>$vo.id])}" class="btn btn-xs btn-primary"><i class="fa fa-pencil"></i></a>
+                            <a href="{:url('admin/project/updateProject',['id'=>$vo.id,'page'=>input('page')])}" class="btn btn-xs btn-primary"><i class="fa fa-pencil"></i></a>
                             <a href="javascript:" oid="{$vo.id}" class="btn btn-xs btn-danger btn-delete"><i class="fa fa-trash"></i></a>
                             <a href="javascript:" oid="{$vo.id}" class="btn btn-xs btn-danger btn-delete"><i class="fa fa-trash"></i></a>
                         </td>
                         </td>
                     </tr>
                     </tr>

application/admin/view/project/updateproject.html

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="/static/fileinput/css/fileinput.css">
 <link rel="stylesheet" href="/static/fileinput/css/fileinput.css">
 <link rel="stylesheet" href="/static/bootstrap-select/css/bootstrap-select.min.css">
 <link rel="stylesheet" href="/static/bootstrap-select/css/bootstrap-select.min.css">
 <link rel="stylesheet" href="/static/datetimepicker/css/bootstrap-datetimepicker.min.css">
 <link rel="stylesheet" href="/static/datetimepicker/css/bootstrap-datetimepicker.min.css">
+<script src="/static/layer/layer.js"></script>
 
 
 
 
 <style type="text/css">
 <style type="text/css">
@@ -330,7 +331,7 @@ $(function(){
         });
         });
 //表单AJAX提交 ，使用formData
 //表单AJAX提交 ，使用formData
         $("#btn-save").click(function(){
         $("#btn-save").click(function(){
-            $(this).attr("disabled","true");
+            // $(this).attr("disabled","true");
             var validate = $('#myFrom').validationEngine('validate')
             var validate = $('#myFrom').validationEngine('validate')
             if(!validate){
             if(!validate){
                 $(this).removeAttr("disabled");
                 $(this).removeAttr("disabled");
@@ -407,7 +408,7 @@ $(function(){
                     formValue.append('kf_qrcode',qcode[0]);
                     formValue.append('kf_qrcode',qcode[0]);
                 }
                 }
             }
             }
-
+            var index = layer.load(2,{ shade: [0.6,'#fff'] });
             $.ajax({
             $.ajax({
                 url: saveUrl,
                 url: saveUrl,
                 type: "POST",
                 type: "POST",
@@ -415,17 +416,18 @@ $(function(){
                 processData: false,  // 不处理数据
                 processData: false,  // 不处理数据
                 contentType: false,  // 不设置内容类型
                 contentType: false,  // 不设置内容类型
                 success:function(data){
                 success:function(data){
+                    layer.close(index);
                     if (data['code'] == 1) {
                     if (data['code'] == 1) {
-                        showDialog("提示", data['msg'], function () {
-                            window.location.href = "{:url('admin/project/index')}";
-                        });
+                        layer.msg(data['msg'],{icon:1});
+                        setTimeout(function(){
+                            window.location.href = "{:url('admin/project/index',['page'=>input('page')])}";
+                        },1500);
                     } else {
                     } else {
-                        showDialog("提示", data['msg'], function () {
-                            // $("#btn-save").removeAttr("disabled");
-                        });
+                        layer.msg(data['msg'],{icon:2});
                     }
                     }
                 },
                 },
                 error:function(err){
                 error:function(err){
+                    layer.close(index);
                     $("#btn-save").removeAttr("disabled");
                     $("#btn-save").removeAttr("disabled");
                   console.log(err);
                   console.log(err);
                 }
                 }