github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-19 08:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改后台秒杀、砍价、拼团、产品、订单、积分、关键词列表页样式

Browse Source
This commit is contained in:
sugar1569 2018-12-22 11:47:10 +08:00
parent 23aafa1a17
commit 2b351f8b15
7 changed files with 177 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/admin/model/order/StoreOrder.php
View File

@ -54,6 +54,7 @@ class StoreOrder extends ModelBasic
$_info[$k]['cart_info'] = json_decode($v['cart_info'],true); $_info[$k]['cart_info'] = json_decode($v['cart_info'],true);
} }
$item['_info'] = $_info; $item['_info'] = $_info;
$item['add_time'] = date('Y-m-d H:i:s',$item['add_time']);
if($item['pink_id'] && $item['combination_id']){ if($item['pink_id'] && $item['combination_id']){
$pinkStatus = StorePink::where('order_id_key',$item['id'])->value('status'); $pinkStatus = StorePink::where('order_id_key',$item['id'])->value('status');
switch ($pinkStatus){ switch ($pinkStatus){
@ -904,4 +905,21 @@ HTML;
if(!$uid) return 0; if(!$uid) return 0;
return self::where('uid',$uid)->where('paid',1)->where('refund_status',0)->where('status',2)->count(); return self::where('uid',$uid)->where('paid',1)->where('refund_status',0)->where('status',2)->count();
} }
/**
* 获取已支付的订单
* @param int $is_promoter
* @return int|string
*/
public static function getOrderPayCount($is_promoter = 0){
return self::where('o.paid',1)->alias('o')->join('User u','u.uid=o.uid')->where('u.is_promoter',$is_promoter)->count();
}
/**
* 获取最后一个月已支付的订单
* @param int $is_promoter
* @return int|string
*/
public static function getOrderPayMonthCount($is_promoter = 0){
return self::where('o.paid',1)->alias('o')->whereTime('o.pay_time','last month')->join('User u','u.uid=o.uid')->where('u.is_promoter',$is_promoter)->count();
}
} }

51
application/admin/view/order/store_order/index.php
View File

