1

.idea/workspace.xml

@@ -2,11 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="aa">
-      <change afterPath="$PROJECT_DIR$/application/nutrition/controller/DatumReport.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/nutrition/view/datum_report/form.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/nutrition/view/datum_report/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/NewsManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/NewsManage.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_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_report/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -184,7 +191,7 @@
       <workItem from="1667263628412" duration="22693000" />
       <workItem from="1667350901825" duration="20542000" />
       <workItem from="1667437262057" duration="15186000" />
-      <workItem from="1667522664245" duration="4708000" />
+      <workItem from="1667522664245" duration="5158000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/NewsManage.php

@@ -147,6 +147,7 @@ class NewsManage extends Controller
     {
 
         if($this->request->isGet()){
+            $this->r = input('get.r',0);
             $all_cate  = NTC::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
             $this->cate_tree = make_tree($all_cate);
         }

application/nutrition/controller/OneArticle.php

@@ -153,6 +153,7 @@ class OneArticle extends Controller
 
         if($this->request->isGet()){
             $all_cate  = ArticleCate::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
+            $this->r = input('get.r',0);
             $this->cate_tree = make_tree($all_cate);
             // 视频
             $this->video_list = \app\common\model\VideoIntro::with('videoArr')

application/nutrition/controller/OneDatum.php

@@ -160,7 +160,7 @@ class OneDatum extends Controller
     protected function _form_filter(&$data)
     {
         if($this->request->isGet()){
-
+            $this->r = input('get.r',0);
         }
 
         if($this->request->isPost()) {

application/nutrition/controller/SeriesArticle.php

@@ -156,6 +156,7 @@ class SeriesArticle extends Controller
     protected function _form_filter(&$data)
     {
         if($this->request->isGet()){
+            $this->r = input('get.r',0);
             if($this->request->isGet()){
                 $all_cate  = SeriesArticleCate::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
                 $this->cate_tree = make_tree($all_cate);

application/nutrition/controller/SeriesDatum.php

@@ -158,7 +158,7 @@ class SeriesDatum extends Controller
     {
         if($this->request->isGet()){
             $this->datum_cate = DatumCate::column('id,title,is_vip','id');
-
+            $this->r = input('get.r',0);
         }
 
         if($this->request->isPost()) {

application/nutrition/controller/SeriesManage.php

@@ -155,6 +155,7 @@ class SeriesManage extends Controller
     {
         if($this->request->isGet()){
             $all_cate  = VCM::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
+            $this->r = input('get.r',0);
             $this->cate_tree = make_tree($all_cate);
             if($this->request->action() == 'add') {
                 $this->video_url  =  $this->request->get('type',1) == 1 ? '' :[];

application/nutrition/controller/VideoManage.php

@@ -162,6 +162,7 @@ class VideoManage extends Controller
     {
         if($this->request->isGet()){
             $all_cate  = VCM::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
+            $this->r = input('get.r',0);
             $this->cate_tree = make_tree($all_cate);
             if($this->request->action() == 'add') {
                 $this->video_url  =  $this->request->get('type',1) == 1 ? '' :[];

application/nutrition/view/article_report/index.html

@@ -70,9 +70,9 @@
             <td class='text-left nowrap'>
 
                 {if $vo.object_type == 1}
-                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/one_article/edit")}?id={$vo.report_id}'>查看图文</span>
+                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/one_article/edit")}?id={$vo.report_id}&r=1'>查看图文</span>
                 {else}
-                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_article/edit")}?id={$vo.report_id}'>查看图文</span>
+                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_article/edit")}?id={$vo.report_id}&r=1'>查看图文</span>
                 {/if}
 
                 {if !$vo.reply}

application/nutrition/view/datum_report/index.html

@@ -70,9 +70,9 @@
             <td class='text-left nowrap'>
 
                 {if $vo.object_type == 1}
-                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/one_datum/edit")}?id={$vo.report_id}'>查看资料</span>
+                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/one_datum/edit")}?id={$vo.report_id}&r=1'>查看资料</span>
                 {else}
-                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_datum/edit")}?id={$vo.report_id}'>查看资料</span>
+                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_datum/edit")}?id={$vo.report_id}&r=1'>查看资料</span>
                 {/if}
 
                 {if !$vo.reply}

application/nutrition/view/one_datum/form.html

@@ -44,10 +44,12 @@
             </div>
 
             {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+            {if !$r}
             <div class="layui-form-item text-center">
                 <button class="layui-btn" type='submit'>保 存</button>
                 <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗？" data-close>取消编辑</button>
             </div>
+            {/if}
         </div>
     </form>
     <script src="/static/plugs/layui/layui.all.js" charset="utf-8"></script>

application/nutrition/view/video_report/index.html

@@ -70,9 +70,9 @@
             <td class='text-left nowrap'>
 
                 {if $vo.object_type == 1}
-                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/video_manage/edit")}?id={$vo.report_id}'>查看视频</span>
+                <span class="layui-btn layui-btn-sm"  data-modal= '{:url("/nutrition/video_manage/edit")}?id={$vo.report_id}&r=1'>查看视频</span>
                 {else}
-                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_manage/edit")}?id={$vo.report_id}'>查看视频</span>
+                <span class="layui-btn layui-btn-sm"  data-modal='{:url("/nutrition/series_manage/edit")}?id={$vo.report_id}&r=1'>查看视频</span>
                 {/if}
 
                 {if !$vo.reply}