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

app/Http/Controllers/AddOrderController.php

+<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use DB;
+use Cookie;
+use App\Http\Page;
+use App\Http\Controllers\PermController;
+use App\Http\Error;
+
+function CheckActive($menus, &$arr, $url)
+{
+    for ($i = 0; $i < count($menus); $i++) {
+        $menu = $menus[$i];
+        array_push($arr, $i);
+
+        if (isset($menu->href) && ($menu->href == $url || ($menu->href == '/' && $url == '//')))
+            return true;
+        if (isset($menu->childs) && count($menu->childs) > 0) {
+            $ret = CheckActive($menu->childs, $arr, $url);
+            if ($ret)
+                return $ret;
+        }
+        array_pop($arr);
+    }
+
+    return false;
+}
+
+function createMenuReal($menus, $active, $level)
+{
+    $subclass = ($level == 0) ? 'nav-second-level' : 'nav-third-level';
+
+    $ret = '';
+    for ($ii = 0; $ii < ($level == 0 ? 1 : 2); $ii++) {
+        for ($i = 0; $i < count($menus); $i++) {
+            $menu = $menus[$i];
+            $act = (count($active) > $level && $active[$level] == $i) ? true : false;
+            $actclass = $act ? ' class="active"' : '';
+            $actmenu  = $act ? ' in': '';
+
+            if (isset($menu->childs) && count($menu->childs) > 0) {
+                if ($ii != 0 && $level > 0)
+                    continue;
+                $ret .= '<li' . $actclass . '><a><i class="'
+                    . $menu->class . '"></i><span class="nav-label">'
+                    . $menu->title . '</span><span class="fa arrow"></span></a>'
+                    . '<ul class="nav ' . $subclass . ' collapse' . $actmenu . '">'
+                    . createMenuReal($menu->childs, $act ? $active : [], $level + 1)
+                    . '</ul></li>';
+            } else {
+                if ($ii != 1 && $level > 0)
+                    continue;
+                $ret .= '<li' . $actclass . '><a href="'. $menu->href . '"><i class="' .
+                    $menu->class . '"></i><span class="nav-label">' . $menu->title . '</span></a></li>';
+            }
+        }
+    }
+
+    return $ret;
+}
+
+function createMenu($menus, $url)
+{
+    $actives = [];
+    $ret = CheckActive($menus, $actives, $url);
+    if (!$ret)
+        $actives = [];
+    return createMenuReal($menus, $actives, 0);
+}
+
+Class AddOrderController extends Controller
+{
+	// 页面用户、菜单信息
+    public function getPageInfo(Request $request)
+    {
+        $uri = '/' . $request->path();
+
+        $username = $request->user->email;
+        $useremail= $request->user->email;
+
+        // 菜单
+        $menuconfig = DB::table('config')->where('config_title', '订单系统')->first();
+        $menus = [];
+        if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
+            $menus = [];
+
+        $perm = new PermController;
+
+        // 获取权限菜单
+        if ($request->user->email != 'admin@ichunt.com' && $request->user->userId != 1000) 
+            $menus = $perm->getPermMenu($request, $menus); 
+
+        $data = [
+            'header'    => $request->user->header,
+            'uri'       => $uri,
+            'username'  => $username,
+            'useremail' => $useremail,
+            'menus'     => $menus,
+        ];
+
+        return $data;
+    }
+
+    // 新增联营订单
+    public function addOrder(Request $request)
+    {
+        $info = $this->getPageInfo($request);
+
+        $info['title'] = '新增联营订单';
+        $info['paths'] = [["title" => '新增联营订单', "href" => '#']];
+
+        $info['sale_id'] = $request->user->userId;
+
+        return view('addOrder', $info);
+    }
+
+    // 新增自营线上订单
+    public function addOnline(Request $request)
+    {
+        $info = $this->getPageInfo($request);
+
+        $info['title'] = '新增自营线上订单';
+        $info['paths'] = [["title" => '新增自营线上订单', "href" => '#']];
+
+        $info['sale_id'] = $request->user->userId;
+
+        return view('addOnline', $info);
+    }
+
+    // 获取用户信息
+    public function getUserInfo(Request $request)
+    {
+        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)) {
+                // 收货地址
+                $address = DB::connection('order')->table('lie_user_address')->where('user_id', $user->user_id)->get();
+
+                // 发票信息
+                $invoice = DB::connection('order')->table('lie_taxinfo')->where('user_id', $user->user_id)->get();
+                
+                $info['user'] = $user;
+                $info['address'] = $address;
+                $info['invoice'] = $invoice;
+            }           
+
+            if (isset($info)) {
+                return ['errcode' => 0, 'errmsg' => '', 'data' => $info];
+            } else {
+                return ['errcode' => -1, 'errmsg' => '未找用户信息'];
+            }
+        }
+    }
+
+    // 选择收货地址
+    public function selectAddr(Request $request)
+    {
+        if ($request->isMethod('post')) {
+            $address_id = $request->input('address_id');
+
+            $address = DB::connection('order')->table('lie_user_address')->where('address_id', $address_id)->first();
+
+            $address->province_val = $this->getAddress($address->province);
+            $address->city_val = $this->getAddress($address->city);
+            $address->district_val = $this->getAddress($address->district);
+
+            return ['errcode' => 0, 'errmsg' => '', 'data' => $address];
+        }
+    }
+
+    // 选择发票信息
+    public function selectInv(Request $request)
+    {
+        if ($request->isMethod('post')) {
+            $tax_id = $request->input('tax_id');
+
+            $invoice = DB::connection('order')->table('lie_taxinfo')->where('tax_id', $tax_id)->first();
+
+            $invoice->province_val = $this->getAddress($invoice->consignee_province);
+            $invoice->city_val = $this->getAddress($invoice->consignee_city);
+            $invoice->district_val = $this->getAddress($invoice->consignee_district);
+
+            return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
+        }
+    }
+
+    // 根据发票类型选择发票信息
+    public function selectInvType(Request $request)
+    {
+        if ($request->isMethod('post')) {
+            $user_id = $request->input('user_id');
+            $inv_type = $request->input('inv_type');
+
+            if ($inv_type == 3) {
+                $invoice = DB::connection('order')->table('lie_taxinfo')->where(['user_id' => $user_id, 'inv_type' => $inv_type])->get();
+            } else {
+                $invoice = DB::connection('order')->table('lie_taxinfo')->where('user_id', $user_id)->whereIn('inv_type', [2, 4])->get();
+            }
+            
+            return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
+        }
+    }
+
+    // 获取可用优惠券
+    public function getCoupon(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['order_goods_type'] = $request->input('goods_type');
+            $data['cart_ids'] = $request->input('cart_ids');        
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'ucoupon/bestusebyordersystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>$response['data']];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }
+        }
+    }
+
+    // 查询省市区
+    public function getAddress($id)
+    {
+        $addr = DB::connection('order')->table('lie_region')->where('region_id', $id)->select('region_name')->first();
+
+        return $addr->region_name;
+    }
+
+	// 新增自营线下订单
+    public function addOffline(Request $request) 
+    {
+        $info = $this->getPageInfo($request);
+
+        $info['title'] = '新增自营线下订单';
+        $info['paths'] = [["title" => '新增自营线下订单', "href" => '#']];
+
+        // 默认内部账号ID
+        $internal = DB::connection('order')->table('lie_user_main')->where('mobile', Config('website.internal-account'))->select('user_id')->first();
+        $info['internal_uid'] = $internal->user_id;
+
+        // 默认内部账号收货地址
+        $address = DB::connection('order')->table('lie_user_address')->where(['user_id' => $info['internal_uid'], 'is_default' => 1])->first();
+        
+        $address->province_val = $this->getAddress($address->province);
+        $address->city_val = $this->getAddress($address->city);
+        $address->district_val = $this->getAddress($address->district);
+        
+        $info['address'] = $address;
+
+        $sale_id = $request->user->userId;
+        $info['sale_id'] = $sale_id;
+
+        // 当前登录用户名称
+        $userInfo = DB::table('user_info')->where('userId', $sale_id)->select('name')->first(); 
+        $info['name'] = $userInfo->name;
+
+        // 当前登录用户内部绑定手机
+        $intracode = DB::table('lie_intracode')->where('admin_id', $sale_id)->select('user_id')->first();
+
+        if (!empty($intracode)) {
+            $user = DB::connection('order')->table('lie_user_main')->where('user_id', $intracode->user_id)->select('mobile')->first();
+
+            $info['mobile'] = $user->mobile;
+        }
+
+        return view('addOffline', $info);
+    }  
+
+    // 获取SKU信息
+    public function getSku(Request $request)
+    {
+        if ($request->isMethod('post')) {
+            $url = Config('website.search-skuid');
+            $data['sku_id'] = $request->input('sku_id');
+            
+            $response = json_decode(curlApi($url, $data, 'POST'), true); 
+
+            if (!empty($response['data']['data'])) {
+                return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][0]];
+            } else {
+                return ['errcode' => -1, 'errmsg' => '未找SKU信息'];
+            }
+        }
+    }
+
+    // 添加到购物车
+    public function addCart(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['id'] = $request->input('id');
+            $data['num'] = $request->input('num');
+            $data['buy'] = $request->input('buy');
+            $data['delivery_place'] = $request->input('delivery_place');
+            $data['pf'] = 4;
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'cart/addByOrderSystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+         
+            return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+        }
+    }
+
+    // 获取购物车列表
+    public function cartList(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['type'] = $request->input('type');
+            $data['delivery_place'] = $request->input('delivery_place');
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'cart/listsByOrderSystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+         
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>$response['data']];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }
+        }
+    }
+
+    // 修改购物车商品数量
+    public function changeNum(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['num'] = $request->input('num');
+            $data['cart_id'] = $request->input('cart_id');
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'cart/changeNumByOrderSystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+            
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>$response['data']];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }            
+        }
+    }
+
+    // 删除购物车商品
+    public function deleteGoods(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['cart_id'] = $request->input('cart_id');
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'cart/deleteByOrderSystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+            
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>$response['data']];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }            
+        }
+    }
+
+    // 获取自营运费
+    public function getExpressFee(Request $request) 
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['address_id'] = $request->input('address_id');
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'cart/getExpressFeeByOrder';
+
+            $response = json_decode(curlApi($url, $data), true); 
+            
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>$response['data']];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }            
+        }
+    }
+
+    // 提交订单
+    public function create(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $data['uid'] = $request->input('uid');
+            $data['sale_id'] = $request->input('sale_id');
+            $data['address_id'] = $request->input('address_id');
+            $data['cart_id'] = implode(',', $request->input('cart_ids'));
+            $data['type'] = $request->input('type');
+
+            if ($data['type'] == 3) { // 自营线下订单
+                $data['address_name'] = $request->input('address_name');
+                $data['address_mobile'] = $request->input('address_mobile');
+            } else { // 联营、自营线上订单
+                $data['tax_id'] = $request->input('tax_id');
+                $data['user_coupon_id'] = $request->input('user_coupon_id');
+            }
+
+            $data['k1'] = time();
+            $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+            $url = Config('website.api_domain').'order/createByOrderSystem';
+
+            $response = json_decode(curlApi($url, $data), true); 
+            
+            if ($response['err_code'] == 0) {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg'], 'data'=>['order_id' => $response['data'], 'type' => $data['type']]];
+            } else {
+                return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+            }            
+        }
+    }
+
+    // 提交订单成功页面
+    public function success(Request $request)
+    {
+        $info = $this->getPageInfo($request);
+
+        $order_id = $request->input('order_id');
+        $type = $request->input('type');
+
+        if ($type == 1) {
+            $title = '新增联营订单';
+        } else if ($type == 2) {
+            $title = '新增自营线上订单';
+        } else {
+            $title = '新增自营线下订单';
+        }
+
+        $info['title'] = $title;
+        $info['paths'] = [["title" => $title, "href" => '#']];
+        $info['type'] = $type;
+
+        $order = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->first();
+
+        if ($type != 3) {
+            $user = DB::connection('order')->table('lie_user_main')->where('user_id', $order->user_id)->select('mobile')->first();
+            $info['user_info'] = $user;
+        }
+
+        $info['order_info'] = $order;  
+
+        return view('success', $info);
+    }
+
+    // 自营线下订单审核
+    public function selfCheck(Request $request)
+    {
+        if ($request->isMethod('post')) {        
+            $order_id = $request->input('order_id');
+            $status = $request->input('status');
+
+            // 审核通过推到WMS
+            if ($status == 4) {
+                $data['order_id'] = $order_id;
+                $data['k1'] = time();
+                $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+
+                $url = Config('website.api_domain').'order/wmsOrder';
+
+                $response = json_decode(curlApi($url, $data), true); 
+
+                if ($response['err_code'] == 0) {
+                    $orderInfo = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->first();
+
+                    DB::beginTransaction();
+                    try {
+                        // 插入到order_price
+                        $price['order_id'] = $order_id;
+                        $price['order_sn'] = $orderInfo->order_sn;
+                        $price['price_type'] = -1;
+                        $price['price'] = '-'.$orderInfo->order_amount;
+                        $price['create_time'] = time();
+
+                        $priceAdd = DB::connection('order')->table('lie_order_price')->insert($price);
+
+                        // 添加付款记录
+                        $pay['user_id'] = $orderInfo->user_id; 
+                        $pay['order_id'] = $order_id; 
+                        $pay['order_sn'] = $orderInfo->order_sn; 
+                        $pay['pay_id'] = 0; // 支付方式ID
+                        $pay['pay_name'] = '交通银行'; // 支付方式名
+                        $pay['pay_type'] = 1;
+                        $pay['pay_amount'] = $orderInfo->order_amount;
+                        $pay['is_paid'] = 1;
+                        $pay['create_time'] = time();
+                        $pay['pay_time'] = time();
+
+                        $payLog = DB::connection('order')->table('lie_pay_log')->insert($pay);
+
+                        // 待发货状态
+                        $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status, 'pay_time' => time()]);
+
+                        if ($update && $priceAdd && $payLog) {
+                            DB::commit();
+                        }
+                    } catch (Exception $e) {
+                        DB::rollBack();
+                    }   
+                } else {
+                    return ['errcode' => $response['err_code'], 'errmsg' => $response['err_msg']];
+                }
+
+                $event = '自营线下订单审核通过';
+            } else {
+                $data['order_id'] = $request->input('order_id');
+                $data['operator_id'] = $request->user->userId;
+                $data['cancel_reason'] = '后台审核不通过';
+
+                $url = Config('website.api_domain').'order/selfCancel';
+
+                $data['k1']  = time();
+                $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
+                
+                $temp = json_decode(curlApi($url, $data, "POST"), true);
+
+                $event = '自营线下订单审核不通过';
+
+                return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
+            }  
+            
+            // 操作记录
+            $log['order_id'] = $order_id;
+            $log['operator_id'] = $request->user->userId;
+            $log['operator_type'] = 2;
+            $log['event'] = $event;
+            $log['ip'] = get_client_ip();
+            $log['create_time'] = time();
+            $actionLog = DB::connection('order')->table('lie_order_action_log')->insert($log);
+
+            if (!$actionLog){
+                errorLog(Error::E_ADD_FAILED, '添加操作记录失败');
+                return ['errcode'=>Error::E_ADD_FAILED, 'errmsg'=>'添加操作记录失败'];
+            } 
+
+            if (!empty($update)) {
+                return ['errcode' => 0, 'errmsg' => '操作成功'];
+            } else {
+                return ['errcode' => -1, 'errmsg' => '操作失败'];
+            }            
+        }
+    }
+
+}
\ No newline at end of file

