wupengfei 2 年之前
父節點
當前提交
3700aac8e1
共有 100 個文件被更改,包括 5 次插入3 次删除
  1. 3 2
      .idea/workspace.xml
  2. 1 0
      application/api/controller/Datum.php
  3. 1 1
      application/common/model/DatumIntro.php
  4. 0 0
      public/dist/css/chunk-03187720.aff12ec5.css
  5. 0 0
      public/dist/css/chunk-066c182d.e6d1b210.css
  6. 0 0
      public/dist/css/chunk-1d968202.f5b07f41.css
  7. 0 0
      public/dist/css/chunk-24c92146.46d6c28c.css
  8. 0 0
      public/dist/css/chunk-3dcffc08.53cf483c.css
  9. 0 0
      public/dist/css/chunk-6127454d.6092c5f5.css
  10. 0 0
      public/dist/css/chunk-fcda0cda.4828771f.css
  11. 0 0
      public/dist/index.html
  12. 0 0
      public/dist/js/app.eae86851.js
  13. 0 0
      public/dist/js/app.eae86851.js.map
  14. 0 0
      public/dist/js/chunk-03187720.c047e856.js
  15. 0 0
      public/dist/js/chunk-03187720.c047e856.js.map
  16. 0 0
      public/dist/js/chunk-04e39e12.825d4654.js
  17. 0 0
      public/dist/js/chunk-05618894.36a12add.js
  18. 0 0
      public/dist/js/chunk-066c182d.1ea3f048.js
  19. 0 0
      public/dist/js/chunk-066c182d.1ea3f048.js.map
  20. 0 0
      public/dist/js/chunk-08ca477f.882322ee.js
  21. 0 0
      public/dist/js/chunk-09eb5162.92bb6cd3.js
  22. 0 0
      public/dist/js/chunk-0a8978cc.775ad09a.js
  23. 0 0
      public/dist/js/chunk-0bbbc39b.56e6b1a4.js
  24. 0 0
      public/dist/js/chunk-0c261f81.8b625ef8.js
  25. 0 0
      public/dist/js/chunk-0c846829.101015a0.js
  26. 0 0
      public/dist/js/chunk-0ce3fb5e.af5b6751.js
  27. 0 0
      public/dist/js/chunk-0cfa797b.30ac2af1.js
  28. 0 0
      public/dist/js/chunk-0d288a80.7214eefc.js
  29. 0 0
      public/dist/js/chunk-0d85bc05.9f6562d3.js
  30. 0 0
      public/dist/js/chunk-0e0de200.e589d6b8.js
  31. 0 0
      public/dist/js/chunk-0fe50e68.ccb66e1c.js
  32. 0 0
      public/dist/js/chunk-10b0528e.0b9e18cc.js
  33. 0 0
      public/dist/js/chunk-12596f15.f765c181.js
  34. 0 0
      public/dist/js/chunk-13adfae0.5110ee6a.js
  35. 0 0
      public/dist/js/chunk-1598d614.2ea0e1a3.js
  36. 0 0
      public/dist/js/chunk-16f29bf4.ce6339f8.js
  37. 0 0
      public/dist/js/chunk-1713fee6.abc9265c.js
  38. 0 0
      public/dist/js/chunk-183a92a2.4add325b.js
  39. 0 0
      public/dist/js/chunk-18ad0b89.041dda0c.js
  40. 0 0
      public/dist/js/chunk-19988f14.a66d0dd6.js
  41. 0 0
      public/dist/js/chunk-1bd24cdc.39f02f97.js
  42. 0 0
      public/dist/js/chunk-1c59c7bc.5596df77.js
  43. 0 0
      public/dist/js/chunk-1d968202.b5f1697a.js
  44. 0 0
      public/dist/js/chunk-1d968202.b5f1697a.js.map
  45. 0 0
      public/dist/js/chunk-1f4df817.1e061796.js
  46. 0 0
      public/dist/js/chunk-2117225e.389ebcbf.js
  47. 0 0
      public/dist/js/chunk-24c92146.b2b1cf96.js
  48. 0 0
      public/dist/js/chunk-24c92146.b2b1cf96.js.map
  49. 0 0
      public/dist/js/chunk-251936e9.37883ffa.js
  50. 0 0
      public/dist/js/chunk-268ee0a3.12eb3c43.js
  51. 0 0
      public/dist/js/chunk-2749a18e.968e37d0.js
  52. 0 0
      public/dist/js/chunk-27a08b23.463d7d45.js
  53. 0 0
      public/dist/js/chunk-28931c56.73e8830f.js
  54. 0 0
      public/dist/js/chunk-29698331.0c44fbc1.js
  55. 0 0
      public/dist/js/chunk-296f91d2.18e373b6.js
  56. 0 0
      public/dist/js/chunk-2ad7ec34.e83d32e8.js
  57. 0 0
      public/dist/js/chunk-2c075e54.3120d4e2.js
  58. 0 0
      public/dist/js/chunk-2c98be0e.c5f7e744.js
  59. 0 0
      public/dist/js/chunk-2e2907fe.3797eb43.js
  60. 0 0
      public/dist/js/chunk-2e30bb74.0e931ee5.js
  61. 0 0
      public/dist/js/chunk-3134844f.5cf7ca28.js
  62. 0 0
      public/dist/js/chunk-320d9d8e.1c603dee.js
  63. 0 0
      public/dist/js/chunk-32b514d6.7f6adf59.js
  64. 0 0
      public/dist/js/chunk-32fd77c6.43bbb248.js
  65. 0 0
      public/dist/js/chunk-3408af0c.9b4df5e9.js
  66. 0 0
      public/dist/js/chunk-3510ce00.176f772c.js
  67. 0 0
      public/dist/js/chunk-3525022f.47586ee1.js
  68. 0 0
      public/dist/js/chunk-36267ce0.77d00ae3.js
  69. 0 0
      public/dist/js/chunk-3674ec71.7bd6876b.js
  70. 0 0
      public/dist/js/chunk-379f0a64.0fc0e84d.js
  71. 0 0
      public/dist/js/chunk-389a6792.aff734c2.js
  72. 0 0
      public/dist/js/chunk-38d97c4e.1c4d7102.js
  73. 0 0
      public/dist/js/chunk-399469d0.f62ebcff.js
  74. 0 0
      public/dist/js/chunk-39f4038b.b45a1bee.js
  75. 0 0
      public/dist/js/chunk-3a3b4530.dc7a3f56.js
  76. 0 0
      public/dist/js/chunk-3d6c10ca.54614877.js
  77. 0 0
      public/dist/js/chunk-3d9d84cd.dd241f6d.js
  78. 0 0
      public/dist/js/chunk-3dad72a6.32c6183e.js
  79. 0 0
      public/dist/js/chunk-3dcffc08.c0b328b8.js
  80. 0 0
      public/dist/js/chunk-3dcffc08.c0b328b8.js.map
  81. 0 0
      public/dist/js/chunk-3fd700f1.46d2fe62.js
  82. 0 0
      public/dist/js/chunk-407c3492.0fde173a.js
  83. 0 0
      public/dist/js/chunk-42284d02.8e625a7d.js
  84. 0 0
      public/dist/js/chunk-42eea479.194dcc8e.js
  85. 0 0
      public/dist/js/chunk-45519e3c.e5cc6dcd.js
  86. 0 0
      public/dist/js/chunk-46f63db9.56a18cac.js
  87. 0 0
      public/dist/js/chunk-48f9fbdc.ca958fac.js
  88. 0 0
      public/dist/js/chunk-4b86c9b0.e3d6722a.js
  89. 0 0
      public/dist/js/chunk-4c93233c.f8d5441f.js
  90. 0 0
      public/dist/js/chunk-4dc19f92.bc22dd54.js
  91. 0 0
      public/dist/js/chunk-4f335153.d4748584.js
  92. 0 0
      public/dist/js/chunk-4f482146.74fa14d7.js
  93. 0 0
      public/dist/js/chunk-524a24a4.c4f44f1a.js
  94. 0 0
      public/dist/js/chunk-53aed23f.49ba113c.js
  95. 0 0
      public/dist/js/chunk-55c6a5f4.a5f7a76a.js
  96. 0 0
      public/dist/js/chunk-58033a65.984655ab.js
  97. 0 0
      public/dist/js/chunk-583560f3.9c142993.js
  98. 0 0
      public/dist/js/chunk-59669610.c1d8c8df.js
  99. 0 0
      public/dist/js/chunk-5a06cb84.6f9bc8c7.js
  100. 0 0
      public/dist/js/chunk-5a8b6c32.8166f6bb.js

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <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/common/model/DatumIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/DatumIntro.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -192,7 +193,7 @@
       <workItem from="1669597148644" duration="17061000" />
       <workItem from="1669682447842" duration="24394000" />
       <workItem from="1669769873624" duration="5352000" />
