Skip to content

朱继来 / 后台订单管理

Go to a project
Commit bb865f41 by 朱继来
Options

fix conflicts

parent 515f9825
Expand all
Inline Side-by-side
Showing with 231 additions and 3 deletions
config/perm.php
......@@ -5,12 +5,18 @@
'平台订单' => ['orderlist_check', 'export', 'cancel_order', 'check_account', 'order_send', 'update_address', 'update_invoice', 'check_test_order', 'check_order', 'download_contract', 'send_salesman'],
'ERP订单' => ['erp_order_check'],
'新增订单' => ['add_order_check'],
],
'自营订单' => [
'订单列表' => ['self_order_check', 'self_order_export', 'self_order_cancel', 'self_order_express', 'self_order_invoice_express', 'self_order_update_address', 'self_order_update_invoice', 'self_check_test_order', 'self_order_download_contract'],
'快递配置' => ['self_order_express_set_check'],
'新增订单_线上' => ['add_online_check'],
'新增订单_线下' => ['add_offline_check'],
],
'订单统计' => [
......
config/website.php
......@@ -41,4 +41,21 @@ return [
// www站点
'main_url' => 'https://www.liexin.com/',
// 新增自营线下订单内部账号
'internal-account' => '15011111111',
// 新增用户入口
'add-user-url' => 'http://member.liexin.net/add',
// 查询SKUID接口
'search-skuid' => 'http://footstone.liexin.net/webapi/sku_list',
// 新增SKU入口
'add-sku-url' => 'http://footstone.liexin.net/manage/addsku',
// 查询联营SKU入口
'search-sku-url-1' => 'http://footstone.liexin.net/manage/skulist',
// 查询自营SKU入口
'search-sku-url-2' => 'http://footstone.liexin.net/manage/GoodsList',
];
public/css/detail.css
......@@ -99,3 +99,68 @@ li {
resize: none;
}
/*新增订单*/
.title-tips {
font-size: 12px;
color: #ff9900;
}
.clear {
clear:both;
height: 0;
line-height: 0;
font-size: 0;
}
.sku-info {
width: 100%;
height: auto;
min-height: 100px;
margin-top: 20px;
display: none;
}
.sku-info-left {
float: left;
width: 70%;
}
.sku-info-right {
float: right;
width: 30%;
}
.sku-info-right .table > tbody > tr > th, .sku-info-right .table > tbody > tr > td {
line-height: 0.5;
}
.shop-lists{
margin-top: 10px;
display: none;
}
.shop-lists input {
width: 100px;
}
.amount-section{
margin-top: 40px;
text-align: right;
display: none;
}
/*提交订单成功页面*/
.section-1, .section-3{
text-align: center;
margin: 20px;
}
.section-1 img{
margin-bottom: 20px;
}
.section-2 {
width: 50%;
height: 100px;
border: 1px solid #ccc;
margin: 0 25%;
padding: 25px;
background: #f0f0f0;
}
.section-2 p {
margin-left: 33%;
}
public/js/order.js
......@@ -1491,6 +1491,40 @@
});
})
// 自营审单
$('.self-check').click(function(){
var order_id = $(this).data('id');
layer.open({
title: '审核自营线下订单',
content: '确定审核通过吗？',
btn:['取消','确定'],
yes: function(index, layero){
layer.close(index);
},
btn2: function(index, layero){
$.ajax({
url: '/ajax/selfCheck',
type: 'post',
data: {order_id: order_id},
dataType:'json',
success: function(resp) {
if(resp.errcode === 0){
layer.msg(resp.errmsg || '操作成功');
setTimeout(function(){
location.reload();
}, 1000);
} else {
layer.alert(resp.errmsg || '网络异常');
}
},
error: function(err) {
console.log(err)
}
})
}
});
})
},
}
......
resources/views/addOffline.blade.php 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | {{ $title }}</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('addOffline.css')
@include('addOffline.js')
</head>
<body class="body-small" style="min-width:1024px;">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
@include('addOffline.content')
</div>
</body>
resources/views/addOffline/css.blade.php 0 → 100644
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="/css/style.css" rel="stylesheet">
<link href="/layer/skin/layer.css" rel="stylesheet">
<link href="/css/order.css" rel="stylesheet">
<link href="/css/detail.css" rel="stylesheet">
\ No newline at end of file
resources/views/addOffline/js.blade.php 0 → 100644
<script src="/js/jquery-2.2.1.js"></script>
<script src="/js/jquery.form.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/layer/layer.js"></script>
<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/js/inspinia.min.js"></script>
<script src="/js/common.js"></script>
<script src="/js/add_order.js"></script>
<script src="/js/plugins/DatePicker/WdatePicker.js"></script>
resources/views/detail/content.blade.php
......@@ -554,7 +554,7 @@
@endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
@if ($order_info['status'] >= 2 && in_array('check_account', $userPerms))
@if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
@if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))
<a href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default last-check">对账</a>
@else
......@@ -576,6 +576,10 @@
<p style="padding-left: 5px;">操作</p>
<div class="tabs-box">
<!-- 判断状态和权限 -->
@if ($order_info['status'] == 1)
<a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}" class="btn btn-default">审单</a>
@endif
@if (in_array($order_info['status'], [2, 3, 4]) && in_array('self_order_cancel', $userPerms))
<a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a>
@endif
......
resources/views/layouts/header.blade.php
<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-lg-10" style="height:10px"></div>
<div class="col-lg-10">
<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;">
<h2>{{ $title }}</h2>
<ol class="breadcrumb">
@for ($i = 0; $i < count($paths); $i++)
......
resources/views/success.blade.php 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | {{ $title }}</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('addOffline.css')
@include('addOffline.js')
</head>
<body class="body-small" style="min-width:1024px;">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
@include('success.content')
</div>
</body>
resources/views/success/content.blade.php 0 → 100644
<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">
<div class="ibox-title" style="border-top:0;">
<?php
$currency = $order_info->currency == 1 ? '￥' : '$';
?>
<div class="section-1">
<img src="../img/success.png" alt="提交成功">
<h3>订单提交成功</h3>
<p>下单时间：{{ date('Y-m-d H:i:s', $order_info->create_time) }}</p>
<p class="title-tips"><i class="fa fa-info-circle"></i>为了方便后续操作，请将如下订单编号，备注在ERP中的采购单中。</p>
</div>
<div class="section-2">
<p>订单编号：{{ $order_info->order_sn }}</p>
<p>应付金额：<span class="text-danger">{{ $currency.$order_info->order_amount }}</span></p>
</div>
<div class="section-3">
<a class="btn btn-success" href="/self_order">查看订单</a>
<a class="btn btn-default" href="/add_offline">继续新增</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
// $.lie.add_order.offline();
</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