app/Http/Controllers/OrderController.php

@@ -215,6 +215,36 @@ function getGoodsName($goods_id)
     return $goods_info['goods_name'];
 }
 
+// 获取订单来源
+function getOrderSource($order_id)
+{
+    $order = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->select('order_type')->first();
+
+    if ($order) {
+        switch ($order->order_type) {
+            case 1: 
+            case 2: 
+            case 3: 
+                $source = '后台';
+                break;
+            case 0:
+                $order_source = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->select('order_source')->first();
+
+                if (preg_match('/pf=1/', $order_source->order_source)) {
+                    $source = 'PC端';
+                } else if (preg_match('/pf=2/', $order_source->order_source)) {
+                    $source = '移动端';
+                } else {
+                    $source = '未知';
+                }
+        }
+
+        return $source;
+    }
+
+    return false;
+}
+
 Class OrderController extends Controller
 {
     // 首页
@@ -885,6 +915,10 @@ Class OrderController extends Controller
 
                 $data['shippings'] = $shippingInfo;
             }
+
+            $extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $id, 'order_type' => 3])->first();
+
+            $data['extend'] = $extend ? $extend : '';       
         }
 
         return view($view_id, $data);

app/Http/routes.php

@@ -78,6 +78,27 @@ Route::group(['middleware' => 'web'], function () {
     
     Route::post('/ajaxInputCancelReason',                     'OrderController@ajaxInputCancelReason');
 
+    Route::get('/add_order',                                  'AddOrderController@addOrder');
+    Route::post('/ajax/getUserInfo',                          'AddOrderController@getUserInfo');
+    Route::post('/ajax/selectAddr',                           'AddOrderController@selectAddr');
+    Route::post('/ajax/selectInv',                            'AddOrderController@selectInv');
+    Route::post('/ajax/selectInvType',                        'AddOrderController@selectInvType');
+    Route::post('/ajax/getCoupon',                            'AddOrderController@getCoupon');
+
+    Route::get('/add_online',                                 'AddOrderController@addOnline');
+    Route::post('/ajax/getExpressFee',                        'AddOrderController@getExpressFee');
+
+    Route::get('/add_offline',                                'AddOrderController@addOffline');
+    Route::post('/ajax/getSku',                               'AddOrderController@getSku');
+    Route::post('/ajax/addCart',                              'AddOrderController@addCart');
+    Route::post('/ajax/cartList',                             'AddOrderController@cartList');
+    Route::post('/ajax/changeNum',                            'AddOrderController@changeNum');
+    Route::post('/ajax/deleteGoods',                          'AddOrderController@deleteGoods');
+    Route::post('/ajax/create',                               'AddOrderController@create');
+    Route::get('/addorder/success',                           'AddOrderController@success');
+
+    Route::post('/ajax/selfCheck',                            'AddOrderController@selfCheck');
+
 });
 
 // 不需要登陆态

