Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_form_duplicate_submit_20191031

app/Http/Controllers/AddOrderController.php

@@ -95,11 +95,12 @@ Class AddOrderController extends Controller
             $operator_id = $request->user->userId;
 
             $UserMainModel = new UserMainModel;
-
-            if(!empty($user_id) && strlen($request->input('user_id')<11 ) ){
-                
+          
+            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 (preg_match('/@/', $mobile)) {
                     $user = $UserMainModel->where('email', $mobile)->select('user_id', 'email', 'is_test')->orderBy('create_time', 'desc')->first();
                 } else {

resources/views/addOnline/content.blade.php

@@ -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 user-mobile" name="user-mobile" value="" placeholder="请输入会员账号">
                 <a class="btn btn-info get-user">获取用户信息</a>
                 
                 <span>快捷入口：

resources/views/detail/content.blade.php

@@ -503,16 +503,16 @@
                             <td>{{$v['brand_name']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
-                                <span id="{{$v['rec_id']}}">{{$v['goods_price_format']}}</span>
+                                <span id="{{$v['rec_id']}}">{{$v['goods_price']}}</span>
                             </td>
                             
                             @if (in_array($order_info['order_type'], [2, 3]))
-                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '') }}</td>
                             @elseif ($username != 'vpadmin@ichunt.com')
                                 <td>{{$v['single_pre_price_format']}}</td>
                                 <td>{{$v['single_pre_price_amount']}}</td>
                             @else
-                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '') }}</td>
                             @endif
 
                             <td>{{$v['delivery_time']}}</td>