Compare commits

..

No commits in common. "8662c3e46b68c61be060a9be279c98eb42ce06dd" and "48dff9457073c13f4dc6076effe2f98e32810802" have entirely different histories.

2 changed files with 5 additions and 7 deletions

View File

@ -31,7 +31,7 @@ if ($act == 'newevent') {
} else if ($act == 'edityunying') { } else if ($act == 'edityunying') {
$id = r('id'); $id = r('id');
$dict = array( $dict = array(
'yunying_remark' => stripslashes(r('content')) 'yunying_remark' => r('content')
); );
$sql = DB::update('calendar', $dict, "id='{$id}'"); $sql = DB::update('calendar', $dict, "id='{$id}'");
@ -40,7 +40,7 @@ if ($act == 'newevent') {
} else if ($act == 'edityanfa') { } else if ($act == 'edityanfa') {
$id = r('id'); $id = r('id');
$dict = array( $dict = array(
'yanfa_remark' => stripslashes(r('content')) 'yanfa_remark' => r('content')
); );
$sql = DB::update('calendar', $dict, "id='{$id}'"); $sql = DB::update('calendar', $dict, "id='{$id}'");
@ -49,7 +49,7 @@ if ($act == 'newevent') {
} else if ($act == 'editchanpin') { } else if ($act == 'editchanpin') {
$id = r('id'); $id = r('id');
$dict = array( $dict = array(
'chanpin_remark' => stripslashes(r('content')) 'chanpin_remark' => r('content')
); );
$sql = DB::update('calendar', $dict, "id='{$id}'"); $sql = DB::update('calendar', $dict, "id='{$id}'");
@ -785,7 +785,7 @@ if ($act == 'newevent') {
arr = JSON.stringify(arr) arr = JSON.stringify(arr)
$.ajax({ $.ajax({
url: './?app=pmcalendar&act=editchanpin', url: './?app=pmcalendar&act=editchanpin',
dataType: 'application/x-www-form-urlencoded', dataType: 'json',
type:"post", type:"post",
async:"true", async:"true",
data: { data: {
@ -1325,7 +1325,6 @@ if ($act == 'newevent') {
success: function (res) { success: function (res) {
$('#pop-title').html('【'+ res.game +'】'+ res.event + ':' + res.title ); $('#pop-title').html('【'+ res.game +'】'+ res.event + ':' + res.title );
// $("#cptext").val(res.yanfa_remark) // $("#cptext").val(res.yanfa_remark)
// res.chanpin_remark = res.chanpin_remark.replace('\\','')
console.log(res.chanpin_remark) console.log(res.chanpin_remark)
var chanpin_remark =JSON.parse(res.chanpin_remark) var chanpin_remark =JSON.parse(res.chanpin_remark)
var yunying_remark = JSON.parse(res.yunying_remark); var yunying_remark = JSON.parse(res.yunying_remark);

View File

@ -4,7 +4,6 @@ $fileData = array();
$cardId = r('id'); $cardId = r('id');
$act = r('act'); $act = r('act');
if ($act == 'add') { if ($act == 'add') {
print_r($fujian);
foreach ($fujian['name'] as $idx => $data) { foreach ($fujian['name'] as $idx => $data) {
if ($fujian['error'][$idx] == 0) { if ($fujian['error'][$idx] == 0) {
$id = uniqid() . $idx; $id = uniqid() . $idx;
@ -19,7 +18,7 @@ if ($act == 'add') {
"bumen" => r('bumen'), "bumen" => r('bumen'),
"file" => $newName "file" => $newName
); );
rename($fujian['tmp_name'][$idx], '.'.$newName); rename($fujian['tmp_name'][$idx], $newName);
} }
} }