Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/AddOrderController.php

@@ -137,7 +137,11 @@ Class AddOrderController extends Controller
         if ($request->isMethod('post')) {
             $mobile = $request->input('mobile');
 
+            if (preg_match('/@/', $mobile)) {
+                $user = DB::connection('order')->table('lie_user_main')->where('email', $mobile)->select('user_id', 'email', 'is_test')->first();
+            } else {
                 $user = DB::connection('order')->table('lie_user_main')->where('mobile', $mobile)->select('user_id', 'mobile', 'is_test')->first();
+            }      
 
             if (!empty($user)) {
                 // 收货地址

public/js/add_order.js

@@ -33,12 +33,18 @@
                         success: function (resp) {
                             if (resp.errcode == 0) {
                                 var data = resp.data;
+                                var reg = /@/;
 
                                 $('.user-info').show();
 
                                 // 账号信息
                                 $('.user_id').val(data.user.user_id);
+
+                                if (reg.test(mobile)) {
+                                    $('.user-mobile').text(data.user.email);
+                                } else {
                                     $('.user-mobile').text(data.user.mobile);
+                                }       
 
                                 var is_test = data.user.is_test ? '是' : '否';
                                 $('.user-test').text(is_test);

resources/views/addOffline/content.blade.php

@@ -18,7 +18,7 @@
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <div class="form-group">
-                                            <span>手机号码：</span>
+                                            <span>会员账号：</span>
                                             <span>{{Config('website.internal-account')}}</span>
                                         </div>
                                     </div>

resources/views/addOnline/content.blade.php

@@ -18,7 +18,7 @@
                                     .get-user{padding: 3px 6px; margin-right: 20px;}
                                 </style>
                                 <div class="col-sm-6">
-                                    <input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入用户手机号码">
+                                    <input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
                                     <a class="btn btn-info get-user">获取用户信息</a>
                                     
                                     <span>快捷入口：<a href="{{Config('website.add-user-url')}}" target="_blank">新增用户账号</a></span>
@@ -34,7 +34,7 @@
                                     <div class="row">
                                         <div class="col-sm-6">
                                             <div class="form-group">
-                                                <span>手机号码：</span>
+                                                <span>会员账号：</span>
                                                 <span class="user-mobile"></span>
                                             </div>
                                         </div>

resources/views/addOrder/content.blade.php

@@ -18,7 +18,7 @@
                                     .get-user{padding: 3px 6px; margin-right: 20px;}
                                 </style>
                                 <div class="col-sm-6">
-                                    <input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入用户手机号码">
+                                    <input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
                                     <a class="btn btn-info get-user">获取用户信息</a>
                                     
                                     <span>快捷入口：<a href="{{Config('website.add-user-url')}}" target="_blank">新增用户账号</a></span>
@@ -34,7 +34,7 @@
                                     <div class="row">
                                         <div class="col-sm-6">
                                             <div class="form-group">
-                                                <span>手机号码：</span>
+                                                <span>会员账号：</span>
                                                 <span class="user-mobile"></span>
                                             </div>
                                         </div>