dever 6 سال پیش
والد
کامیت
be14ab52b8
4فایلهای تغییر یافته به همراه13 افزوده شده و 5 حذف شده
  1. 4 0
      main/lib/Core.php
  2. 2 2
      main/src/Journal.php
  3. 3 3
      main/src/User.php
  4. 4 0
      push/lib/Data.php

+ 4 - 0
main/lib/Core.php

@@ -120,6 +120,10 @@ class Core
             $info['num_ding'] = $info['num_add_ding'] + $info['num_ding'];
             unset($info['num_add_ding']);
         }
+
+        if (isset($info['name']) && $info['name']) {
+            $info['name'] = Dever::cut($info['name'], 20, '...');
+        }
         return $info;
     }
 

+ 2 - 2
main/src/Journal.php

@@ -635,9 +635,9 @@ class Journal extends Core
 
     private function createOrder($prefix = 'JC')
     {
-        //$order = Dever::order($prefix);
+        $order = Dever::order($prefix);
 
-        $order = Dever::rand(2, 2) . Dever::rand(6, 0);
+        //$order = Dever::rand(2, 2) . Dever::rand(6, 0);
 
         $info = Dever::db('journal/order')->one(array('order_id' => $order));
 

+ 3 - 3
main/src/User.php

@@ -118,7 +118,7 @@ class User extends Core
         $send['send'] = $scene;
         $send['width'] = 152;
         $send['path'] = $path; 
-        //$logo = Dever::load('wechat_applet/code.get', $send);
+        $logo = Dever::load('wechat_applet/code.get', $send);
 
         if (!$info['share_pic']) {
             return array('img' => '');
@@ -131,8 +131,8 @@ class User extends Core
         (
             'pic' => Dever::local($info['share_pic']),
             'name' => $info['share_title'],
-            //'logo' => Dever::local(str_replace('https', 'http', $logo)),
-            'logo' => 'http://cm.5dev.cn/applet_on/data/upload/1/2018/06/06/239fa207778aa923f4ff7594dfbdfcca.png',
+            'logo' => Dever::local(str_replace('https', 'http', $logo)),
+            //'logo' => 'http://cm.5dev.cn/applet_on/data/upload/1/2018/06/06/239fa207778aa923f4ff7594dfbdfcca.png',
         );
 
         if ($user) {

+ 4 - 0
push/lib/Data.php

@@ -118,6 +118,10 @@ class Data
             $info['pic'] = Dever::load('main/lib/core')->replacePic($info['pic']);
         }
 
+        if (isset($info['name']) && $info['name']) {
+            $info['name'] = Dever::cut($info['name'], 20, '...');
+        }
+
         return $info;
     }
 }