edit

act/database/journal_num.php

@@ -90,12 +90,12 @@ return array
 
 	'manage' => array
 	(
-		'insert' => false,
-		'edit' => false,
+		//'insert' => false,
+		//'edit' => false,
 		'delete' => false,
 		'button' => array
 		(
-			'导出排行榜' => array('location', 'act/lib/num.out?id=' . Dever::input('search_option_data_id')),
+			'导出排行榜' => array('location', 'act/lib/num.out?id=' . Dever::input('search_option_journal_id')),
 		),
 	),
 

buy/assets/mobile/list.html

@@ -11,8 +11,8 @@
     <div class="logo"><img src="images/logo.jpg" />精品购物指南</div>
     <div class="info-txt">这里加一行简介</div>
     <div class="tab" node-id="tab">
-        <div class="li active"><span>预购杂志</span></div>
-        <div class="li"><span>兑换码</span></div>
+        <a class="li active"><span>预购杂志</span></a>
+        <a class="li"><span>兑换码</span></a>
     </div>
     <div class="list" node-id="list">
         <div class="item">
@@ -42,29 +42,6 @@
         
     </div>
 
-    <div class="list pages  fn-hide" node-id="list">
-        <div class="item2 clearfix">
-            <div class="order-info">
-                <p>2019年4月30日  15:20</p>
-                <a href="#">查看>></a>
-            </div>
-            <div class="mag-info">
-                <p>《段宜恩电子刊段宜恩电子刊段宜恩电子刊》</p>
-                <span>100本  ¥798.00</span>
-            </div>
-        </div>
-        <div class="item2 clearfix">
-            <div class="order-info">
-                <p>2019年4月30日  15:20</p>
-                <a href="#">查看>></a>
-            </div>
-            <div class="mag-info">
-                <p>《段宜恩电子刊段宜恩电子刊段宜恩电子刊》</p>
-                <span>100本  ¥798.00</span>
-            </div>
-        </div>
-    </div>
-
     <div class="mask fn-hide" id="layer">
         <div class="layer read-layer">
             <div class="qrcode-wrap">