config/perm.php

@@ -5,12 +5,18 @@
 			'平台订单' => ['orderlist_check', 'export', 'cancel_order', 'check_account', 'order_send', 'update_address', 'update_invoice', 'check_test_order', 'check_order', 'download_contract', 'send_salesman'],
 
 			'ERP订单'  => ['erp_order_check'],
+
+			'线上用户下单'  => ['add_order_check'],
 		],
 
 		'自营订单' => [
 			'订单列表' => ['self_order_check', 'self_order_export', 'self_order_cancel', 'self_order_express', 'self_order_invoice_express', 'self_order_update_address', 'self_order_update_invoice', 'self_check_test_order', 'self_order_download_contract'],
 
 			'快递配置' => ['self_order_express_set_check'],
+
+			'线上用户下单'  => ['add_online_check'],
+
+			'内部采购下单'  => ['add_offline_check', 'add_offline_audit'],
 		],
 
 		'订单统计' => [

config/website.php

@@ -41,4 +41,27 @@ return [
     // www站点
     'main_url' => 'https://www.liexin.com/',
 
+    // 新增自营线下订单内部账号
+    'internal-account' => '15011111111',
+
+    // 新增用户入口
+    'add-user-url' => 'http://member.liexin.net/add',
+
+    // 编辑用户入口
+    'check-user-url' => 'http://member.liexin.net/list',
+
+    // 查询SKUID接口
+    // 'search-skuid' => 'http://footstone.liexin.net/webapi/sku_list',
+    'search-skuid' => 'http://www.liexin.com/v3/sku/list',
+
+    // 新增SKU入口
+    'add-sku-url' => 'http://footstone.liexin.net/manage/addsku',
+
+    // 查询联营SKU入口
+    'search-sku-url-1' => 'http://footstone.liexin.net/manage/skulist',
+    // 查询自营SKU入口
+    'search-sku-url-2' => 'http://footstone.liexin.net/manage/GoodsList',
+
+    // 新增自营线上订单付款地址
+    'pay_online_url' => 'http://www.liexin.com/v3/pay/online?id=',
 ];

public/css/detail.css

@@ -99,3 +99,83 @@ li {
 	resize: none;
 }
 
+/*新增订单*/
+.user-info, .address-content, .invoice-content, .order-info {
+	display: none;
+}
+
+.title-tips {
+	font-size: 12px;
+	color: #ff9900;
+}
+
+.clear {
+    clear:both; 
+    height: 0; 
+    line-height: 0; 
+    font-size: 0;
+}
+.sku-info {
+	width: 100%;
+	height: auto;
+	min-height: 100px;
+	margin-top: 20px;
+	display: none;
+}
+.sku-info-left {
+	float: left;
+	width: 70%;
+}
+.sku-info-right {
+	float: right;
+	width: 30%;
+}
+.sku-info-right .table > tbody > tr > th, .sku-info-right .table > tbody > tr > td {
+	line-height: 0.5;
+}
+
+.shop-lists{
+	margin-top: 10px;
+	display: none;
+}
+.shop-lists input {
+	width: 100px;
+}
+
+.amount-section{
+	margin-top: 40px;
+	text-align: right;
+	display: none;
+}
+
+/*提交订单成功页面*/
+.section-1, .section-3{
+	text-align: center;
+	margin: 20px;
+}
+.section-1 img{
+	margin-bottom: 20px;
+}
+.section-2 {
+	width: 50%;
+	height: 100px;
+	border: 1px solid #ccc;
+	margin: 0 25%;
+	padding: 25px;
+	background: #f0f0f0;
+}
+.section-2 p {
+	margin-left: 33%;
+}
+
+.con-title {
+	float: left;
+	width: 100px;
+}
+.con-title span {
+	float: right;
+}
+.con-val {
+	float: left;
+}
+

public/js/add_order.js

++(function($){
+	$.lie = $.lie || {version: "v1.0.0"};
+
+	$.extend($.lie, {
+		add_order:{
+            lyorder: function() { // 联营订单
+                this.bind(1, 1);      
+            },
+
+            zyorder: function() { // 自营线上订单
+                this.bind(2, 1);      
+            },
+
+			offline: function(internal_uid) { // 自营线下订单
+                this.bind(2, 0, internal_uid);
+                this.lists(internal_uid, 2, 0);
+            },
+
+            bind: function(goods_type, is_online, internal_uid='') { //goods_type：1-联营，2-自营 is_online：是否线上订单
+                var loading = this;
+
+                // 获取用户信息
+                $('.get-user').click(function(){
+                    var mobile = $(this).siblings('.search-user').val();
+
+                    if (!mobile) return false;
+
+                    $.ajax({
+                        url: '/ajax/getUserInfo',
+                        type: 'post',
+                        data: {mobile : mobile.trim()},
+                        dataType: 'json',
+                        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);
+
+                                // 快递信息
+                                if (data.address != null) {
+                                    var addr_len = data.address.length;
+                                    var addr_str = '<option value="">请选择</option>';
+
+                                    for (var i = 0; i < addr_len; i++) {
+                                        addr_str += '<option value="'+data.address[i]['address_id']+'">'+data.address[i]['consignee']+'</option>';
+                                    }
+
+                                    $('#address').empty().append(addr_str);
+                                }
+
+                                // 发票信息
+                                if (data.invoice != null) {
+                                    var inv_len = data.invoice.length;
+                                    var inv_str = '<option value="">请选择</option>';
+
+                                    for (var i = 0; i < inv_len; i++) {
+                                        inv_str += '<option value="'+data.invoice[i]['tax_id']+'">'+data.invoice[i]['tax_title']+'</option>';
+                                    }
+
+                                    $('#invoice').empty().append(inv_str);
+                                }
+          
+                                loading.lists(data.user.user_id, goods_type, is_online); // 加载该用户购物车
+
+                                return false;
+                            }
+
+                            layer.msg(resp.errmsg)
+                        },
+                    })
+                })
+
+                // 选择收货地址
+                $('.user-info').delegate('#address', 'change', function() {
+                    var user_id = $('.user_id').val();
+                    var address_id = $(this).val();
+
+                    var goods_amount = parseFloat($('.goods_amount').val());
+                    var currency = $('.currency').val();
+                    var coupon_amount = $('.user_coupon_id').val() != '' ? parseFloat($('#user_coupon').data('amount')) : 0;
+                    
+                    if (address_id) {
+                        $.ajax({
+                            url: '/ajax/selectAddr',
+                            type: 'post',
+                            data: {address_id : address_id},
+                            dataType: 'json',
+                            success: function (resp) {
+                                if (resp.errcode == 0) { 
+                                    var data = resp.data;
+
+                                    $('.address-content').show();
+
+                                    $('.address_id').val(data.address_id);
+                                    $('.address-consignee').text(data.consignee);
+                                    $('.address-mobile').text(data.mobile);
+                                    $('.address-detail').text(data.province_val + data.city_val + data.district_val + data.detail_address);
+
+                                    if (goods_type == 2 && address_id) {
+                                        loading.getExpressFee(user_id, address_id); // 获取自营运费                              
+                                    }
+                                }
+                            }
+                        })
+                    } else {
+                        $('.address-content').hide();
+                        $('.address_id').val('');
+
+                        if (goods_type == 2) {
+                            $('.express_fee').val(0);
+                            $('.express_fee_val').text('￥0.00');
+                        }                        
+
+                        var express_fee = parseFloat($('.express_fee').val()); 
+                        var order_amount = parseFloat(goods_amount-coupon_amount+express_fee).toFixed(4);
+
+                        $('.order_amount').text(currency+order_amount); 
+                    }
+                })
+
+                // 选择发票类型
+                $('.user-info').delegate('.radio-inv-type', 'click', function() { 
+                    var inv_type = $(this).val();
+                    var user_id = $('.user_id').val();
+                    var inv_str = '<option value="">请选择</option>';
+
+                    $('.invoice-content').hide();
+                    $('.tax_id').val('');
+
+                    if (inv_type) {
+                        $.ajax({
+                            url: '/ajax/selectInvType',
+                            type: 'post',
+                            data: {user_id: user_id, inv_type: inv_type},
+                            dataType: 'json',
+                            success: function (resp) { console.log(resp)
+                                if (resp.errcode == 0) {
+                                    var data = resp.data;
+
+                                    if (data != null) {
+                                        var inv_len = data.length;  
+
+                                        for (var i = 0; i < inv_len; i++) {
+                                            inv_str += '<option value="'+data[i]['tax_id']+'">'+data[i]['tax_title']+'</option>';
+                                        }
+
+                                        $('#invoice').empty().append(inv_str);
+                                    } else {
+                                        $('#invoice').empty().append(inv_str);
+                                    }
+                                }
+                            }
+                        })
+                    } else {
+                        $('#invoice').empty().append(inv_str);
+                    }
+                })
+
+                // 选择发票信息
+                $('.user-info').delegate('#invoice', 'change', function() {
+                    var tax_id = $(this).val();
+                    
+                    if (tax_id) {
+                        $.ajax({
+                            url: '/ajax/selectInv',
+                            type: 'post',
+                            data: {tax_id : tax_id},
+                            dataType: 'json',
+                            success: function (resp) {
+                                if (resp.errcode == 0) { 
+                                    var data = resp.data;
+                                    var inv_type_val = '';
+
+                                    $('.invoice-content').show();
+
+                                    $('.tax_id').val(data.tax_id);
+                                    $('.tax_title').text(data.tax_title);
+                                    $('.tax_no').text(data.tax_no);
+                                    $('.bank_account').text(data.bank_account);
+                                    $('.bank_name').text(data.bank_name);
+                                    $('.company_phone').text(data.company_phone);
+                                    $('.company_address').text(data.company_address);
+                                    $('.consignee').text(data.consignee);
+                                    $('.consignee_phone').text(data.consignee_phone);
+                                    $('.consignee_address').text(data.province_val + data.city_val + data.district_val + data.consignee_address);
+
+                                    switch (data.inv_type) {
+                                        case 2: inv_type_val = '普通发票'; break;
+                                        case 3: inv_type_val = '增值税专用发票'; break;
+                                        case 4: inv_type_val = '增值税普通发票'; break;
+                                        default: inv_type_val = '未知'; break;
+                                    }
+
+                                    $('.inv_type').text(inv_type_val);
+                                }
+                            }
+                        })
+                    } else {
+                        $('.invoice-content').hide();
+                        $('.tax_id').val('');
+                    }
+                })
+
+                // 获取SKU信息
+                $('.get-sku').click(function() {
+                    var sku_id = $(this).siblings('.search-sku').val();
+
+                    if (!sku_id) return false;
+
+                    $.ajax({
+                        url: '/ajax/getSku',
+                        type: 'post',
+                        data: {sku_id : sku_id.trim()},
+                        dataType: 'json',
+                        success: function (resp) {
+                            if (resp.errcode != 0) {
+                                layer.msg(resp.errmsg);
+                                return false;
+                            }
+
+                            $('.sku-info').show();
+
+                            var data = resp.data;
+                            var status_val = '';
+
+                            $('.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;
+                            }
+                            
+                            $('.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 (len > 0) {
+                                    var html = '';
+                                    var str = '';
+
+                                    for (var i = 0; i < len; i++) {
+                                        if (i == 0) {
+                                            if (goods_type == 1) {
+                                                str = '<td>$<span class="goods-min-price-us">'+data.ladder_price[i]['price_us']+'</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 += '<tr><td><span>'+data.ladder_price[i]['purchases']+'</span></td><td>￥<span>'+data.ladder_price[i]['price_cn']+'</span></td>'+str+'</tr>'; 
+                                        }     
+                                    }
+
+                                    $('.ladder_price_table tr:gt(0)').remove();
+                                    $('.ladder_price_table').append(html);
+                                }
+                            }    
+                        }
+                    })
+                })
+
+                // 添加到商品列表
+                $('.add-to-lists').click(function() {
+                    var goods_min_num = $(this).parents('.sku-info').find('.goods-min-num').text();
+                    var goods_id = $(this).siblings('.goods_id').val();
+                    var type = $(this).siblings('.goods_type').val();
+                    var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
+                    var user_id = 0;
+
+                    if (is_online) { // 线上订单
+                        user_id = $('.user_id').val();
+
+                        if (!user_id) {
+                            layer.msg('请先选择用户');
+                            return false;
+                        }
+
+                        if (goods_type == 1) { // 联营需要选择交货地
+                            delivery_place = $('input[name=delivery_place]:checked').val();
+
+                            if (delivery_place == null) {
+                                layer.msg('请选择交货地');
+                                return false;
+                            }
+
+                            if (type == 0) {
+                                layer.msg('仅支持联营商品下单，请在自营订单中下单');
+                                return false;
+                            }
+
+                            var goods_min_price = $(this).parents('.sku-info').find('.goods-min-price').text();
+                            var goods_min_price_us = $(this).parents('.sku-info').find('.goods-min-price-us').text();
+
+                            if (delivery_place == 1) {
+                                if (goods_min_price == 0) {
+                                    layer.msg('缺少RMB价格，商品添加失败');
+                                    return false;
+                                }
+                            } else if (delivery_place == 2) {
+                                if (goods_min_price_us == 0) {
+                                    layer.msg('缺少美金价格，商品添加失败');
+                                    return false;
+                                }
+                            }                         
+                        } else {
+                            if (type == 2) {
+                                layer.msg('仅支持自营商品下单，请在联营订单中下单');
+                                return false;
+                            }
+                        }
+                    }
+
+                    user_id = internal_uid ? internal_uid : user_id;
+
+                    var datax = {
+                        uid: user_id,
+                        id: goods_id,
+                        num: goods_min_num,
+                        buy: -1,
+                        delivery_place: delivery_place, 
+                    }
+
+                    $.ajax({
+                        type: "POST",
+                        url: '/ajax/addCart',
+                        data: datax,
+                        dataType: "json",
+                        success: function(resp){
+                            layer.msg(resp.errmsg);
+                            loading.lists(user_id, goods_type, is_online); // 加载购物车列表
+                            return false;
+                        },
+                    })                
+                })
+
+                // 切换交货地
+                $('.delivery_place').click(function() {
+                    var user_id = $('.user_id').val();
+                    var delivery_place = $(this).val();
+
+                    loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
+                })
+
+                // 调整商品数量
+                $('.shop-table').delegate('.goods_num', 'blur', function() {
+                    var self = $(this);
+                    var num = self.val();
+                    var cart_id = self.parents('tr').data('cid');
+                    var user_id = 0;
+
+                    if (is_online) {
+                        user_id = $('.user_id').val();
+                    }
+
+                    user_id = internal_uid ? internal_uid : user_id;
+
+                    $.ajax({
+                        type: "POST",
+                        url: '/ajax/changeNum',
+                        data: {uid : user_id, num : num, cart_id : cart_id},
+                        dataType: "json",
+                        success: function(resp){
+                            if (resp.errcode == 0) {
+                                loading.lists(user_id, goods_type, is_online); // 加载购物车列表
+                                // var data = resp.data;
+
+                                // self.parents('tr').find('.goods_price').text(data.goods_price);
+                                // self.parents('tr').find('.goods_amount').text(data.goods_amount_format);
+                            }
+
+                            layer.msg(resp.errmsg);
+                        },
+                    })
+                })
+
+                // 删除商品
+                $('.shop-table').delegate('.remove-goods', 'click', function() {
+                    var self = $(this);
+                    var cart_id = self.parents('tr').data('cid');
+                    var user_id = 0;
+
+                    if (is_online) {
+                        user_id = $('.user_id').val();
+                    }
+
+                    user_id = internal_uid ? internal_uid : user_id;
+
+                    layer.open({
+                        title: '删除提示',
+                        content: '确定删除该商品吗？',
+                        btn: ['确定', '取消'],
+                        btn1: function () {
+                            $.ajax({
+                                type: "POST",
+                                url: '/ajax/deleteGoods',
+                                data: {uid : user_id, cart_id : cart_id},
+                                dataType: "json",
+                                success: function(resp){
+                                    layer.msg(resp.errmsg);
+                                    // self.parents('tr').remove();
+                                    loading.lists(user_id, goods_type, is_online); // 加载购物车列表
+                                    return false;
+                                },
+                            })
+                        }, 
+                        btn2: function (index) {
+                            layer.close(index);
+                        }
+                    })    
+                })
+
+                // 选择优惠券
+                $('#user_coupon').change(function(){
+                    var coupon_id = $(this).val();
+                    var goods_amount = parseFloat($('.goods_amount').val());
+                    var currency = $('.currency').val();
+                    var coupon_amount = parseFloat($(this).data('amount'));
+                    var express_fee = 0;
+
+                    if (goods_type == 2) {
+                        express_fee = parseFloat($('.express_fee').val());
+                    }
+
+                    if (coupon_id) {      
+                        var order_amount = parseFloat(goods_amount-coupon_amount+express_fee).toFixed(4);
+
+                        $('.user_coupon_id').val(coupon_id);
+                        $('.order_amount').text(currency+order_amount);
+                    } else {
+                        $('.user_coupon_id').val('');
+
+                        var order_amount = parseFloat(goods_amount+express_fee).toFixed(4);
+                        $('.order_amount').text(currency+order_amount);
+                    }
+                })
+
+                // 提交订单
+                $('.submit-order').click(function() {
+                    var address_id = $('input[name=address_id]').val();
+                    var type = $(this).data('type');
+                    var cart_ids = [];
+                    var user_id = 0;
+
+                    if (is_online) {
+                        user_id = $('.user_id').val();
+                    }
+
+                    user_id = internal_uid ? internal_uid : user_id;
+
+                    $('.shop-table tbody tr').each(function() {
+                        var cid = $(this).data('cid');
+                        cart_ids.push(cid);
+                    })
+
+                    if (cart_ids.length > 0) {
+                        var datax = {
+                            uid: user_id,
+                            sale_id: sale_id,
+                            address_id: address_id,
+                            type: type,
+                            cart_ids: cart_ids,
+                        }
+
+                        if (type == 3) { // 自营线下订单
+                            datax.address_name = $('input[name=address_name]').val();
+                            datax.address_mobile = $('input[name=address_mobile]').val();
+                        } else { // 联营、自营线上订单
+                            var tax_id = $('.tax_id').val();
+                            var inv_type = $('input[name=inv_type]:checked').val();
+                            var user_coupon_id = $('.user_coupon_id').val();
+
+                            if (!address_id) {
+                                layer.msg('请选择快递信息');
+                                return false;
+                            }
+
+                            if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
+                                layer.msg('请选择发票信息');
+                                return false;
+                            }
+
+                            datax.tax_id = tax_id;
+                            datax.user_coupon_id = user_coupon_id;
+                        }
+
+                        $.ajax({
+                            type: "POST",
+                            url: '/ajax/create',
+                            data: datax,
+                            dataType: "json",
+                            success: function(resp){
+                                if (resp.errcode == 0) {
+                                    layer.msg(resp.errmsg);
+                                    location.href = '/addorder/success?order_id='+resp.data.order_id+'&type='+resp.data.type;
+                                   
+                                    return false;
+                                }   
+
+                                layer.msg(resp.errmsg); 
+                            },
+                        })
+                    } else {
+                        layer.msg('请先添加商品');
+                    }
+                })
+            },
+
+            // 购物车商品列表
+            lists: function(user_id, goods_type, is_online, delivery_place="1") { // type：1-联营，2-自营
+                var self = this;
+
+                $.ajax({
+                    type: 'post',
+                    url: '/ajax/cartList',
+                    data: {uid : user_id, type: goods_type, delivery_place: delivery_place},
+                    dataType: "json",
+                    success: function(resp){
+                        if (resp.errcode == 0) {
+                            var list = resp.data.list;
+                            var len = list.length;
+                            var html = '';
+                            var order_amount = 0;
+                            var currency = '';
+                            var cart_ids = [];
+
+                            if (len > 0) {
+                                for (var i = 0; i < len; i++) {
+                                    html += '<tr data-cid="'+list[i].cart_id+'">'+
+                                        '<td>'+list[i].goods_id+'</td>'+
+                                        '<td>'+list[i].goods_name+'</td>'+
+                                        '<td>'+list[i].brand_name+'</td>'+
+                                        '<td><input type="text" class="goods_num" name="goods_num" value="'+list[i].goods_number+'"></td>'+
+                                        '<td class="goods_price">'+list[i].goods_price+'</td>'+
+                                        '<td class="goods_amount">'+list[i].goods_amount_format+'</td>'+
+                                        '<td>'+list[i].delivery_time+'</td>'+
+                                        '<td>'+list[i].supplier_name+'</td>'+
+                                        '<td><a class="btn btn-danger btn-xs remove-goods">删除</a></td>'+
+                                    '</tr>';
+
+                                    cart_ids.push(list[i].cart_id); // 购物车ID集合
+
+                                    order_amount += list[i].goods_number * list[i].goods_price;
+                                }
+
+                                order_amount = parseFloat(order_amount).toFixed(4);
+
+                                if (list[0].currency == 1) {
+                                    currency = '￥';    
+                                } else {
+                                    currency = '$';
+                                }
+
+                                $('.shop-lists').show();
+                                $('.shop-table tbody').empty().append(html);
+
+                                if (is_online) {
+                                    $('.order-info').show();
+                                    $('.goods_amount').val(order_amount);
+                                    $('.currency').val(currency);
+                                    $('.goods_amount_val').empty().text(currency+order_amount);
+                                    $('.order_amount').empty().text(currency+order_amount);
+
+                                    self.getCoupon(user_id, goods_type, cart_ids); // 获取最优的优惠券
+
+                                    var address_id = $('.address_id').val();
+                                    if (goods_type == 2 && address_id) {
+                                        self.getExpressFee(user_id, address_id); // 获取自营运费
+
+                                        var express_fee = $('.express_fee').val();
+                                        $('.order_amount').empty().text(currency+order_amount+express_fee);
+                                    }
+                                } else {
+                                    $('.amount-section').show();
+                                    $('.order_amount').empty().text(currency+order_amount); 
+                                }  
+                            }
+                        } else {
+                            $('.shop-lists').hide();
+
+                            if (is_online) {
+                                // $('.goods_amount').val(''); // 清空值
+                                $('.order-info').hide(); 
+                            } else {
+                                $('.amount-section').hide();
+                            } 
+                            
+                        }
+                    },
+                });
+            },
+
+            // 可用优惠券
+            getCoupon: function (user_id, goods_type, cart_ids)
+            {
+                $.ajax({
+                    type: 'post',
+                    url: '/ajax/getCoupon',
+                    data: {uid : user_id, goods_type: goods_type, cart_ids : cart_ids},
+                    dataType: "json",
+                    success: function(resp){
+                        if (resp.errcode == 0) {
+                            var data = resp.data;
+                            var str = '<option value="">请选择</option>';
+
+                            if (data.user_coupon_id != null) {
+                                layer.msg(resp.errmsg);
+
+                                str += '<option value="'+data.user_coupon_id+'">'+data.coupon_name+'</option>';
+                                
+                                $('#user_coupon').attr('data-amount', data.sale_amount); // 优惠券金额
+                                $('#user_coupon').empty().append(str);
+
+                                return false;
+                            } else {
+                                $('#user_coupon').empty().append(str);
+                            }
+                        }
+
+                        return false;
+                    }
+                })
+            },
+
+            // 获取自营运费
+            getExpressFee: function(user_id, address_id) {
+                $.ajax({
+                    type: 'post',
+                    url: '/ajax/getExpressFee',
+                    data: {uid: user_id, address_id: address_id},
+                    dataType: "json",
+                    success: function(resp){
+                        if (resp.errcode == 0) { 
+                            var data = parseFloat(resp.data);
+
+                            $('.express_fee').val(data);
+                            $('.express_fee_val').empty().text('￥' + data);
+
+                            var goods_amount = parseFloat($('.goods_amount').val());
+                            var currency = $('.currency').val();
+                            var coupon_amount = $('.user_coupon_id').val() != '' ? parseFloat($('#user_coupon').data('amount')) : 0;
+                            var order_amount = parseFloat(goods_amount-coupon_amount+data).toFixed(4);
+
+                            $('.order_amount').empty().text(currency+order_amount);  
+                        }
+
+                        return false;
+                    }
+                })
+            },
+        }
+    });
+})(jQuery)
\ No newline at end of file

