commit

app/admin/controller/user/Out.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller\user;
 
 use app\admin\controller\AuthController;
@@ -13,10 +14,12 @@ use crmeb\services\{ExpressService,
     FormBuilder as Form,
     CacheService,
     UtilService as Util,
-    JsonService as Json};
+    JsonService as Json
+};
 use app\admin\model\system\{SystemAdmin,
     SystemAttachment as SystemAttachmentModel,
-    SystemAttachmentCategory as Category};
+    SystemAttachmentCategory as Category
+};
 use think\Db;
 use think\facade\Route as Url;
 use think\facade\Validate;
@@ -60,6 +63,7 @@ class Out extends AuthController
         $f[] = Form::input('name', '名称')->col(12);
         $f[] = Form::textarea('info', '简介');
         $f[] = Form::number('number', '达标额度')->col(12);
+        $f[] = Form::frameFiles('pics', '轮播图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'images')))->maxLength(5)->icon('image')->width('100%')->height('500px');
         $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
@@ -69,12 +73,13 @@ class Out extends AuthController
 
     public function save()
     {
-        $mode  = new model;
+        $mode = new model;
         $data = Util::postMore([
             'name',
             'info',
             'number',
             'status',
+            ['pics', []]
         ]);
         $validate = Validate::rule('name', 'require')->rule([
             'name' => 'require',
@@ -84,13 +89,14 @@ class Out extends AuthController
             'name.require' => '名称不能为空',
             'number.require' => '达标额度不能为空',
         ]);
+        $data['pics'] = implode(',', $data['pics']);
         if (!$validate->check($data)) {
             return Json::fail($validate->getError());
         }
         $res = $mode->save($data);
-        if ($res){
+        if ($res) {
             return Json::success('添加成功!');
-        }else{
+        } else {
             return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
         }
 
@@ -108,9 +114,9 @@ class Out extends AuthController
         $model = new model;
 
         $res = $model->where('id', $id)->delete();
-        if ($res){
+        if ($res) {
             return Json::success('删除成功!');
-        }else{
+        } else {
             return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
         }
 
@@ -120,12 +126,12 @@ class Out extends AuthController
     public function set_status($id, $status)
     {
 
-        if (empty($id))return Json::fail('修改失败');
+        if (empty($id)) return Json::fail('修改失败');
 
         $res = model::update(['status' => $status, 'id' => $id]);
-        if ($res){
+        if ($res) {
             return Json::success('修改成功!');
-        }else{
+        } else {
             return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
         }
     }
@@ -135,8 +141,9 @@ class Out extends AuthController
         if (!$id) Json::fail('数据不存在');
         $data = model::find($id);
         $f = [];
-        $f[] = Form::input('name', '名称',$data->getData('name'))->col(12);
-        $f[] = Form::textarea('info', '介绍',$data->getData('info'));
+        $f[] = Form::input('name', '名称', $data->getData('name'))->col(12);
+        $f[] = Form::textarea('info', '介绍', $data->getData('info'));
+        $f[] = Form::frameFiles('pics', '轮播图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'images')), explode(',', $data->getData('pics')))->maxLength(5)->icon('image')->width('100%')->height('500px');
         $f[] = Form::number('number', '达标额度', $data->getData('number'))->col(12);
         $f[] = Form::radio('status', '状态', $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
 
@@ -154,6 +161,7 @@ class Out extends AuthController
             'info',
             'status',
             'number',
+            ['pics', []]
         ]);
 
         $validate = Validate::rule('name', 'require')->rule([
@@ -165,17 +173,44 @@ class Out extends AuthController
             'number.require' => '达标数量不能为空',
 
         ]);
+        $data['pics'] = implode(',', $data['pics']);
         if (!$validate->check($data)) {
             return Json::fail($validate->getError());
         }
         $res = model::update($data);
-        if ($res){
+        if ($res) {
             return Json::success('修改成功!');
-        }else{
+        } else {
             return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
         }
 
 
     }
 
+    public function edit_content($id)
+    {
+        if (!$id) return $this->failed('数据不存在');
+        $seckill = model::get($id);
+        if (!$seckill) return Json::fail('数据不存在!');
+        $this->assign([
+            'content' => htmlspecialchars_decode($seckill['content']),
+            'field' => 'description',
+            'action' => Url::buildUrl('change_field', ['id' => $id, 'field' => 'content'])
+        ]);
+        return $this->fetch('public/edit_content');
+    }
+
+    public function change_field($id)
+    {
+        if (!$id) return $this->failed('数据不存在');
+        $seckill = model::get($id);
+        if (!$seckill) return Json::fail('数据不存在!');
+        $data['content'] = request()->post('content');
+        $res = model::edit($data, $id);
+        if ($res)
+            return Json::successful('添加成功');
+        else
+            return Json::fail('添加失败');
+    }
+
 }

app/admin/view/index/index.php

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <title>Liuniu管理系统</title>
+    <title>红酒管理系统</title>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->

app/admin/view/login/index.php

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="noindex,nofollow" />
-    <title>登录管理系统 -  Powered by Liuniu!</title>
+    <title>登录管理系统</title>
     <meta name="generator" content="CRMEB! v2.5" />
     <meta name="author" content="CRMEB! Team and CRMEB UI Team" />
     <link href="{__FRAME_PATH}css/bootstrap.min.css?v=3.4.0" rel="stylesheet">
@@ -17,11 +17,11 @@
     </script>
 </head>
 <body class="gray-bg login-bg">
-<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>
+<!--<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>-->
 <div class="middle-box text-center loginscreen  animated fadeInDown">
     <div class="login-group">
         <h3 class="login-logo">
-            <img src="{__ADMIN_PATH}images/logo.png">
+            红酒
         </h3>
         <form role="form" action="{:url('verify')}" method="post" id="form" onsubmit="return false">
             <div class="form-group">

app/admin/view/user/out/index.php

@@ -4,55 +4,59 @@
 {/block}
 {block name="content"}
 <style>
-    .btn-outline{
-        border:none;
+    .btn-outline {
+        border: none;
     }
-    .btn-outline:hover{
+
+    .btn-outline:hover {
         background-color: #0e9aef;
         color: #fff;
     }
+
     .layui-form-item .layui-btn {
         margin-top: 5px;
         margin-right: 10px;
     }
-    .layui-btn-primary{
+
+    .layui-btn-primary {
         margin-right: 10px;
-        margin-left: 0!important;
+        margin-left: 0 !important;
     }
-    label{
-        margin-bottom: 0!important;
+
+    label {
+        margin-bottom: 0 !important;
         margin-top: 4px;
     }
 </style>
 <div class="layui-fluid">
     <div class="layui-row layui-col-space15" id="app">
         <!--搜索条件-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-card">-->
-<!--                <div class="layui-card-header">搜索条件</div>-->
-<!--                <div class="layui-card-body">-->
-<!--                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">-->
-<!--                        <form class="layui-form layui-form-pane" action="">-->
-<!--                            <div class="layui-form-item">-->
-<!---->
-<!--                                <div class="layui-col-lg12">-->
-<!--                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>-->
-<!--                                    <div class="layui-input-inline">-->
-<!--                                        <input type="text" id="auction" name="auction" class="layui-input" placeholder="请输入名称,编号">-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                                <div class="layui-inline">-->
-<!--                                    <div class="layui-input-inline">-->
-<!--                                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">-->
-<!--                                            <i class="layui-icon layui-icon-search"></i>搜索</button>-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                            </div>-->
-<!--                        </form>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
+        <!--        <div class="layui-col-md12">-->
+        <!--            <div class="layui-card">-->
+        <!--                <div class="layui-card-header">搜索条件</div>-->
+        <!--                <div class="layui-card-body">-->
+        <!--                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">-->
+        <!--                        <form class="layui-form layui-form-pane" action="">-->
+        <!--                            <div class="layui-form-item">-->
+        <!---->
+        <!--                                <div class="layui-col-lg12">-->
+        <!--                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>-->
+        <!--                                    <div class="layui-input-inline">-->
+        <!--                                        <input type="text" id="auction" name="auction" class="layui-input" placeholder="请输入名称,编号">-->
+        <!--                                    </div>-->
+        <!--                                </div>-->
+        <!--                                <div class="layui-inline">-->
+        <!--                                    <div class="layui-input-inline">-->
+        <!--                                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">-->
+        <!--                                            <i class="layui-icon layui-icon-search"></i>搜索</button>-->
+        <!--                                    </div>-->
+        <!--                                </div>-->
+        <!--                            </div>-->
+        <!--                        </form>-->
+        <!--                    </div>-->
+        <!--                </div>-->
+        <!--            </div>-->
+        <!--        </div>-->
 
         <!-- 中间详细信息-->
         <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
@@ -67,22 +71,29 @@
                 <div class="layui-card-header">出局奖励列表</div>
                 <div class="layui-card-body">
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加出局奖励</a>
-<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                        <a class="layui-btn layui-btn-sm"
+                           onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加出局奖励</a>
+                        <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
 
 
                     <script type="text/html" id="image">
-                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" >
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
                     </script>
                     <script type="text/html" id="status">
-                        <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
+                        <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status'
+                               lay-text='使用|禁用' {{ d.status== 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal"
+                                onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
                             编辑
                         </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal"
+                                onclick="$eb.createModalFrame('{{d.title}}-编辑内容','{:Url('edit_content')}?id={{d.id}}')">
+                            编辑内容
+                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
@@ -110,49 +121,49 @@
     });
 
     //查询
-    layList.search('search',function(where){
-        layList.reload(where,true);
+    layList.search('search', function (where) {
+        layList.reload(where, true);
     });
 
     //点击事件绑定
-    layList.tool(function (event,data,obj) {
+    layList.tool(function (event, data, obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'user.out',a:'delete',q:{id:data.id}});
-                var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
-                $eb.$swal('delete',function(){
-                    $eb.axios.get(url).then(function(res){
-                        if(res.status == 200 && res.data.code == 200) {
-                            $eb.$swal('success',res.data.msg);
+                var url = layList.U({c: 'user.out', a: 'delete', q: {id: data.id}});
+                var code = {title: "操作提示", text: "确定将该商品移入回收站吗？", type: 'info', confirm: '是的，移入回收站'};
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
                             obj.del();
                             location.reload();
-                        }else
+                        } else
                             return Promise.reject(res.data.msg || '删除失败')
-                    }).catch(function(err){
-                        $eb.$swal('error',err);
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
                     });
-                },code)
+                }, code)
                 break;
             case 'open_image':
                 $eb.openImage(data.image);
                 break;
             case 'edit':
-                location.href = layList.U({a:'edit',q:{id:data.id}});
+                location.href = layList.U({a: 'edit', q: {id: data.id}});
                 break;
         }
     })
 
 
     //改状态
-    layList.switch('status',function (odj,value) {
-        if(odj.elem.checked==true){
-            layList.baseGet(layList.Url({c:'user.out',a:'set_status',p:{status:1,id:value}}),function (res) {
+    layList.switch('status', function (odj, value) {
+        if (odj.elem.checked == true) {
+            layList.baseGet(layList.Url({c: 'user.out', a: 'set_status', p: {status: 1, id: value}}), function (res) {
                 layList.msg(res.msg, function () {
                     layList.reload();
                 });
             });
-        }else{
-            layList.baseGet(layList.Url({c:'user.out',a:'set_status',p:{status:0,id:value}}),function (res) {
+        } else {
+            layList.baseGet(layList.Url({c: 'user.out', a: 'set_status', p: {status: 0, id: value}}), function (res) {
                 layList.msg(res.msg, function () {
                     layList.reload();
                 });