dever 6 years ago
parent
commit
0954efc36c

+ 1 - 1
journal/database/info.php

@@ -518,7 +518,7 @@ return array
 			),
 			'type' => 'all',
 			'order' => array('reorder' => 'desc', 'id' => 'desc'),
-			'page' => array(10, 'list'),
+			//'page' => array(10, 'list'),
 			'col' => $col,
 		),
 		

+ 4 - 0
main/src/Journal.php

@@ -448,6 +448,10 @@ class Journal extends Core
             $info['info']['author'] = Dever::db('content/author')->one($info['info']['author_id']);
         }
 
+        if (isset($info['pic']) && $info['pic']) {
+            $info['pic'] = str_replace('http://', 'https://', $info['pic']);
+        }
+
         return $info;
     }
 

+ 3 - 0
service/assets/mobile/js/config.js

@@ -0,0 +1,3 @@
+//定义瀑布流
+Dever.Page().name = '#page';
+//Dever.Page().loading = '.loadding';

+ 1 - 1
service/assets/mobile/list_code.html

@@ -41,7 +41,7 @@
         
     </div>
 
-    <div class="list fn-hide" node-id="list">
+    <div class="list fn-hide pages" node-id="list">
         <div class="item2 clearfix">
             <div class="cover"><img class="default" /></div>
             <div class="info">

+ 7 - 5
service/src/Buy.php

@@ -10,11 +10,12 @@ class Buy extends Base
     	parent::__construct();
 
     	if (!$this->user) {
-    		return $this->location('home');
+    		//return $this->location('home');
     	}
 
         if ($this->type == 1) {
-            return $this->location('list', array('type' => 2));
+            $this->type = 2;
+            return $this->location('list');
         }
     }
     
@@ -59,7 +60,7 @@ class Buy extends Base
             foreach ($data as $k => $v) {
                 $info = Dever::db('journal/info')->one($v['product_id']);
 
-                $data[$k]['code_string'] = '兑换码:' . $v['code'];
+                $data[$k]['code_string'] = '兑换码:' . trim($v['code']);
 
                 $data[$k]['name'] = $info['name'];
 
@@ -67,7 +68,8 @@ class Buy extends Base
 
                 $data[$k]['pic_gd'] .= '?imageView2/2/w/375';
 
-                $data[$k]['code_pic'] = $this->create_code($info['id']);
+                $data[$k]['code_pic'] = '';
+                //$data[$k]['code_pic'] = $this->create_code($info['id']);
             }
         }
 
@@ -158,7 +160,7 @@ class Buy extends Base
                 $config['button'] = '刷新';
                 //$this->location('success', array('id' => $id, 'buy' => $buy_id, 'order_id' => $order_id));
             } else {
-                $config['button'] = '复制兑换码<span>'.$order['code'].'</span>';
+                $config['button'] = '复制兑换码<span>'.trim($order['code']).'</span>';
             }
             
             $config['code'] = '<p>兑换码:'.$order['code'].'</p>';

+ 1 - 0
service/template/mobile/inc/foot.php

@@ -8,6 +8,7 @@ $view
 
 ->append('body',    '<script src="'.Dever::assets('lib/jquery/jquery.min.js', 'script').'"></script>')
 ->append('body',    '<script src="'.Dever::assets('dever/core.js', 'script').'"></script>')
+->append('body',    '<script src="'.Dever::assets('config.js').'"></script>')
 ->append('body',    '<script src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>')
 
 ;

+ 3 - 0
service/template/mobile/list_code.php

@@ -62,6 +62,9 @@ $view
     )
 )
 
+# 暂无记录
+->append('body', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".pages"></div>')
+
 ->import('inc/foot')
 
 ->display();