public/js/order.js

@@ -1491,6 +1491,58 @@
                     });
                 })
 
+                // 自营审单
+                $('.self-check').click(function(){
+                    var order_id = $(this).data('id');
+
+                    layer.open({
+                        title: '审核自营线下订单',
+                        content: '确定审核通过吗？',
+                        btn:['通过', '不通过'],
+                        yes: function(index, layero){ 
+                            $.ajax({
+                                url: '/ajax/selfCheck',
+                                type: 'post',
+                                data: {order_id: order_id, status: 4},
+                                dataType:'json',
+                                success: function(resp) {
+                                    if(resp.errcode === 0){
+                                        layer.msg(resp.errmsg || '操作成功');
+                                        setTimeout(function(){
+                                            location.reload();
+                                        }, 1000);
+                                    } else {
+                                        layer.alert(resp.errmsg || '网络异常');
+                                    }
+                                },
+                                error: function(err) {
+                                    console.log(err)
+                                }
+                            })
+                        },
+                        btn2: function(index, layero){ // 不通过--取消订单
+                            $.ajax({
+                                url: '/ajax/selfCheck',
+                                type: 'post',
+                                data: {order_id: order_id, status: -1},
+                                dataType:'json',
+                                success: function(resp) {
+                                    if(resp.errcode === 0){
+                                        layer.msg(resp.errmsg || '操作成功');
+                                        setTimeout(function(){
+                                            location.reload();
+                                        }, 1000);
+                                    } else {
+                                        layer.alert(resp.errmsg || '网络异常');
+                                    }
+                                },
+                                error: function(err) {
+                                    console.log(err)
+                                }
+                            })
+                        }
+                    });
+                })
             },
 		}
 

