活动/商家

application/admin/controller/Project.php

@@ -11,7 +11,10 @@ namespace app\admin\controller;
 use app\admin\controller\AuthBase;
 use app\common\model\Admin as AdminModel;
 use app\admin\controller\Upload;
+use app\common\model\Catalogs;
+use app\common\model\Citys;
 use app\common\model\Project as ProjectModel;
+use app\common\model\Tags;
 
 class Project extends AuthBase
 {
@@ -548,4 +551,19 @@ class Project extends AuthBase
         $project->allowField('id', 'sort')->update(input('post.'));
         halt($project->getLastSql());
     }
+
+    public function save()
+    {
+        if(input('id')){
+            $info = ProjectModel::get(input('id'));
+            $this->assign('info',$info);
+        }
+        //分类
+        $catalogs = Catalogs::all();
+        //城市
+        $city = Citys::all();
+        //标签
+        $tags = Tags::all();
+        return $this->fetch('',compact('catalogs','city','tags'));
+    }
 }

application/admin/view/project/index.html

@@ -60,7 +60,7 @@
                 <button type="submit" class="btn btn-primary">搜索</button>
             </form>
             <div class=" pull-left margin-left">
-                <a  href="{:url('admin/project/create')}" class="btn btn-success">创建活动/商家</a>
+                <a  href="{:url('admin/project/save')}" class="btn btn-success">创建活动/商家</a>
             </div>
         </div>
     </div>
@@ -149,7 +149,7 @@
                             <input type="number" size="4" style="width:50px" onchange="setSort(this.value,{$vo.id})" value="{$vo.sort}">
                         </td>
                         <td>
-                            <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="{:url('admin/project/save',['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>
                         </td>
                     </tr>

application/database.php

@@ -13,7 +13,7 @@ $config = [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '127.0.0.1',
+    'hostname'        => 'mkt.jqlink.tech',
     // 数据库名
     'database'        => 'maveler',
     // 用户名