edit

content/lib/Article.php

@@ -6,6 +6,7 @@ use Dever;
 
 class Article
 {
+    public $uid;
     # 根据文章id 获取文章信息
     public function get($data)
     {
@@ -137,6 +138,15 @@ class Article
                     if (isset($info['content'])) {
                         unset($info['content']);
                     }
+
+                    if ($type == 3) {
+                        # 查看是否有预约
+                        if ($this->uid > 0) {
+                            $info['user_act']['note'] = Dever::load('act/lib/note')->get($this->uid, $v, $type);
+                        } else {
+                            $info['user_act']['note'] = 2;
+                        }
+                    }
                     $replace[] = array('id' => $v, 'type' => $type, 'content' => $info);
                 }
             }

main/src/Journal.php

@@ -649,6 +649,10 @@ class Journal extends Core
 
         if ($code) {
 
+            $code = trim($code);
+
+            $code = str_replace("\n", '', $code);
+
             $product = Dever::db('journal/info')->one($journal_id);
 
             $info = Dever::db('code/info')->one(array('product_id' => $journal_id, 'code' => $code));

service/src/Buy.php

@@ -60,11 +60,13 @@ class Buy extends Base
             foreach ($data as $k => $v) {
                 $info = Dever::db('journal/info')->one($v['product_id']);
 
+                $data[$k]['code'] = str_replace("\n", '', trim($v['code']));
+
                 $data[$k]['code_string'] = '兑换码：' . trim($v['code']);
 
                 $data[$k]['name'] = $info['name'];
 
-                $data[$k]['pic_gd'] = $info['pic_view_cover'] ? $info['pic_view_cover'] : $info['pic_gd'];
+                $data[$k]['pic_gd'] = $info['pic_gd'] ? $info['pic_gd'] : $info['pic_view_cover'];
 
                 $data[$k]['pic_gd'] .= '?imageView2/2/w/375';
 
@@ -151,6 +153,7 @@ class Buy extends Base
         if ($order && $order['type'] == 3) {
             $config['code_show'] = '';
             $config['button_node'] = 'copy';
+            $order['code'] = str_replace("\n", '', trim($order['code']));
             $config['button_span'] = $order['code'];
             if (!$order['code']) {
                 $order['code'] = '生成中...';
@@ -160,7 +163,7 @@ class Buy extends Base
                 $config['button'] = '刷新';
                 //$this->location('success', array('id' => $id, 'buy' => $buy_id, 'order_id' => $order_id));
             } else {
-                $config['button'] = '复制兑换码<span>'.trim($order['code']).'</span>';
+                $config['button'] = '复制兑换码<span>'.$order['code'].'</span>';
             }
             
             $config['code'] = '<p>兑换码：'.$order['code'].'</p>';