dever 6 лет назад
Родитель
Сommit
526bc079fa
4 измененных файлов с 17 добавлено и 21 удалено
  1. 0 17
      act/database/form_id.php
  2. 11 0
      act/database/live_note.php
  3. 5 3
      act/lib/Note.php
  4. 1 1
      main/src/Content.php

+ 0 - 17
act/database/form_id.php

@@ -1,24 +1,9 @@
 <?php
 <?php
-$auth = Dever::tops();
 $type = array
 $type = array
 (
 (
     1 => '普通表单',
     1 => '普通表单',
     2 => '支付表单',
     2 => '支付表单',
 );
 );
-$cate = function() use ($auth)
-{
-    $array = array();
-    if ($auth) {
-        $info = Dever::db('journal/cate')->getIds(array('ids' => $auth));
-    } else {
-        $info = Dever::db('journal/cate')->state();
-    }
-    if($info)
-    {
-        $array += $info;
-    }
-    return $array;
-};
 $time = time()+(3600*24*7);
 $time = time()+(3600*24*7);
 return array
 return array
 (
 (
@@ -60,8 +45,6 @@ return array
             'default'   => '1',
             'default'   => '1',
             'desc'      => '小刊分类',
             'desc'      => '小刊分类',
             'match'     => 'is_numeric',
             'match'     => 'is_numeric',
-            'update'    => 'select',
-            'option'    => $cate,
             //'search'    => 'select',
             //'search'    => 'select',
             'list'      => true,
             'list'      => true,
         ),
         ),

+ 11 - 0
act/database/live_note.php

@@ -64,6 +64,17 @@ return array
             'list'      => 'Dever::load("act/lib/manage.load", "{type}", {data_id})',
             'list'      => 'Dever::load("act/lib/manage.load", "{type}", {data_id})',
         ),
         ),
 
 
+        'cate_id'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '小刊分类',
+            'default'   => '1',
+            'desc'      => '小刊分类',
+            'match'     => 'is_numeric',
+            //'search'    => 'select',
+            'list'      => true,
+        ),
+
         'formid'      => array
         'formid'      => array
         (
         (
             'type'      => 'varchar-200',
             'type'      => 'varchar-200',

+ 5 - 3
act/lib/Note.php

@@ -31,6 +31,7 @@ class Note
         $where['uid'] = $uid;
         $where['uid'] = $uid;
         $where['data_id'] = $id;
         $where['data_id'] = $id;
         $where['type'] = $type;
         $where['type'] = $type;
+        $where['cate_id'] = $system;
         $info = Dever::db('act/live_note')->one($where);
         $info = Dever::db('act/live_note')->one($where);
         if (!$info) {
         if (!$info) {
             if ($formid) {
             if ($formid) {
@@ -39,6 +40,7 @@ class Note
             
             
             Dever::db('act/live_note')->insert($where);
             Dever::db('act/live_note')->insert($where);
         } else {
         } else {
+            $update['cate_id'] = $system;
             $update['where_id'] = $info['id'];
             $update['where_id'] = $info['id'];
             if ($formid) {
             if ($formid) {
                 $update['formid'] = $formid;
                 $update['formid'] = $formid;
@@ -87,14 +89,14 @@ class Note
                         Dever::load('sms/api.send', 'note_live', $user['mobile'], $send);
                         Dever::load('sms/api.send', 'note_live', $user['mobile'], $send);
                     }
                     }
 
 
-                    $formid = Dever::load('act/lib/form')->get($v['uid'], 1);
-
+                    //$formid = Dever::load('act/lib/form')->get($v['uid'], 1);
+                    $formid = $v['formid'];
                     if ($formid) {
                     if ($formid) {
                         # 发送模板消息
                         # 发送模板消息
                         $wechat = Dever::db('passport/wechat')->one(array('uid' => $v['uid']));
                         $wechat = Dever::db('passport/wechat')->one(array('uid' => $v['uid']));
                         if ($wechat && Dever::project('wechat_applet')) {
                         if ($wechat && Dever::project('wechat_applet')) {
                             $send['key'] = 'note_live';
                             $send['key'] = 'note_live';
-                            $send['project_id'] = 1;
+                            $send['project_id'] = $v['cate_id'];
                             $send['touser'] = $wechat['openid'];
                             $send['touser'] = $wechat['openid'];
                             $send['page'] = Dever::config('base')->applet_index . '?scene=' . Dever::login($v['uid']) . ',' . $v['type'] . ',' . $v['id'];
                             $send['page'] = Dever::config('base')->applet_index . '?scene=' . Dever::login($v['uid']) . ',' . $v['type'] . ',' . $v['id'];
                             $send['data'] = array
                             $send['data'] = array

+ 1 - 1
main/src/Content.php

@@ -68,7 +68,7 @@ class Content extends Core
     # 首页精选
     # 首页精选
     public function home()
     public function home()
     {
     {
-        //1 Y2JhNGRwc0hhMEt5akp2bHBPeWIwc08tTDRWcG1DVURrUUZ4ZjV0Um85U01QMlZkOEtTcGEtR3c=
+        //1 NDY3MmVlOGVsdUxxa2pzNHczckR2TEl1NGFmVmVTd2ItWWhDcDB1T04wdXBDaUpDMl9rRmU4VHM=
         //2 ZTdjNjBHUTY4QUpoZk16QVlZRlg0d3locDFRcll5a3FQcWhFdEo1M1QzaFhmNGhrUlAyTTdGVWc= 
         //2 ZTdjNjBHUTY4QUpoZk16QVlZRlg0d3locDFRcll5a3FQcWhFdEo1M1QzaFhmNGhrUlAyTTdGVWc= 
         //9 ZTBiZWN5dW9ublpnSzR2dmlXUUc5MWJJQWk5d3pFQmx0TEp6a0VJVkU4NG5HVTYtcjhFNTdfdnc=
         //9 ZTBiZWN5dW9ublpnSzR2dmlXUUc5MWJJQWk5d3pFQmx0TEp6a0VJVkU4NG5HVTYtcjhFNTdfdnc=
         # 栏目
         # 栏目