Commit b7e110d7 by 朱继来

Merge branch 'zjl_merge_20200821'

parents 202f41b1 7fb57c7a
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
} }
} }
var joint_goods_type = ['1', '2']; // 商品联营类型 var joint_goods_type = [1, 2]; // 商品联营类型
if (joint_goods_type.indexOf(data.goods_type) != -1) { if (joint_goods_type.indexOf(data.goods_type) != -1) {
html += '<th>USD价格</th>'; html += '<th>USD价格</th>';
...@@ -502,12 +502,13 @@ ...@@ -502,12 +502,13 @@
} }
if (num < min_buy) { if (num < min_buy) {
num = min_buy; self.val(min_buy);
layer.msg('购买数量低于最小起订量,默认调整为最小起订量'); layer.msg('购买数量低于最小起订量,默认调整为最小起订量');
return
} }
var curr_goods_type = $(this).parents('tr').data('goods_type'); var curr_goods_type = $(this).parents('tr').data('goods_type');
var joint_goods_type = ['1', '2']; // 商品联营类型 var joint_goods_type = [1, 2]; // 商品联营类型
// if (goods_type == 1) { // 联营需要选择交货地 // if (goods_type == 1) { // 联营需要选择交货地
if (joint_goods_type.indexOf(curr_goods_type) != -1) { if (joint_goods_type.indexOf(curr_goods_type) != -1) {
...@@ -516,7 +517,7 @@ ...@@ -516,7 +517,7 @@
var mpl = Number(self.parents('tr').find('.goods_mpl').text()); // 倍数 var mpl = Number(self.parents('tr').find('.goods_mpl').text()); // 倍数
num = Math.ceil(num / mpl) * mpl; num = Math.ceil(num / mpl) * mpl;
} }
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/ajax/changeNum', url: '/ajax/changeNum',
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | 更改发票</title> <title>订单管理后台 | 更改发票</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script> <script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('orderlist.css') @include('detail.css')
@include('orderlist.js') @include('detail.js')
</head> </head>
<body class=""> <body class="">
<div id="wrapper"> <div id="wrapper">
<!-- layouts.navigation --> <!-- layouts.navigation -->
@include('layouts.navigation') @include('layouts.navigation')
<div id="page-wrapper" class="gray-bg"> <div id="page-wrapper" class="gray-bg">
<div class="row"> <div class="row">
@include('changeInvoice.content') @include('changeInvoice.content')
</div> </div>
</div> </div>
</div> </div>
</body> </body>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | 更改收货地址</title> <title>订单管理后台 | 更改收货地址</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script> <script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('orderlist.css') @include('detail.css')
@include('orderlist.js') @include('detail.js')
</head> </head>
<body class=""> <body class="">
<div id="wrapper"> <div id="wrapper">
<!-- layouts.navigation --> <!-- layouts.navigation -->
@include('layouts.navigation') @include('layouts.navigation')
<div id="page-wrapper" class="gray-bg"> <div id="page-wrapper" class="gray-bg">
<div class="row"> <div class="row">
@include('changeShipping.content') @include('changeShipping.content')
</div> </div>
</div> </div>
</div> </div>
</body> </body>
<div class="wrapper"> <div class="wrapper">
@include('layouts.header') @include('layouts.header')
<div class="page-content order-details"> <div class="page-content order-details">
<!-- <ul class="nav nav-tabs"> <!-- <ul class="nav nav-tabs">
@if (isset($_REQUEST['tags'])) @if (isset($_REQUEST['tags']))
<li><a href="{{URL('erp_order')}}">ERP订单</a></li> <li><a href="{{URL('erp_order')}}">ERP订单</a></li>
<li><a href="/details/{{$detail['order_id']}}?tags={{$_REQUEST['tags']}}">订单详情</a></li> <li><a href="/details/{{$detail['order_id']}}?tags={{$_REQUEST['tags']}}">订单详情</a></li>
@else @else
<li><a href="{{URL('list')}}">平台订单</a></li> <li><a href="{{URL('list')}}">平台订单</a></li>
<li><a href="{{URL('details', ['order_id'=>$detail['order_id']])}}">订单详情</a></li> <li><a href="{{URL('details', ['order_id'=>$detail['order_id']])}}">订单详情</a></li>
@endif @endif
<li class="active"><a href="javascript:;">订单收货信息</a></li> <li class="active"><a href="javascript:;">订单收货信息</a></li>
</ul> --> </ul> -->
<?php <?php
$route = \Route::current()->getActionName(); $route = \Route::current()->getActionName();
$action_name = explode('@', $route)[1]; $action_name = explode('@', $route)[1];
?> ?>
<input type="hidden" class="action_type" value="{{$action_name}}"> <input type="hidden" class="action_type" value="{{$action_name}}">
<div class="tabs-box shipping-info"> <div class="tabs-box shipping-info">
<form action="{{URL('changeShipping')}}" method="POST" class="table-responsive"> <form action="{{URL('changeShipping')}}" method="POST" class="table-responsive">
<input type="hidden" name="order_id" value="{{$detail['order_id']}}"> <input type="hidden" name="order_id" value="{{$detail['order_id']}}">
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<caption><h3>订单物流信息</h3></caption> <caption><h3>订单物流信息</h3></caption>
<tr> <tr>
<th width="10%">配送方式</th> <th width="10%">配送方式</th>
<td> <td>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="shipping_type" class="shipping_type" value="1"> 快递配送 <input type="radio" name="shipping_type" class="shipping_type" value="1"> 快递配送
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="shipping_type" class="shipping_type" value="2"> 上门自提 <input type="radio" name="shipping_type" class="shipping_type" value="2"> 上门自提
</label> </label>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="10%">收货人</th> <th width="10%">收货人</th>
<td><input type="text" name="consignee" value="{{$detail['consignee']}}"></td> <td><input type="text" name="consignee" value="{{$detail['consignee']}}"></td>
</tr> </tr>
<tr> <tr>
<th width="10%">联系电话</th> <th width="10%">联系电话</th>
<td><input type="text" name="mobile" value="{{$detail['mobile']}}"></td> <td><input type="text" name="mobile" value="{{$detail['mobile']}}"></td>
</tr> </tr>
<tr class="address-info"> <tr class="address-info">
<th width="10%">收货地址</th> <th width="10%">收货地址</th>
<td> <td>
<select class="address s_province" name="province" default="{{$detail['province']}}"></select> <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_city" name="city" default="{{$detail['city']}}"></select>
<select class="address s_county" name="district" default="{{$detail['district']}}"></select> <select class="address s_county" name="district" default="{{$detail['district']}}"></select>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="10%">详细地址</th> <th width="10%">详细地址</th>
<td><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>
<tr> <tr>
<td colspan="2"><input type="submit" value="保存" class="btn btn-success"></td> <td colspan="2"><input type="submit" value="保存" class="btn btn-success"></td>
</tr> </tr>
</table> </table>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
var tags = "{{isset($_REQUEST['tags']) ? $_REQUEST['tags'] : ''}}"; var tags = "{{isset($_REQUEST['tags']) ? $_REQUEST['tags'] : ''}}";
var shipping_type = "{{isset($order_info) ? $order_info['order_shipping_type'] : 1}}"; var shipping_type = "{{isset($order_info) ? $order_info['order_shipping_type'] : 1}}";
var goods_type = "{{isset($order_info) ? $order_info['order_goods_type'] : 1}}"; var goods_type = "{{isset($order_info) ? $order_info['order_goods_type'] : 1}}";
$('.shipping_type').each(function() { $('.shipping_type').each(function() {
if ($(this).val() == shipping_type) { if ($(this).val() == shipping_type) {
$(this).attr('checked', true); $(this).attr('checked', true);
} }
}) })
// 自提时隐藏省市区 // 自提时隐藏省市区
if (shipping_type == 2) { if (shipping_type == 2) {
$('.address-info').hide(); $('.address-info').hide();
} }
if (goods_type == 2) { if (goods_type == 2) {
var self_addr = "{{ Config('params.self_addr') }}"; var self_addr = "{{ Config('params.self_addr') }}";
} else { } else {
var self_addr = "{{ Config('params.joint_addr') }}"; var self_addr = "{{ Config('params.joint_addr') }}";
} }
$('.shipping_type').change(function() { $('.shipping_type').change(function() {
if ($(this).val() == 2) { if ($(this).val() == 2) {
$('.address-info').hide(); $('.address-info').hide();
$('textarea[name=address]').val(self_addr).attr('disabled', true); $('textarea[name=address]').val(self_addr).attr('disabled', true);
} else { } else {
$('.address-info').show(); $('.address-info').show();
$('textarea[name=address]').val('').attr('disabled', false); $('textarea[name=address]').val('').attr('disabled', false);
} }
}) })
$.lie.order.details(); $.lie.order.details();
</script> </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