周六临时线上修改

core/CoreApp/controllers/Fullorder.php

@@ -1105,10 +1105,10 @@ class Fullorder extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'此快递方式必须选择Hair Sample/Human Hair Wigs/Human Hair Goods！','success'=>false));exit;
 			}
-			if($post['country'] != 192 && $post['express'] == 1 && $post['sbpm'] != 'Synthetic Hair Wigs' && $post['sbpm'] != 'Synthetic Hair Goods')//$post['express'] == 3 || 
-			{
-				echo json_encode(array('msg'=>'非美国选择官方DHL必须选择Synthetic Hair Wigs/Synthetic Hair Goods','success'=>false));exit;
-			}
+// 			if($post['country'] != 192 && $post['express'] == 1 && $post['sbpm'] != 'Synthetic Hair Wigs' && $post['sbpm'] != 'Synthetic Hair Goods')//$post['express'] == 3 || 
+// 			{
+// 				echo json_encode(array('msg'=>'非美国选择官方DHL必须选择Synthetic Hair Wigs/Synthetic Hair Goods','success'=>false));exit;
+// 			}
 			if($way == count($whlabeldata) && $post['type'] != 12)
 			{
 				echo json_encode(array('msg'=>'必须选择特殊仓！','success'=>false));exit;

core/CoreApp/models/Model_logic_order.php

@@ -186,7 +186,7 @@ class Model_logic_order extends Lin_Model {
                 'Synthetic Hair',
                 'Synthetic Hair Wigs',
                 'Synthetic Hair Goods',
-            ])){
+            ])&&($post['country'] == 192)){
                 //'此快递方式必须选择Human Hair Wigs/Human Hair Goods！'
                 return [
                     'code'=>-1,