Skip to content

bds
bds
Commit 57a85420 by 冷斌
Options

fix bug

parent 8998dd2c
Showing with 49 additions and 13 deletions
Application/Admin/Controller/AuthManagerController.class.php
...@@ -200,11 +200,15 @@ class AuthManagerController extends AdminController{ ...@@ -200,11 +200,15 @@ class AuthManagerController extends AdminController{
$map = array('module'=>'admin','type'=>AuthRuleModel::RULE_URL,'status'=>1); $map = array('module'=>'admin','type'=>AuthRuleModel::RULE_URL,'status'=>1);
$child_rules = M('AuthRule')->where($map)->getField('name,id'); $child_rules = M('AuthRule')->where($map)->getField('name,id');
$authGroupAccess=M('AuthGroupAccess');
$authAccess=$authGroupAccess->where('uid='.$_GET['uid'] . ' and group_id='.$_GET['group_id'])->find();
$this->assign('main_rules', $main_rules); $this->assign('main_rules', $main_rules);
$this->assign('auth_rules', $child_rules); $this->assign('auth_rules', $child_rules);
$this->assign('node_list', $node_list); $this->assign('node_list', $node_list);
$this->assign('auth_group', $auth_group); $this->assign('auth_group', $auth_group);
$this->assign('this_group', $auth_group[(int)$_GET['group_id']]); // $this->assign('this_group', $auth_group[(int)$_GET['group_id']]);
$this->assign('this_group', $authAccess);
if(isset($_GET['city'])){ if(isset($_GET['city'])){
$this->assign('dre',$_GET['city']); $this->assign('dre',$_GET['city']);
}elseif(isset($_GET['pid'])){ }elseif(isset($_GET['pid'])){
...@@ -224,6 +228,24 @@ class AuthManagerController extends AdminController{ ...@@ -224,6 +228,24 @@ class AuthManagerController extends AdminController{
$this->ajaxReturn($list); $this->ajaxReturn($list);
} }
public function writeAccess()
{
if(isset($_POST['rules'])){
sort($_POST['rules']);
$_POST['rules'] = implode( ',' , array_unique($_POST['rules']));
}
$authGroupAccess=M('AuthGroupAccess');
$data = $authGroupAccess->where('uid='.$_POST['uid'] . ' and group_id='.$_POST['group_id'])->save([
'rules' => $_POST['rules'],
]);
if ($data) {
$this->success('更新成功！');
} else {
$this->error('更新失败');
}
}
/** /**
* 管理员用户组数据写入/更新 * 管理员用户组数据写入/更新
* @author 朱亚杰 <zhuyajie@topthink.net> * @author 朱亚杰 <zhuyajie@topthink.net>
......
Application/Admin/Controller/GoodsController.class.php
...@@ -94,6 +94,7 @@ class GoodsController extends AdminController ...@@ -94,6 +94,7 @@ class GoodsController extends AdminController
$data['city_id']=$v; $data['city_id']=$v;
$data['price']=$_POST['price'.$v]; $data['price']=$_POST['price'.$v];
$data['suggest_price']=$_POST['suggest_price'.$v]; $data['suggest_price']=$_POST['suggest_price'.$v];
$data['vip_price']=$_POST['vip_price'.$v];
$data['favorable']=$_POST['favorable'.$v]; $data['favorable']=$_POST['favorable'.$v];
$data['meet']=$_POST['meet'.$v]; $data['meet']=$_POST['meet'.$v];
$data['reduce']=$_POST['reduce'.$v]; $data['reduce']=$_POST['reduce'.$v];
...@@ -160,6 +161,7 @@ class GoodsController extends AdminController ...@@ -160,6 +161,7 @@ class GoodsController extends AdminController
$city_id[]=$v['city_id']; $city_id[]=$v['city_id'];
$pr[$v['city_id']]=$v['price']; $pr[$v['city_id']]=$v['price'];
$su_pr[$v['city_id']]=$v['suggest_price']; $su_pr[$v['city_id']]=$v['suggest_price'];
$vip_pr[$v['city_id']]=$v['vip_price'];
$fa[$v['city_id']]=$v['favorable']; $fa[$v['city_id']]=$v['favorable'];
$me[$v['city_id']]=$v['meet']; $me[$v['city_id']]=$v['meet'];
$re[$v['city_id']]=$v['reduce']; $re[$v['city_id']]=$v['reduce'];
...@@ -167,6 +169,7 @@ class GoodsController extends AdminController ...@@ -167,6 +169,7 @@ class GoodsController extends AdminController
} }
$this->pr=$pr; $this->pr=$pr;
$this->su_pr=$su_pr; $this->su_pr=$su_pr;
$this->vip_pr = $vip_pr;
$this->me=$me; $this->me=$me;
$this->re=$re; $this->re=$re;
$this->ex=$ex; $this->ex=$ex;
...@@ -243,6 +246,7 @@ class GoodsController extends AdminController ...@@ -243,6 +246,7 @@ class GoodsController extends AdminController
$data['city_id']=$v; $data['city_id']=$v;
$data['price']=$_POST['price'.$v]; $data['price']=$_POST['price'.$v];
$data['suggest_price']=$_POST['suggest_price'.$v]; $data['suggest_price']=$_POST['suggest_price'.$v];
$data['vip_price']=$_POST['vip_price'.$v];
$data['favorable']=$_POST['favorable'.$v]; $data['favorable']=$_POST['favorable'.$v];
$data['meet']=$_POST['meet'.$v]; $data['meet']=$_POST['meet'.$v];
$data['reduce']=$_POST['reduce'.$v]; $data['reduce']=$_POST['reduce'.$v];
......
Application/Admin/Controller/OtherController.class.php
...@@ -61,6 +61,8 @@ class OtherController extends AdminController ...@@ -61,6 +61,8 @@ class OtherController extends AdminController
if($dredge->where('city='.$_POST['city'])->find()){$this->error('城市已存在！');die;}//城市已存在就返回 if($dredge->where('city='.$_POST['city'])->find()){$this->error('城市已存在！');die;}//城市已存在就返回
$data['city']=$rows['city']; $data['city']=$rows['city'];
$data['city_name']=$rows['city_name']; $data['city_name']=$rows['city_name'];
$data['meet']=$rows['meet'];
$data['reduce']=$rows['reduce'];
$msg=$dredge->data($data)->add(); $msg=$dredge->data($data)->add();
if($msg){ if($msg){
$this->success('添加成功！'); $this->success('添加成功！');
......
Application/Admin/View/AuthManager/index.html
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
{$vo.detail} {$vo.detail}
</td> </td>
<td><span>{:mb_strimwidth($vo['description'],0,60,"...","utf-8")}</span></td> <td><span>{:mb_strimwidth($vo['description'],0,60,"...","utf-8")}</span></td>
<td><a href="{:U('AuthManager/access?group_name='.$vo['title'].'&group_id='.$vo['id'].'&city='.$city)}" >权限管理</a> <td>
<!--<a href="{:U('AuthManager/category?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >分类授权</a>--> <!--<a href="{:U('AuthManager/category?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >分类授权</a>-->
<a href="{:U('AuthManager/user?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >成员管理</a> <a href="{:U('AuthManager/user?group_name='.$vo['title'].'&group_id='.$vo['id'].'&city='.$city)}" >成员管理</a>
</td> </td>
<td>{$vo.status_text}</td> <td>{$vo.status_text}</td>
<td><eq name="vo.status" value="1"> <td><eq name="vo.status" value="1">
......
Application/Admin/View/AuthManager/managergroup.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="tab-content"> <div class="tab-content">
<!-- 访问授权 --> <!-- 访问授权 -->
<div class="tab-pane in"> <div class="tab-pane in">
<form action="{:U('AuthManager/writeGroup')}" enctype="application/x-www-form-urlencoded" method="POST" class="form-horizontal auth-form"> <form action="{:U('AuthManager/writeAccess')}" enctype="application/x-www-form-urlencoded" method="POST" class="form-horizontal auth-form">
<empty name="pid"> <empty name="pid">
<input type="hidden" value="{$dre}" name="group_city"> <input type="hidden" value="{$dre}" name="group_city">
<else/> <else/>
...@@ -56,7 +56,9 @@ ...@@ -56,7 +56,9 @@
</dl> </dl>
</volist> </volist>
<input type="hidden" name="id" value="{$this_group.id}" /> <!-- <input type="hidden" name="id" value="{$this_group.id}" />-->
<input type="hidden" name="uid" value="{$this_group.uid}" />
<input type="hidden" name="group_id" value="{$this_group.group_id}" />
<button type="submit" class="btn submit-btn ajax-post" target-form="auth-form">确 定</button> <button type="submit" class="btn submit-btn ajax-post" target-form="auth-form">确 定</button>
<button class="btn btn-return" onclick="javascript:history.back(-1);return false;">返 回</button> <button class="btn btn-return" onclick="javascript:history.back(-1);return false;">返 回</button>
</form> </form>
......
Application/Admin/View/AuthManager/user.html
...@@ -35,8 +35,9 @@ ...@@ -35,8 +35,9 @@
<td><span>{$vo.last_login_time|time_format}</span></td> <td><span>{$vo.last_login_time|time_format}</span></td>
<td><span>{$vo.last_login_ip|long2ip}</span></td> <td><span>{$vo.last_login_ip|long2ip}</span></td>
<td>{$vo.status_text}</td> <td>{$vo.status_text}</td>
<td><a href="{:U('AuthManager/removeFromGroup?uid='.$vo['uid'].'&group_id='.I('group_id'))}" class="ajax-get">解除授权</a> <td>
<a href="{:U('AuthManager/access?uid='.$vo['uid'].'&group_name='.I('group_name').'&group_id='.I('group_id').'&city='.I('city'))}" >权限管理</a>
<a href="{:U('AuthManager/removeFromGroup?uid='.$vo['uid'].'&group_id='.I('group_id'))}" class="ajax-get">解除授权</a>
</td> </td>
</tr> </tr>
</volist> </volist>
......
Application/Admin/View/goods/add.html
...@@ -176,8 +176,9 @@ ...@@ -176,8 +176,9 @@
<label class="checkbox" style="width:130px;"> <label class="checkbox" style="width:130px;">
<input type="checkbox" value="{$vo.id}" name="city_id[]">{$vo.city_name|msubstr='0','6'} <input type="checkbox" value="{$vo.id}" name="city_id[]">{$vo.city_name|msubstr='0','6'}
</label> </label>
<input type="text" class="text" name="price{$vo.id}" value="" placeholder="{$vo.city_name}价格"/> <input type="text" class="text" style="width:140px" name="price{$vo.id}" value="" placeholder="{$vo.city_name}用户价格"/>
<input type="text" class="text" name="suggest_price{$vo.id}" value="" placeholder="{$vo.city_name}建议零售价"/> <input type="text" class="text" style="width:140px" name="suggest_price{$vo.id}" value="" placeholder="{$vo.city_name}认证价格"/>
<input type="text" class="text" style="width:140px" name="vip_price{$vo.id}" value="" placeholder="{$vo.city_name}vip价格"/>
<select name="favorable{$vo.id}"> <select name="favorable{$vo.id}">
<option value="0">选择活动</option> <option value="0">选择活动</option>
<option value="1">满就送</option> <option value="1">满就送</option>
......
Application/Admin/View/goods/updGoods.html
...@@ -186,8 +186,9 @@ ...@@ -186,8 +186,9 @@
<label class="checkbox" style="width:130px;"> <label class="checkbox" style="width:130px;">
<input type="checkbox" value="{$vo.id}" name="city_id[]" <in name="vo.id" value="$city_id">checked</in>/>{$vo.city_name|msubstr='0','6'} <input type="checkbox" value="{$vo.id}" name="city_id[]" <in name="vo.id" value="$city_id">checked</in>/>{$vo.city_name|msubstr='0','6'}
</label> </label>
<input type="text" class="text" name="price{$vo.id}" value="<?php if(in_array($vo['id'],$city_id)){echo $pr[$vo['id']];}?>" placeholder="{$vo.city_name}价格"/> <input type="text" class="text" style="width:140px" name="price{$vo.id}" value="<?php if(in_array($vo['id'],$city_id)){echo $pr[$vo['id']];}?>" placeholder="{$vo.city_name}用户价格"/>
<input type="text" class="text" name="suggest_price{$vo.id}" value="<?php if(in_array($vo['id'],$city_id)){echo $su_pr[$vo['id']];}?>" placeholder="{$vo.city_name}建议零售价"/> <input type="text" class="text" style="width:140px" name="suggest_price{$vo.id}" value="<?php if(in_array($vo['id'],$city_id)){echo $su_pr[$vo['id']];}?>" placeholder="{$vo.city_name}认证价格"/>
<input type="text" class="text" style="width:140px" name="vip_price{$vo.id}" value="<?php if(in_array($vo['id'],$city_id)){echo $vip_pr[$vo['id']];}?>" placeholder="{$vo.city_name}vip价格"/>
<select name="favorable{$vo.id}"> <select name="favorable{$vo.id}">
<option value="0" <?php if($fa[$vo['id']]==0)echo 'selected'?>>选择活动</option> <option value="0" <?php if($fa[$vo['id']]==0)echo 'selected'?>>选择活动</option>
<option value="1" <?php if($fa[$vo['id']]==1)echo 'selected'?>>满就送</option> <option value="1" <?php if($fa[$vo['id']]==1)echo 'selected'?>>满就送</option>
......
ThinkPHP/Library/OT/Database.class.php
...@@ -152,8 +152,11 @@ class Database{ ...@@ -152,8 +152,11 @@ class Database{
//备份数据记录 //备份数据记录
$result = $db->query("SELECT * FROM `{$table}` LIMIT {$start}, 1000"); $result = $db->query("SELECT * FROM `{$table}` LIMIT {$start}, 1000");
foreach ($result as $row) { foreach ($result as $row) {
$row = array_map('mysql_real_escape_string', $row); $value = [];
$sql = "INSERT INTO `{$table}` VALUES ('" . implode("', '", $row) . "');\n"; foreach ($row as $val) {
$value[] = $db->escapeString($val);
}
$sql = "INSERT INTO `{$table}` VALUES ('" . implode("', '", $value) . "');\n";
if(false === $this->write($sql)){ if(false === $this->write($sql)){
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment