dever 6 年之前
父節點
當前提交
ef58523df3
共有 5 個文件被更改,包括 24 次插入0 次删除
  1. 2 0
      act/src/Order.php
  2. 1 0
      doc/apidoc_v1.php
  3. 17 0
      main/database/version.php
  4. 2 0
      main/src/Journal.php
  5. 2 0
      main/src/Journal_v1.php

+ 2 - 0
act/src/Order.php

@@ -224,6 +224,8 @@ class Order extends Core
             }
             }
         }
         }
 
 
+        $this->data['order_id'] = $order_id;
+
         return $this->data;
         return $this->data;
     }
     }
 
 

+ 1 - 0
doc/apidoc_v1.php

@@ -261,6 +261,7 @@
  * @apiSuccess {String}   pay.sign_type 签名算法
  * @apiSuccess {String}   pay.sign_type 签名算法
  * @apiSuccess {String}   pay.sign 签名
  * @apiSuccess {String}   pay.sign 签名
  * @apiSuccess {String}   pay.yes 苹果支付时显示改参数,1为支付成功2为支付失败
  * @apiSuccess {String}   pay.yes 苹果支付时显示改参数,1为支付成功2为支付失败
+ * @apiSuccess {String}   pay.order_id 支付的订单id
  */
  */
 
 
 /**
 /**

+ 17 - 0
main/database/version.php

@@ -17,6 +17,12 @@ $vip = array
 	2 => '不显示',
 	2 => '不显示',
 );
 );
 
 
+$button = array
+(
+	1 => '显示',
+	2 => '不显示',
+);
+
 return array
 return array
 (
 (
 	# 表名
 	# 表名
@@ -146,6 +152,17 @@ return array
 			'option'	=> $vip,
 			'option'	=> $vip,
 		),
 		),
 
 
+		'button'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '兑换阅读按钮-是否显示兑换阅读按钮',
+			'default' 	=> '2',
+			'desc' 		=> '兑换阅读按钮',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'radio',
+			'option'	=> $button,
+		),
+
 		'state'		=> array
 		'state'		=> array
 		(
 		(
 			'type' 		=> 'tinyint-1',
 			'type' 		=> 'tinyint-1',

+ 2 - 0
main/src/Journal.php

@@ -421,6 +421,7 @@ class Journal extends Core
         $applet_type = Dever::input('applet_type');
         $applet_type = Dever::input('applet_type');
 
 
         $this->data['info']['vip_state'] = 1;
         $this->data['info']['vip_state'] = 1;
+        $this->data['info']['code_state'] = 1;
         $version_code = Dever::input('version_code');
         $version_code = Dever::input('version_code');
         if ($version_code) {
         if ($version_code) {
             $source_type = Dever::input('source_type');
             $source_type = Dever::input('source_type');
@@ -429,6 +430,7 @@ class Journal extends Core
             $version = Dever::db('main/version')->getOne($version_where);
             $version = Dever::db('main/version')->getOne($version_where);
             if ($version && $version['vip'] > 0) {
             if ($version && $version['vip'] > 0) {
                $this->data['info']['vip_state'] = $version['vip'];
                $this->data['info']['vip_state'] = $version['vip'];
+               $this->data['info']['code_state'] = $version['button'];
             }
             }
         }
         }
 
 

+ 2 - 0
main/src/Journal_v1.php

@@ -194,6 +194,7 @@ class Journal_v1 extends Core
 
 
 	        # 会员状态
 	        # 会员状态
         	$this->data['info']['vip_state'] = 1;
         	$this->data['info']['vip_state'] = 1;
+            $this->data['info']['code_state'] = 1;
 	        $version_code = Dever::input('version_code');
 	        $version_code = Dever::input('version_code');
 	        if ($version_code) {
 	        if ($version_code) {
 	            $source_type = Dever::input('source_type');
 	            $source_type = Dever::input('source_type');
@@ -202,6 +203,7 @@ class Journal_v1 extends Core
 	            $version = Dever::db('main/version')->getOne($version_where);
 	            $version = Dever::db('main/version')->getOne($version_where);
 	            if ($version && $version['vip'] > 0) {
 	            if ($version && $version['vip'] > 0) {
 	               $this->data['info']['vip_state'] = $version['vip'];
 	               $this->data['info']['vip_state'] = $version['vip'];
+                   $this->data['info']['code_state'] = $version['button'];
 	            }
 	            }
 	        }
 	        }