resources/views/addOffline.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>订单管理后台 | {{ $title }}</title>
+  <script>document.domain="{{ Config::get('website.domain') }}";</script>
+
+  @include('addOffline.css')
+  @include('addOffline.js')
+</head>
+
+<body class="body-small" style="min-width:1024px;">
+    <div id="wrapper">
+      <!-- layouts.navigation --> 
+      @include('layouts.navigation')
+
+      @include('addOffline.content')
+    </div>
+</body>
+

resources/views/addOffline/content.blade.php

+<div id="page-wrapper" class="gray-bg">
+    @include('layouts.header')
+
+    <div class="wrapper wrapper-content">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <form>
+                        <div class="ibox-title" style="border-top:0;">
+                            <h3>客户信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="account-info">
+                                <h4>账户信息 <span class="title-tips"><i class="fa fa-info-circle"></i> 此账号为内部下单账号，前台不可登录。</span></h4>
+                                
+                                <input type="hidden" name="user_id" value="{{$internal_uid}}">
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>会员账号：</span>
+                                            <span>{{Config('website.internal-account')}}</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>密码：</span>
+                                            <span>******</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>测试账号：</span>
+                                            <span>否</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div> 
+                            
+                            <div class="express-info">
+                                <h4>快递信息</h4>
+                                <input type="hidden" name="address_id" value="{{ $address->address_id }}">
+                                <input type="hidden" name="address_name" value="{{ $name }}">
+                                <input type="hidden" name="address_mobile" value="{{ $mobile }}">
+
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>收货方式：</span>
+                                            <span>快递上门</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>联系人：</span>
+                                            <span>{{$name}}</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>联系电话：</span>
+                                            <span>{{$mobile}}</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <span>收货地址：</span>
+                                            <span>{{ $address->province_val.$address->city_val.$address->district_val.$address->detail_address }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="ibox-title">
+                            <h3>商品信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="row">
+                                <style>
+                                    .search-sku{width: 240px !important;}
+                                    .label-prompt{padding: 6px 6px;}
+                                    .get-sku{padding: 3px 6px; margin-right: 20px;}
+                                </style>
+                                <div class="col-sm-6">
+                                    <input type="text" class="search-sku" name="sku_id" value="" placeholder="请输入SKUID">
+                                    <a class="btn btn-info get-sku">获取SKU信息</a>
+                                    
+                                    <span>快捷入口：<a href="{{Config('website.search-sku-url-2')}}" target="_blank">查询SKU</a></span>
+                                </div>   
+                            </div>
+                            
+                            <!-- SKU信息 -->
+                            <div class="sku-info">
+                                <h4>型号信息</h4>
+                                
+                                <div class="sku-info-left">
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>SKU型号：</span>
+                                                <span class="goods_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>制造商：</span>
+                                                <span class="brand_name"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>供应商：</span>
+                                                <span class="supplier_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>库存数量：</span>
+                                                <span class="stock"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>起订量：</span>
+                                                <span class="moq"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>标准包装量：</span>
+                                                <span class="mpq"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>状态：</span>
+                                                <span class="status"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+  
+                                <div class="sku-info-right">
+                                    <table class="table table-hover ladder_price_table">
+                                        <tr>
+                                            <th>阶梯</th>
+                                            <th>RMB价格</th>
+                                        </tr>                                
+                                    </table>
+                                </div>
+
+                                <input type="hidden" name="goods_id" class="goods_id" value="">
+
+                                <div class="clear"></div> 
+
+                                <a class="btn btn-success add-to-lists">添加至商品列表</a>  
+                            </div>
+
+                            <!-- 商品列表 -->
+                            <div class="shop-lists">
+                                <table class="table table-bordered table-hover shop-table">
+                                    <thead>
+                                        <tr>
+                                            <th width="15%">SKUID</th>
+                                            <th width="20%">商品名称</th>
+                                            <th width="10%">制造商</th>
+                                            <th width="10%">采购数量</th>
+                                            <th width="10%">采购单价</th>
+                                            <th width="10%">小计</th>
+                                            <th width="10%">货期</th>
+                                            <th width="10%">供应商</th>
+                                            <th width="5%">操作</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody></tbody>
+                                </table>
+                            </div>
+
+                            <!-- 订单金额 -->
+                            <div class="amount-section">
+                                <p>应付金额：<span class="text-danger order_amount"></span></p>
+                            </div>
+                        </div>
+
+                        <div class="ibox-title" style="text-align: right;">
+                            <a class="btn btn-success submit-order" data-type="3">提交</a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>  
+    var internal_uid = "{{$internal_uid}}";
+    var sale_id = "{{$sale_id}}";
+    var URL_api = "{{Config('website.api_domain')}}";
+
+	$.lie.add_order.offline(internal_uid);
+</script>
\ No newline at end of file

resources/views/addOffline/css.blade.php

+<link href="/css/bootstrap.min.css" rel="stylesheet">
+<link href="/font-awesome/css/font-awesome.css" rel="stylesheet">
+<link href="/css/style.css" rel="stylesheet">
+<link href="/layer/skin/layer.css" rel="stylesheet">
+<link href="/css/order.css" rel="stylesheet">
+<link href="/css/detail.css" rel="stylesheet">
\ No newline at end of file

resources/views/addOffline/js.blade.php

+<script src="/js/jquery-2.2.1.js"></script>
+<script src="/js/jquery.form.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+<script src="/layer/layer.js"></script>
+<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
+<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+<script src="/js/inspinia.min.js"></script>
+
+<script src="/js/common.js"></script>
+<script src="/js/add_order.js"></script>
+<script src="/js/plugins/DatePicker/WdatePicker.js"></script>

resources/views/addOnline.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>订单管理后台 | {{ $title }}</title>
+  <script>document.domain="{{ Config::get('website.domain') }}";</script>
+
+  @include('addOffline.css')
+  @include('addOffline.js')
+</head>
+
+<body class="body-small" style="min-width:1024px;">
+    <div id="wrapper">
+      <!-- layouts.navigation --> 
+      @include('layouts.navigation')
+
+      @include('addOnline.content')
+    </div>
+</body>
+

resources/views/addOnline/content.blade.php

+<div id="page-wrapper" class="gray-bg">
+    @include('layouts.header')
+
+    <div class="wrapper wrapper-content">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <form>
+                        <div class="ibox-title" style="border-top:0;">
+                            <h3>客户信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="row" style="margin-bottom: 30px;">
+                                <style>
+                                    .search-user{width: 240px !important;}
+                                    .label-prompt{padding: 6px 6px;}
+                                    .get-user{padding: 3px 6px; margin-right: 20px;}
+                                </style>
+                                <div class="col-sm-12">
+                                    <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" style="margin-right: 10px;">新增用户账号</a>
+                                        <a href="{{Config('website.check-user-url')}}" target="_blank">查询/编辑用户账号</a>
+                                    </span>
+                                </div>  
+                            </div>
+
+                            <div class="user-info">
+                                <div class="account-info">
+                                    <h4>账户信息</h4>
+                                    
+                                    <input type="hidden" name="user_id" class="user_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>会员账号：</span>
+                                                <span class="user-mobile"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>密码：</span>
+                                                <span>******</span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>测试账号：</span>
+                                                <span class="user-test"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div> 
+                                
+                                <div class="express-info">
+                                    <h4>快递信息 <span class="title-tips"><i class="fa fa-info-circle"></i>必须在下单前填写快递信息</span></h4>
+
+                                    <input type="hidden" name="address_id" class="address_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>收货方式：</span>
+                                                <span>快递上门</span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span><i class="text-danger">*</i> 选择收货地址：</span>
+                                                <select name="address" id="address">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
+                                    <div class="address-content">
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系人：</span>
+                                                    <span class="address-consignee"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系电话：</span>
+                                                    <span class="address-mobile"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>收货地址：</span>
+                                                    <span  class="address-detail"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>     
+                                </div>
+
+                                <div class="invoice-info">
+                                    <h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>自营订单没有审核流程，所以一定要完善发票资料。</span></h4>
+
+                                    <input type="hidden" name="tax_id" class="tax_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>发票类型：</span>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value="3"> 增值税专用发票
+                                                </label>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value="4"> 增值税普通发票
+                                                </label>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value=""> 不开发票
+                                                </label>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span><i class="text-danger">*</i> 选择发票信息：</span>
+                                                <select name="invoice" id="invoice">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
+                                    <div class="invoice-content">
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>发票抬头：</span>
+                                                    <span class="tax_title"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>税务登记号：</span>
+                                                    <span class="tax_no"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>银行卡号：</span>
+                                                    <span class="bank_account"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>开户银行：</span>
+                                                    <span class="bank_name"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>公司电话：</span>
+                                                    <span class="company_phone"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>公司注册地址：</span>
+                                                    <span class="company_address"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系人：</span>
+                                                    <span class="consignee"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系电话：</span>
+                                                    <span class="consignee_phone"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>收货地址：</span>
+                                                    <span class="consignee_address"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>发票类型：</span>
+                                                    <span class="inv_type"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>     
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="ibox-title">
+                            <h3>商品信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="row">
+                                <style>
+                                    .search-sku{width: 240px !important;}
+                                    .label-prompt{padding: 6px 6px;}
+                                    .get-sku{padding: 3px 6px; margin-right: 20px;}
+                                </style>
+                                <div class="col-sm-12">
+                                    <input type="text" class="search-sku" name="sku_id" value="" placeholder="请输入SKUID">
+                                    <a class="btn btn-info get-sku">获取SKU信息</a>
+                                    
+                                    <span>快捷入口：
+                                        <a href="{{Config('website.search-sku-url-2')}}" target="_blank">查询SKU</a>
+                                    </span>
+                                </div>   
+                            </div>
+                            
+                            <!-- SKU信息 -->
+                            <div class="sku-info">
+                                <h4>型号信息</h4>
+                                
+                                <div class="sku-info-left">
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>SKU型号：</span>
+                                                <span class="goods_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>制造商：</span>
+                                                <span class="brand_name"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>供应商：</span>
+                                                <span class="supplier_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>库存数量：</span>
+                                                <span class="stock"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>起订量：</span>
+                                                <span class="moq"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>标准包装量：</span>
+                                                <span class="mpq"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>状态：</span>
+                                                <span class="status"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+  
+                                <div class="sku-info-right">
+                                    <table class="table table-hover ladder_price_table">
+                                        <tr>
+                                            <th>阶梯</th>
+                                            <th>RMB价格</th>
+                                        </tr>                                
+                                    </table>
+                                </div>
+
+                                <input type="hidden" name="goods_id" class="goods_id" value="">
+                                <input type="hidden" name="goods_type" class="goods_type" value="">
+
+                                <div class="clear"></div> 
+
+                                <a class="btn btn-success add-to-lists">添加至商品列表</a>  
+                            </div>
+
+                            <!-- 商品列表 -->
+                            <div class="shop-lists">
+                                <table class="table table-bordered table-hover shop-table">
+                                    <thead>
+                                        <tr>
+                                            <th width="15%">SKUID</th>
+                                            <th width="20%">商品名称</th>
+                                            <th width="10%">制造商</th>
+                                            <th width="10%">采购数量</th>
+                                            <th width="10%">采购单价</th>
+                                            <th width="10%">小计</th>
+                                            <th width="10%">货期</th>
+                                            <th width="10%">供应商</th>
+                                            <th width="5%">操作</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody></tbody>
+                                </table>
+                            </div>
+                        </div>
+
+                        <div class="order-info">
+                            <div class="ibox-title">
+                                <h3>订单信息</h3>
+                            </div>
+
+                            <div class="ibox-content">
+                                <input type="hidden" class="currency" name="currency" value="￥">
+                                <input type="hidden" class="goods_amount" name="goods_amount" value="0">
+                                <input type="hidden" class="express_fee" name="express_fee" value="0">
+                                
+                                <div class="row">
+                                    <p class="con-title"><span>商品总额：</span></p>
+                                    <p class="con-val goods_amount_val"></p>
+                                </div>
+
+                                <div class="row">
+                                    <input type="hidden" class="user_coupon_id" name="user_coupon_id" value="">
+                                    <p class="con-title"><span>选择优惠券：</span></p>
+                                    <p class="con-val">
+                                        <select name="user_coupon" id="user_coupon">
+                                            <option value="">请选择</option>
+                                        </select>
+                                    </p>
+                                </div>
+
+                                <div class="row">
+                                    <p class="con-title"><span>运费：</span></p>
+                                    <p class="con-val express_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>
+                                </div>                        
+                            </div>
+                        </div>
+
+                        <div class="ibox-title" style="text-align: right;">
+                            <a class="btn btn-success submit-order" data-type="2">提交</a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>  
+    var sale_id = "{{$sale_id}}";
+    var URL_api = "{{Config('website.api_domain')}}";
+
+	$.lie.add_order.zyorder();
+</script>
\ No newline at end of file

resources/views/addOrder.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>订单管理后台 | {{ $title }}</title>
+  <script>document.domain="{{ Config::get('website.domain') }}";</script>
+
+  @include('addOffline.css')
+  @include('addOffline.js')
+</head>
+
+<body class="body-small" style="min-width:1024px;">
+    <div id="wrapper">
+      <!-- layouts.navigation --> 
+      @include('layouts.navigation')
+
+      @include('addOrder.content')
+    </div>
+</body>
+

resources/views/addOrder/content.blade.php

+<div id="page-wrapper" class="gray-bg">
+    @include('layouts.header')
+
+    <div class="wrapper wrapper-content">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <form>
+                        <div class="ibox-title" style="border-top:0;">
+                            <h3>客户信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="row" style="margin-bottom: 30px;">
+                                <style>
+                                    .search-user{width: 240px !important;}
+                                    .label-prompt{padding: 6px 6px;}
+                                    .get-user{padding: 3px 6px; margin-right: 20px;}
+                                </style>
+                                <div class="col-sm-12">
+                                    <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" style="margin-right: 10px;">新增用户账号</a>
+                                        <a href="{{Config('website.check-user-url')}}" target="_blank">查询/编辑用户账号</a>
+                                    </span>
+                                </div>  
+                            </div>
+
+                            <div class="user-info">
+                                <div class="account-info">
+                                    <h4>账户信息</h4>
+                                    
+                                    <input type="hidden" name="user_id" class="user_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>会员账号：</span>
+                                                <span class="user-mobile"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>密码：</span>
+                                                <span>******</span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>测试账号：</span>
+                                                <span class="user-test"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div> 
+                                
+                                <div class="express-info">
+                                    <h4>快递信息 <span class="title-tips"><i class="fa fa-info-circle"></i>必须在下单前填写快递信息</span></h4>
+
+                                    <input type="hidden" name="address_id" class="address_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>收货方式：</span>
+                                                <span>快递上门</span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span><i class="text-danger">*</i> 选择收货地址：</span>
+                                                <select name="address" id="address">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
+                                    <div class="address-content">
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系人：</span>
+                                                    <span class="address-consignee"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系电话：</span>
+                                                    <span class="address-mobile"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>收货地址：</span>
+                                                    <span  class="address-detail"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>     
+                                </div>
+
+                                <div class="invoice-info">
+                                    <h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4>
+
+                                    <input type="hidden" name="tax_id" class="tax_id" value="">
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>发票类型：</span>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value="3"> 增值税专用发票
+                                                </label>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value="4"> 增值税普通发票
+                                                </label>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="inv_type" class="radio-inv-type" value=""> 不开发票
+                                                </label>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>选择发票信息：</span>
+                                                <select name="invoice" id="invoice">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
+                                    <div class="invoice-content">
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>发票抬头：</span>
+                                                    <span class="tax_title"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>税务登记号：</span>
+                                                    <span class="tax_no"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>银行卡号：</span>
+                                                    <span class="bank_account"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>开户银行：</span>
+                                                    <span class="bank_name"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>公司电话：</span>
+                                                    <span class="company_phone"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>公司注册地址：</span>
+                                                    <span class="company_address"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系人：</span>
+                                                    <span class="consignee"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>联系电话：</span>
+                                                    <span class="consignee_phone"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>收货地址：</span>
+                                                    <span class="consignee_address"></span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-6">
+                                                <div class="form-group">
+                                                    <span>发票类型：</span>
+                                                    <span class="inv_type"></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>     
+                                </div>
+
+                                <div class="delivery-info">
+                                    <h4>交货信息</h4>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>交货地址：</span>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="delivery_place" class="delivery_place" value="1" checked="checked"> 大陆
+                                                </label>
+                                                <label class="radio-inline">
+                                                    <input type="radio" name="delivery_place" class="delivery_place" value="2"> 香港
+                                                </label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="ibox-title">
+                            <h3>商品信息</h3>
+                        </div>
+
+                        <div class="ibox-content">
+                            <div class="row">
+                                <style>
+                                    .search-sku{width: 240px !important;}
+                                    .label-prompt{padding: 6px 6px;}
+                                    .get-sku{padding: 3px 6px; margin-right: 20px;}
+                                </style>
+                                <div class="col-sm-12">
+                                    <input type="text" class="search-sku" name="sku_id" value="" placeholder="请输入SKUID">
+                                    <a class="btn btn-info get-sku">获取SKU信息</a>
+                                    
+                                    <span>快捷入口：
+                                        <a href="{{Config('website.add-sku-url')}}" target="_blank" style="margin-right: 10px;">+新增SKU</a>
+                                        <a href="{{Config('website.search-sku-url-1')}}" target="_blank">查询SKU</a>
+                                    </span>
+                                </div>   
+                            </div>
+                            
+                            <!-- SKU信息 -->
+                            <div class="sku-info">
+                                <h4>型号信息</h4>
+                                
+                                <div class="sku-info-left">
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>SKU型号：</span>
+                                                <span class="goods_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>制造商：</span>
+                                                <span class="brand_name"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>供应商：</span>
+                                                <span class="supplier_name"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>库存数量：</span>
+                                                <span class="stock"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>起订量：</span>
+                                                <span class="moq"></span>
+                                            </div>
+                                        </div>
+
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>标准包装量：</span>
+                                                <span class="mpq"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="form-group">
+                                                <span>状态：</span>
+                                                <span class="status"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+  
+                                <div class="sku-info-right">
+                                    <table class="table table-hover ladder_price_table">
+                                        <tr>
+                                            <th>阶梯</th>
+                                            <th>RMB价格</th>
+                                            <th>USD价格</th>
+                                        </tr>                                
+                                    </table>
+                                </div>
+
+                                <input type="hidden" name="goods_id" class="goods_id" value="">
+                                <input type="hidden" name="goods_type" class="goods_type" value="">
+
+                                <div class="clear"></div> 
+
+                                <a class="btn btn-success add-to-lists">添加至商品列表</a>  
+                            </div>
+
+                            <!-- 商品列表 -->
+                            <div class="shop-lists">
+                                <table class="table table-bordered table-hover shop-table">
+                                    <thead>
+                                        <tr>
+                                            <th width="15%">SKUID</th>
+                                            <th width="20%">商品名称</th>
+                                            <th width="10%">制造商</th>
+                                            <th width="10%">采购数量</th>
+                                            <th width="10%">采购单价</th>
+                                            <th width="10%">小计</th>
+                                            <th width="10%">货期</th>
+                                            <th width="10%">供应商</th>
+                                            <th width="5%">操作</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody></tbody>
+                                </table>
+                            </div>
+                        </div>
+                        
+                        <div class="order-info">
+                            <div class="ibox-title">
+                                <h3>订单信息</h3>
+                            </div>
+
+                            <div class="ibox-content">
+                                <input type="hidden" class="currency" name="currency" value="">
+                                <input type="hidden" class="goods_amount" name="goods_amount" value="">
+
+                                <div class="row">
+                                    <p class="con-title"><span>商品总额：</span></p>
+                                    <p class="con-val goods_amount_val"></p>
+                                </div>
+
+                                <div class="row">
+                                    <input type="hidden" class="user_coupon_id" name="user_coupon_id" value="">
+                                    <p class="con-title"><span>选择优惠券：</span></p>
+                                    <p class="con-val">
+                                        <select name="user_coupon" id="user_coupon">
+                                            <option value="">请选择</option>
+                                        </select>
+                                    </p>
+                                </div>
+
+                                <div class="row">
+                                    <p class="con-title"><span>应付金额：</span></p>
+                                    <p class="con-val text-danger order_amount"></p>
+                                </div>       
+                            </div>
+                        </div>
+
+                        <div class="ibox-title" style="text-align: right;">
+                            <a class="btn btn-success submit-order" data-type="1">提交</a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>  
+    var sale_id = "{{$sale_id}}";
+    var URL_api = "{{Config('website.api_domain')}}";
+
+	$.lie.add_order.lyorder();
+</script>
\ No newline at end of file

resources/views/detail/content.blade.php

@@ -245,7 +245,7 @@
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
-                        @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
+                        @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
@@ -434,7 +434,6 @@
             </table>
         </div>
 
-
         <div class="tabs-box order-total">
             <div>
                 <table>
@@ -554,7 +553,7 @@
                 @endif
 
                 <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
-                @if ($order_info['status'] >= 2 && in_array('check_account', $userPerms))
+                @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
                     @if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))
                         <a href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default last-check">对账</a>
                     @else
