1

app/admin/controller/BestKnowledge.php

@@ -21,9 +21,13 @@ use app\data\model\DataClassification;
 use app\data\model\DataPoolTalent;
 use app\data\model\DataUser;
 use app\data\model\DataZhicheng;
+use app\data\model\ShopGoodsCate;
+use app\data\model\ShopGoodsMark;
+use app\data\service\GoodsService;
 use Carbon\Carbon;
 use think\admin\Controller;
 use app\data\model\SystemUser;
+use think\admin\service\AdminService;
 use think\db\Query;
 
 /**
@@ -154,6 +158,13 @@ class BestKnowledge extends Controller
     public function index2(){
         $this->title='百知文库列表';
         $name=input('name');
+        $title=input('title');
+        $class_id = input('class_id');
+        $where = [];
+        if($class_id != ''){
+            $where['class_id'] = $class_id;
+        }
+        $this->class = DataClassification::where('is_del',1)->select();
         DataBestKnowledge::mQuery()
             ->when($name,function (Query $query) use ($name) {
                 $query->hasWhere('user',function (Query $query) use ($name) {
@@ -163,10 +174,13 @@ class BestKnowledge extends Controller
             ->with(['user','classTo'])
 //            ->whereIn('type','1,2')
             ->where('is_del',1)
+            ->where($where)
+            ->whereLike('title',"%{$title}%")
             ->order('id','desc')
             ->layTable();
     }
 
+
     /**
      * 百知文库添加
      * @auth true

app/admin/view/best_knowledge/index2.html

@@ -15,6 +15,27 @@
                 </label>
             </div>
             <div class="layui-form-item layui-inline">
+                <label class="layui-form-label">标题</label>
+                <label class="layui-input-inline">
+                    <input name="title" value="{$get.title|default=''}" placeholder="标题" class="layui-input">
+                </label>
+            </div>
+            <div class="layui-form-item layui-inline">
+                <label class="layui-form-label">商品分类</label>
+                <div class="layui-input-inline">
+                    <label class="layui-input-inline">
+                        <select class="layui-select" lay-search name="class_id">
+                            <option value="">-- 全部分类 --</option>
+                            {foreach $class as $cate}{if input('cateids') eq $cate.id}
+                            <option selected value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
+                            {else}
+                            <option value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
+                            {/if}{/foreach}
+                        </select>
+                    </label>
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline">
                 <input type="hidden" name="type" value="{$type|default='index'}">
                 <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             </div>

app/data/controller/shop/Goods.php

@@ -202,6 +202,11 @@ class Goods extends Controller
             $data['admin_id']=AdminService::getUserId();
             $data['examine']=0;
 
+            $good = ShopGoodsItem::mk()->where(['goods_code' => $data['code']])->find();
+            if($good){
+                $data['admin_id'] = $good['admin_id'];
+            }
+
             if (empty($data['cover'])) $this->error('商品图片不能为空！');
 //            if (empty($data['slider'])) $this->error('轮播图片不能为空！');
 //            if (empty($data['payment'])) $this->error('支付方式不能为空！');

app/data/view/shop/goods/form.html

@@ -336,6 +336,15 @@
 </label>
 
 <script>
+    let editorContent;
+    let vo={:json_encode($vo?:null,256)};
+    let category=256;
+    require(['ckeditor'], function () {
+        editorContent=window.createEditor('[name=content]', {height: 350})
+        if(vo){
+            editorContent.setData(vo.content)
+        }
+    });
     /*! 入会礼包切换 */
     window.form.on('radio(vip_entry)', setVipEntry);
     setVipEntry({value: ('{$vo.vip_entry|default="0"}')});