Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 9caf65e6 by 朱继来
Options

Merge branch 'zjl_adjust_20181026' into development

parents d63e5d1a c1b12d13
Inline Side-by-side
Showing with 301 additions and 605 deletions
app/Http/Controllers/AddOrderController.php
......@@ -11,67 +11,6 @@ use App\Http\Page;
use App\Http\Controllers\PermController;
use App\Http\Error;
function CheckActive($menus, &$arr, $url)
{
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
array_push($arr, $i);
if (isset($menu->href) && ($menu->href == $url || ($menu->href == '/' && $url == '//')))
return true;
if (isset($menu->childs) && count($menu->childs) > 0) {
$ret = CheckActive($menu->childs, $arr, $url);
if ($ret)
return $ret;
}
array_pop($arr);
}
return false;
}
function createMenuReal($menus, $active, $level)
{
$subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
$ret = '';
for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
$act = (count($active) > $level && $active[$level] == $i) ? true : false;
$actclass = $act ? ' class="active"' : '';
$actmenu = $act ? ' in': '';
if (isset($menu->childs) && count($menu->childs) > 0) {
if ($ii != 0 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a><i class="'
. $menu->class . '"></i><span class="nav-label">'
. $menu->title . '</span><span class="fa arrow"></span></a>'
. '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
. createMenuReal($menu->childs, $act ? $active : [], $level + 1)
. '</ul></li>';
} else {
if ($ii != 1 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
$menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
}
}
}
return $ret;
}
function createMenu($menus, $url)
{
$actives = [];
$ret = CheckActive($menus, $actives, $url);
if (!$ret)
$actives = [];
return createMenuReal($menus, $actives, 0);
}
Class AddOrderController extends Controller
{
// 页面用户、菜单信息
......@@ -115,7 +54,6 @@ Class AddOrderController extends Controller
$info = $this->getPageInfo($request);
$info['title'] = '新增联营订单';
$info['paths'] = [["title" => '新增联营订单', "href" => '#']];
$info['sale_id'] = $request->user->userId;
......@@ -128,7 +66,6 @@ Class AddOrderController extends Controller
$info = $this->getPageInfo($request);
$info['title'] = '新增自营线上订单';
$info['paths'] = [["title" => '新增自营线上订单', "href" => '#']];
$info['sale_id'] = $request->user->userId;
......@@ -253,7 +190,6 @@ Class AddOrderController extends Controller
$info = $this->getPageInfo($request);
$info['title'] = '新增自营线下订单';
$info['paths'] = [["title" => '新增自营线下订单', "href" => '#']];
// 默认内部账号ID
$internal = DB::connection('order')->table('lie_user_main')->where('mobile', Config('website.internal-account'))->select('user_id')->first();
......
app/Http/Controllers/OrderController.php
......@@ -15,67 +15,6 @@ use Excel;
use App\Model\OrderModel;
use App\Model\UserMainModel;
function CheckActive($menus, &$arr, $url)
{
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
array_push($arr, $i);
if (isset($menu->href) && ($menu->href == $url || ($menu->href == '/' && $url == '//')))
return true;
if (isset($menu->childs) && count($menu->childs) > 0) {
$ret = CheckActive($menu->childs, $arr, $url);
if ($ret)
return $ret;
}
array_pop($arr);
}
return false;
}
function createMenuReal($menus, $active, $level)
{
$subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
$ret = '';
for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
$act = (count($active) > $level && $active[$level] == $i) ? true : false;
$actclass = $act ? ' class="active"' : '';
$actmenu = $act ? ' in': '';
if (isset($menu->childs) && count($menu->childs) > 0) {
if ($ii != 0 && $level > 0)
continue;
$ret .= '<li'. $actclass .'><a><i class="'
. $menu->class . '"></i><span class="nav-label">'
. $menu->title . '</span><span class="fa arrow"></span></a>'
. '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
. createMenuReal($menu->childs, $act ? $active : [], $level + 1)
. '</ul></li>';
} else {
if ($ii != 1 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
$menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
}
}
}
return $ret;
}
function createMenu($menus, $url)
{
$actives = [];
$ret = CheckActive($menus, $actives, $url);
if (!$ret)
$actives = [];
return createMenuReal($menus, $actives, 0);
}
// 获取订单优惠券金额
function getCoupon($order_id)
{
......@@ -498,6 +437,7 @@ Class OrderController extends Controller
public function erpOrder(Request $request)
{
$info = $this->getPageInfo($request);
$info['title'] = 'ERP订单';
$map = array();
......@@ -561,6 +501,7 @@ Class OrderController extends Controller
public function selfOrder(Request $request)
{
$info = $this->getOrderInfo($request, 2);
$info['title'] = '自营订单';
return view('selfOrder', $info);
}
......@@ -632,6 +573,17 @@ Class OrderController extends Controller
public function templateData(Request $request, $id, $view_id)
{
$info = $this->orderDetail($request, $id);
$info['title'] = '订单详情';
$param = $request->only('tags');
if (!$param['tags']) {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => '平台订单', "href" => '/list'], ["title" => '订单明细', "href" => '#']];
} else if ($param['tags'] && $param['tags'] == 'erp') {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => 'ERP订单', "href" => '/erp_order'], ["title" => '订单明细', "href" => '#']];
} else if ($param['tags'] && $param['tags'] == 'self') {
$info['paths'] = [["title" => '自营订单', "href" => '#'], ["title" => '自营订单', "href" => '/self_order'], ["title" => '订单明细', "href" => '#']];
}
if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单
if ($request->input('tags') != 'self') {
......@@ -672,6 +624,7 @@ Class OrderController extends Controller
public function changeOrder(Request $request, $id)
{
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '人工审单', ["title" => '人工审单', "href" => '#']);
if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单
if ($request->input('tags') != 'self') {
......@@ -847,6 +800,7 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '推送业务员', ["title" => '推送业务员', "href" => '#']);
// 获取所有的业务员
$sale_list = $this->getSales('销售');
......@@ -1098,6 +1052,7 @@ Class OrderController extends Controller
public function checkPay(Request $request, $id)
{
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '对账', ["title" => '对账', "href" => '#']);
if ($request->isMethod('post')) {
$order_id = $request->input('order_id', '');
......@@ -1182,6 +1137,7 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '订单收货地址', ["title" => '收货地址', "href" => '#']);
if (!$info['order_address_info']) {
errorLog(Error::E_NOT_EXISTS, '订单地址不存在');
......@@ -1218,6 +1174,7 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '订单发票信息', ["title" => '发票信息', "href" => '#']);
if (!$info['order_invoice_info']) {
errorLog(Error::E_NOT_EXISTS, '发票不存在');
......@@ -1230,6 +1187,25 @@ Class OrderController extends Controller
return view('changeInvoice', $info);
}
// 订单详情页面头部信息
public function pageHeader($request, &$info, $title, $addInfo=[])
{
$info['title'] = $title;
$param = $request->only('tags');
if (!$param['tags']) {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => '平台订单列表', "href" => '/list'], ["title" => '订单明细', "href" => !empty($addInfo) ? '/details/'.$info['order_info']['order_id'] : '#']];
} else if ($param['tags'] && $param['tags'] == 'erp') {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => 'ERP订单列表', "href" => '/erp_order'], ["title" => '订单明细', "href" => !empty($addInfo) ? '/details/'.$info['order_info']['order_id'].'?tags=erp' : '#']];
} else if ($param['tags'] && $param['tags'] == 'self') {
$info['paths'] = [["title" => '自营订单', "href" => '#'], ["title" => '自营订单列表', "href" => '/self_order'], ["title" => '订单明细', "href" => !empty($addInfo) ? '/details/'.$info['order_info']['order_id'].'?tags=self' : '#']];
}
if (!empty( $addInfo))
array_push($info['paths'], $addInfo);
}
/**
*发货
*/
......@@ -1251,6 +1227,7 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '发货', ["title" => '发货', "href" => '#']);
$shippings = DB::connection('order')->table('lie_shipping')->where(['enabled'=>1,'is_order'=>1])->get();//获取配送方式
......@@ -1265,7 +1242,7 @@ Class OrderController extends Controller
return view('detail', $info);
}
//发票物流信息
// 发票物流信息
public function invShipping(Request $request, $id)
{
if($request->isMethod('post')){
......@@ -1294,6 +1271,7 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '寄送发票', ["title" => '寄送发票', "href" => '#']);
if($info['order_invoice_info']['inv_type'] == 1){
return redirect('/prompt')->with(['message'=>'当前订单不需要发票~','url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);
......@@ -1445,6 +1423,8 @@ Class OrderController extends Controller
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '自营对账', ["title" => '自营对账', "href" => '#']);
$this->selfOtherData($info, $id);
return view('detail', $info);
......@@ -1467,6 +1447,7 @@ Class OrderController extends Controller
}
$info = $this->getPageInfo($request);
$info['title'] = '快递配置';
$redis = Redis::connection('read');
$express = $redis->get($key);
......
app/Http/Controllers/OrderCountController.php
......@@ -10,67 +10,6 @@ use Cookie;
use App\Http\Page;
use App\Http\Controllers\PermController;
function CheckActive($menus, &$arr, $url)
{
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
array_push($arr, $i);
if (isset($menu->href) && ($menu->href == $url || ($menu->href == '/' && $url == '//')))
return true;
if (isset($menu->childs) && count($menu->childs) > 0) {
$ret = CheckActive($menu->childs, $arr, $url);
if ($ret)
return $ret;
}
array_pop($arr);
}
return false;
}
function createMenuReal($menus, $active, $level)
{
$subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
$ret = '';
for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
$act = (count($active) > $level && $active[$level] == $i) ? true : false;
$actclass = $act ? ' class="active"' : '';
$actmenu = $act ? ' in': '';
if (isset($menu->childs) && count($menu->childs) > 0) {
if ($ii != 0 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a><i class="'
. $menu->class . '"></i><span class="nav-label">'
. $menu->title . '</span><span class="fa arrow"></span></a>'
. '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
. createMenuReal($menu->childs, $act ? $active : [], $level + 1)
. '</ul></li>';
} else {
if ($ii != 1 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
$menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
}
}
}
return $ret;
}
function createMenu($menus, $url)
{
$actives = [];
$ret = CheckActive($menus, $actives, $url);
if (!$ret)
$actives = [];
return createMenuReal($menus, $actives, 0);
}
Class OrderCountController extends Controller
{
// 页面用户、菜单信息
......@@ -114,6 +53,8 @@ Class OrderCountController extends Controller
public function count(Request $request, $type = 1, $view = 'count')
{
$info = $this->getPageInfo($request);
$info['type'] = $type;
$info['title'] = '订单统计';
$url = Config('website.api_domain').'order/orderCount';
......@@ -135,6 +76,9 @@ Class OrderCountController extends Controller
public function amount(Request $request, $type = 1, $view = 'amount')
{
$info = $this->getPageInfo($request);
$info['type'] = $type;
$info['title'] = '订单金额统计';
$info['paths'] = [["title" => '订单统计', "href" => '#'], ["title" => $type == 1 ? '联营订单统计' : '自营订单统计', "href" => $type == 1 ? '/count' : 'self_count'], ["title" => '订单金额统计', "href" => '#']];
$time_start = $request->input('time_start', ''); // 开始时间
$time_end = $request->input('time_end', ''); // 结束时间
......@@ -195,12 +139,12 @@ Class OrderCountController extends Controller
// 自营订单统计
public function selfCount(REQUEST $request)
{
return $this->count($request, 2, 'self_count');
return $this->count($request, 2, 'count');
}
// 自营订单金额统计
public function selfAmount(REQUEST $request)
{
return $this->amount($request, 2, 'self_amount');
return $this->amount($request, 2, 'amount');
}
}
\ No newline at end of file
app/Http/Controllers/WebController.php
......@@ -9,48 +9,6 @@ use App\Http\Requests;
use App\Http\Controllers\Controller;
use DB;
function createMenuReal($menus, $active, $level)
{
$subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
$ret = '';
for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
$act = (count($active) > $level && $active[$level] == $i) ? true : false;
$actclass = $act ? ' class="active"' : '';
$actmenu = $act ? ' in': '';
if (isset($menu->childs) && count($menu->childs) > 0) {
if ($ii != 0 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a><i class="'
. $menu->class . '"></i><span class="nav-label">'
. $menu->title . '</span><span class="fa arrow"></span></a>'
. '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
. createMenuReal($menu->childs, $act ? $active : [], $level + 1)
. '</ul></li>';
} else {
if ($ii != 1 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
$menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
}
}
}
return $ret;
}
function createMenu($menus, $url)
{
$actives = [];
$ret = CheckActive($menus, $actives, $url);
if (!$ret)
$actives = [];
return createMenuReal($menus, $actives, 0);
}
class WebController extends Controller
{
// 页面用户、菜单信息
......@@ -80,7 +38,6 @@ class WebController extends Controller
$data = [
'header' => $request->user->header,
'uri' => $uri,
'paths' => [["title" => "首页", "href" => '/database/']],
'username' => $username,
'useremail' => $useremail,
'menus' => $menus,
......@@ -104,6 +61,7 @@ class WebController extends Controller
private function AuthPaymentDays($request,$data,$id){
$data['title']='审核账期申请';
$data['Status']=[1=>'待审核',2=>'审核通过',3=>'审核不通过'];
$data['paths'] = [["title" => '账期管理', "href" => '#'], ["title" => '申请列表', "href" => '/web/PaymentDaysList'], ["title" => '审核账期申请', "href" => '#']];
$Model=new PaymentDaysModel();
$data['info']=$Model->AuthPaymentDays();
return view($id,$data);
......
app/Http/Function.php
......@@ -229,3 +229,45 @@
return false;
}
function createMenuReal($menus, $active, $level)
{
$subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
$ret = '';
for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
for ($i = 0; $i < count($menus); $i++) {
$menu = $menus[$i];
$act = (count($active) > $level && $active[$level] == $i) ? true : false;
$actclass = $act ? ' class="active"' : '';
$actmenu = $act ? ' in': '';
if (isset($menu->childs) && count($menu->childs) > 0) {
if ($ii != 0 && $level > 0)
continue;
$ret .= '<li'. $actclass .'><a><i class="'
. $menu->class . '"></i><span class="nav-label">'
. $menu->title . '</span><span class="fa arrow"></span></a>'
. '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
. createMenuReal($menu->childs, $act ? $active : [], $level + 1)
. '</ul></li>';
} else {
if ($ii != 1 && $level > 0)
continue;
$ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
$menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
}
}
}
return $ret;
}
function createMenu($menus, $url)
{
$actives = [];
$ret = CheckActive($menus, $actives, $url);
if (!$ret)
$actives = [];
return createMenuReal($menus, $actives, 0);
}
\ No newline at end of file
config/params.php 0 → 100644
<?php
return [
'joint_addr' => '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技', // 联营自提地址
'self_addr' => '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼', // 自营自提地址
];
\ No newline at end of file
public/css/detail.css
.page-content {
margin-top: 20px;
}
/* 订单信息 */
.order-details .order-info {
width: 100%;
......@@ -202,11 +206,21 @@ li {
width: 55%;
}
.payment-status {
width: 420px;
}
/* 响应式 */
@media screen and (max-width: 768px) {
.body-small .navbar-static-side { width: 170px; top: 48px; left: 10px; }
#page-wrapper { padding: 0 10px; }
.search-box > div dl dd { width: 130px; }
.body-small .navbar-static-side { width: 220px; top: 48px; left: 10px; background: #293846; }
.side-section { margin-left: 40px; }
.search-box > div dl dd { width: 120px; }
.test-order { width: 130px !important; }
.Wdate{ width: 110px !important; }
......@@ -215,5 +229,7 @@ li {
.search-btn { margin-bottom: 20px !important; }
.show-list-info { display: none; }
.payment-status { width: 220px; }
}
public/css/order.css
......@@ -144,11 +144,11 @@ input[type="color"],
.nav-tabs>li.active>a,
.nav-tabs>li.active>a:hover,
.nav-tabs>li.active>a:focus{
background-color: #ffa300 !important;
background-color: #1ab394 !important;
color: #fff;
border-top: 1px solid #ffa300 !important;
border-left: 1px solid #ffa300 !important;
border-right: 1px solid #ffa300 !important;
border-top: 1px solid #1ab394 !important;
border-left: 1px solid #1ab394 !important;
border-right: 1px solid #1ab394 !important;
}
.tabs-box{
......@@ -164,6 +164,12 @@ input[type="color"],
box-shadow: 0 1px 10px rgba(0,0,0,0.1);
}
.order-amount-search {
height: 28px;
line-height: 10px;
margin-top: -4px;
}
.row-fluid {
width: 100%;
}
......
public/js/inspinia.min.js
$(document).ready(function(){if($(this).width()<769){$("body").addClass("body-small")}else{$("body").removeClass("body-small")}$("#side-menu").metisMenu();$(".collapse-link").click(function(){var d=$(this).closest("div.ibox");var b=$(this).find("i");var c=d.find("div.ibox-content");c.slideToggle(200);b.toggleClass("fa-chevron-up").toggleClass("fa-chevron-down");d.toggleClass("").toggleClass("border-bottom");setTimeout(function(){d.resize();d.find("[id^=map-]").resize()},50)});$(".close-link").click(function(){var b=$(this).closest("div.ibox");b.remove()});$(".fullscreen-link").click(function(){var c=$(this).closest("div.ibox");var b=$(this).find("i");$("body").toggleClass("fullscreen-ibox-mode");b.toggleClass("fa-expand").toggleClass("fa-compress");c.toggleClass("fullscreen");setTimeout(function(){$(window).trigger("resize")},100)});$(".close-canvas-menu").click(function(){$("body").toggleClass("mini-navbar");SmoothlyMenu()});$("body.canvas-menu .sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9});$(".right-sidebar-toggle").click(function(){$("#right-sidebar").toggleClass("sidebar-open")});$(".sidebar-container").slimScroll({height:"100%",railOpacity:0.4,wheelStep:10});$(".open-small-chat").click(function(){$(this).children().toggleClass("fa-comments").toggleClass("fa-remove");$(".small-chat-box").toggleClass("active")});$(".small-chat-box .content").slimScroll({height:"234px",railOpacity:0.4});$(".check-link").click(function(){var c=$(this).find("i");var b=$(this).next("span");c.toggleClass("fa-check-square").toggleClass("fa-square-o");b.toggleClass("todo-completed");return false});$(".navbar-minimalize").click(function(){$("body").toggleClass("mini-navbar");SmoothlyMenu()});$(".tooltip-demo").tooltip({selector:"[data-toggle=tooltip]",container:"body"});$(".modal").appendTo("body");function a(){var d=$("body > #wrapper").height()-61;$(".sidebard-panel").css("min-height",d+"px");var b=$("nav.navbar-default").height();var c=$("#page-wrapper").height();if(b>c){$("#page-wrapper").css("min-height",b+"px")}if(b<c){$("#page-wrapper").css("min-height",$(window).height()+"px")}if($("body").hasClass("fixed-nav")){if(b>c){$("#page-wrapper").css("min-height",b-60+"px")}else{$("#page-wrapper").css("min-height",$(window).height()-60+"px")}}}a();$(window).bind("load",function(){if($("body").hasClass("fixed-sidebar")){$(".sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9})}});$(window).scroll(function(){if($(window).scrollTop()>0&&!$("body").hasClass("fixed-nav")){$("#right-sidebar").addClass("sidebar-top")}else{$("#right-sidebar").removeClass("sidebar-top")}});$(window).bind("load resize scroll",function(){if(!$("body").hasClass("body-small")){a()}});$("[data-toggle=popover]").popover();$(".full-height-scroll").slimscroll({height:"100%"})});$(window).bind("resize",function(){if($(this).width()<769){$("body").addClass("body-small")}else{$("body").removeClass("body-small")}});$(document).ready(function(){if(localStorageSupport){var e=localStorage.getItem("collapse_menu");var f=localStorage.getItem("fixedsidebar");var d=localStorage.getItem("fixednavbar");var b=localStorage.getItem("boxedlayout");var c=localStorage.getItem("fixedfooter");var a=$("body");if(f=="on"){a.addClass("fixed-sidebar");$(".sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9})}if(e=="on"){if(a.hasClass("fixed-sidebar")){if(!a.hasClass("body-small")){a.addClass("mini-navbar")}}else{if(!a.hasClass("body-small")){a.addClass("mini-navbar")}}}if(d=="on"){$(".navbar-static-top").removeClass("navbar-static-top").addClass("navbar-fixed-top");a.addClass("fixed-nav")}if(b=="on"){a.addClass("boxed-layout")}if(c=="on"){$(".footer").addClass("fixed")}}});function localStorageSupport(){return(("localStorage" in window)&&window.localStorage!==null)}function animationHover(a,b){a=$(a);a.hover(function(){a.addClass("animated "+b)},function(){window.setTimeout(function(){a.removeClass("animated "+b)},2000)})}function SmoothlyMenu(){if(!$("body").hasClass("mini-navbar")||$("body").hasClass("body-small")){$("#side-menu").hide();setTimeout(function(){$("#side-menu").fadeIn(400)},200)}else{if($("body").hasClass("fixed-sidebar")){$("#side-menu").hide();setTimeout(function(){$("#side-menu").fadeIn(400)},100)}else{$("#side-menu").removeAttr("style")}}}function WinMove(){var b="[class*=col]";var c=".ibox-title";var a="[class*=col]";$(b).sortable({handle:c,connectWith:a,tolerance:"pointer",forcePlaceholderSize:true,opacity:0.8}).disableSelection()};
\ No newline at end of file
$(document).ready(function(){if($(this).width()<769){$("body").addClass("body-small");$('.navbar-minimalize').addClass('navdrop').removeClass('navbar-minimalize');$('.navdrop').click(function() {$('.body-small .navbar-static-side').toggle();})}else{$("body").removeClass("body-small")}$("#side-menu").metisMenu();$(".collapse-link").click(function(){var d=$(this).closest("div.ibox");var b=$(this).find("i");var c=d.find("div.ibox-content");c.slideToggle(200);b.toggleClass("fa-chevron-up").toggleClass("fa-chevron-down");d.toggleClass("").toggleClass("border-bottom");setTimeout(function(){d.resize();d.find("[id^=map-]").resize()},50)});$(".close-link").click(function(){var b=$(this).closest("div.ibox");b.remove()});$(".fullscreen-link").click(function(){var c=$(this).closest("div.ibox");var b=$(this).find("i");$("body").toggleClass("fullscreen-ibox-mode");b.toggleClass("fa-expand").toggleClass("fa-compress");c.toggleClass("fullscreen");setTimeout(function(){$(window).trigger("resize")},100)});$(".close-canvas-menu").click(function(){$("body").toggleClass("mini-navbar");SmoothlyMenu()});$("body.canvas-menu .sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9});$(".right-sidebar-toggle").click(function(){$("#right-sidebar").toggleClass("sidebar-open")});$(".sidebar-container").slimScroll({height:"100%",railOpacity:0.4,wheelStep:10});$(".open-small-chat").click(function(){$(this).children().toggleClass("fa-comments").toggleClass("fa-remove");$(".small-chat-box").toggleClass("active")});$(".small-chat-box .content").slimScroll({height:"234px",railOpacity:0.4});$(".check-link").click(function(){var c=$(this).find("i");var b=$(this).next("span");c.toggleClass("fa-check-square").toggleClass("fa-square-o");b.toggleClass("todo-completed");return false});$(".navbar-minimalize").click(function(){$("body").toggleClass("mini-navbar");SmoothlyMenu()});$(".tooltip-demo").tooltip({selector:"[data-toggle=tooltip]",container:"body"});$(".modal").appendTo("body");function a(){var d=$("body > #wrapper").height()-61;$(".sidebard-panel").css("min-height",d+"px");var b=$("nav.navbar-default").height();var c=$("#page-wrapper").height();if(b>c){$("#page-wrapper").css("min-height",b+"px")}if(b<c){$("#page-wrapper").css("min-height",$(window).height()+"px")}if($("body").hasClass("fixed-nav")){if(b>c){$("#page-wrapper").css("min-height",b-60+"px")}else{$("#page-wrapper").css("min-height",$(window).height()-60+"px")}}}a();$(window).bind("load",function(){if($("body").hasClass("fixed-sidebar")){$(".sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9})}});$(window).scroll(function(){if($(window).scrollTop()>0&&!$("body").hasClass("fixed-nav")){$("#right-sidebar").addClass("sidebar-top")}else{$("#right-sidebar").removeClass("sidebar-top")}});$(window).bind("load resize scroll",function(){if(!$("body").hasClass("body-small")){a()}});$("[data-toggle=popover]").popover();$(".full-height-scroll").slimscroll({height:"100%"})});$(window).bind("resize",function(){if($(this).width()<769){$("body").addClass("body-small")}else{$("body").removeClass("body-small")}});$(document).ready(function(){if(localStorageSupport){var e=localStorage.getItem("collapse_menu");var f=localStorage.getItem("fixedsidebar");var d=localStorage.getItem("fixednavbar");var b=localStorage.getItem("boxedlayout");var c=localStorage.getItem("fixedfooter");var a=$("body");if(f=="on"){a.addClass("fixed-sidebar");$(".sidebar-collapse").slimScroll({height:"100%",railOpacity:0.9})}if(e=="on"){if(a.hasClass("fixed-sidebar")){if(!a.hasClass("body-small")){a.addClass("mini-navbar")}}else{if(!a.hasClass("body-small")){a.addClass("mini-navbar")}}}if(d=="on"){$(".navbar-static-top").removeClass("navbar-static-top").addClass("navbar-fixed-top");a.addClass("fixed-nav")}if(b=="on"){a.addClass("boxed-layout")}if(c=="on"){$(".footer").addClass("fixed")}}});function localStorageSupport(){return(("localStorage" in window)&&window.localStorage!==null)}function animationHover(a,b){a=$(a);a.hover(function(){a.addClass("animated "+b)},function(){window.setTimeout(function(){a.removeClass("animated "+b)},2000)})}function SmoothlyMenu(){if(!$("body").hasClass("mini-navbar")||$("body").hasClass("body-small")){$("#side-menu").hide();setTimeout(function(){$("#side-menu").fadeIn(400)},200)}else{if($("body").hasClass("fixed-sidebar")){$("#side-menu").hide();setTimeout(function(){$("#side-menu").fadeIn(400)},100)}else{$("#side-menu").removeAttr("style")}}}function WinMove(){var b="[class*=col]";var c=".ibox-title";var a="[class*=col]";$(b).sortable({handle:c,connectWith:a,tolerance:"pointer",forcePlaceholderSize:true,opacity:0.8}).disableSelection()};
\ No newline at end of file
public/js/orderamount.js
......@@ -9,18 +9,17 @@
},
bind:function(){
$('.order-amount-search').click(function(){
searchAmount('/amount');
})
$('.self-order-amount-search').click(function(){
searchAmount('/self_amount');
})
function searchAmount(url) {
var checkTime = $('#checkTime').val(),
var type = $('input[name=type]').val(),
checkTime = $('#checkTime').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
checkStatus = $('#checkStatus').val(),
checkStatus = $('#checkStatus').val();
if (type == 1) {
var url = '/amount';
} else {
var url = '/self_amount';
}
time_start = Date.parse(time_start) / 1000;
time_end = Date.parse(time_end) / 1000;
......@@ -28,7 +27,7 @@
url = url+'?checkTime='+checkTime+'&time_start='+time_start+'&time_end='+time_end+'&checkStatus='+checkStatus;
location.href = url;
}
})
}
}
......
resources/views/PaymentDays.blade.php
......@@ -23,11 +23,12 @@
<div id="wrapper">
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
@include('layouts.header')
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins ibox-content" style="margin: 15px">
<div class="row mapping-rows" style="overflow:hidden;margin: 10px">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="row-fluid ibox-content">
@include("PaymentDays.$id")
</div>
</div>
......
resources/views/PaymentDays/AuthPaymentDays.blade.php
......@@ -12,9 +12,9 @@
}
</style>
<div class="layui-table-box layui-form">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<fieldset class="layui-elem-field layui-field-title table-responsive" style="margin-top: 20px;">
<legend>申请信息</legend>
<table class="layui-table">
<table class="layui-table table">
<thead>
<tr>
<th style="text-align: center">申请状态</th>
......@@ -40,9 +40,9 @@
</table>
</fieldset>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<fieldset class="layui-elem-field layui-field-title table-responsive" style="margin-top: 20px;">
<legend>申请公司信息</legend>
<table class="layui-table">
<table class="layui-table table">
<thead>
<tr>
<th style="text-align: center">公司注册地址</th>
......
resources/views/PaymentDays/PaymentDaysList.blade.php
......@@ -17,7 +17,7 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">状态</label>
<div class="layui-input-inline" style="width: 420px">
<div class="layui-input-inline payment-status">
<input type="hidden" name="status" value="1,2,">
@if(!empty($Status) && is_array($Status))
@foreach($Status as $k=>$v)
......
resources/views/addOffline.blade.php
......@@ -11,12 +11,24 @@
@include('addOffline.js')
</head>
<body class="body-small" style="min-width:1024px;">
<body class="body-small">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="ibox float-e-margins">
@include('addOffline.content')
</div>
</div>
</div>
</div>
</div>
</div>
</body>
resources/views/addOffline/content.blade.php
<div id="page-wrapper" class="gray-bg">
@include('layouts.header')
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<form>
<form>
<div class="ibox-title" style="border-top:0;">
<h3>客户信息</h3>
</div>
......@@ -163,7 +156,7 @@
</div>
</div>
<div class="sku-info-right">
<div class="sku-info-right table-responsive">
<table class="table table-hover ladder_price_table">
<tr>
<th>阶梯</th>
......@@ -180,7 +173,7 @@
</div>
<!-- 商品列表 -->
<div class="shop-lists">
<div class="shop-lists table-responsive">
<table class="table table-bordered table-hover shop-table">
<thead>
<tr>
......@@ -210,12 +203,7 @@
<div class="ibox-title" style="text-align: right;">
<a class="btn btn-success submit-order" data-type="3">提交</a>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</form>
<script>
var internal_uid = "{{$internal_uid}}";
......
resources/views/addOnline.blade.php
......@@ -11,12 +11,24 @@
@include('addOffline.js')
</head>
<body class="body-small" style="min-width:1024px;">
<body class="body-small">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="ibox float-e-margins">
@include('addOnline.content')
</div>
</div>
</div>
</div>
</div>
</div>
</body>
resources/views/addOnline/content.blade.php
<div id="page-wrapper" class="gray-bg">
@include('layouts.header')
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<form>
<form>
<div class="ibox-title" style="border-top:0;">
<h3>客户信息</h3>
</div>
......@@ -308,7 +301,7 @@
</div>
</div>
<div class="sku-info-right">
<div class="sku-info-right table-responsive">
<table class="table table-hover ladder_price_table">
<!-- <tr>
<th>阶梯</th>
......@@ -326,7 +319,7 @@
</div>
<!-- 商品列表 -->
<div class="shop-lists">
<div class="shop-lists table-responsive">
<table class="table table-bordered table-hover shop-table">
<thead>
<tr>
......@@ -404,12 +397,7 @@
<div class="ibox-title" style="text-align: right;">
<a class="btn btn-success submit-order" data-type="2">提交</a>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</form>
<script>
var sale_id = "{{$sale_id}}";
......
resources/views/addOrder.blade.php
......@@ -11,12 +11,26 @@
@include('addOffline.js')
</head>
<body class="body-small" style="min-width:1024px;">
<body class="body-small">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="ibox float-e-margins">
@include('addOrder.content')
</div>
</div>
</div>
</div>
</div>
</div>
</body>
resources/views/addOrder/content.blade.php
<div id="page-wrapper" class="gray-bg">
@include('layouts.header')
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<form>
<form>
<div class="ibox-title" style="border-top:0;">
<h3>客户信息</h3>
</div>
......@@ -327,7 +320,7 @@
</div>
</div>
<div class="sku-info-right">
<div class="sku-info-right table-responsive">
<table class="table table-hover ladder_price_table">
<!-- <tr>
<th>阶梯</th>
......@@ -346,7 +339,7 @@
</div>
<!-- 商品列表 -->
<div class="shop-lists">
<div class="shop-lists table-responsive">
<table class="table table-bordered table-hover shop-table">
<thead>
<tr>
......@@ -409,12 +402,7 @@
<div class="ibox-title" style="text-align: right;">
<a class="btn btn-success submit-order" data-type="1">提交</a>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</form>
<script>
var sale_id = "{{$sale_id}}";
......
resources/views/amount/content.blade.php
<div class="page-content">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<ul class="nav nav-tabs">
<li><a href="{{URL('count')}}">联营订单数统计</a></li>
<li class="active"><a href="javascript:;">订单金额统计</a></li>
<li><a href="{{ $type == 1 ? URL('count') : URL('self_count') }}">{{ $type == 1 ? '联营订单状态概览' : '自营订单状态概览' }}</a></li>
<li class="active"><a href="javascript:;">{{ $type == 1 ? '联营订单金额统计' : '自营订单金额统计' }}</a></li>
</ul>
<div class="tabs-box">
<div class="row-fluid order-amount">
<select name="checkTime" id="checkTime" style="width: 150px; margin-bottom: 0;">
......@@ -20,11 +24,12 @@
<option value="3">未完成</option>
</select>
<input type="hidden" name="type" value="{{ $type }}">
<button class="btn btn-primary order-amount-search">搜索</button>
</div>
</div>
<div class="tabs-box">
<div class="row-fluid">
<div class="row-fluid table-responsive">
<table class="table table-bordered">
<tr>
<th>序号</th>
......@@ -35,7 +40,7 @@
</tr>
<empty name="list">
@if (empty($list))
<tr><td colspan="5">没有更多数据~</td></tr>
<tr><td colspan="5" class="text-center">没有更多数据~</td></tr>
@else
@foreach ($list as $key => $vo)
<tr>
......@@ -114,7 +119,7 @@
</div>
<div class="row-fluid pagination">
<span>
<span class="show-list-info">
@if ($checkStatus == 1)
实收金额：￥{{isset($pay_count['rmb_pay']) ? $pay_count['rmb_pay'] : 0}} &nbsp; ${{isset($pay_count['usd_pay']) ? $pay_count['usd_pay'] : 0}}
已完成金额：￥{{!empty($pay_count['rmb_pay_finish']) ? $pay_count['rmb_pay_finish'] : 0}} &nbsp; ${{!empty($pay_count['usd_pay_finish']) ? $pay_count['usd_pay_finish'] : 0}}
......@@ -131,9 +136,9 @@
<?php echo isset($page) ? $page : ''; ?>
</div>
</div>
</div>
</div>
<script>
$.lie.orderamount.index();
......@@ -142,7 +147,4 @@
$('#checkTime').val(checkTime);
$('#checkStatus').val(checkStatus);
$('#side-menu').children('li').last().attr('class', 'active');
$('#side-menu').children('li').last().children('ul').children('li').eq(2).attr('class', 'active');
</script>
\ No newline at end of file
resources/views/changeInvoice/content.blade.php
<div class="page-content order-details">
<ul class="nav nav-tabs">
<div class="wrapper">
@include('layouts.header')
<div class="page-content order-details">
<!-- <ul class="nav nav-tabs">
@if (isset($_REQUEST['tags']))
<li><a href="{{URL('erp_order')}}">ERP订单</a></li>
<li><a href="/details/{{$detail['order_id']}}?tags={{$_REQUEST['tags']}}">订单详情</a></li>
......@@ -9,7 +12,7 @@
@endif
<li class="active"><a href="javascript:;">订单发票信息</a></li>
</ul>
</ul> -->
<?php
$route = \Route::current()->getActionName();
$action_name = explode('@', $route)[1];
......@@ -17,7 +20,7 @@
<input type="hidden" class="action_type" value="{{$action_name}}">
<div class="tabs-box shipping-info">
<form action="{{URL('changeInvoice')}}" method="POST">
<form action="{{URL('changeInvoice')}}" method="POST" class="table-responsive">
<input type="hidden" name="order_id" value="{{$detail['order_id']}}">
<table class="table table-bordered table-hover order-invoice">
<caption><h3>订单发票信息</h3></caption>
......@@ -27,7 +30,8 @@
<select name="inv_type" id="inv_type" style="width:164px;">
<option value="1">不开发票</option>
<option value="2">普通发票</option>
<option value="3">增值税发票</option>
<option value="3">增值税专用发票</option>
<option value="4">增值税普通发票</option>
</select>
</td>
<td width="10%">开票状态</td>
......@@ -73,7 +77,7 @@
</td>
<td>公司注册地址</td>
<td>
<textarea name="company_address" id="company_address" cols="30" rows="10" placeholder="请填写详细地址">{{$detail['company_address']}}</textarea>
<textarea name="company_address" id="company_address" cols="50" rows="2" placeholder="请填写详细地址">{{$detail['company_address']}}</textarea>
</td>
</tr>
......@@ -84,6 +88,7 @@
</form>
</div>
</div>
</div>
<script>
......
resources/views/changeShipping/content.blade.php
<div class="page-content order-details">
<ul class="nav nav-tabs">
<div class="wrapper">
@include('layouts.header')
<div class="page-content order-details">
<!-- <ul class="nav nav-tabs">
@if (isset($_REQUEST['tags']))
<li><a href="{{URL('erp_order')}}">ERP订单</a></li>
<li><a href="/details/{{$detail['order_id']}}?tags={{$_REQUEST['tags']}}">订单详情</a></li>
......@@ -9,7 +12,7 @@
@endif
<li class="active"><a href="javascript:;">订单收货信息</a></li>
</ul>
</ul> -->
<?php
$route = \Route::current()->getActionName();
$action_name = explode('@', $route)[1];
......@@ -17,13 +20,13 @@
<input type="hidden" class="action_type" value="{{$action_name}}">
<div class="tabs-box shipping-info">
<form action="{{URL('changeShipping')}}" method="POST">
<form action="{{URL('changeShipping')}}" method="POST" class="table-responsive">
<input type="hidden" name="order_id" value="{{$detail['order_id']}}">
<table class="table table-hover table-bordered">
<caption><h3>订单物流信息</h3></caption>
<tr>
<th width="10%">配送方式</th>
<td colspan="3">
<td>
<label class="radio-inline">
<input type="radio" name="shipping_type" class="shipping_type" value="1"> 快递配送
</label>
......@@ -36,13 +39,16 @@
<tr>
<th width="10%">收货人</th>
<td><input type="text" name="consignee" value="{{$detail['consignee']}}"></td>
</tr>
<tr>
<th width="10%">联系电话</th>
<td><input type="text" name="mobile" value="{{$detail['mobile']}}"></td>
</tr>
<tr class="address-info">
<th width="10%">收货地址</th>
<td colspan="3">
<td>
<select class="address s_province" name="province" default="{{$detail['province']}}"></select>
<select class="address s_city" name="city" default="{{$detail['city']}}"></select>
<select class="address s_county" name="district" default="{{$detail['district']}}"></select>
......@@ -50,14 +56,14 @@
</tr>
<tr>
<th width="10%">详细地址</th>
<td colspan="3"><textarea class="form-control" name="address" placeholder="请输入详细地址">{{$detail['address']}}</textarea></td>
<td><textarea class="form-control" name="address" placeholder="请输入详细地址">{{$detail['address']}}</textarea></td>
</tr>
<tr>
<td colspan="4"><input type="submit" value="保存" class="btn btn-success"></td>
<td colspan="2"><input type="submit" value="保存" class="btn btn-success"></td>
</tr>
</table>
</form>
</div>
</div>
</div>
......@@ -78,9 +84,9 @@
}
if (goods_type == 2) {
var self_addr = '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼';
var self_addr = "{{ Config('params.self_addr') }}";
} else {
var self_addr = '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技';
var self_addr = "{{ Config('params.joint_addr') }}";
}
$('.shipping_type').change(function() {
......
resources/views/count/content.blade.php
<div class="page-content">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">联营订单状态概览</a></li>
<li><a href="{{URL('amount')}}">订单金额统计</a></li>
<li class="active"><a href="javascript:;">{{ $type == 1 ? '联营订单状态概览' : '自营订单状态概览' }}</a></li>
<li><a href="{{ $type == 1 ? URL('amount') : URL('self_amount') }}">{{ $type == 1 ? '联营订单金额统计' : '自营订单金额统计' }}</a></li>
</ul>
<div class="tabs-box">
<div class="row-fluid">
<div class="row-fluid table-responsive">
<table class="table">
<tr>
<th>时间</th>
......@@ -54,6 +57,7 @@
</div>
</div>
</div>
</div>
<script>
......
resources/views/detail/content.blade.php
<div class="page-content order-details">
<div class="wrapper">
@include('layouts.header')
<div class="page-content order-details">
@if (!$isPage)
<ul class="nav nav-tabs">
<!-- <ul class="nav nav-tabs">
@if (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
<li><a href="{{URL('erp_order')}}">ERP订单</a></li>
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
......@@ -9,7 +12,7 @@
<li><a href="{{URL('list')}}">平台订单</a></li>
@endif
<li class="active"><a href="javascript:;">订单详情</a></li>
</ul>
</ul> -->
@endif
<?php
......@@ -32,11 +35,7 @@
<th>交易状态</th>
<th>对账状态</th>
<th>支付方式</th>
@if (!isset($_REQUEST['tags']))
<th>支付类型</th>
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] != 'self')
<th>支付类型</th>
@endif
<th>支付状态</th>
</tr>
......@@ -104,27 +103,6 @@
?>
</td>
@if (!isset($_REQUEST['tags']))
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') {
echo '全款';
} else {
echo '--';
}
} else if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['pay_type'] != '') {
echo '尾款';
} else if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') {
echo '预付款';
} else {
echo '--';
}
}
?>
</td>
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] != 'self')
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
......@@ -144,7 +122,6 @@
}
?>
</td>
@endif
<td>
<?php
......@@ -168,9 +145,9 @@
</tr>
</table>
<div class="order-info">
<input type="hidden" id="order_id" value="{{$order_info['order_id']}}">
<input type="hidden" id="user_id" value="{{$order_info['user_id']}}">
<table class="table table-bordered">
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
......@@ -231,8 +208,8 @@
@endif
</tr>
</table>
</div>
@if (!empty($order_invoice_info))
<table class="table table-bordered order-express">
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
......@@ -296,6 +273,7 @@
</td>
</tr>
</table>
@endif
<!-- 发票收货地址 -->
@if ($order_invoice_address_info)
......@@ -758,6 +736,7 @@
@endif
</div>
</div>
<script>
......
resources/views/detail/sendSales.blade.php
......@@ -5,7 +5,7 @@
<p class="error">订单已推送！</p>
@endif
<form id="sendSalesForm" class="form-horizontal">
<form id="sendSalesForm" class="form-horizontal table-responsive">
<input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
<table class="table table-bordered table-hover check-table" style="min-height:150px;">
......
resources/views/erpOrder.blade.php
......@@ -13,8 +13,6 @@
<body class="">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
......
resources/views/erpOrder/content.blade.php
<div class="wrapper wrapper-content">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<ul class="nav nav-tabs">
<!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">ERP订单</a></li>
</ul>
</ul> -->
<div class="tabs-box">
<div class="row-fluid search-box">
......@@ -211,7 +213,7 @@
<td class="show-list">{{date('Y-m-d', $v['create_time'])}}</td>
<td>
<div class="btn-group btn-group-xs">
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=erp">详情</a>
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=erp" target="_blank">详情</a>
</div>
</td>
</tr>
......
resources/views/express_set/content.blade.php
<div class="page-content">
<ul class="nav nav-tabs">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">自营快递配置</a></li>
</ul>
</ul> -->
<div class="tabs-box">
<div class="row-fluid">
<div class="row-fluid table-responsive">
<table class="table table-hover table-bordered">
<thead>
<tr>
......@@ -26,6 +30,7 @@
</div>
</div>
</div>
</div>
<script>
......
resources/views/layouts/header.blade.php
<div class="row wrapper border-bottom white-bg page-heading">
<a class="navbar-minimalize minimalize-styl-2 btn btn-primary pull-left" style="margin-left:0px;margin-top:18px;" href="#"><i class="fa fa-bars"></i> </a>
<div class="col-lg-10" style="padding-left:0px;">
<div class="col-lg-10 side-section" style="padding-left:0px;">
<h2>{{ $title }}</h2>
<ol class="breadcrumb">
{{--@for ($i = 0; $i < count($paths); $i++)--}}
{{--@if ($i == count($paths) - 1)--}}
{{--<li><a href="{{ $paths[$i]["href"] }}">{{ $paths[$i]["title"] }}</a></li>--}}
{{--@else--}}
{{--<li class="active"><a>{{ $paths[$i]["title"] }}</a></li>--}}
{{--@endif--}}
{{--@endfor--}}
<?php echo Crumbs($menus, $uri); ?>
@if (!empty($paths))
@for ($i = 0; $i < count($paths); $i++)
<li><a href="{{ $paths[$i]["href"] }}">{{ $paths[$i]["title"] }}</a></li>
@endfor
@else
<?php echo Crumbs($menus, $uri) ?>
@endif
</ol>
</div>
</div>
resources/views/layouts/navigation.blade.php
......@@ -16,7 +16,7 @@
</div>
</li>
<?php echo App\Http\Controllers\createMenu($menus, $uri); ?>
<?php echo createMenu($menus, $uri); ?>
</ul>
</div>
</nav>
resources/views/orderlist.blade.php
......@@ -13,8 +13,6 @@
<body class="">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
......
resources/views/orderlist/content.blade.php
<div class="wrapper wrapper-content">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<ul class="nav nav-tabs">
<!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">平台订单</a></li>
</ul>
</ul> -->
<div class="tabs-box">
<div class="row-fluid search-box">
......@@ -172,8 +174,8 @@
@if (in_array('check_test_order', $userPerms))
<dl>
<dt></dt>
<dd>
<label><input type="checkbox" name="test_order"> 所有订单-包括测试</label>
<dd class="test-order">
<label><input type="checkbox" name="test_order">所有订单-包括测试</label>
</dd>
</dl>
@endif
......
resources/views/selfOrder/content.blade.php
<div class="wrapper wrapper-content">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<ul class="nav nav-tabs">
<!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">自营订单</a></li>
</ul>
</ul> -->
<div class="tabs-box">
<div class="row-fluid search-box">
......@@ -149,7 +151,7 @@
@if (in_array('self_check_test_order', $userPerms))
<dl>
<dt></dt>
<dd>
<dd class="test-order">
<label><input type="checkbox" name="test_order"> 所有订单-包括测试</label>
</dd>
</dl>
......
resources/views/self_amount/content.blade.php deleted 100644 → 0
<div class="page-content">
<ul class="nav nav-tabs">
<li><a href="{{URL('self_count')}}">自营订单数统计</a></li>
<li class="active"><a href="javascript:;">订单金额统计</a></li>
</ul>
<div class="tabs-box">
<div class="row-fluid order-amount">
<select name="checkTime" id="checkTime" style="width: 150px; margin-bottom: 0;">
<option value="1">订单付款时间</option>
<option value="2">订单创建时间</option>
</select>
<input type="text" readonly name="time_start" value="{{ !empty($time_start) ? date('Y-m-d H:i:s', $time_start) : '' }}" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})">
<span> - </span>
<input type="text" readonly name="time_end" value="{{ !empty($time_end) ? date('Y-m-d H:i:s', $time_end) : '' }}" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})">
<select name="checkStatus" id="checkStatus" style="width: 80px; margin-bottom: 0;">
<option value="1">全部</option>
<option value="2">已完成</option>
<option value="3">未完成</option>
</select>
<button class="btn btn-primary self-order-amount-search">搜索</button>
</div>
</div>
<div class="tabs-box">
<div class="row-fluid">
<table class="table table-bordered">
<tr>
<th>序号</th>
<th>订单号</th>
<th>订单付款时间</th>
<th>交易完成时间</th>
<th>订单金额</th>
</tr>
<empty name="list">
@if (empty($list))
<tr><td colspan="5">没有更多数据~</td></tr>
@else
@foreach ($list as $key => $vo)
<tr>
<td>{{$key + 1}}</td>
<td>{{$vo['order_sn']}}</td>
<td>
<?php
// 全款
if ($vo['order_pay_type'] == 1) {
echo date('Y-m-d H:i:s', $vo['pay_time']);
} else if ($vo['order_pay_type'] == 2) { // 预付款
$exp = explode(',', $vo['pay_time']);
$pay_amount = explode(',', $vo['pay_amount']);
if (count($exp) == 1) {
// 如果有两条金额记录，支付时间只有一条，则首尾款时间一致
if (count($pay_amount) == 2) {
echo date('Y-m-d H:i:s', $exp[0]).' (尾款)<br>'.date('Y-m-d H:i:s', $exp[0]).' (首款)';
} else {
if ($vo['pay_type'] == 2) {
echo date('Y-m-d H:i:s', $exp[0]).' (首款)';
} else {
echo date('Y-m-d H:i:s', $exp[0]).' (尾款)';
}
}
} else {
if ($exp[0] < $exp[1]){
echo date('Y-m-d H:i:s', $exp[1]).' (尾款)<br>'.date('Y-m-d H:i:s', $exp[0]).' (首款)';
} else {
echo date('Y-m-d H:i:s', $exp[0]).' (尾款)<br>'.date('Y-m-d H:i:s', $exp[1]).' (首款)';
}
}
}
?>
</td>
<td>
@if ($vo['finish_time'] != 0)
{{date('Y-m-d H:i:s', $vo['finish_time'])}}
@endif
</td>
<td>
<?php
if ($vo['currency'] == 1) {
$currency = '￥';
} else {
$currency = '$';
}
if ($vo['order_pay_type'] == 1) { // 全款
echo $currency.$vo['pay_amount'];
} else if ($vo['order_pay_type'] == 2) { // 预付款
$exp = explode(',', $vo['pay_amount']);
if (count($exp) == 1) {
if ($vo['pay_type'] == 2) {
echo $currency.$exp[0].' (首款)';
} else {
echo $currency.$exp[0].' (尾款)';
}
} else {
if ($exp[0] > $exp[1]) {
echo $currency.$exp[0].' (尾款)<br>'.$currency.$exp[1].' (首款)';
} else {
echo $currency.$exp[1].' (尾款)<br>'.$currency.$exp[0].' (首款)';
}
}
}
?>
</td>
</tr>
@endforeach
@endif
</table>
</div>
<div class="row-fluid pagination">
<span>
@if ($checkStatus == 1)
实收金额：￥{{isset($pay_count['rmb_pay']) ? $pay_count['rmb_pay'] : 0}} &nbsp; ${{isset($pay_count['usd_pay']) ? $pay_count['usd_pay'] : 0}}
已完成金额：￥{{!empty($pay_count['rmb_pay_finish']) ? $pay_count['rmb_pay_finish'] : 0}} &nbsp; ${{!empty($pay_count['usd_pay_finish']) ? $pay_count['usd_pay_finish'] : 0}}
未完成金额：￥{{!empty($pay_count['rmb_pay_unfinish']) ? $pay_count['rmb_pay_unfinish'] : 0}} &nbsp; ${{!empty($pay_count['usd_pay_unfinish']) ? $pay_count['usd_pay_unfinish'] : 0}}
@elseif ($checkStatus == 2)
实收金额：￥{{isset($pay_count['rmb_pay']) ? $pay_count['rmb_pay'] : 0}} &nbsp; ${{isset($pay_count['usd_pay']) ? $pay_count['usd_pay'] : 0}}
已完成金额：￥{{!empty($pay_count['rmb_pay_finish']) ? $pay_count['rmb_pay_finish'] : 0}} &nbsp; ${{!empty($pay_count['usd_pay_finish']) ? $pay_count['usd_pay_finish'] : 0}}
@else
实收金额：￥{{isset($pay_count['rmb_pay']) ? $pay_count['rmb_pay'] : 0}} &nbsp; ${{isset($pay_count['usd_pay']) ? $pay_count['usd_pay'] : 0}}
未完成金额：￥{{!empty($pay_count['rmb_pay_unfinish']) ? $pay_count['rmb_pay_unfinish'] : 0}} &nbsp; ${{!empty($pay_count['usd_pay_unfinish']) ? $pay_count['usd_pay_unfinish'] : 0}}
@endif
</span>
<?php echo isset($page) ? $page : ''; ?>
</div>
</div>
</div>
<script>
$.lie.orderamount.index();
var checkTime = '{{$checkTime}}';
var checkStatus = '{{$checkStatus}}';
$('#checkTime').val(checkTime);
$('#checkStatus').val(checkStatus);
$('#side-menu').children('li').last().attr('class', 'active');
$('#side-menu').children('li').last().children('ul').children('li').eq(2).attr('class', 'active');
</script>
\ No newline at end of file
resources/views/self_count/content.blade.php deleted 100644 → 0
<div class="page-content">
<ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">自营订单状态概览</a></li>
<li><a href="{{URL('self_amount')}}">订单金额统计</a></li>
</ul>
<div class="tabs-box">
<div class="row-fluid">
<table class="table">
<tr>
<th>时间</th>
<th title = "指定时间内，新创建的订单，不考虑该订单是否有状态变化。">新创建订单数</th>
<th title = "指定时间内，客户完成了所有款项的支付，并系统对账完成的订单数量。(对应待发货状态)">已付款</th>
<th title = "指定时间内，订单完成发货，但客户还未完成收货状态的订单数量。(对应待收货状态)">待收货</th>
<th title = "指定时间内，订单已完成状态的订单数量(对应已完成状态)">已完成</th>
<th title = "指定时间内，订单已取消的订单数量(对应已取消状态) ">已取消</th>
</tr>
<tr>
<td>今日</td>
<td>{{$count['all']['today']}}</td>
<td>{{$count['paid']['today']}}</td>
<td>{{$count['send']['today']}}</td>
<td>{{$count['done']['today']}}</td>
<td>{{$count['cancel']['today']}}</td>
</tr>
<tr>
<td>近7天</td>
<td>{{$count['all']['week']}}</td>
<td>{{$count['paid']['week']}}</td>
<td>{{$count['send']['week']}}</td>
<td>{{$count['done']['week']}}</td>
<td>{{$count['cancel']['week']}}</td>
</tr>
<tr>
<td>近30天</td>
<td>{{$count['all']['month']}}</td>
<td>{{$count['paid']['month']}}</td>
<td>{{$count['send']['month']}}</td>
<td>{{$count['done']['month']}}</td>
<td>{{$count['cancel']['month']}}</td>
</tr>
</table>
</div>
</div>
</div>
<script>
$.lie.order.index();
</script>
\ No newline at end of file
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 sign in to comment