1

application/admin/controller/Accounts.php

@@ -247,13 +247,17 @@ class Accounts extends Base
 //            if (strlen($param['searchText'])) {
 //                $where['name'] = ['like', '%' . $param['searchText'] . '%'];
 //            }
-            $result = db('accountslabel')->where($where)->limit($offset, $limit)->order('add_time', 'desc')->select();
+            $result = db('accountslabel')->where($where)->limit($offset, $limit)->order('id', 'asc')->select();
 
             foreach($result as $key=>$vo){
                 $result[$key]['add_time'] = date('Y-m-d H:i:s',$result[$key]['add_time']);
 
                 // 生成操作按钮
-                $result[$key]['operate'] = $this->makeBtnLabel($vo['id']);
+                if($vo['id'] != 1){
+                    $result[$key]['operate'] = $this->makeBtnLabel($vo['id']);
+                }else{
+                    $result[$key]['operate'] = $operate = '<a style="margin-left:5px;" href="' . url('Accounts/editlabel', ['id' => $vo['id']]) . '"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+                }
             }
             $return['total'] = db('accountslabel')->count();  //总数据
             $return['rows'] = $result;
@@ -326,6 +330,7 @@ class Accounts extends Base
             $id = input('param.id/d');
 
             try {
+                db('accounts')->where('label_id', $id)->update(['label_id'=>1]);
                 db('accountslabel')->where('id', $id)->delete();
             } catch (\Exception $e) {
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);

application/admin/view/material/add.html

@@ -36,7 +36,6 @@
                                 <button type="button" class="layui-btn layui-btn-small" id="up-material">
                                     <i class="layui-icon"></i>上传图片</button>
                             </div>
-                            <span>建议上传180px*180px</span>
                             <div class="input-group col-sm-3" id="img_material">
 
                             </div>