diff --git a/control/tpl.php b/control/tpl.php index e6d7ee9..a89a5e7 100644 --- a/control/tpl.php +++ b/control/tpl.php @@ -12,5 +12,41 @@ class tpl extends publicBase { * @return void */ public function home() { + $this->view['menu_page'] = 'home'; + } + + /** + * 发货提醒 + */ + public function deliver_remind() { + $this->view['menu_page'] = 'deliver_remind'; + } + + public function ajax_get_order_list() { + $data = array(); + $page = $this->get('page')+0; + $limit = $this->get('limit')+0; + for($i=0;$i < 10;$i++){ + $vals = array( + "goods_name" => "万方查重毕业论文检测大学生文章专科本科系万方查重毕业论文检测大学生文章专科本科系万方查重毕业论文检测大学生文章专科本科系", + "tid" => "43565765786867898".$i, + "count_down" => "倒计时:10:09:23", + 'sale_date' => date('Y-m-d H:i:s', time()+($i*8)), + 'remained_time' => date('Y-m-d H:i:s', time()+($i*88)), + "income" => "999.09", + "status" => "1" + ); + if($i % 2 == 0) { + $vals['count_down'] = date('Y-m-d H:i:s', time()+$i); + $vals['status'] = 0; + } + + $data[] = $vals; + } + + $reture_data['data'] = $data; + $reture_data['total'] = 300; + + $this->ajax_json(true, '', $reture_data); } } diff --git a/view/css/admin_style.css b/view/css/admin_style.css index 8033e7e..f83ede9 100644 --- a/view/css/admin_style.css +++ b/view/css/admin_style.css @@ -392,4 +392,75 @@ body{ padding-right: 0px !important; min-width: 207px !important; } + } + .admin-index-top-item-header{ + width: 100%; + height: 46px; + line-height: 46px; + padding-left: 12px; + padding-right: 12px; + color: rgba(0, 0, 0, 0.65); + font-size: 16px; + font-family: PingFangSC-Regular; + text-align: left; + white-space: nowrap; + box-sizing: border-box; + } + .admin-index-top-item-header-line{ + width: 100%; + height: 1px; + background-color: rgba(232, 232, 232, 1); + } + .admin-index-top-item-header-left{ + display: block; + float: left; + height: 100%; + width: auto; + } + .admin-index-top-item-header-left li{ + display: inline-block; + float: left; + font-size: 16px; + font-family: PingFangSC-Regular; + color: rgba(0,0,0,0.65); + margin-right: 64px; + cursor: pointer; + } + .admin-index-top-item-header-left li.active{ + font-family: PingFangSC-Medium !important; + color: #1890FF !important; + position: relative; + } + .admin-index-top-item-header-left li.active::after{ + content: ''; + width: 100%; + height: 2px; + border-radius: 1px; + background: #1890FF; + display: block; + } + .admin-index-top-item-header-right{ + display: block; + float: right; + height: 100%; + width: auto; + } + .admin-index-top-item-header-right li{ + display: inline-block; + float: left; + margin-left: 24px; + line-height: 55px; + font-size: 14px; + font-family: PingFangSC-Regular; + color: #595959; + cursor: pointer; + } + .admin-index-top-item-header-right li.active{ + color: #1890FF !important; + } + #admin-map-container{ + width: 100%; + box-sizing: border-box; + height: 325px; + overflow: hidden; } \ No newline at end of file diff --git a/view/css/common.css b/view/css/common.css index 62d9ac9..511546a 100644 --- a/view/css/common.css +++ b/view/css/common.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('/font/icomoon.eot?myxkk3'); - src: url('/font/icomoon.eot?myxkk3#iefix') format('embedded-opentype'), - url('/font/icomoon.ttf?myxkk3') format('truetype'), - url('/font/icomoon.woff?myxkk3') format('woff'), - url('/font/icomoon.svg?myxkk3#icomoon') format('svg'); + src: url('/font/icomoon.eot?j9lv8n'); + src: url('/font/icomoon.eot?j9lv8n#iefix') format('embedded-opentype'), + url('/font/icomoon.ttf?j9lv8n') format('truetype'), + url('/font/icomoon.woff?j9lv8n') format('woff'), + url('/font/icomoon.svg?j9lv8n#icomoon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -34,7 +34,7 @@ color: #1890ff; } .icon--8:before { - content: "\e90e"; + content: "\e912"; color: #fff; } .icon-1-2:before { @@ -69,6 +69,14 @@ content: "\e911"; color: #fff; } +.icon-uniE90E:before { + content: "\e90e"; + color: #1890ff; +} +.icon--3:before { + content: "\e913"; + color: #f21019; +} .icon-uniE9001:before { content: "\e907"; color: #c4c7cc; @@ -96,4 +104,4 @@ .icon-uniE900:before { content: "\e901"; color: #c4c7cc; -} \ No newline at end of file +} diff --git a/view/font/icomoon.eot b/view/font/icomoon.eot index 282cb77..60b6d64 100644 Binary files a/view/font/icomoon.eot and b/view/font/icomoon.eot differ diff --git a/view/font/icomoon.svg b/view/font/icomoon.svg index d00d82a..7d863b8 100644 --- a/view/font/icomoon.svg +++ b/view/font/icomoon.svg @@ -21,8 +21,10 @@ - + + + \ No newline at end of file diff --git a/view/font/icomoon.ttf b/view/font/icomoon.ttf index 7fa8681..9a8b334 100644 Binary files a/view/font/icomoon.ttf and b/view/font/icomoon.ttf differ diff --git a/view/font/icomoon.woff b/view/font/icomoon.woff index 0d6317d..c256706 100644 Binary files a/view/font/icomoon.woff and b/view/font/icomoon.woff differ diff --git a/view/js/clipboard.min.js b/view/js/clipboard.min.js new file mode 100644 index 0000000..1103f81 --- /dev/null +++ b/view/js/clipboard.min.js @@ -0,0 +1,7 @@ +/*! + * clipboard.js v2.0.11 + * https://clipboardjs.com/ + * + * Licensed MIT © Zeno Rocha + */ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return b}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),r=n.n(e);function c(t){try{return document.execCommand(t)}catch(t){return}}var a=function(t){t=r()(t);return c("cut"),t};function o(t,e){var n,o,t=(n=t,o="rtl"===document.documentElement.getAttribute("dir"),(t=document.createElement("textarea")).style.fontSize="12pt",t.style.border="0",t.style.padding="0",t.style.margin="0",t.style.position="absolute",t.style[o?"right":"left"]="-9999px",o=window.pageYOffset||document.documentElement.scrollTop,t.style.top="".concat(o,"px"),t.setAttribute("readonly",""),t.value=n,t);return e.container.appendChild(t),e=r()(t),c("copy"),t.remove(),e}var f=function(t){var e=1首页
-
- +
+ 首页 @@ -25,8 +25,8 @@ 常用功能
-
- +
+ 发货提醒 diff --git a/view/templates/tpl/deliver_remind.html b/view/templates/tpl/deliver_remind.html new file mode 100644 index 0000000..0f59b39 --- /dev/null +++ b/view/templates/tpl/deliver_remind.html @@ -0,0 +1,306 @@ + + + + + + + + + 首页 + + + + + + {literal} + + {/literal} + + +
+ {include file="include/admin_header.html"} + {include file="include/admin_leftmenu.html"} +
+
+
+
+
发货提醒/
+
发货列表
+
导出列表
+
+
+
+
+ +
+
+ + +{literal} + +{/literal} + + diff --git a/view/templates/tpl/home.html b/view/templates/tpl/home.html index df6222f..45988ff 100644 --- a/view/templates/tpl/home.html +++ b/view/templates/tpl/home.html @@ -16,77 +16,6 @@ {literal} {/literal} @@ -253,13 +182,6 @@ layui.use(['element', 'layer', 'util'], function(){ }); }); -// width: 70px; -// height: 22px; -// font-size: 14px; -// font-family: PingFangSC-Medium, PingFang SC; -// font-weight: 500; -// line-height: 22px; - var myChart = echarts.init(document.getElementById('admin-map-container')); var monthList = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']; var option = {