@@ -576,7 +575,11 @@
             <p style="padding-left: 5px;">操作</p>
             <div class="tabs-box">
                 <!-- 判断状态和权限 -->
-                @if (in_array($order_info['status'], [2, 3, 4]) && in_array('self_order_cancel', $userPerms))
+                @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms)) 
+                    <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}" class="btn btn-default">审单</a>
+                @endif
+
+                @if (in_array($order_info['status'], [2, 3, 4]) && !$extend && in_array('self_order_cancel', $userPerms))
                 <a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a> 
                 @endif
 

resources/views/layouts/header.blade.php

 <div class="row wrapper border-bottom white-bg page-heading">
-  <div class="col-lg-10" style="height:10px"></div>
-  <div class="col-lg-10">
+  <a class="navbar-minimalize minimalize-styl-2 btn btn-primary pull-left" style="margin-left:0px;margin-top:18px;" href="#"><i class="fa fa-bars"></i> </a>
+  <div class="col-lg-10" style="padding-left:0px;">
     <h2>{{ $title }}</h2>
     <ol class="breadcrumb">
       @for ($i = 0; $i < count($paths); $i++)

resources/views/orderlist/content.blade.php

@@ -120,6 +120,7 @@
                                                 <li data-val="" class="active">全部</li>
                                                 <li data-val="1">PC端</li>
                                                 <li data-val="2">移动端</li>