@@ -79,12 +56,14 @@
 <script>
 
     function init(){
+        /*
         var tabIndex = 0;
         $('[node-id="tab"]').on('click','.li',function(){
             tabIndex = $(this).index();
             $(this).addClass('active').siblings('.li').removeClass('active');
             $('[node-id="list"]').hide().eq(tabIndex).show();
         });
+*/
 
         $('[node-act="read"]').on('click',function(){
             $('#code').attr('src',$(this).data('src'));
@@ -97,5 +76,10 @@
 
     }
     init();
+
+    function pay(url)
+    {
+        location.href = url;
+    }
 </script>
 </html>

buy/index.php

@@ -1,5 +1,6 @@
 <?php
 
+# 取代service
 # 启动session，用以记录用户信息
 define('DEVER_SESSION', 1);
 define('DEVER_APP_NAME', 'buy');

buy/src/Base.php

@@ -1,4 +1,4 @@
-<?php namespace Service\Src;
+<?php namespace Buy\Src;
 
 use Dever;
 
@@ -18,8 +18,6 @@ class Base
         $this->cate = $this->getConfig('cate', 1);
         # 渠道
         $this->source = $this->getConfig('source', 1);
-        # 类型 1为直接购买 2为购买兑换码
-        $this->type = $this->getConfig('type', 1);
         # 销售商
         $this->seller = $this->getConfig('seller', 1);
 
@@ -48,8 +46,6 @@ class Base
         $this->cate = Dever::input('cate', 1);
         # 渠道
         $this->source = Dever::input('source', 1);
-        # 类型 1为直接购买 2为购买兑换码
-        $this->type = Dever::input('type', 1);
         # 销售商
         $this->seller = Dever::input('seller', 1);
         
@@ -69,35 +65,42 @@ class Base
     # 获取基本配置
     public function config()
     {
-        $cate = Dever::db('journal/cate')->one($this->cate);
+        $key = 'buy_config_' . $this->cate . '_' . $this->account . '_' . $this->source;
 
-        $cate['login_title'] = '登录后才可以使用' . $cate['name'] . '服务';
+        $cate = Dever::cache($key);
 
-        $cate['bglogo'] = 'background-image:url('.$cate['logo'].');';
+        if (!$cate) {
+            $cate = Dever::db('journal/cate')->one($this->cate);
 
-        $url = urlencode($this->url('list_code'));
-        $cate['login'] = 'location.href=\'' . Dever::url('request.auth?account='.$this->account.'&source='.$this->source.'&refer=' . $url, 'oauth') . '\'';
+            $cate['login_title'] = '<span>授权后才可以使用' . $cate['name'] . '服务<br>感谢您的支持</span>';
 
-        $info = Dever::db('journal/info')->getOne($cate['journal_id']);
+            $cate['bglogo'] = 'background-image:url('.$cate['logo'].');';
 
-        if ($info && $info['pic_gd']) {
-            $cate['cover'] = $info['pic_gd'];
-        }
+            $cate['logotxt'] = '<img src="'.$cate['logo'].'" />' . $cate['name'];
+
+            $url = urlencode($this->url('list_code'));
+            $cate['login'] = 'location.href=\'' . Dever::url('request.auth?account='.$this->account.'&source='.$this->source.'&refer=' . $url, 'oauth') . '\'';
+
+            $info = Dever::db('journal/info')->getOne($cate['journal_id']);
+
+            if ($info && $info['pic_gd']) {
+                $cate['cover'] = $info['pic_gd'];
+            }
 
-        $cate['list_link'] = $this->url('list_code');
-        $cate['my_link'] = $this->url('my_code');
+            $cate['list_link'] = $this->url('list_code');
+            $cate['my_link'] = $this->url('my_code');
+
+            Dever::cache($key, $cate);
+        }
+        
         return $cate;
     }
 
     # 生成url
-    protected function url($uri, $param = array(), $project = 'service')
+    protected function url($uri, $param = array(), $project = 'buy')
     {
-        if ($uri == 'list' && $this->type == 2) {
-            $uri = 'list_code';
-        }
     	$send['cate'] = $this->cate;
     	$send['source'] = $this->source;
-        $send['type'] = $this->type;
         $send['seller'] = $this->seller;
         $param['p'] = Dever::encode(Dever::json_encode($send), $this->key);
         if ($this->signature) {
@@ -112,7 +115,7 @@ class Base
     	return $url;
     }
 
-    protected function location($uri, $param = array(), $project = 'service')
+    protected function location($uri, $param = array(), $project = 'buy')
     {
     	return Dever::location($this->url($uri, $param, $project));
     }

buy/src/Buy.php

@@ -1,4 +1,4 @@
-<?php namespace Service\Src;
+<?php namespace Buy\Src;
 
 use Dever;
 
@@ -10,24 +10,21 @@ class Buy extends Base
     	parent::__construct();
 
     	if (!$this->user) {
-    		return $this->location('home');
+    		//return $this->location('home');
     	}
-
-        if ($this->type == 1) {
-            $this->type = 2;
-            return $this->location('list');
-        }
     }
     
     # 列表页
     public function lists()
     {
         # 记录列表页渠道pv、uv数
+        /*
         if (Dever::project('source')) {
             Dever::load('source/lib/core')->save($this->user['id'], 'list', $this->source);
         }
+        */
         $where['cate_id'] = $this->cate;
-        $where['buy'] = 1;
+        //$where['buy'] = 1;
         $data = Dever::db('journal/info')->getAllByPage($where);
 
         if ($data) {
@@ -38,7 +35,7 @@ class Buy extends Base
                     $data[$k]['price'] = '免费';
                 }
 
-                $data[$k]['ding'] = '销量：' . $v['num_ding'];
+                //$data[$k]['ding'] = '销量：' . $v['num_ding'];
 
                 $data[$k]['pay_url'] = $this->url('pay', array('id' => $v['id']));
 
@@ -301,7 +298,7 @@ class Buy extends Base
         $order_data['buy_id'] = $buy_id;
         $order_data['uid'] = $uid;
 
-        $order_data['type'] = 1;
+        $order_data['type'] = 3;
         $order_data['status'] = 1;
         $order_data['name'] = $info['name'] . '-' . $buy['name'];
         //$order_data['num'] = Dever::input('num', 1);

buy/src/Data.php

@@ -1,4 +1,4 @@
-<?php namespace Service\Src;
+<?php namespace Buy\Src;
 
 use Dever;
 
@@ -12,7 +12,7 @@ class Data extends Base
 
     public function checkLogin()
     {
-        //return $this->location('list');
+        return $this->location('list');
         if ($this->user) {
             return $this->location('list');
         }

buy/template/mobile/home.php

@@ -2,17 +2,19 @@
 
 $view
 
+->set('name', 'auth')
+
 ->import('inc/head')
 
-->fetch('img@src',    'service/base.config#cover')
+//->fetch('img@src',    'buy/base.config#cover')
 
-->fetch('.txt@check', 'service/data.checkLogin')
+->fetch('.txt@check', 'buy/data.checkLogin')
 
-->fetch('.txt', 'service/base.config#login_title')
+->fetch('.txt', 'buy/base.config#login_title')
 
-->fetch('.ellipsis', 'service/base.config#title')
+//->fetch('.ellipsis', 'buy/base.config#title')
 
-->fetch('.button@onclick', 'service/base.config#login')
+->fetch('.button@onclick', 'buy/base.config#login')
 
 ->import('inc/foot')
 

buy/template/mobile/inc/head.php

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

buy/template/mobile/list.php

@@ -6,24 +6,23 @@ $view
 
 ->import('inc/head')
 
-->fetch('.title', 'service/base.config#title')
+->fetch('.logo', 'buy/base.config#logotxt')
 
-->fetch('.logo@style', 'service/base.config#bglogo')
+->fetch('.info-txt', 'buy/base.config#desc')
 
-->fetch('.info-txt', 'service/base.config#desc')
+->fetch(array('.tab .li@href', 0), 'service/base.config#list_link')
+->fetch(array('.tab .li@href', 1), 'service/base.config#my_link')
 
 # 循环
 ->loop
 (
     '.item',
-    'service/buy.lists',
+    'buy/buy.lists',
     array
     (
         'h2' => '$v.name',
         '.price' => '$v.price',
 
-        '.num' => '$v.ding',
-
         'img' => array
         (
             'src' => '$v.pic_gd',
@@ -37,6 +36,9 @@ $view
     )
 )
 
+# 暂无记录
+->append('body', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".pages"></div>')
+
 ->import('inc/foot')
 
 ->display();

buy/template/mobile/list_code.php

@@ -1,52 +0,0 @@
-<?php
-
-$view
-
-->set('name', 'list')
-
-->import('inc/head')
-
-->fetch(array('.title', 0), 'service/base.config#title')
-
-->fetch('.logo@style', 'service/base.config#bglogo')
-
-->fetch('.logo', 'service/base.config#name')
-
-->fetch('.info-txt', 'service/base.config#desc')
-
-//->fetch('.richtext', 'service/base.config#code_desc')
-
-->fetch(array('.tab .li@href', 0), 'service/base.config#list_link')
-->fetch(array('.tab .li@href', 1), 'service/base.config#my_link')
-
-# 循环
-->loop
-(
-    '.item',
-    'service/buy.lists',
-    array
-    (
-        'h2' => '$v.name',
-        '.price' => '$v.price',
-
-        '.num' => '$v.ding',
-
-        'img' => array
-        (
-            'src' => '$v.pic_gd',
-        ),
-
-        '.button' => array
-        (
-            'onclick' => 'pay(\'<{$v.pay_url}>\')',
-        )
-        
-    )
-)
-
-# 暂无记录
-->append('body', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".pages"></div>')
-
-->import('inc/foot')
-
-->display();

buy/template/mobile/my_code.php

@@ -6,22 +6,17 @@ $view
 
 ->import('inc/head')
 
-->fetch(array('.title', 0), 'service/base.config#title')
+->fetch('.logo', 'buy/base.config#logotxt')
 
-->fetch('.logo@style', 'service/base.config#bglogo')
+->fetch('.info-txt', 'buy/base.config#desc')
 
-->fetch('.logo', 'service/base.config#name')
-
-->fetch('.info-txt', 'service/base.config#desc')
-
-//->fetch('.richtext', 'service/base.config#code_desc')
 ->fetch(array('.tab .li@href', 0), 'service/base.config#list_link')
 ->fetch(array('.tab .li@href', 1), 'service/base.config#my_link')
 
 ->loop
 (
     '.item2',
-    'service/buy.lists_code',
+    'buy/buy.lists_code',
     array
     (
         'img' => array

buy/template/mobile/success.php

@@ -1,32 +0,0 @@
-<?php
-
-$view
-
-->set('name', 'success')
-
-->import('inc/head')
-
-->fetch('.default@src', 'service/buy.code')
-
-->fetch(array('span', 0), 'service/base.config#name')
-
-->fetch(array('p', 0), 'service/base.config#name')
-
-->fetch('.opposite@href', 'service/buy.success#list')
-
-->fetch(array('.button@href', 1), 'service/buy.success#buy')
-
-->fetch('#code@style', 'service/buy.success#code_show')
-
-->fetch('#code .read', 'service/buy.success#code')
-
-->fetch(array('.button', 1), 'service/buy.success#button')
-
-//->fetch(array('.button@node-id', 1), 'service/buy.success#button_node')
-
-//->fetch(array('span', 1), 'service/buy.success#button_span')
-
-
-->import('inc/foot')
-
-->display();

journal/database/info.php

@@ -514,7 +514,7 @@ $config = array
 			'edit' => array('预览', str_replace('https://api.', 'http://www.', Dever::url('main/preview.get?type=4'))),
 			'edit1' => array('活动预览', str_replace('https://api.', 'http://www.', Dever::url('main/preview.get?type=13'))),
 			'br2' => array('<br />'),
-			'list10' => array('排行榜', '"journal_num&project=act&search_type=4&search_option_data_id={id}&oper_parent=info&oper_project=journal"'),
+			'list10' => array('排行榜', '"journal_num&project=act&search_type=4&search_option_journal_id={id}&oper_parent=info&oper_project=journal"'),
 			//'list11' => array('邀请排行', '"invite&project=act&search_type=4&search_option_data_id={id}&oper_parent=info&oper_project=journal"'),
 			'br1' => array('<br />'),
 			'list' => array('内页管理', '"content&search_option_info_id={id}&oper_parent=info&page_type=1"' , '{audit} == 1'),