application
/
kuaileorder
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch '20220729_newtpl' of http://gitea.intra.yunpaper.com/application/kuaileorder into 20220729_newtpl

pull/9/head
liuyu 3 years ago
parent
1c509fa55f 3b288da895
commit
0b3ff177ee
5 changed files with 41 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      control/index.php
  2. 17
      view/css/admin_style.css
  3. 12
      view/templates/include/admin_leftmenu.html
  4. 14
      view/templates/index/home.html
  5. 2
      view/templates/index/order_list.html

13
control/index.php
View File

@ -13,6 +13,7 @@ class index extends publicBase {
$obj = new mOrder();
$this->view['today_data'] = $obj->getTodayData($uid, $shop_id);
$this->view['total_data'] = $obj->getToalData($uid, $shop_id);
$this->view['menu_page'] = 'home';
}
public function ajax_get_data() {
@ -33,7 +34,13 @@ class index extends publicBase {
$this->ajax_json(true, 'succ', $list);
}
public function order_list() {}
public function order_list() {
$this->view['menu_page'] = 'order_list';
}
public function wait_deliver_list() {
$this->view['menu_page'] = 'wait_deliver_list';
}
public function ajax_get_order_list() {
$shopinfo = $this->get_shopinfo();
@ -64,7 +71,9 @@ class index extends publicBase {
$this->ajax_json(true, 'succ', $nlist);
}
public function after_sale_list() {}
public function after_sale_list() {
$this->view['menu_page'] = 'after_sale_list';
}
public function ajax_get_after_sale_order_list() {
$shopinfo = $this->get_shopinfo();

17
view/css/admin_style.css
View File

@ -264,7 +264,7 @@ body{
padding-left: 22px;
padding-right: 6px;
}
.admin-index-top-item-list-item-child-dot-red2{
.admin-index-top-item-list-item-child-dot-red2,.admin-index-top-item-list-item-child-dot-grey2{
margin-right: 5px;
}
.admin-index-top-item-list-item-child-dot-red2::after{
@ -277,6 +277,16 @@ body{
position: relative;
top: -2px;
}
.admin-index-top-item-list-item-child-dot-grey2::after{
content: '';
display: inline-block;
width: 6px;
height: 6px;
background: #69717D;
border-radius: 50%;
position: relative;
top: -2px;
}
.admin-card-text-3 span,.admin-card-text-4 span{
font-size: 11px;
margin-left: 5px;
@ -563,6 +573,9 @@ body{
.deliver_remind_list_table_class .layui-table-main tr:hover > td:nth-child(-n+2){
color:#1890FF !important;
}
.deliver_remind_list_table_class .layui-table-main tr:hover > td:nth-child(-n+2) a{
color:#1890FF !important;
}
.count_down_wait{
color: #F21019;
position: relative;
@ -729,7 +742,7 @@ body{
margin:0 auto;
}
.admin-menuleft-footer div{
width: 100%;
width: 200px;
font-size: 12px;
text-align: center;
}

12
view/templates/include/admin_leftmenu.html
View File

@ -7,7 +7,7 @@
</a>
<dl class="layui-nav-child admin-layui-nav-child">
<dd class="{if $menu_page == 'home' || !$menu_page}layui-this{/if}">
<a href="{if $menu_page != 'home' || !$menu_page}/tpl{else}javascript:;{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<a href="{if $menu_page != 'home' || !$menu_page}/{else}javascript:;{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<span class="icon-2 admin-no-select menu-left-icon-img menu-left-icon-img-15"></span>
<span class="icon-3 admin-select menu-left-icon-img menu-left-icon-img-15"></span>
首页
@ -25,8 +25,8 @@
<span>常用功能</span>
</a>
<dl class="layui-nav-child admin-layui-nav-child">
<dd class="{if $menu_page == 'deliver_remind'}layui-this{/if}">
<a href="{if $menu_page != 'deliver_remind'}/tpl/deliver_remind{else}javascript:;{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<dd class="{if $menu_page == 'wait_deliver_list'}layui-this{/if}">
<a href="{if $menu_page != 'wait_deliver_list'}/index/wait_deliver_list{else}javascript:;{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<span class="icon-uniE90A admin-no-select menu-left-icon-img menu-left-icon-img-15"></span>
<span class="icon-1 admin-select menu-left-icon-img menu-left-icon-img-15"></span>
发货提醒
@ -35,8 +35,8 @@
</div>
</a>
</dd>
<dd class="{if $menu_page == 'sale_monitor'}layui-this{/if}">
<a href="{if $menu_page == 'sale_monitor'}javascript:;{else}/tpl/sale_monitor{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<dd class="{if $menu_page == 'after_sale_list'}layui-this{/if}">
<a href="{if $menu_page == 'after_sale_list'}javascript:;{else}/index/after_sale_list{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<span class="icon--6 admin-no-select menu-left-icon-img menu-left-icon-img-16"></span>
<span class="icon--6-2 admin-select menu-left-icon-img menu-left-icon-img-16"></span>
售后监控
@ -46,7 +46,7 @@
</a>
</dd>
<dd class="{if $menu_page == 'order_list'}layui-this{/if}">
<a href="{if $menu_page == 'order_list'}javascript:;{else}/tpl/order_list{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<a href="{if $menu_page == 'order_list'}javascript:;{else}/index/order_list{/if}" class="admin-layui-nav-item-a admin-layui-nav-item-a-child">
<span class="icon-dingd admin-no-select menu-left-icon-img"></span>
<span class="icon-dingd1 admin-select menu-left-icon-img"></span>
订单列表

14
view/templates/index/home.html
View File

@ -100,7 +100,7 @@
<div class="layui-row layui-col-space20 bottom-layui-row">
<div class="layui-col-lg2dot4 admin-layui-col-bottom-list">
<div class="admin-index-bottom-item">
<div class="admin-card-text-1">催发货订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></div>
<div class="admin-card-text-1"><a href="/index/wait_deliver_list">催发货订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></a></div>
<div class="admin-card-text-2">{$total_data.total_urge_order_count}<span>&nbsp;单</span></div>
<div class="admin-card-text-3">日增长：+0.61%<span class="icon--2"></span></div>
<div class="admin-card-text-4">周减少：-0.61%<span class="icon-21"></span></div>
@ -109,7 +109,7 @@
</div>
<div class="layui-col-lg2dot4 admin-layui-col-bottom-list">
<div class="admin-index-bottom-item">
<div class="admin-card-text-1">倒计时订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></div>
<div class="admin-card-text-1"><a href="/index/wait_deliver_list">倒计时订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></a></div>
<div class="admin-card-text-2">{$total_data.total_countdown_order_count}<span>&nbsp;单</span></div>
<div class="admin-card-text-3">日增长：+0.61%<span class="icon--2"></span></div>
<div class="admin-card-text-4">周减少：-0.61%<span class="icon-21"></span></div>
@ -118,17 +118,17 @@
</div>
<div class="layui-col-lg2dot4 admin-layui-col-bottom-list">
<div class="admin-index-bottom-item">
<div class="admin-card-text-1">待发货订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></div>
<div class="admin-card-text-1"><a href="/index/wait_deliver_list">待发货订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></a></div>
<div class="admin-card-text-2">{$total_data.total_wait_deliver_goods_count}<span>&nbsp;单</span></div>
<div class="admin-card-text-3">日增长：+0.61%<span class="icon--2"></span></div>
<div class="admin-card-text-4">周减少：-0.61%<span class="icon-21"></span></div>
<div class="admin-card-text-5 primary-msg"><i class="admin-index-top-item-list-item-child-dot-red2"></i>有新增的订单啦</div>
<div class="admin-card-text-5 primary-msg"><i class="admin-index-top-item-list-item-child-dot-grey2"></i>有新增的订单啦</div>
</div>
</div>
<div class="layui-col-lg2dot4 admin-layui-col-bottom-list">
<div class="admin-index-bottom-item">
<div class="admin-card-text-1">平台介入中订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></div>
<div class="admin-card-text-1"><a href="/index/after_sale_list">平台介入中订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></a></div>
<div class="admin-card-text-2">{$total_data.total_platform_processing_count}<span>&nbsp;单</span></div>
<div class="admin-card-text-3">日增长：+0.61%<span class="icon--2"></span></div>
<div class="admin-card-text-4">周减少：-0.61%<span class="icon-21"></span></div>
@ -138,11 +138,11 @@
<div class="layui-col-lg2dot4 admin-layui-col-bottom-list admin-layui-col-bottom-list-last">
<div class="admin-index-bottom-item">
<div class="admin-card-text-1">待售后订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></div>
<div class="admin-card-text-1"><a href="/index/after_sale_list">待售后订单(总)&nbsp;&nbsp;<span class="icon-1-2 admin-right-arrow"></span></a></div>
<div class="admin-card-text-2">{$total_data.total_wait_after_sale_count}<span>&nbsp;单</span></div>
<div class="admin-card-text-3">日增长：+0.61%<span class="icon--2"></span></div>
<div class="admin-card-text-4">周减少：-0.61%<span class="icon-21"></span></div>
<div class="admin-card-text-5 primary-msg"><i class="admin-index-top-item-list-item-child-dot-red2"></i>这些顾客想要退款</div>
<div class="admin-card-text-5 primary-msg"><i class="admin-index-top-item-list-item-child-dot-grey2"></i>这些顾客想要退款</div>
</div>
</div>
</div>

2
view/templates/index/order_list.html
View File

@ -115,7 +115,7 @@ layui.use(['element', 'layer', 'util', 'table'], function(){
var data = res.data;
for(var i=0; i<data.length; i++){
var tid = data[i].tid;
var tid = data[i].order_sn;
var clipboard = new ClipboardJS('.admin-table-td-outter-'+tid);
clipboard.on('success', function(e) {
layer.msg('复制成功', {time:1500});

Write Preview
Loading…
Cancel
Save