dever 6 years ago
parent
commit
338710086e

+ 2 - 2
service/assets/mobile/list.html

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

+ 2 - 2
service/assets/mobile/pay.html

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

+ 17 - 10
service/src/Data.php

@@ -6,9 +6,10 @@ class Data
 {
     public function checkHomeLogin()
     {
+        $cate = Dever::input('cate', 1);
         $user = Dever::load('passport/user')->data();
         if ($user) {
-            $url = Dever::url('list', 'service');
+            $url = Dever::url('list?cate=' . $cate, 'service');
             Dever::location($url);
             return;
         }
@@ -16,9 +17,10 @@ class Data
 
     public function checkLogin()
     {
+        $cate = Dever::input('cate', 1);
         $user = Dever::load('passport/user')->data();
         if (!$user) {
-            $url = Dever::url('home', 'service');
+            $url = Dever::url('home?cate=' . $cate, 'service');
             Dever::location($url);
             return;
         }
@@ -27,7 +29,6 @@ class Data
     # 获取基本配置
     public function config()
     {
-        
         $cate = Dever::input('cate', 1);
         $cate = Dever::db('journal/cate')->one($cate);
 
@@ -35,7 +36,7 @@ class Data
 
         $cate['bglogo'] = ':url('.$cate['logo'].') no-repeat;';
 
-        $url = urlencode(Dever::url('home', 'service'));
+        $url = urlencode(Dever::url('list?cate=' . $cate['id'], 'service'));
         $cate['login'] = 'location.href=\'' . Dever::url('request.auth?account=1&refer=' . $url, 'oauth') . '\'';
         return $cate;
     }
@@ -43,7 +44,7 @@ class Data
     # 列表页
     public function lists()
     {
-        $where['cate_id'] = 1;
+        $where['cate_id'] = Dever::input('cate', 1);
         $where['buy'] = 1;
         $data = Dever::db('journal/info')->getAll($where);
 
@@ -84,10 +85,11 @@ class Data
     {
         # 生成二维码
         $id = Dever::input('id');
+        $cate = Dever::input('cate', 1);
 
         $this->data = Dever::load('passport/user')->data();
         if (!$this->data) {
-            $url = Dever::url('home', 'service');
+            $url = Dever::url('home?cate=' . $cate, 'service');
             Dever::location($url);
             return;
         } else {
@@ -116,8 +118,9 @@ class Data
         $config = Dever::db('main/config')->one(1);
 
         $id = Dever::input('id');
-        $config['list'] = Dever::url('list', 'service');
-        $config['buy'] = Dever::url('pay?id=' . $id, 'service');
+        $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;
     }
@@ -125,6 +128,7 @@ class Data
     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);
 
@@ -139,6 +143,7 @@ class Data
                 if (!$v['name']) {
                     $data[$k]['name'] = '购买' . $v['num'] . '本';
                 }
+                $data[$k]['cate'] = $info['cate_id'];
                 
             }
         }
@@ -149,7 +154,8 @@ class Data
     {
         $this->data = Dever::load('passport/user')->data();
         if (!$this->data) {
-            $url = Dever::url('home', 'service');
+            $cate = Dever::input('cate', 1);
+            $url = Dever::url('home?cate=' . $cate, 'service');
             Dever::location($url);
             return;
         } else {
@@ -207,6 +213,7 @@ class Data
             Dever::alert('支付失败');
         }
 
+        $cate = Dever::input('cate', 1);
         //$param参数
         $param = array
         (
@@ -220,7 +227,7 @@ class Data
             'openid' => $wechat['openid'],
             'product_id' => $journal_id . '-' . $buy_id,
             'order_id' => $order_id,
-            'refer' => Dever::url('success?id=' . $journal_id . '&buy=' . $buy_id)
+            'refer' => Dever::url('success?cate='.$cate.'&id=' . $journal_id . '&buy=' . $buy_id)
         );
 
         return Dever::load('pay/api.page', $param);

+ 1 - 1
service/template/mobile/list.php

@@ -31,7 +31,7 @@ $view
 
         '.button' => array
         (
-            'onclick' => 'pay(<{$v.id}>)',
+            'onclick' => 'pay(<{$v.cate_id}>, <{$v.id}>)',
         )
         
     )

+ 1 - 1
service/template/mobile/pay.php

@@ -23,7 +23,7 @@ $view
         'self' => array
         (
             'href' => 'javascript:;',
-            'onclick' => 'pay(<{$v.id}>, <{$v.info_id}>)',
+            'onclick' => 'pay(<{$v.cate}>, <{$v.id}>, <{$v.info_id}>)',
         ),
         
     )