-      <workItem from="1669776182613" duration="33000" />
+      <workItem from="1669776182613" duration="676000" />
     </task>
     <servers />
   </component>

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

@@ -257,6 +257,7 @@ class Datum extends Base
     {
         $url_id = input('get.url_id');
         $detail = DatumUrl::where('id',$url_id)->find()->toArray();
+        if($detail['is_deleted'] == 1 || $detail['status'] == 0) $this->error('该资料已下架');
         $detail['collect_num']  = UserCollect::where(['coll_type'=>2,'coll_id'=>$detail['datum_id'],'children_id'=>$detail['id']])->count();
         $detail['is_collect']  = UserCollect::checkCollectByType($this->user_id,2,$detail['datum_id'],$detail['id']);
         UserTrack::crateTrack($this->user_id,2,$detail['datum_id'],$url_id);

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

@@ -6,7 +6,7 @@ class DatumIntro extends Model
 {
     public function urlArr()
     {
-        return $this->hasMany('DatumUrl','datum_id')->field('id,datum_id,title,url,sort,is_vip,transmit_num,down_num,read_num')->where('is_deleted',0)->order('sort desc');
+        return $this->hasMany('DatumUrl','datum_id')->field('id,datum_id,title,url,sort,is_vip,transmit_num,down_num,read_num')->where('is_deleted',0)->where('status',1)->order('sort desc');
     }
 
 }

文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-03187720.aff12ec5.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-066c182d.e6d1b210.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-1d968202.f5b07f41.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-24c92146.46d6c28c.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-3dcffc08.53cf483c.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-6127454d.6092c5f5.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/css/chunk-fcda0cda.4828771f.css


文件差異過大導致無法顯示
+ 0 - 0
public/dist/index.html


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/app.eae86851.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/app.eae86851.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-03187720.c047e856.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-03187720.c047e856.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-04e39e12.825d4654.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-05618894.36a12add.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-066c182d.1ea3f048.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-066c182d.1ea3f048.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-08ca477f.882322ee.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-09eb5162.92bb6cd3.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0a8978cc.775ad09a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0bbbc39b.56e6b1a4.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0c261f81.8b625ef8.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0c846829.101015a0.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0ce3fb5e.af5b6751.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0cfa797b.30ac2af1.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0d288a80.7214eefc.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0d85bc05.9f6562d3.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0e0de200.e589d6b8.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-0fe50e68.ccb66e1c.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-10b0528e.0b9e18cc.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-12596f15.f765c181.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-13adfae0.5110ee6a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1598d614.2ea0e1a3.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-16f29bf4.ce6339f8.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1713fee6.abc9265c.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-183a92a2.4add325b.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-18ad0b89.041dda0c.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-19988f14.a66d0dd6.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1bd24cdc.39f02f97.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1c59c7bc.5596df77.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1d968202.b5f1697a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1d968202.b5f1697a.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-1f4df817.1e061796.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2117225e.389ebcbf.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-24c92146.b2b1cf96.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-24c92146.b2b1cf96.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-251936e9.37883ffa.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-268ee0a3.12eb3c43.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2749a18e.968e37d0.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-27a08b23.463d7d45.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-28931c56.73e8830f.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-29698331.0c44fbc1.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-296f91d2.18e373b6.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2ad7ec34.e83d32e8.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2c075e54.3120d4e2.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2c98be0e.c5f7e744.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2e2907fe.3797eb43.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-2e30bb74.0e931ee5.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3134844f.5cf7ca28.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-320d9d8e.1c603dee.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-32b514d6.7f6adf59.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-32fd77c6.43bbb248.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3408af0c.9b4df5e9.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3510ce00.176f772c.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3525022f.47586ee1.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-36267ce0.77d00ae3.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3674ec71.7bd6876b.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-379f0a64.0fc0e84d.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-389a6792.aff734c2.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-38d97c4e.1c4d7102.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-399469d0.f62ebcff.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-39f4038b.b45a1bee.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3a3b4530.dc7a3f56.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3d6c10ca.54614877.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3d9d84cd.dd241f6d.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3dad72a6.32c6183e.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3dcffc08.c0b328b8.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3dcffc08.c0b328b8.js.map


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-3fd700f1.46d2fe62.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-407c3492.0fde173a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-42284d02.8e625a7d.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-42eea479.194dcc8e.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-45519e3c.e5cc6dcd.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-46f63db9.56a18cac.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-48f9fbdc.ca958fac.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-4b86c9b0.e3d6722a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-4c93233c.f8d5441f.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-4dc19f92.bc22dd54.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-4f335153.d4748584.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-4f482146.74fa14d7.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-524a24a4.c4f44f1a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-53aed23f.49ba113c.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-55c6a5f4.a5f7a76a.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-58033a65.984655ab.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-583560f3.9c142993.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-59669610.c1d8c8df.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-5a06cb84.6f9bc8c7.js


文件差異過大導致無法顯示
+ 0 - 0
public/dist/js/chunk-5a8b6c32.8166f6bb.js


部分文件因文件數量過多而無法顯示