Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 3e5ffe84 by 朱继来
Options

fix conflicts

parents 386fd8ac bc69f462
Inline Side-by-side
Showing with 99 additions and 49 deletions
app/Http/Controllers/AddOrderController.php
......@@ -288,12 +288,15 @@ Class AddOrderController extends Controller
{
if ($request->isMethod('post')) {
$url = Config('website.search-skuid');
$data['sku_id'] = $request->input('sku_id');
$data['id'] = $request->input('sku_id');
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$response = json_decode(curlApi($url, $data, 'POST'), true);
if (!empty($response['data']['data'])) {
return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][$data['sku_id']]];
if (!empty($response['data'])) {
return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']];
} else {
return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
}
......
app/Http/Controllers/PermController.php
......@@ -57,6 +57,8 @@
return 6;
} else if ($department->name == '自营客服') {
return 7;
} else if ($department->name == '运营助理') {
return 8;
} else {
return 0;
}
......
config/website.php
......@@ -52,7 +52,8 @@ return [
// 查询SKUID接口
// 'search-skuid' => 'http://footstone.liexin.net/webapi/sku_list',
'search-skuid' => 'http://www.liexin.com/v3/sku/list',
// 'search-skuid' => 'http://www.liexin.com/v3/sku/list',
'search-skuid' => 'http://api.liexin.com/goods/detail',
// 新增SKU入口
'add-sku-url' => 'http://footstone.liexin.net/manage/addsku',
......
public/css/detail.css
......@@ -152,9 +152,12 @@ li {
padding: 5px;
resize: none;
}
.preferential_price{ /* 优惠金额 */
.preferential_price, .extend_fee { /* 优惠金额、附加费 */
display: none;
}
.price-line {
text-decoration: line-through;
}
/*提交订单成功页面*/
.section-1, .section-3{
......
public/js/add_order.js
......@@ -222,7 +222,7 @@
type: 'post',
data: {sku_id : sku_id.trim()},
dataType: 'json',
success: function (resp) {
success: function (resp) { console.log(resp)
if (resp.errcode != 0) {
layer.msg(resp.errmsg);
return false;
......@@ -236,52 +236,77 @@
$('.goods_name').text(data.goods_name);
$('.brand_name').text(data.brand_name);
$('.supplier_name').text(data.supplier_name);
$('.stock').text(data.stock);
$('.moq').text(data.moq);
$('.mpq').text(data.mpq);
if (goods_type == 1) {
var status = data.goods_status;
} else {
var status = data.status;
}
switch (status) {
case 0: status_val = '待入库'; break;
case 1: status_val = '审核通过（上架）'; break;
case 3: status_val = '下架'; break;
case 4: status_val = '删除'; break;
}
$('.stock').text(data.goods_number);
$('.moq').text(data.min_buy);
$('.mpq').text(data.min_mpq);
// if (goods_type == 1) {
// var status = data.goods_status;
// } else {
// var status = data.status;
// }
// switch (status) {
// case 0: status_val = '待入库'; break;
// case 1: status_val = '审核通过（上架）'; break;
// case 3: status_val = '下架'; break;
// case 4: status_val = '删除'; break;
// }
status_val = data.is_buy ? '是' : '否';
$('.status').text(status_val);
$('.goods_id').val(data.goods_id);
$('.goods_type').val(data.goods_type);
//阶梯价格
if (data.ladder_price != null) {
var len = data.ladder_price.length;
if (data.tiered != null) {
var len = data.tiered.length;
if (len > 0) {
var html = '';
var str = '';
html += '<tr><th>阶梯</th><th>RMB价格</th>';
if (data.ac_type == 1) {
html += '<th>活动价</th>';
}
if (goods_type == 1) {
html += '<th>USD价格</th>';
}
html += '</tr>';
for (var i = 0; i < len; i++) {
html += '<tr>';
if (i == 0) {
if (goods_type == 1) {
str = '<td>$<span class="goods-min-price-us">'+data.ladder_price[i]['price_us']+'</span></td>';
if (data.ac_type) {
html += '<td><span class="goods-min-num">'+data.tiered[i]['purchases']+'</span></td><td>￥<span class="goods-min-price price-line">'+data.tiered[i]['price_cn']+'</span><td>￥<span>'+data.tiered[i]['price_ac']+'</span></td>';
} else {
html += '<td><span class="goods-min-num">'+data.tiered[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+data.tiered[i]['price_cn']+'</span></td>';
}
html += '<tr><td><span class="goods-min-num">'+data.ladder_price[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+data.ladder_price[i]['price_cn']+'</span></td>'+str+'</tr>';
} else {
if (goods_type == 1) {
str = '<td>$<span>'+data.ladder_price[i]['price_us']+'</span></td>';
html += '<td>$<span class="goods-min-price-us">'+data.tiered[i]['price_us']+'</span></td>';
}
} else {
if (data.ac_type) {
html += '<td><span>'+data.tiered[i]['purchases']+'</span></td><td>￥<span class="price-line">'+data.tiered[i]['price_cn']+'</span></td><td>￥<span>'+data.tiered[i]['price_ac']+'</span></td>';
} else {
html += '<td><span>'+data.tiered[i]['purchases']+'</span></td><td>￥<span>'+data.tiered[i]['price_cn']+'</span></td>';
}
if (goods_type == 1) {
html += '<td>$<span>'+data.tiered[i]['price_us']+'</span></td>';
}
}
html += '<tr><td><span>'+data.ladder_price[i]['purchases']+'</span></td><td>￥<span>'+data.ladder_price[i]['price_cn']+'</span></td>'+str+'</tr>';
}
html += '</tr>';
}
$('.ladder_price_table tr:gt(0)').remove();
$('.ladder_price_table').append(html);
// $('.ladder_price_table tr:gt(0)').remove();
$('.ladder_price_table').empty().append(html);
}
}
}
......@@ -312,7 +337,7 @@
return false;
}
if (type == 0) {
if (type == 3 || type == 4) {
layer.msg('仅支持联营商品下单，请在自营订单中下单');
return false;
}
......@@ -614,7 +639,7 @@
return false;
}
layer.msg(resp.errmsg);
layer.alert(resp.errmsg);
},
})
} else {
......@@ -744,6 +769,11 @@
$('.preferential_price_val').empty().text(data.preferential_price_format);
}
if (data.extend_fee) {
$('.extend_fee').show();
$('.extend_fee_val').empty().text(data.extend_fee_format); // 附加费
}
if (goods_type == 2) {
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
}
......
resources/views/addOnline/content.blade.php
......@@ -301,7 +301,7 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>状态：</span>
<span>是否能购买：</span>
<span class="status"></span>
</div>
</div>
......@@ -310,10 +310,10 @@
<div class="sku-info-right">
<table class="table table-hover ladder_price_table">
<tr>
<!-- <tr>
<th>阶梯</th>
<th>RMB价格</th>
</tr>
</tr> -->
</table>
</div>
......@@ -384,6 +384,11 @@
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row extend_fee">
<p class="con-title"><span>附加费：</span></p>
<p class="con-val extend_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>运费：</span></p>
<p class="con-val express_fee_val">0.00</p>
......
resources/views/addOrder/content.blade.php
......@@ -320,7 +320,7 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>状态：</span>
<span>是否能购买：</span>
<span class="status"></span>
</div>
</div>
......@@ -329,11 +329,11 @@
<div class="sku-info-right">
<table class="table table-hover ladder_price_table">
<tr>
<!-- <tr>
<th>阶梯</th>
<th>RMB价格</th>
<th>USD价格</th>
</tr>
</tr> -->
</table>
</div>
......@@ -394,6 +394,11 @@
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row extend_fee">
<p class="con-title"><span>附加费：</span></p>
<p class="con-val extend_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p>
......
resources/views/detail/content.blade.php
......@@ -202,7 +202,6 @@
@else
<th>收货地址</th>
@endif
<th>客户备注</th>
</tr>
<tr>
<td>
......@@ -230,8 +229,6 @@
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
</td>
@endif
<td>{{$order_info['order_remark']}}</td>
</tr>
</table>
</div>
......
resources/views/detail/sendSales.blade.php
......@@ -77,8 +77,8 @@
</td>
</tr>
<!-- 查看权限：当前推送人或管理员、经理、测试 -->
@if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5]))
<!-- 查看权限：当前推送人或管理员、经理、测试、运营助理 -->
@if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5, 8]))
<tr>
<td class="check-table-title" width="20%">备注信息：</td>
<td>
......
resources/views/selfOrder/content.blade.php
......@@ -18,6 +18,7 @@
<li class="order_type_tab active" data-val="">会员账号</li>
<li class="order_type_tab" data-val="1">订单编号</li>
<li class="order_type_tab" data-val="2">型号名称</li>
<li class="order_type_tab" data-val="3">发票抬头</li>
</ul>
</div>
</dd>
......@@ -47,6 +48,7 @@
</div>
</dd>
</dl>
<dl>
<dt>销售类型：</dt>
<dd style="width: 115px;">
......@@ -60,6 +62,8 @@
</dd>
</dl>
<dl>
<!-- <dl>
<dt>客服：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
......@@ -71,7 +75,7 @@
</ul>
</div>
</dd>
</dl>
</dl> -->
<!-- 京东自营角色不显示订单来源 -->
@if ($role != 6)
<dl>
......
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