+                                                <li data-val="3">后台</li>
                                             </ul>
                                         </div>
                                     </dd>
@@ -377,8 +378,14 @@
                                     <tr> 
                                         <td class="table-list-title">快递单号</td>
                                         <td class="table-list-content">{{$shippingNo ? substr($shippingNo, 0, -2) : ''}}</td> 
-                                        <td class="table-list-title">Adtag或其它</td>
+                                        <td class="table-list-title">订单来源</td>
                                         <td class="table-list-content">
+                                            <?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?>
+                                        </td> 
+                                    </tr>
+                                    <tr>
+                                        <td class="table-list-title">Adtag或其它</td>
+                                        <td class="table-list-content" colspan="3">
                                             <p class="show-title" title="{{$v['order_source']}}">{{$v['order_source']}}</p>
                                         </td>
                                     </tr>

resources/views/selfOrder/content.blade.php

@@ -68,6 +68,7 @@
                                                 <li data-val="" class="active">全部</li>
                                                 <li data-val="1">PC端</li>
                                                 <li data-val="2">移动端</li>
+                                                <li data-val="3">后台</li>
                                             </ul>
                                         </div>
                                     </dd>
@@ -149,7 +150,7 @@
                     <th class="pl30">应付金额</th>
                     <th class="pl30">订单状态</th>               
                     <th class="pl30">支付方式</th>                  
