dever 6 years ago
parent
commit
89a3414c9d
5 changed files with 17 additions and 3 deletions
  1. 1 1
      audit/database/data.php
  2. 9 1
      common.php
  3. 2 0
      content/database/cate.php
  4. 1 0
      journal/lib/Pay.php
  5. 4 1
      main/src/Content.php

+ 1 - 1
audit/database/data.php

@@ -204,7 +204,7 @@ return array
 			),
 			'type' => 'all',
 			'order' => array('reorder' => 'desc','id' => 'desc'),
-			'page' => array(15, 'list'),
+			'page' => array(1, 'list'),
 			'col' => '*',
 		),
 	)

+ 9 - 1
common.php

@@ -6,7 +6,15 @@ function checkVersion()
 	$video = 1;
 	$journal_buy = 1;
 	$config = Dever::db('main/config')->one();
-    if (isset($config['video']) && $config['video'] == 2) {
+    $source_type = Dever::input('source_type');
+
+    #小程序去掉视频
+    $app = false;
+    if ($source_type == 'ios' || $source_type == 'android') {
+        $app = true;
+    }
+    $app = true;
+    if ((isset($config['video']) && $config['video'] == 2) || !$app) {
         $video = 2;
     } elseif (isset($config['version']) && Dever::input('version') && $config['version'] == Dever::input('version')) {
         $video = 2;

+ 2 - 0
content/database/cate.php

@@ -116,6 +116,8 @@ return array
 			'option' => array
 			(
 				'state' => 1,
+				# 小程序去掉视频栏目
+				'id_no' => array('yes-id', '!='),
 			),
 			'type' => 'all',
 			'order' => array('reorder' => 'desc','id' => 'desc'),

+ 1 - 0
journal/lib/Pay.php

@@ -13,6 +13,7 @@ class Pay
         $where['type'] = 3;
         $where['status'] = 2;
         $data = Dever::db('journal/order')->getUnCode($where);
+        echo Dever::sql();
         if ($data) {
             print_r($data);die;
             foreach ($data as $k => $v) {

+ 4 - 1
main/src/Content.php

@@ -190,7 +190,10 @@ class Content extends Core
         # 栏目
         //$this->data['push_menu'] = Dever::load('push/lib/data')->get('menu', '头部导航');
 
-        $this->data['menu'] = Dever::db('content/cate')->getAll();
+        # 小程序去掉视频栏目
+        $cate = array();
+        //$cate['id_no'] = 2;
+        $this->data['menu'] = Dever::db('content/cate')->getAll($cate);
 
         if ($this->app) {
             # 焦点图