Commit 06580cb8 by 朱继来

调整后台下单(针对国际手机号码搜索不到)

parent 7753e303
......@@ -62,6 +62,16 @@ Class AddOrderController extends Controller
$info['title'] = '新增联营订单';
$info['sale_id'] = $request->user->userId;
$crm_user_id = $request->input('user_id', 0);
$info['crm_account'] = '';
if ($crm_user_id) {
$UserMainModel = new UserMainModel();
$user_info = $UserMainModel->find($crm_user_id);
$info['crm_account'] = $user_info['mobile'] ? $user_info['mobile'] : $user_info['email'];
}
return view('addOrder', $info);
}
......@@ -73,6 +83,16 @@ Class AddOrderController extends Controller
$info['title'] = '新增自营线上订单';
$info['sale_id'] = $request->user->userId;
$crm_user_id = $request->input('user_id', 0);
$info['crm_account'] = '';
if ($crm_user_id) {
$UserMainModel = new UserMainModel();
$user_info = $UserMainModel->find($crm_user_id);
$info['crm_account'] = $user_info['mobile'] ? $user_info['mobile'] : $user_info['email'];
}
return view('addOnline', $info);
}
......@@ -92,21 +112,22 @@ Class AddOrderController extends Controller
{
if ($request->isMethod('post')) {
$mobile = $request->input('mobile');
$user_id = $request->input('user_id');
// $user_id = $request->input('user_id');
$goods_type = $request->input('goods_type'); // 类型,1-联营,2-自营
$operator_id = $request->user->userId;
$UserMainModel = new UserMainModel;
if(!empty($user_id) && strlen($request->input('user_id'))<11 ){
$user = $UserMainModel->where('user_id', $user_id)->select('user_id', 'email','mobile', 'is_test')->orderBy('create_time', 'desc')->first();
}else{
// if(!empty($user_id) && strlen($request->input('user_id'))<11 ){
// if(!empty($user_id)){
// $user = $UserMainModel->where('user_id', $user_id)->select('user_id', 'email','mobile', 'is_test')->orderBy('create_time', 'desc')->first();
// }else{
if (preg_match('/@/', $mobile)) {
$user = $UserMainModel->where('email', $mobile)->select('user_id', 'email', 'is_test')->orderBy('create_time', 'desc')->first();
} else {
$user = $UserMainModel->where('mobile', $mobile)->select('user_id', 'mobile', 'is_test')->orderBy('create_time', 'desc')->first();
}
}
// }
if (empty($user)) return ['errcode' => -1, 'errmsg' => '未找用户信息'];
......
......@@ -31,15 +31,13 @@
var loading = this;
// 获取用户信息
function get_user(mobile = -1){
// var mobile = $(this).siblings('.search-user').val();
function get_user(){
var mobile = $('.search-user').val();
if(mobile == -1){
var mobile = getUrlParam('user_id');
}
// if(mobile == -1){
// var mobile = getUrlParam('user_id');
// }
if (!mobile) return false;
// 自营其他订单类型---仓库损耗
......@@ -49,12 +47,10 @@
$('#business_type').val(1).attr('disabled', false);
}
$.ajax({
url: '/ajax/getUserInfo',
type: 'post',
data: {user_id:mobile.trim(), goods_type: goods_type,mobile:mobile},
data: {goods_type: goods_type, mobile: mobile},
dataType: 'json',
success: function (resp) {
if (resp.errcode == 0) {
......@@ -109,12 +105,13 @@
})
}
get_user();
get_user();
$('.get-user').click(function(){
var mobile = $(this).siblings('.search-user').val();
get_user(mobile)
})
$('.get-user').click(function(){
// var mobile = $(this).siblings('.search-user').val();
// get_user(mobile)
get_user();
})
// 选择收货地址
$('.user-info').delegate('#address', 'change', function() {
......
......@@ -6,7 +6,7 @@
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="col-sm-12" >
<input type="text" class="search-user user-mobile" name="user-mobile" value="" placeholder="请输入会员账号">
<input type="text" class="search-user" name="user-mobile" value="{{ $crm_account }}" placeholder="请输入会员账号">
<a class="btn btn-info get-user">获取用户信息</a>
<span>快捷入口:
......
......@@ -6,7 +6,7 @@
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="col-sm-12">
<input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
<input type="text" class="search-user" name="user-mobile" value="{{ $crm_account }}" placeholder="请输入会员账号">
<a class="btn btn-info get-user">获取用户信息</a>
<span>快捷入口:
......
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