Skip to content

quxiu
quxiu
Commit 30e50e7d by 冷斌
Options

fix bug

parent 14a5c8a7
Showing with 118 additions and 1 deletions
admin/themes/simplebootx/Admin/Gift/index.html
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<div class="wrap"> <div class="wrap">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a >礼物列表</a></li> <li class="active"><a >礼物列表</a></li>
<li><a href="{:U('Gift/index2')}">宝箱礼物列表</a></li>
<li><a href="{:U('Gift/add')}">礼物添加</a></li> <li><a href="{:U('Gift/add')}">礼物添加</a></li>
</ul> </ul>
<form method="post" class="js-ajax-form" action="{:U('Gift/listorders')}"> <form method="post" class="js-ajax-form" action="{:U('Gift/listorders')}">
......
admin/themes/simplebootx/Admin/Gift/index2.html 0 → 100644
<admintpl file="header" />
</head>
<body>
<div class="wrap">
<ul class="nav nav-tabs">
<li><a href="{:U('Gift/index')}">礼物列表</a></li>
<li class="active"><a >宝箱礼物列表</a></li>
<li><a href="{:U('Gift/add')}">礼物添加</a></li>
</ul>
<form method="post" class="js-ajax-form" action="{:U('Gift/listorders')}">
<div class="table-actions">
<button class="btn btn-primary btn-small js-ajax-submit" type="submit">{:L('SORT')}</button>
</div>
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>排序</th>
<th align="center">ID</th>
<th>类型</th>
<!-- <th>分类</th> -->
<th>标识</th>
<th>名称</th>
<th>所需点数</th>
<th>魅力值</th>
<!-- <th>礼物小图 （25 X 25）</th> -->
<th>图片</th>
<th>动画类型</th>
<th>动画</th>
<th>动画时长</th>
<th>发布时间</th>
<th align="center">{:L('ACTIONS')}</th>
</tr>
</thead>
<tbody>
<foreach name="lists" item="vo">
<tr>
<td><input name="listorders[{$vo['id']}]" type="text" size="3" value="{$vo['orderno']}" class="input input-order"></td>
<td align="center">{$vo.id}</td>
<td>{$type[$vo['type']]}</td>
<!-- <td>{$gift_sort[$vo['sid']]}</td> -->
<td>{$mark[$vo['mark']]}</td>
<td>{$vo['giftname']}</td>
<td>{$vo['needcoin']}</td>
<td>{$vo['votes']}</td>
<!-- <td><img width="25" height="25" src="{$vo['gifticon_mini']}" /></td> -->
<td><img width="25" height="25" src="{$vo['gifticon']}" /></td>
<td><if condition="$vo['type'] eq 1">{$swftype[$vo['swftype']]}</if></td>
<td><if condition="$vo['swf']">
<if condition="$vo['swftype'] eq 1">
{$vo['swf']}
<else/>
<img width="100" height="100" src="{$vo['swf']}" />
</if>
</if>
</td>
<td>{$vo['swftime']}</td>
<td>{$vo.addtime|date="Y-m-d H:i:s",###}</td>
<td align="center">
<if condition="$vo['type'] eq 0 && $vo['mark'] eq 3">
<a href="{:U('Luckrate/index',array('giftid'=>$vo['id']))}" >中奖设置</a>
|
<!--
<a href="{:U('Jackpotrate/index',array('giftid'=>$vo['id']))}" >奖池设置</a>
|
-->
</if>
<if condition="$vo['isjusung'] eq 0 ">
<a href="{:U('Gift/recomm',array('id'=>$vo['id']))}" >推荐周星榜</a> |
<else/>
<a href="{:U('Gift/cancel',array('id'=>$vo['id']))}" >取消周星榜 |
</if>
<a href="{:U('Gift/edit',array('id'=>$vo['id']))}" >编辑</a>
|
<a href="{:U('Gift/del',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn" data-msg="您确定要删除吗？">删除</a>
</td>
</tr>
</foreach>
</tbody>
</table>
<div class="pagination">{$page}</div>
<div class="table-actions">
<button class="btn btn-primary btn-small js-ajax-submit" type="submit">{:L('SORT')}</button>
</div>
</form>
</div>
<script src="__PUBLIC__/js/common.js"></script>
</body>
</html>
api/Appapi/Model/Live.php
...@@ -491,6 +491,7 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -491,6 +491,7 @@ class Model_Live extends PhalApi_Model_NotORM {
$rs=DI()->notorm->gift $rs=DI()->notorm->gift
->select("id,type,mark,giftname,needcoin,gifticon") ->select("id,type,mark,giftname,needcoin,gifticon")
->where('channel = 0')
->order("orderno asc,addtime desc") ->order("orderno asc,addtime desc")
->fetchAll(); ->fetchAll();
foreach($rs as $k=>$v){ foreach($rs as $k=>$v){
......
application/Admin/Controller/GiftController.class.php
...@@ -15,7 +15,7 @@ class GiftController extends AdminbaseController { ...@@ -15,7 +15,7 @@ class GiftController extends AdminbaseController {
$gift_sort[0]="默认分类"; $gift_sort[0]="默认分类";
$this->assign('gift_sort', $gift_sort); */ $this->assign('gift_sort', $gift_sort); */
$gift_model=M("gift"); $gift_model=M("gift")->where('channel = 0');
$count=$gift_model->count(); $count=$gift_model->count();
$page = $this->page($count, 20); $page = $this->page($count, 20);
$lists = $gift_model $lists = $gift_model
...@@ -31,6 +31,28 @@ class GiftController extends AdminbaseController { ...@@ -31,6 +31,28 @@ class GiftController extends AdminbaseController {
$this->display(); $this->display();
} }
function index2(){
/* $gift_sort=M("gift_sort")->getField("id,sortname");
$gift_sort[0]="默认分类";
$this->assign('gift_sort', $gift_sort); */
$gift_model=M("gift")->where('channel = 1');
$count=$gift_model->count();
$page = $this->page($count, 20);
$lists = $gift_model
//->where()
->order("orderno, addtime desc")
->limit($page->firstRow . ',' . $page->listRows)
->select();
$this->assign('lists', $lists);
$this->assign('type', $this->type);
$this->assign('mark', $this->mark);
$this->assign('swftype', $this->swftype);
$this->assign("page", $page->show('Admin'));
$this->display();
}
function del(){ function del(){
$id=intval($_GET['id']); $id=intval($_GET['id']);
......
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