dever 6 лет назад
Родитель
Сommit
62617ffceb
3 измененных файлов с 9 добавлено и 8 удалено
  1. 1 1
      database/msg_form.php
  2. 2 2
      database/msg_log.php
  3. 6 5
      src/Msg.php

+ 1 - 1
database/msg_form.php

@@ -46,7 +46,7 @@ return array
 		
 		'form_id'		=> array
 		(
-			'type' 		=> 'varchar-200',
+			'type' 		=> 'varchar-300',
 			'name' 		=> 'form_id',
 			'default' 	=> '',
 			'desc' 		=> 'form_id',

+ 2 - 2
database/msg_log.php

@@ -59,7 +59,7 @@ return array
 			'list'		=> true,
 		),
 
-		'page'		=> array
+		'path'		=> array
 		(
 			'type' 		=> 'varchar-200',
 			'name' 		=> '跳转页面',
@@ -83,7 +83,7 @@ return array
 
 		'form_id'		=> array
 		(
-			'type' 		=> 'varchar-30',
+			'type' 		=> 'varchar-300',
 			'name' 		=> '表单或者支付id',
 			'default' 	=> '',
 			'desc' 		=> '表单或者支付id',

+ 6 - 5
src/Msg.php

@@ -57,6 +57,7 @@ class Msg
 		$project_id = Dever::input('project_id');
 		$touser = Dever::input('touser');
 		$page = Dever::input('page');
+		//$data = json_encode(Dever::input('data'));
 		$data = Dever::input('data');
 		$form_id = Dever::input('form_id');
 		$emphasis_keyword = Dever::input('emphasis_keyword');
@@ -66,16 +67,16 @@ class Msg
 	}
 
 	# 发送单条模板消息
-	public function sendOne($key, $project_id, $touser, $page, $data, $form_id = false, $emphasis_keyword = '', $state = false)
+	public function sendOne($key, $project_id, $touser, $path, $data, $form_id = false, $emphasis_keyword = '', $state = false)
 	{
-		if ($project_id > 0 && $key && $touser && $page && $data) {
+		if ($project_id > 0 && $key && $touser && $path && $data) {
 			$info = Dever::db('wechat_applet/msg')->one(array('option_key' => $key, 'option_project_id' => $project_id));
 			if ($info) {
 				$update = array();
 				$update['project_id'] = $info['project_id'];
 				$update['msg_id'] = $info['id'];
 				$update['touser'] = $touser;
-				$update['page'] = $page;
+				$update['path'] = $path;
 				$update['data'] = $data;
 				$update['form_id'] = $form_id;
 				$update['status'] = 1;
@@ -94,11 +95,11 @@ class Msg
 				$where['option_touser'] = $update['touser'];
 				//$where['option_data'] = $update['data'];
 				//$where['option_form_id'] = $update['form_id'];
-				$where['option_page'] = $update['page'];
+				$where['option_path'] = $update['path'];
 
 				$id = Dever::upinto('wechat_applet/msg_log', $where, $update);
 
-				Core::run($info['project_id'], 'send_msg', 'msg.sendAction', 'msg.sendLog', 'applet', $id, $state);
+				Core::run($info['project_id'], 'send_msg', 'msg.sendAction', 'msg.sendLog', 'wechat_applet', $id, $state);
 			}
 		}
 	}