商品分类

application/admin/controller/unishop/Category.php

@@ -100,12 +100,12 @@ class Category extends Backend
             if ($params) {
                 $params = $this->preExcludeFields($params);
 
-                if ($params['pid'] != $row['pid']) {
+                /*if ($params['pid'] != $row['pid']) {
                     $childrenIds = Tree::instance()->init(collection(\app\admin\model\unishop\Category::select())->toArray())->getChildrenIds($row['id']);
                     if (in_array($params['pid'], $childrenIds)) {
                         $this->error(__('Can not change the parent to child'));
                     }
-                }
+                }*/
 
                 try {
                     //是否采用模型验证

application/admin/view/unishop/category/add.html

@@ -16,7 +16,7 @@
 
         </div>
     </div>-->
-    <div class="form-group">
+    <!--<div class="form-group">
         <label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -27,7 +27,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -65,14 +65,14 @@
             </div>
             <ul class="row list-inline plupload-preview" id="p-image"></ul>
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-keywords" class="form-control" name="row[keywords]" type="text" value="">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label for="c-description" class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-description" class="form-control" name="row[description]"></textarea>

application/admin/view/unishop/category/edit.html

@@ -12,7 +12,7 @@
 
         </div>
     </div>-->
-    <div class="form-group">
+    <!--<div class="form-group">
         <label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -23,7 +23,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -61,14 +61,14 @@
             </div>
             <ul class="row list-inline plupload-preview" id="p-image"></ul>
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-keywords" class="form-control" name="row[keywords]" type="text" value="{$row.keywords}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label for="c-description" class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-description" class="form-control" name="row[description]">{$row.description}</textarea>

application/admin/view/unishop/category/index.html

@@ -1,5 +1,5 @@
 <div class="panel panel-default panel-intro">
-    <div class="panel-heading">
+    <!--<div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs">
             <li class="active"><a href="#all" data-toggle="tab">{:__('All')}</a></li>
@@ -8,13 +8,13 @@
             {/foreach}
         </ul>
 
-    </div>
+    </div>-->
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh,add,edit,del')}
+                        {:build_toolbar('refresh,add')}
                         <div class="dropdown btn-group {:$auth->check('category/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">

application/index/controller/Plantask.php

@@ -13,12 +13,12 @@ class Plantask extends Controller
 
     }
 
-    //超预约时间N分钟后 未接诊订单 自动取消 并退款
+    //自动取消未接诊订单
     public function auto_cancel_noaccept_order(){
 
     }
 
-    //视频订单接诊后N分钟自动结束
+    //视频订单接诊后，并第一次拨打N分钟自动结束
     public function auto_finish_accept_videoorder(){
 
     }

public/assets/js/backend/unishop/category.js

@@ -34,6 +34,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'type', title: __('Type'), searchList: Config.searchList, formatter: Table.api.formatter.normal},
                         {field: 'name', title: __('Name'), align: 'left'},
                         {field: 'nickname', title: __('Nickname')},
+                        {field: 'keywords', title: __('Keywords')},
                         /*{field: 'flag', title: __('Flag'), operate: false, formatter: Table.api.formatter.flag},
                         {field: 'image', title: __('Image'), operate: false, formatter: Table.api.formatter.image},*/
                         {field: 'weigh', title: __('Weigh')},