Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/AddOrderController.php

@@ -289,8 +289,8 @@ Class AddOrderController extends Controller
         if ($request->isMethod('post')) {
         if ($request->isMethod('post')) {
             $url = Config('website.search-skuid');
             $url = Config('website.search-skuid');
             $data['sku_id'] = $request->input('sku_id');
             $data['sku_id'] = $request->input('sku_id');
-
-            $response = json_decode(curlApi($url, $data), true); 
+            
+            $response = json_decode(curlApi($url, $data, 'POST'), true); 
 
 
             if (!empty($response['data']['data'])) {
             if (!empty($response['data']['data'])) {
                 return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][0]];
                 return ['errcode' => 0, 'errmsg' => '', 'data' => $response['data']['data'][0]];

config/website.php

@@ -48,7 +48,8 @@ return [
     'add-user-url' => 'http://member.liexin.net/add',
     'add-user-url' => 'http://member.liexin.net/add',
 
 
     // 查询SKUID接口
     // 查询SKUID接口
-    'search-skuid' => 'http://footstone.liexin.net/webapi/sku_list',
+    // 'search-skuid' => 'http://footstone.liexin.net/webapi/sku_list',
+    'search-skuid' => 'http://www.liexin.com/v3/sku/list',
 
 
     // 新增SKU入口
     // 新增SKU入口
     'add-sku-url' => 'http://footstone.liexin.net/manage/addsku',
     'add-sku-url' => 'http://footstone.liexin.net/manage/addsku',

public/js/add_order.js

@@ -264,12 +264,17 @@
                                 var len = data.ladder_price.length;
                                 var len = data.ladder_price.length;
                                 if (len > 0) {
                                 if (len > 0) {
                                     var html = '';
                                     var html = '';
+                                    var str = '';
 
 
                                     for (var i = 0; i < len; i++) {
                                     for (var i = 0; i < len; i++) {
+                                        if (goods_type == 1) {
+                                            str = '<td>$<span>'+data.ladder_price[i]['price_us']+'</span></td>';
+                                        }
+
                                         if (i == 0) {
                                         if (i == 0) {
-                                           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></tr>'; 
+                                           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 {
                                         } else {
-                                            html += '<tr><td><span>'+data.ladder_price[i]['purchases']+'</span></td><td>￥<span>'+data.ladder_price[i]['price_cn']+'</span></td></tr>'; 
+                                            html += '<tr><td><span>'+data.ladder_price[i]['purchases']+'</span></td><td>￥<span>'+data.ladder_price[i]['price_cn']+'</span></td>'+str+'</tr>'; 
                                         }     
                                         }     
                                     }
                                     }
 
 

resources/views/addOrder/content.blade.php

@@ -329,6 +329,7 @@
                                         <tr>
                                         <tr>
                                             <th>阶梯</th>
                                             <th>阶梯</th>
                                             <th>RMB价格</th>
                                             <th>RMB价格</th>
+                                            <th>USD价格</th>
                                         </tr>                                
                                         </tr>                                
                                     </table>
                                     </table>
                                 </div>
                                 </div>