-                    <th class="pl30">绑定客服</th>
+                    <th class="pl30">订单来源</th>
                     <th class="pl30">发货状态</th>
                     <th class="pl30">下单时间</th>                   
                     <th class="pl30">操作</th>
@@ -191,15 +192,8 @@
 
                             <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
                             
-                            <td class="show-list">
-                                <?php 
-                                    foreach ($sale_list as $val) {
-                                        if ($val->userId == $v['sale_id']) {
-                                            echo $val->name;
-                                        }
-                                    }     
-                                ?>
-                            </td>
+                            <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?></td>
+                            
                             <td class="show-list" class="show-list">
                                 <?php
                                     $shipping = App\Http\Controllers\getShipping($v['order_id']);

resources/views/success.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>订单管理后台 | {{ $title }}</title>
+  <script>document.domain="{{ Config::get('website.domain') }}";</script>
+
+  @include('addOffline.css')
+  @include('addOffline.js')
+</head>
+
+<body class="body-small" style="min-width:1024px;">
+    <div id="wrapper">
+      <!-- layouts.navigation --> 
+      @include('layouts.navigation')
+
+      @include('success.content')
+    </div>
+</body>
+

resources/views/success/content.blade.php

+<div id="page-wrapper" class="gray-bg">
+    @include('layouts.header')
+
+    <div class="wrapper wrapper-content">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title" style="border-top:0;">
+                        <?php 
+                            $currency = $order_info->currency == 1 ? '￥' : '$'; 
+                        ?>
+
+                        <div class="section-1">
+                            <img src="../img/success.png" alt="提交成功">
+                            <h3>订单提交成功</h3>
+                            <p>下单时间：{{ date('Y-m-d H:i:s', $order_info->create_time) }}</p>
+                            @if ($type == 1) 
+                                <p class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，最迟在客户付款前一定要完善发票信息，否则无法同步至ERP</p>
+                            @endif
+                        </div>
+
+                        <div class="section-2">
+                            @if ($type != 3) 
+                                <style>.section-2{height: 150px;}</style>
+                                <p>手机号码：{{ $user_info->mobile }}</p>  
+                            @endif
+                            <p>订单编号：{{ $order_info->order_sn }}</p>
+                            <p>应付金额：<span class="text-danger">{{ $currency.$order_info->order_amount }}</span></p>
+
+                            @if ($type == 2) 
+                                <div style="text-align: center;">付款地址：{{ Config('website.pay_online_url').$order_info->order_id }}</div>
+                            @endif
+                        </div>
+
+                        <div class="section-3">
+                            @if ($type == 1)
+                                <a class="btn btn-success" href="/change/{{ $order_info->order_id }}">审核订单</a>
+                                <a class="btn btn-default" href="/add_order">继续新增</a>
+                            @elseif ($type == 2)
+                                <a class="btn btn-success" href="/self_order">查看订单</a>
+                                <a class="btn btn-default" href="/add_online">继续新增</a>
+                            @else
+                                <a class="btn btn-success" href="/self_order">查看订单</a>
+                                <a class="btn btn-default" href="/add_offline">继续新增</a>
+                            @endif             
+                        </div>
+                    </div>
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>  
+	// $.lie.add_order.offline();
+</script>
\ No newline at end of file