@ -82,7 +82,7 @@
<table class="layui-hide" id="List" lay-filter="List"></table> <table class="layui-hide" id="List" lay-filter="List"></table>
<!--订单--> <!--订单-->
<script type="text/html" id="order_id"> <script type="text/html" id="order_id">
<h4>{{d.order_id}}</h4> {{d.order_id}}
<span style="color: {{d.color}};">{{d.pink_name}}</span>　　 <span style="color: {{d.color}};">{{d.pink_name}}</span>　　
</script> </script>
<!--用户信息--> <!--用户信息-->
@ -112,32 +112,32 @@
{{# if(item.cart_info.productInfo.attrInfo!=undefined){ }} {{# if(item.cart_info.productInfo.attrInfo!=undefined){ }}
<p> <p>
<span> <span>
<img style="width: 30px;height: 30px;cursor: pointer;" src="{{item.cart_info.productInfo.attrInfo.image}}"> <img style="width: 30px;height: 30px;margin:0;cursor: pointer;" src="{{item.cart_info.productInfo.attrInfo.image}}">
</span> </span>
<span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span> <span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
<span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span> <span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
</p> </p>
{{# }else{ }} {{# }else{ }}
<p> <p>
<span><img style="width: 30px;height: 30px;cursor: pointer;" src="{{item.cart_info.productInfo.image}}"></span> <span><img style="width: 30px;height: 30px;margin:0;cursor: pointer;" src="{{item.cart_info.productInfo.image}}"></span>
<span>{{item.cart_info.productInfo.store_name}}</span><span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span> <span>{{item.cart_info.productInfo.store_name}}</span><span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
</p> </p>
{{# } }} {{# } }}
{{# }); }} {{# }); }}
</script> </script>
<!--详情-->
<script type="text/html" id="order_info">
<button class="btn btn-white btn-bitbucket btn-xs" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</button>
</script>
<script type="text/html" id="act"> <script type="text/html" id="act">
{{# if(d._status==1){ }} {{# if(d._status==1){ }}
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('修改订单','{:Url('edit')}?id={{d.id}}')"> <a href="javascript:void(0);" onclick="$eb.createModalFrame('修改订单','{:Url('edit')}?id={{d.id}}')">
<i class="fa fa-file-text"></i> 修改订单 <i class="fa fa-edit"></i> 修改订单
</a> </a>
</li> </li>
<li> <li>
@ -156,6 +156,11 @@
<i class="fa fa-cart-plus"></i> 去发货</button> <i class="fa fa-cart-plus"></i> 去发货</button>
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('去送货','{:Url('delivery')}?id={{d.id}}',{w:400,h:300})"> <a href="javascript:void(0);" onclick="$eb.createModalFrame('去送货','{:Url('delivery')}?id={{d.id}}',{w:400,h:300})">
<i class="fa fa-motorcycle"></i> 去送货 <i class="fa fa-motorcycle"></i> 去送货
@ -188,6 +193,11 @@
{{# }else if(d._status==3){ }} {{# }else if(d._status==3){ }}
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('去送货','{:Url('delivery')}?id={{d.id}}',{w:400,h:300})"> <a href="javascript:void(0);" onclick="$eb.createModalFrame('去送货','{:Url('delivery')}?id={{d.id}}',{w:400,h:300})">
<i class="fa fa-motorcycle"></i> 去送货 <i class="fa fa-motorcycle"></i> 去送货
@ -227,6 +237,11 @@
<i class="fa fa-cart-arrow-down"></i> 配送信息</button> <i class="fa fa-cart-arrow-down"></i> 配送信息</button>
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a lay-event='marke' href="javascript:void(0);" > <a lay-event='marke' href="javascript:void(0);" >
<i class="fa fa-paste"></i> 订单备注 <i class="fa fa-paste"></i> 订单备注
@ -259,6 +274,11 @@
{{# }else if(d._status==5 || d._status==6){ }} {{# }else if(d._status==5 || d._status==6){ }}
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a lay-event='marke' href="javascript:void(0);" > <a lay-event='marke' href="javascript:void(0);" >
<i class="fa fa-paste"></i> 订单备注 <i class="fa fa-paste"></i> 订单备注
@ -286,6 +306,11 @@
{{# }else if(d._status==7){ }} {{# }else if(d._status==7){ }}
<button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button> <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
<ul class="layui-nav-child layui-anim layui-anim-upbit"> <ul class="layui-nav-child layui-anim layui-anim-upbit">
<li>
<a href="javascript:void(0);" onclick="$eb.createModalFrame('{{d.nickname}}-订单详情','{:Url('order_info')}?oid={{d.id}}')">
<i class="fa fa-file-text"></i> 订单详情
</a>
</li>
<li> <li>
<a lay-event='marke' href="javascript:void(0);" > <a lay-event='marke' href="javascript:void(0);" >
<i class="fa fa-paste"></i> 订单备注 <i class="fa fa-paste"></i> 订单备注
@ -318,13 +343,13 @@
<script> <script>
layList.tableList('List',"{:Url('order_list',['real_name'=>$real_name])}",function (){ layList.tableList('List',"{:Url('order_list',['real_name'=>$real_name])}",function (){
return [ return [
{field: 'order_id', title: '订单号', sort: true,event:'order_id',width:'12%',templet:'#order_id'}, {field: 'order_id', title: '订单号', sort: true,event:'order_id',width:'14%',templet:'#order_id'},
{field: 'nickname', title: '用户信息',templet:'#userinfo',width:'10%'}, {field: 'nickname', title: '用户信息',templet:'#userinfo',width:'10%'},
{field: 'info', title: '商品信息',templet:"#info",width:'36%'}, {field: 'info', title: '商品信息',templet:"#info"},
{field: 'pay_price', title: '实际支付',width:'8%'}, {field: 'pay_price', title: '实际支付',width:'8%'},
{field: 'paid', title: '支付状态',templet:'#paid',width:'8%'}, {field: 'paid', title: '支付状态',templet:'#paid',width:'8%'},
{field: 'status', title: '订单状态',templet:'#status',width:'8%'}, {field: 'status', title: '订单状态',templet:'#status',width:'8%'},
{field: 'order_info', title: '详情',templet:'#order_info',width:'8%'}, {field: 'add_time', title: '下单时间',width:'10%',sort: true},
{field: 'right', title: '操作',align:'center',toolbar:'#act',width:'10%'}, {field: 'right', title: '操作',align:'center',toolbar:'#act',width:'10%'},
]; ];
}); });

4
application/admin/view/ump/store_combination/index.php
View File

@ -135,8 +135,8 @@
layList.tableList('combinationList',"{:Url('get_combination_list')}",function () { layList.tableList('combinationList',"{:Url('get_combination_list')}",function () {
return [ return [
{field: 'id', title: '编号', sort: true,event:'id'}, {field: 'id', title: '编号', sort: true,event:'id'},
{field: 'image', title: '拼团图片',templet: '<p><img src="{{d.image}}" alt="{{d.title}}" class="open_image" data-image="{{d.image}}"></p>'}, {field: 'image', title: '拼团图片',width:'10%',templet: '<p><img src="{{d.image}}" alt="{{d.title}}" class="open_image" data-image="{{d.image}}"></p>'},
{field: 'title', title: '拼团名称'}, {field: 'title', title: '拼团名称',width:'10%'},
{field: 'ot_price', title: '原价'}, {field: 'ot_price', title: '原价'},
{field: 'price', title: '拼团价'}, {field: 'price', title: '拼团价'},
{field: 'stock', title: '库存'}, {field: 'stock', title: '库存'},

22
application/admin/view/ump/store_seckill/index.php
View File

@ -113,17 +113,17 @@
layList.form.render(); layList.form.render();
layList.tableList('seckillList',"{:Url('get_seckill_list')}",function () { layList.tableList('seckillList',"{:Url('get_seckill_list')}",function () {
return [ return [
{field: 'id', title: '编号', sort: true,width:'5%',event:'id',unresize:true}, {field: 'id', title: 'ID', sort: true,width:'6%',event:'id'},
{field: 'image', title: '产品图片',unresize:true, width: '8%',templet: '<p><img src="{{d.image}}" alt="{{d.title}}" class="open_image" data-image="{{d.image}}"></p>'}, {field: 'image', title: '产品图片', width: '10%',templet: '<p><img src="{{d.image}}" alt="{{d.title}}" class="open_image" data-image="{{d.image}}"></p>'},
{field: 'title', title: '活动标题',width:'14%',unresize:true}, {field: 'title', title: '活动标题'},
{field: 'info', title: '活动简介',width:'17%',unresize:true}, {field: 'info', title: '活动简介',width:'20%'},
{field: 'ot_price', title: '原价',width:'6%',unresize:true}, {field: 'ot_price', title: '原价',width:'6%'},
{field: 'price', title: '秒杀价',unresize:true,width:'6%'}, {field: 'price', title: '秒杀价',width:'6%'},
{field: 'stock', title: '库存',width:'7%',unresize:true}, {field: 'stock', title: '库存',width:'6%'},
{field: 'start_name', title: '秒杀状态',width:'13%',toolbar:"#statusCn",unresize:true}, {field: 'start_name', title: '秒杀状态',width:'8%',toolbar:"#statusCn"},
{field: 'stop_time', title: '结束时间', width: '13%',toolbar: '#stopTime',unresize:true}, {field: 'stop_time', title: '结束时间', width: '13%',toolbar: '#stopTime'},
{field: 'status', title: '状态',width:'6%',toolbar:"#status",unresize:true}, {field: 'status', title: '状态',width:'6%',toolbar:"#status"},
{field: 'right', title: '操作', width: '5%', align: 'center', toolbar: '#barDemo',unresize:true} {field: 'right', title: '操作', width: '6%', align: 'center', toolbar: '#barDemo'}
] ]
}); });
layList.tool(function (event,data,obj) { layList.tool(function (event,data,obj) {

2
application/admin/view/ump/user_point/index.php
View File

@ -88,7 +88,7 @@
layList.form.render(); layList.form.render();
layList.tableList('userList',"{:Url('getponitlist')}",function () { layList.tableList('userList',"{:Url('getponitlist')}",function () {
return [ return [
{field: 'id', title: '编号', sort: true,event:'uid'}, {field: 'id', title: 'ID', sort: true,event:'uid',width:'8%'},
{field: 'title', title: '标题' }, {field: 'title', title: '标题' },
{field: 'balance', title: '积分余量',sort:true,event:'now_money'}, {field: 'balance', title: '积分余量',sort:true,event:'now_money'},
{field: 'number', title: '明细数字',sort:true}, {field: 'number', title: '明细数字',sort:true},

2
application/admin/view/wechat/reply/keyword.php
View File

@ -64,7 +64,7 @@
{/switch} {/switch}
</td> </td>
<td class="text-center"> <td class="text-right">
<button class="btn btn-info btn-xs" type="button" onclick="window.location.href='{:Url('info_keyword',array('key'=>$vo['key']))}'" ><i class="fa fa-paste"></i> 编辑</button> <button class="btn btn-info btn-xs" type="button" onclick="window.location.href='{:Url('info_keyword',array('key'=>$vo['key']))}'" ><i class="fa fa-paste"></i> 编辑</button>
<button class="btn btn-warning btn-xs" data-url="{:Url('delete',array('id'=>$vo['id']))}" type="button"><i class="fa fa-warning"></i> 删除 <button class="btn btn-warning btn-xs" data-url="{:Url('delete',array('id'=>$vo['id']))}" type="button"><i class="fa fa-warning"></i> 删除
</button> </button>

162
public/system/css/layui-admin.css
View File

@ -1,4 +1,11 @@
@charset "UTF-8"; @charset "UTF-8";
.layui-btn {
background-color: #0092DC;
}
.layui-btn-primary:hover {
border-color: #0092DC;
color: #333;
}
.layui-table-box{ .layui-table-box{
overflow: initial; overflow: initial;
} }
@ -11,44 +18,14 @@
.table-responsive{ .table-responsive{
overflow: initial; overflow: initial;
} }
.layui-table img{width: 100% !important;} /*.layui-table img{width: 100% !important;}*/
/* /*部分样式重构*/
部分样式重构 .layui-laypage-limits select{
*/ height: 26px;
.layui-form-pane .layui-input, .layui-select, .layui-textarea {
height: 32px;
line-height: 1.5;
padding: 4px 7px;
font-size: 12px;
border: 1px solid #dddee1;
color: #495060;
background-color: #fff;
} }
.layui-card-body { .layui-card-body {
} }
.layui-form-pane{
/*padding: 20px;*/
}
.layui-form-pane .layui-form-label {
padding: 5px 15px;
height: 32px;
}
.layui-fluid {
padding: 0;
}
.layui-btn-normal{
background-color:#0092DC;
}
.layui-btn .layui-icon {
font-size: 12px;
}
.layui-btn-sm i {
font-size: 12px!important;
}
.layui-form-onswitch {
border-color: #0092DC;
background-color: #0092DC;
}
.layui-table-cell p{ .layui-table-cell p{
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
@ -58,6 +35,10 @@
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
.layui-laypage a, .layui-laypage button, .layui-laypage input, .layui-laypage select, .layui-laypage span {
color:#333 !important;
}
.layui-form-checked[lay-skin=primary] i { .layui-form-checked[lay-skin=primary] i {
border-color: #0093DE; border-color: #0093DE;
background-color: #0093DE; background-color: #0093DE;
@ -73,23 +54,6 @@
.layui-tab-title .layui-this:after{ .layui-tab-title .layui-this:after{
border-bottom: 2px solid #0092DC !important; border-bottom: 2px solid #0092DC !important;
} }
.layui-form-label{
width: auto;
}
.layui-table-cell {
white-space:normal;
height: auto!important;
}
.layui-input-block .layui-admin-input{
width: 50%;
height: 34px;
}
.layui-form-item{
margin-bottom: 0;
}
.layui-input-block .time-w{
width: 200px;
}
.layui-btn-group button i{ .layui-btn-group button i{
line-height: 30px; line-height: 30px;
@ -99,11 +63,8 @@
.back-f8{ .back-f8{
background-color: #F8F8F8; background-color: #F8F8F8;
} }
.layui-input-block button{
border: 1px solid #C9C9C9;
}
.layui-card-body p.layuiadmin-big-font { .layui-card-body p.layuiadmin-big-font {
font-size: 36px; font-size: 24px;
color: #666; color: #666;
line-height: 36px; line-height: 36px;
padding: 5px 0 10px; padding: 5px 0 10px;
@ -184,3 +145,92 @@
.layadmin-text-center{ .layadmin-text-center{
text-align: center; text-align: center;
} }
/*表格样式*/
.layui-table-view .layui-table td, .layui-table-view .layui-table th {
font-size: 13px;
font-weight: bolder;
}
.layui-table-cell {
white-space:normal;
height: auto!important;
font-size: 13px;
font-weight: normal;
}
/*form 样式*/
.layui-form-select .layui-input {
padding-right: 30px;
cursor: pointer;
font-size: 12px;
height: 32px;
}
.layui-form-select dl {
top: 32px;
font-size: 12px;
}
.layui-form-select dl dd.layui-this {
background-color: #0092DC;
color: #fff;
}
.layui-input{
height: 32px;
font-size: 12px;
}
.layui-input-block .layui-admin-input{
width: 50%;
font-size: 12px;
height: 32px;
}
.layui-form-item{
margin-bottom: 0;
}
.layui-input-block .time-w{
width: 200px;
}
.layui-form-pane .layui-input, .layui-select, .layui-textarea {
height: 34px;
line-height: 1.5;
padding: 4px 12px;
font-size: 12px;
border: 1px solid #e5e6e7;
color: #333;
background-color: #fff;
}
.layui-form-pane{
/*padding: 20px;*/
}
.layui-form-pane .layui-inline .layui-form-label {
padding: 5px 15px;
height: 34px;
line-height: 24px;
background: none;
border-radius: 5px 0 0 5px;
}
.layui-form-item .layui-btn{
margin-top: -5px;
}
.layui-form-label{
width: auto;
padding: 6px;
}
.layui-fluid {
padding: 0;
}
.layui-btn-normal{
background-color:#0092DC;
}
.layui-btn .layui-icon {
font-size: 12px;
}
.layui-btn-sm i {
font-size: 12px!important;
}
.layui-form-onswitch {
border-color: #0092DC;
background-color: #0092DC;
}
.layui-btn-primary {
border: 1px solid #e5e6e7;
background-color: #fff;
color: #333;
}