wupengfei 2 years ago
parent
commit
13add69004

+ 11 - 8
.idea/workspace.xml

@@ -3,12 +3,15 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/nutrition/controller/OneArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/OneArticle.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/OneDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/OneDatum.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesArticle.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesManage.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/one_article/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_article/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_manage/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_manage/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -136,6 +139,9 @@
     <property name="settings.editor.selected.configurable" value="reference.idesettings.emmet" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\zs\gaoyixia\application\api\controller" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\zs\gaoyixia\application\common\model" />
       <recent name="D:\zs\gaoyixia\application\user\view\tag" />
@@ -143,9 +149,6 @@
       <recent name="D:\zs\gaoyixia\application\api\controller" />
       <recent name="D:\zs\gaoyixia\application\nutrition\view\video_cate" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\zs\gaoyixia\application\api\controller" />
-    </key>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -189,7 +192,7 @@
       <workItem from="1668562566617" duration="3108000" />
       <workItem from="1668644889000" duration="5906000" />
       <workItem from="1668670847013" duration="9000" />
-      <workItem from="1668749820707" duration="210000" />
+      <workItem from="1668749820707" duration="3399000" />
     </task>
     <servers />
   </component>

+ 6 - 3
application/api/controller/Article.php

@@ -89,9 +89,9 @@ class Article extends Base
     {
         $type = input('type',1);
         if($type == 1) {
-            $list = ArticleCate::where(['is_deleted'=>0])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
+            $list = ArticleCate::where(['is_deleted'=>0,'status'=>1])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
         }else{
-            $list = SeriesArticleCate::where(['is_deleted'=>0])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
+            $list = SeriesArticleCate::where(['is_deleted'=>0,'status'=>1])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
         }
         $list =  make_tree($list);
         $this->success('ok',['list'=>$list]);
@@ -116,6 +116,7 @@ class Article extends Base
      * @return name:read_num type:int default:-- desc:阅读量
      * @return name:app_name type:string default:-- desc:平台名称
      * @return name:app_logo type:string default:-- desc:平台头像
+     * @return name:author type:string default:-- desc:原创作者
      */
     public function getRecommendList()
     {
@@ -129,7 +130,7 @@ class Article extends Base
             $search_arr[] =  " b.label like '".'%'.$t."%'" .' ';
         }
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
-        $field = ' a.id,a.title,a.cover,a.images,a.user_id,a.is_vip,a.read_num,a.article_id ,IFNULL(is_recommend,0) is_recommend ';
+        $field = ' a.id,a.title,a.cover,a.images,a.user_id,a.is_vip,a.read_num,a.article_id ,a.author,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_article_item';
         $order_by_two = 'a.read_num';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id LEFT JOIN dd_article_intro as k ON k.id = a.article_id  WHERE a.is_deleted = 0 AND a.status =1 AND k.status = 1 AND k.is_deleted = 0 ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
@@ -258,6 +259,7 @@ class Article extends Base
      * @return name:item_list.video_item type:int default:-- desc:关联视频详情id【video_arr.id】
      * @return name:item_list.datum_id type:int default:-- desc:资料id【单个id||系列id】
      * @return name:item_list.datum_item type:int default:-- desc:资料详情id【url_arr.id】
+     * @return name:item_list.author type:string default:-- desc:原创作者
      */
     public function getArticleDetail()
     {
@@ -298,6 +300,7 @@ class Article extends Base
      * @return name:video_item type:int default:-- desc:关联视频详情id【video_arr.id】
      * @return name:datum_id type:int default:-- desc:资料id【单个id||系列id】
      * @return name:datum_item type:int default:-- desc:资料详情id【url_arr.id】
+     * @return name:author type:string default:-- desc:原创作者
      */
     public function getArticleItemInfo()
     {

+ 1 - 1
application/api/controller/Datum.php

@@ -73,7 +73,7 @@ class Datum extends Base
      */
     public function getDatumCate()
     {
-        $list = DatumCate::field('id,title')->where('is_deleted',0)->select()->toArray();
+        $list = DatumCate::field('id,title')->where('is_deleted',0)->where('status',1)->select()->toArray();
         foreach ($list as &$v) {
             $v['datum_list'] = DatumIntro::field('id,title')
                 ->where(['datum_cate'=>$v['id'],'status'=>1,'is_deleted'=>0])->select()->toArray();

+ 3 - 3
application/api/controller/Video.php

@@ -83,9 +83,9 @@ class Video extends Base
     {
         $type = input('type',1);
         if($type == 1) {
-            $list = VideoCate::where(['is_deleted'=>0])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
+            $list = VideoCate::where(['is_deleted'=>0,'status'=>1])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
         }else{
-            $list = SeriesVideoCate::where(['is_deleted'=>0])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
+            $list = SeriesVideoCate::where(['is_deleted'=>0,'status'=>1])->field('id,logo,title,pid')->order('sort desc')->select()->toArray();
         }
         $list =  make_tree($list);
         $this->success('ok',['list'=>$list]);
@@ -216,7 +216,7 @@ class Video extends Base
         $where_str = 'id > 0';
         switch ($sort_type) {
             case 1:
-                $order =  ['is_top'=>'desc','sort'=>'desc','id'=>'desc'];
+                $order =  ['sort'=>'desc','id'=>'desc'];
                 break;
             case 2:
                 $order =  ['id'=>'asc','sort'=>'desc'];

+ 1 - 1
application/common/model/ArticleIntro.php

@@ -8,7 +8,7 @@ class ArticleIntro extends Model
     public function itemList(){
         return $this->hasMany('ArticleItem','article_id')
             ->where('is_deleted',0)
-            ->field('id,article_id,cover,is_vip,sort,transmit_num,read_num,title,images,content,video_id,video_item,datum_id,datum_item')
+            ->field('id,article_id,cover,is_vip,sort,transmit_num,read_num,title,images,content,video_id,video_item,datum_id,datum_item,author')
             ->order('sort desc');
     }
 

+ 4 - 1
application/nutrition/controller/OneArticle.php

@@ -164,7 +164,9 @@ class OneArticle extends Controller
             $this->datum_list  = DatumIntro::with('urlArr')
                 ->where(['is_deleted'=>0])->order('id desc')
                 ->select()->toArray();
-            $this->phone = \app\common\model\ArticleItem::where('article_id',input('id'))->value('phone');
+            $item_info = \app\common\model\ArticleItem::where('article_id',input('id'))->find();
+            $this->phone = $item_info? $item_info->phone : '';
+            $this->author =  $item_info? $item_info->author : '';
         }
 
         if($this->request->isPost())
@@ -198,6 +200,7 @@ class OneArticle extends Controller
             'datum_id' => isset($data['datum_id']) ?$data['datum_id'] : 0,
             'datum_item' => isset($data['datum_item']) ?$data['datum_item']:0,
             'phone' => isset($data['phone']) ?$data['phone']:'',
+            'author' => isset($data['author']) ?$data['author']:'',
             'user_id' => $user_id
         ];
         Data::save('ArticleItem',$item,'article_id',['article_id'=>$article_info['id']]);

+ 0 - 1
application/nutrition/controller/VideoManage.php

@@ -45,7 +45,6 @@ class VideoManage extends Controller
         $sel_where[] = ['type','=',1];
         if($title = $this->request->get('title')) $sel_where[] = ['title','like','%'.$title.'%'];
         if($label = $this->request->get('label')) $sel_where[] = ['label','like','%'.$label.'%'];
-        if($user_id = $this->request->get('user_id')) $sel_where[] = ['user_id','=',$user_id];
         $query = $this->_query($this->table);
         $query->where($sel_where)->order('sort desc,id desc')->page();
     }

+ 7 - 0
application/nutrition/view/article_item/form.html

@@ -11,6 +11,13 @@
             </div>
 
             <div class="layui-form-item">
+                <label class="layui-form-label label-required">原创作者</label>
+                <div class="layui-input-block">
+                    <input name="author"  value='{$vo.author|default=""}' placeholder="请输入原创作者" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
                 <label class="layui-form-label label-required">关联视频</label>
                 <div class="layui-input-inline">
                     <select name="video_id" lay-filter ="video_id">

+ 8 - 0
application/nutrition/view/one_article/form.html

@@ -11,6 +11,14 @@
                 </div>
             </div>
 
+
+            <div class="layui-form-item">
+                <label class="layui-form-label label-required">原创作者</label>
+                <div class="layui-input-block">
+                    <input name="author"   value='{$author|default=""}' placeholder="请输入原创作者" class="layui-input">
+                </div>
+            </div>
+
             <div class="layui-form-item">
                 <label class="layui-form-label label-required">分类</label>
                 <div class="layui-input-inline">

+ 0 - 6
application/nutrition/view/video_manage/index_search.html

@@ -16,12 +16,6 @@
         </div>
 
 
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员ID</label>
-            <div class="layui-input-inline">
-                <input name="user_id" value="{$Think.get.user_id|default=''}" placeholder="请输入会员ID" class="layui-input">
-            </div>
-        </div>
 
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>