edit

code/database/info.php

@@ -33,6 +33,16 @@ return array
 			//'list'		=> true,
 		),
 
+		'create_uid'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '创建人',
+			'default' 	=> '-1',
+			'desc' 		=> '创建人',
+			'match' 	=> 'is_numeric',
+			//'list'		=> 'Dever::load("code/lib/manage.showUserInfo", "{uid}", "{ldate}")',
+		),
+
 		'product_id'		=> array
 		(
 			'type' 		=> 'int-11',

content/database/article.php

@@ -173,7 +173,7 @@ return array
 			'name' 		=> '4:3封面图-图片尺寸750*564px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -189,7 +189,7 @@ return array
 			'name' 		=> '16:9封面图-图片尺寸750*422px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -367,7 +367,7 @@ return array
 			'name' 		=> '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '分享图片',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',

doc/apidoc.php

@@ -812,6 +812,8 @@
  * @apiSuccess {String}   invite.uid 用户id
  * @apiSuccess {String}   invite.username 用户名
  * @apiSuccess {String}   invite.avatar 头像
+
+ * @apiSuccess {String}   buy 是否显示购买按钮，1显示，2不显示
  */
 
 /**

journal/database/info.php

@@ -119,7 +119,7 @@ return array
 			'name' 		=> '列表页封面图-4:3比例的图片',
 			'default' 	=> '',
 			'desc' 		=> '列表封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			//'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -131,7 +131,7 @@ return array
 			'name' 		=> '封面图-图片尺寸660*660px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -143,7 +143,7 @@ return array
 			'name' 		=> '全屏背景图-图片尺寸750*1386px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '全屏背景图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'images',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -155,7 +155,7 @@ return array
 			'name' 		=> '小刊推广图-图片尺寸750*1128px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '小刊推广图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -319,13 +319,15 @@ return array
 		'buy'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '小刊是否收费',
+			'name' 		=> '是否收费',
 			'default' 	=> '1',
-			'desc' 		=> '小刊是否收费',
+			'desc' 		=> '是否收费',
 			'match' 	=> 'option',
 			'update'	=> 'radio',
 			'option'	=> $buy,
 			'control'	=> 'buy',
+			'list'		=> true,
+			'search'	=> 'select',
 		),
 
 		'cash'      => array
@@ -391,7 +393,7 @@ return array
 			'name' 		=> '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '分享图片',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',

journal/database/order.php

@@ -6,6 +6,22 @@ $type = array
     2 => '兑换',
 );
 
+# 系统
+$system = array
+(
+    1 => '小程序',
+    2 => 'H5',
+    3 => 'ios',
+    4 => '安卓',
+);
+
+# 渠道
+$source = function()
+{
+    return array();
+    return Dever::db('source/info')->state();
+};
+
 $status = array
 (
     1 => '待支付',
@@ -139,6 +155,32 @@ return array
             'control'   => 'type',
         ),
 
+        'system'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '系统',
+            'default'   => '1',
+            'desc'      => '系统',
+            'match'     => 'is_numeric',
+            'option'    => $system,
+            'search'    => 'select',
+            'update'    => 'radio',
+            'list'        => true,
+        ),
+
+        'source'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '来源',
+            'default'   => '1',
+            'desc'      => '支付方式',
+            'match'     => 'is_numeric',
+            'option'    => $source,
+            'search'    => 'select',
+            'update'    => 'radio',
+            //'list'        => true,
+        ),
+
         'notice'        => array
         (
             'type'      => 'int-11',

main/src/Content.php

@@ -113,10 +113,7 @@ class Content extends Core
             $where['type'] = $type;
         }
 
-        $config = Dever::db('main/config')->one();
-        if (isset($config['video']) && $config['video'] == 2) {
-            $where['type_no'] = 2;
-        } elseif (isset($config['version']) && Dever::input('version') && $config['version'] == Dever::input('version')) {
+        if (checkVersion()->video == 2) {
             $where['type_no'] = 2;
         }
 

main/src/Journal.php

@@ -15,6 +15,10 @@ class Journal extends Core
 
         # 小刊列表
         $where = array();
+        if (checkVersion()->journal_buy == 2) {
+            # 隐藏支付的小刊
+            //$where['buy'] = 2;
+        }
         $data = Dever::db('journal/info')->getAll($where);
         if ($data) {
             foreach ($data as $k => $v) {
@@ -165,6 +169,13 @@ class Journal extends Core
             $this->setButton('code', 1, '兑换码阅读');
             //$this->setButton('share', -1);
         }
+
+        if (checkVersion()->journal_buy == 2) {
+            # 隐藏所有支付按钮
+            $this->setButton('read', -1);
+            $this->setButton('code', 1, '兑换码阅读');
+            //$this->setButton('share', -1);
+        }
     }
 
     private function setButton($key = false, $status = false, $name = false)
@@ -275,6 +286,12 @@ class Journal extends Core
             $this->data['invite'] = Dever::load('act/lib/invite')->getList($this->data['uid'], $id);
         }
 
+        # 是否显示购买按钮 1显示 2不显示
+        $this->data['buy'] = 1;
+        if (checkVersion()->journal_buy == 2) {
+            $this->data['buy'] = 2;
+        }
+
         return $this->data;
     }
 
@@ -468,8 +485,14 @@ class Journal extends Core
 
         if ($source_type == 'ios' || $source_type == 'android') {
             $method = 'app';
+            if ($source_type == 'ios') {
+                $order_data['system'] = 3;
+            } else {
+                $order_data['system'] = 4;
+            }
         } else {
             $method = 'applet';
+            $order_data['system'] = 1;
         }
 
         $order_id = $this->createOrder('JP');
@@ -492,6 +515,10 @@ class Journal extends Core
             $order_data['cash'] = $info['cash'] * $order_data['num'];
         }
 
+        if ($source) {
+            $order_data['source'] = $source;
+        }
+
         $id = Dever::db('journal/order')->insert($order_data);
 
         if (!$id) {

oauth/index.php

@@ -1,4 +1,4 @@
-<?php
-define('DEVER_PACKAGE',  'oauth');
-define('DEVER_APP_SETUP', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+<?php
+define('DEVER_PACKAGE',  'oauth');
+define('DEVER_APP_SETUP', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(dirname(__FILE__) . DIRECTORY_SEPARATOR . '../boot.php');

push/lib/Data.php

@@ -32,10 +32,7 @@ class Data
             $where['info_id'] = $info['id'];
 
             
-            $config = Dever::db('main/config')->one();
-            if (isset($config['video']) && $config['video'] == 2) {
-                $where['type_no'] = 2;
-            } elseif (isset($config['version']) && Dever::input('version') && $config['version'] == Dever::input('version')) {
+            if (checkVersion()->video == 2) {
                 $where['type_no'] = 2;
             }
 

service/assets/mobile/list.html

@@ -41,9 +41,8 @@
 
 </html>
 <script>
-function pay(cate,id)
+function pay(url)
 {
-    var url = config.host + 'pay&cate='+cate+'&id=' + id;
     location.href = url;
 }
 </script>

service/assets/mobile/pay.html

@@ -34,10 +34,9 @@
 </html>
 
 <script>
-function pay(cate,buy_id, journal_id)
+function pay(url)
 {
-    var url = config.host + 'data.pay';
-    $.get(url, {cate:cate,buy_id:buy_id, journal_id:journal_id}, function(t) {
+    $.get(url, function(t) {
         $("#pay").html(t);
     })
 }

service/src/Base.php

@@ -0,0 +1,58 @@
+<?php namespace Service\Src;
+
+use Dever;
+
+class Base
+{
+	public function __construct()
+    {
+        $this->cate = Dever::input('cate', 1);
+        $this->source = Dever::input('source', 1);
+        $this->user = Dever::load('passport/user')->data();
+    }
+
+    # 获取基本配置
+    public function config()
+    {
+        $cate = Dever::db('journal/cate')->one($this->cate);
+
+        $cate['login_title'] = '登录后才可以使用' . Dever::config('base')->name . '服务';
+
+        $cate['bglogo'] = ':url('.$cate['logo'].') no-repeat;';
+
+        $url = urlencode($this->url('list'));
+        $cate['login'] = 'location.href=\'' . Dever::url('request.auth?account=1&refer=' . $url, 'oauth') . '\'';
+        return $cate;
+    }
+
+    # 生成url
+    protected function url($uri, $param = array())
+    {
+    	$param['cate'] = $this->cate;
+    	$param['source'] = $this->source;
+    	$param = http_build_query($param);
+    	$url = Dever::url($uri . '?' . $param, 'service');
+
+    	return $url;
+    }
+
+    protected function location($uri, $param = array())
+    {
+    	return Dever::location($this->url($uri, $param));
+    }
+
+    protected function createOrder($prefix = 'JC')
+    {
+        //$order = Dever::order($prefix);
+
+        $order = Dever::rand(2, 2) . Dever::rand(6, 0);
+
+        $info = Dever::db('journal/order')->one(array('order_id' => $order));
+
+        if ($info) {
+            return $this->createOrder();
+        }
+
+        return $order;
+    }
+}

service/src/Buy.php

@@ -0,0 +1,195 @@
+<?php namespace Service\Src;
+
+use Dever;
+
+# 必须登录才能购买小刊
+class Buy extends Base
+{
+	public function __construct()
+    {
+    	parent::__construct();
+
+    	if (!$this->user) {
+    		return $this->location('home');
+    	}
+
+    	# 记录渠道数
+    }
+    
+    # 列表页
+    public function lists()
+    {
+        $where['cate_id'] = $this->cate;
+        $where['buy'] = 1;
+        $data = Dever::db('journal/info')->getAll($where);
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['cash'] > 0) {
+                    $data[$k]['price'] = '￥' . number_format($v['cash'], 2);
+                } else {
+                    $data[$k]['price'] = '免费';
+                }
+
+                $data[$k]['ding'] = '销量：' . $v['num_ding'];
+
+                $data[$k]['pay_url'] = $this->url('pay', array('id' => $v['id']));
+            }
+        }
+
+        return $data;
+    }
+
+    # 详细信息
+    public function info()
+    {
+        $id = Dever::input('id');
+        $info = Dever::db('journal/info')->one($id);
+
+        $info['buy'] = '正在购买《' . $info['name'] . '》';
+
+        $buy = Dever::db('journal/buy')->one(array('id' => $id));
+
+        if ($buy) {
+            $info['buy_desc'] = $buy['buy_content'];
+        } else {
+            $info['buy_desc'] = '';
+        }
+        
+        return $info;
+    }
+
+    # 生成二维码
+    public function code()
+    {
+        $id = Dever::input('id');
+        $type = 4;
+        $uid = $this->user['id'];
+        
+        $scene = $uid . ',' . $type . ',' . $id;
+
+        $path = Dever::config('base')->applet_index;
+        $send['project'] = Dever::input('project', 1);
+        $send['send'] = $scene;
+        $send['width'] = 152;
+        $send['path'] = $path; 
+        $code = Dever::load('wechat_applet/code.get', $send);
+
+        return $code;
+    }
+
+    # 小刊购买成功
+    public function success()
+    {
+        $config = Dever::db('main/config')->one(1);
+
+        $id = Dever::input('id');
+        $config['list'] = $this->url('list');
+        $config['buy'] = $this->url('pay', array('id' => $id));
+
+        return $config;
+    }
+
+    # 小刊购买
+    public function buy()
+    {
+        $id = Dever::input('id');
+        $data = Dever::db('journal/buy_num')->getAll(array('info_id' => $id));
+        $info = Dever::db('journal/info')->one($id);
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($info['cash'] > 0) {
+                    $data[$k]['price'] = '￥' . number_format($info['cash'] * $v['num'], 2);
+                } else {
+                    $data[$k]['price'] = '免费';
+                }
+
+                if (!$v['name']) {
+                    $data[$k]['name'] = '购买' . $v['num'] . '本';
+                }
+                $data[$k]['cate'] = $info['cate_id'];
+
+                $data[$k]['pay_url'] = $this->url('buy.pay', array('buy_id' => $v['id'], 'journal_id' => $v['info_id']));
+            }
+        }
+        return $data;
+    }
+
+    # 小刊购买
+    public function pay()
+    {
+        $uid = $this->user['id'];
+
+        $buy_id = Dever::input('buy_id');
+        $journal_id = Dever::input('journal_id');
+
+        if (!$buy_id) {
+            Dever::alert('请传入正确的支付ID');
+        }
+        if (!$journal_id) {
+            Dever::alert('请传入正确的小刊ID');
+        }
+
+        $info = Dever::db('journal/info')->one($journal_id);
+        $buy = Dever::db('journal/buy_num')->one($buy_id);
+
+        if (!$buy || !$info) {
+            Dever::alert('请传入正确的小刊ID');
+        }
+
+        if (!$buy['name']) {
+            $buy['name'] = '购买' . $buy['num'] . '本';
+        }
+
+        $user = Dever::db('passport/user')->one($uid);
+        $wechat = Dever::db('passport/wechat')->one(array('uid' => $uid, 'type' => 2));
+
+        $order_id = $this->createOrder('JP');
+        $order_data['order_id'] = $order_id;
+        $order_data['product_id'] = $journal_id;
+        $order_data['buy_id'] = $buy_id;
+        $order_data['uid'] = $uid;
+
+        $order_data['type'] = 1;
+        $order_data['status'] = 1;
+        $order_data['name'] = $info['name'] . '-' . $buy['name'];
+        //$order_data['num'] = Dever::input('num', 1);
+        $order_data['num'] = $buy['num'];
+        if (isset($buy['price']) && $buy['price'] && $buy['price'] > 0) {
+            $order_data['cash'] = $buy['price'];
+        } else {
+            $order_data['cash'] = $info['cash'] * $order_data['num'];
+        }
+
+        $order_data['system'] = 2;
+        if ($this->source) {
+        	$order_data['source'] = $this->source;
+        }
+
+        $id = Dever::db('journal/order')->insert($order_data);
+
+        if (!$id) {
+            Dever::alert('支付失败');
+        }
+
+        //$param参数
+        $refer = $this->url('success', array('id' => $journal_id, 'buy' => $buy_id));
+        $param = array
+        (
+            'account_id' => 2,
+            'project_id' => 1,
+            'uid' => $uid,
+            'username' => $user['username'],
+            'name' => $order_data['name'],
+            'cash' => $order_data['cash'],
+            //'cash' => '0.01',
+            'openid' => $wechat['openid'],
+            'product_id' => $journal_id . '-' . $buy_id,
+            'order_id' => $order_id,
+            'refer' => $refer
+        );
+
+        return Dever::load('pay/api.page', $param);
+    }
+}

service/src/Data.php

@@ -2,249 +2,13 @@
 
 use Dever;
 
-class Data
+# 未登录
+class Data extends Base
 {
-    public function checkHomeLogin()
-    {
-        $cate = Dever::input('cate', 1);
-        $user = Dever::load('passport/user')->data();
-        if ($user) {
-            $url = Dever::url('list?cate=' . $cate, 'service');
-            Dever::location($url);
-            return;
-        }
-    }
-
     public function checkLogin()
     {
-        $cate = Dever::input('cate', 1);
-        $user = Dever::load('passport/user')->data();
-        if (!$user) {
-            $url = Dever::url('home?cate=' . $cate, 'service');
-            Dever::location($url);
-            return;
-        }
-    }
-
-    # 获取基本配置
-    public function config()
-    {
-        $cate = Dever::input('cate', 1);
-        $cate = Dever::db('journal/cate')->one($cate);
-
-        $cate['login_title'] = '登录后才可以使用' . Dever::config('base')->name . '服务';
-
-        $cate['bglogo'] = ':url('.$cate['logo'].') no-repeat;';
-
-        $url = urlencode(Dever::url('list?cate=' . $cate['id'], 'service'));
-        $cate['login'] = 'location.href=\'' . Dever::url('request.auth?account=1&refer=' . $url, 'oauth') . '\'';
-        return $cate;
-    }
-    
-    # 列表页
-    public function lists()
-    {
-        $where['cate_id'] = Dever::input('cate', 1);
-        $where['buy'] = 1;
-        $data = Dever::db('journal/info')->getAll($where);
-
-        if ($data) {
-            foreach ($data as $k => $v) {
-                if ($v['cash'] > 0) {
-                    $data[$k]['price'] = '￥' . number_format($v['cash'], 2);
-                } else {
-                    $data[$k]['price'] = '免费';
-                }
-
-                $data[$k]['ding'] = '销量：' . $v['num_ding'];
-            }
-        }
-
-        return $data;
-    }
-
-    public function info()
-    {
-        $id = Dever::input('id');
-        $info = Dever::db('journal/info')->one($id);
-
-        $info['buy'] = '正在购买《' . $info['name'] . '》';
-
-        $buy = Dever::db('journal/buy')->one(array('id' => $id));
-
-        if ($buy) {
-            $info['buy_desc'] = $buy['buy_content'];
-        } else {
-            $info['buy_desc'] = '';
-        }
-        
-        return $info;
-    }
-
-    public function code()
-    {
-        # 生成二维码
-        $id = Dever::input('id');
-        $cate = Dever::input('cate', 1);
-
-        $this->data = Dever::load('passport/user')->data();
-        if (!$this->data) {
-            $url = Dever::url('home?cate=' . $cate, 'service');
-            Dever::location($url);
-            return;
-        } else {
-            $this->data['uid'] = $this->data['id'];
-        }
-
-        $type = 4;
-
-        $scene = Dever::login($this->data['uid']) . ',' . $type . ',' . $id;
-
-        $path = '';
-        //echo $scene;die;
-        $send['project'] = Dever::input('project', 1);
-        $send['send'] = $scene;
-        $send['width'] = 152;
-        $send['path'] = $path; 
-        //$logo = Dever::load('wechat_applet/code.get', $send);
-
-        $code = 'https://cm.5dev.cn/applet_on/data/upload/1/2018/06/06/239fa207778aa923f4ff7594dfbdfcca.png';
-
-        return $code;
-    }
-
-    public function success()
-    {
-        $config = Dever::db('main/config')->one(1);
-
-        $id = Dever::input('id');
-        $cate = Dever::input('cate', 1);
-        $config['list'] = Dever::url('list?cate=' . $cate, 'service');
-        $config['buy'] = Dever::url('pay?cate='.$cate.'&id=' . $id, 'service');
-
-        return $config;
-    }
-
-    public function buy()
-    {
-        $id = Dever::input('id');
-        $cate = Dever::input('cate', 1);
-        $data = Dever::db('journal/buy_num')->getAll(array('info_id' => $id));
-        $info = Dever::db('journal/info')->one($id);
-
-        if ($data) {
-            foreach ($data as $k => $v) {
-                if ($info['cash'] > 0) {
-                    $data[$k]['price'] = '￥' . number_format($info['cash'] * $v['num'], 2);
-                } else {
-                    $data[$k]['price'] = '免费';
-                }
-
-                if (!$v['name']) {
-                    $data[$k]['name'] = '购买' . $v['num'] . '本';
-                }
-                $data[$k]['cate'] = $info['cate_id'];
-                
-            }
-        }
-        return $data;
-    }
-
-    public function pay()
-    {
-        $this->data = Dever::load('passport/user')->data();
-        if (!$this->data) {
-            $cate = Dever::input('cate', 1);
-            $url = Dever::url('home?cate=' . $cate, 'service');
-            Dever::location($url);
-            return;
-        } else {
-            $this->data['uid'] = $this->data['id'];
-        }
-
-        $buy_id = Dever::input('buy_id');
-        $journal_id = Dever::input('journal_id');
-
-        if (!$buy_id) {
-            Dever::alert('请传入正确的支付ID');
-        }
-        if (!$journal_id) {
-            Dever::alert('请传入正确的小刊ID');
-        }
-
-        $info = Dever::db('journal/info')->one($journal_id);
-        $buy = Dever::db('journal/buy_num')->one($buy_id);
-
-        if (!$buy || !$info) {
-            Dever::alert('请传入正确的小刊ID');
-        }
-
-        if (!$buy['name']) {
-            $buy['name'] = '购买' . $buy['num'] . '本';
-        }
-
-        $user = Dever::db('passport/user')->one($this->data['uid']);
-        $wechat = Dever::db('passport/wechat')->one(array('uid' => $this->data['uid'], 'type' => 2));
-
-        $source_type = Dever::input('source_type');
-
-        if ($source_type == 'ios' || $source_type == 'android') {
-            $method = 'app';
-        } else {
-            $method = 'applet';
-        }
-
-        $order_id = $this->createOrder('JP');
-        $order_data['order_id'] = $order_id;
-        $order_data['product_id'] = $journal_id;
-        $order_data['buy_id'] = $buy_id;
-        $order_data['uid'] = $this->data['uid'];
-
-        $order_data['type'] = 1;
-        $order_data['status'] = 1;
-        $order_data['name'] = $info['name'] . '-' . $buy['name'];
-        //$order_data['num'] = Dever::input('num', 1);
-        $order_data['num'] = $buy['num'];
-        $order_data['cash'] = $info['cash'] * $order_data['num'];
-
-        $id = Dever::db('journal/order')->insert($order_data);
-
-        if (!$id) {
-            Dever::alert('支付失败');
-        }
-
-        $cate = Dever::input('cate', 1);
-        //$param参数
-        $param = array
-        (
-            'account_id' => 2,
-            'project_id' => 1,
-            'uid' => $this->data['uid'],
-            'username' => $user['username'],
-            'name' => $order_data['name'],
-            'cash' => $order_data['cash'],
-            'cash' => '0.01',
-            'openid' => $wechat['openid'],
-            'product_id' => $journal_id . '-' . $buy_id,
-            'order_id' => $order_id,
-            'refer' => Dever::url('success?cate='.$cate.'&id=' . $journal_id . '&buy=' . $buy_id)
-        );
-
-        return Dever::load('pay/api.page', $param);
-    }
-
-    private function createOrder($prefix = 'JC')
-    {
-        //$order = Dever::order($prefix);
-
-        $order = Dever::rand(2, 2) . Dever::rand(6, 0);
-
-        $info = Dever::db('journal/order')->one(array('order_id' => $order));
-
-        if ($info) {
-            return $this->createOrder();
+        if ($this->user) {
+            return $this->location('list');
         }
-
-        return $order;
     }
 }

service/template/mobile/home.php

@@ -4,15 +4,15 @@ $view
 
 ->import('inc/head')
 
-->fetch('img@src',    'service/data.config#cover')
+->fetch('img@src',    'service/base.config#cover')
 
-->fetch('.txt@check', 'service/data.checkHomeLogin')
+->fetch('.txt@check', 'service/data.checkLogin')
 
-->fetch('.txt', 'service/data.config#login_title')
+->fetch('.txt', 'service/base.config#login_title')
 
-->fetch('.ellipsis', 'service/data.config#title')
+->fetch('.ellipsis', 'service/base.config#title')
 
-->fetch('.button@onclick', 'service/data.config#login')
+->fetch('.button@onclick', 'service/base.config#login')
 
 ->import('inc/foot')
 

service/template/mobile/inc/head.php

@@ -1,7 +1,7 @@
 <?php
 
 $view
-->fetch('title',                    '<{isset($title) ? $title . "_" . Dever::load("service/data.config#title") : Dever::load("service/data.config#title")}>')
+->fetch('title',                    '<{isset($title) ? $title . "_" . Dever::load("service/base.config#title") : Dever::load("service/data.config#title")}>')
 
 ->fetch(array('link@href', 0),      Dever::assets("global.css"))
 ->fetch(array('link@href', 1),      Dever::assets('<{(isset($name) ? $name : "index")}>.css', "css"))

service/template/mobile/list.php

@@ -6,19 +6,17 @@ $view
 
 ->import('inc/head')
 
-->fetch('.title@check', 'service/data.checkLogin')
+->fetch('.title', 'service/base.config#title')
 
-->fetch('.title', 'service/data.config#title')
+->fetch('.logo@style', 'service/base.config#bglogo')
 
-->fetch('.logo@style', 'service/data.config#bglogo')
-
-->fetch('.info-txt', 'service/data.config#desc')
+->fetch('.info-txt', 'service/base.config#desc')
 
 # 循环
 ->loop
 (
     '.item',
-    'service/data.lists',
+    'service/buy.lists',
     array
     (
         'h2' => '$v.name',
@@ -33,7 +31,7 @@ $view
 
         '.button' => array
         (
-            'onclick' => 'pay(<{$v.cate_id}>, <{$v.id}>)',
+            'onclick' => 'pay("<{$v.pay_url}>")',
         )
         
     )

service/template/mobile/pay.php

@@ -6,15 +6,15 @@ $view
 
 ->import('inc/head')
 
-->fetch('.h1', 'service/data.info#buy')
+->fetch('.h1', 'service/buy.info#buy')
 
-->fetch('.richtext', 'service/data.info#buy_desc')
+->fetch('.richtext', 'service/buy.info#buy_desc')
 
 # 循环
 ->loop
 (
     '.item',
-    'service/data.buy',
+    'service/buy.buy',
     array
     (
         'p|0' => '$v.name',
@@ -23,9 +23,8 @@ $view
         'self' => array
         (
             'href' => 'javascript:;',
-            'onclick' => 'pay(<{$v.cate}>, <{$v.id}>, <{$v.info_id}>)',
+            'onclick' => 'pay("<{$v.pay_url}>")',
         ),
-        
     )
 )
 

service/template/mobile/success.php

@@ -6,13 +6,13 @@ $view
 
 ->import('inc/head')
 
-->fetch('.default@src', 'service/data.code')
+->fetch('.default@src', 'service/buy.code')
 
-->fetch('span', 'service/data.success#service_text')
+->fetch('span', 'service/buy.success#service_text')
 
-->fetch('.opposite@href', 'service/data.success#list')
+->fetch('.opposite@href', 'service/buy.success#list')
 
-->fetch(array('.button@href', 1), 'service/data.success#buy')
+->fetch(array('.button@href', 1), 'service/buy.success#buy')
 
 
 ->import('inc/foot')

source/database/info.php

@@ -0,0 +1,99 @@
+<?php
+
+$link = function()
+{
+	$array = array();
+	$info = Dever::db('source/link')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
+return array
+(
+	# 表名
+	'name' => 'info',
+	# 显示给用户看的名称
+	'lang' => '渠道管理',
+	'order' => 10,
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+		),
+		
+		'name'		=> array
+		(
+			'type' 		=> 'varchar-80',
+			'name' 		=> '名称',
+			'default' 	=> '',
+			'desc' 		=> '请输入名称',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+			'search'	=> 'fulltext',
+			'list'		=> true,
+		),
+
+		'link_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '推广链接',
+			'default' 	=> '1',
+			'desc' 		=> '推广链接',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $link,
+			'search'	=> 'select',
+			'list'		=> true,
+		),
+
+		'code'		=> array
+		(
+			'type' 		=> 'varchar-200',
+			'name' 		=> '渠道二维码',
+			'default' 	=> '',
+			'desc' 		=> '渠道二维码',
+			'match' 	=> 'is_string',
+			'update'	=> 'textarea',
+			'list'		=> 'Dever::load("source/lib/manage.show", "{id}")',
+		),
+
+		'state'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '状态',
+			'default' 	=> '1',
+			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
+		),
+		
+		'cdate'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '录入时间',
+			'match' 	=> array('is_numeric', time()),
+			'desc' 		=> '',
+			# 只有insert时才生效
+			'insert'	=> true,
+		),
+	),
+
+	'manage' => array
+	(
+		'delete' => false,
+		'edit' => false,
+		# 列表
+		'list_button' => array
+		(
+			'list' => array('渠道统计', '"stat&search_option_info_id={id}&oper_parent=info"'),
+		),
+	),
+);

source/database/link.php

@@ -0,0 +1,95 @@
+<?php
+
+$type = array
+(
+	1 => 'H5',
+	2 => '小程序',
+);
+
+return array
+(
+	# 表名
+	'name' => 'link',
+	# 显示给用户看的名称
+	'lang' => '推广链接管理',
+	'order' => 1,
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+		),
+		
+		'name'		=> array
+		(
+			'type' 		=> 'varchar-80',
+			'name' 		=> '名称',
+			'default' 	=> '',
+			'desc' 		=> '请输入名称',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+			'search'	=> 'fulltext',
+			'list'		=> true,
+		),
+
+		'type'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '类型',
+			'default' 	=> '1',
+			'desc' 		=> '类型',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $type,
+			'search'	=> 'select',
+			'list'		=> true,
+		),
+
+		'link'		=> array
+		(
+			'type' 		=> 'varchar-500',
+			'name' 		=> '链接或路径-填写完整的h5链接或者小程序路径',
+			'default' 	=> '',
+			'desc' 		=> '链接或路径',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+			'search'	=> 'fulltext',
+			'list'		=> true,
+		),
+
+		'state'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '状态',
+			'default' 	=> '1',
+			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
+		),
+		
+		'cdate'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '录入时间',
+			'match' 	=> array('is_numeric', time()),
+			'desc' 		=> '',
+			# 只有insert时才生效
+			'insert'	=> true,
+		),
+	),
+
+	'manage' => array
+	(
+		'delete' => false,
+		'edit' => false,
+		# 列表
+		'list_button' => array
+		(
+			'list' => array('渠道列表', '"info&search_option_link_id={id}&oper_parent=link"'),
+		),
+	),
+);

source/database/stat.php

@@ -0,0 +1,177 @@
+<?php
+
+$info = function()
+{
+	$array = array();
+	$info = Dever::db('source/info')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
+
+return array
+(
+	# 表名
+	'name' => 'stat',
+	# 显示给用户看的名称
+	'lang' => '渠道统计',
+	'order' => 10,
+	'menu' => false,
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+		),
+
+		'uid'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '用户名',
+			'default' 	=> '0',
+			'desc' 		=> '请选择用户',
+			'match' 	=> 'is_numeric',
+			//'update'	=> 'select',
+			//'search'	=> 'select',
+			'search'    => array
+            (
+                'api' => 'passport/user-all',
+                'col' => 'username',
+                'result' => 'id',
+            ),
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
+		),
+
+		'info_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '渠道',
+			'default' 	=> '1',
+			'desc' 		=> '渠道',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $info,
+			'search'	=> 'select',
+			'list'		=> true,
+		),
+		
+		'day'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '统计时间',
+			'default' 	=> '',
+			'desc' 		=> '统计时间',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $action,
+			'search'	=> 'select',
+			'list'		=> true,
+		),
+
+		'pv'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'pv数',
+			'default' 	=> '',
+			'desc' 		=> 'pv数',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			'list'		=> true,
+		),
+
+		'uv'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'uv数',
+			'default' 	=> '',
+			'desc' 		=> 'uv数',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			'list'		=> true,
+		),
+
+		'order'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '下单数',
+			'default' 	=> '',
+			'desc' 		=> '下单数',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			'list'		=> true,
+		),
+
+        'state'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '状态',
+			'default' 	=> '1',
+			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
+		),
+
+		'cdate'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '录入时间',
+			'match' 	=> array('is_numeric', time()),
+			'desc' 		=> '',
+			# 只有insert时才生效
+			'insert'	=> true,
+			'list'      => 'date("Y-m-d H:i:s", {cdate})',
+		),
+	),
+
+	'manage' => array
+	(
+		'delete' => false,
+		'edit' => false,
+		'insert' => false,
+	),
+
+	# request 请求接口定义
+	'request' => array
+	(
+		'getNew' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'config_id' => 'yes',
+				'action_id' => 'yes',
+				'uid' => 'yes',
+				'status' => 'yes',
+				'state' => 1,
+			),
+			'type' => 'one',
+			'order' => array('cdate' => 'desc'),
+			'col' => '*',
+		),
+
+		'getNewTotal' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'config_id' => 'yes',
+				'action_id' => 'yes',
+				'uid' => 'yes',
+				'status' => 'yes',
+				'state' => 1,
+				'start' => array('yes-cdate', '>='),
+				'end' => array('yes-cdate', '<='),
+			),
+			'type' => 'count',
+			'order' => array('cdate' => 'desc'),
+			'col' => 'count(1) as total',
+		),
+	)
+);

source/index.php

@@ -0,0 +1,8 @@
+<?php
+
+define('DEVER_APP_NAME', 'source');
+define('DEVER_APP_LANG', '渠道来源');
+define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+define('DEVER_MANAGE_ORDER', 10);
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-credit-card layui-icon-cellphone');
+include(DEVER_APP_PATH . '../boot.php');

source/lib/Core.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Source\Lib;
+
+use Dever;
+
+class Core
+{
+	/**
+	 * 日志记录
+	 *
+	 * @return mixed
+	 */
+	public function save($uid, $id)
+	{
+		$input = Dever::json_encode(Dever::input());
+        $url = Dever::url();
+
+		$log = array
+		(
+			'uid' => $uid,
+			'source_id' => $id,
+			'input' => $input,
+			'url' => $url,
+		);
+		Dever::log($log, 'source');
+
+		return true;
+	}
+}

source/lib/Manage.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Source\Lib;
+
+use Dever;
+
+class Manage
+{
+	/**
+	 * 显示信息
+	 *
+	 * @return mixed
+	 */
+	public function show($id)
+	{
+		$info = Dever::db('source/info')->one($id);
+		$link = Dever::db('source/link')->one($id);
+
+		return '';
+	}
+}

video/database/live.php

@@ -148,7 +148,7 @@ return array
 			'name' 		=> '4:3封面图-图片尺寸750*564px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -164,7 +164,7 @@ return array
 			'name' 		=> '16:9封面图-图片尺寸750*422px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -420,7 +420,7 @@ return array
 			'name' 		=> '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '分享图片',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',

video/database/vod.php

@@ -162,7 +162,7 @@ return array
 			'name' 		=> '4:3封面图-图片尺寸750*564px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -178,7 +178,7 @@ return array
 			'name' 		=> '16:9封面图-图片尺寸750*422px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '封面图',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -356,7 +356,7 @@ return array
 			'name' 		=> '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '分享图片',
-			'match' 	=> 'option',
+			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',