Merge branch 'zjl_erp_syn_20190514' into development

config/params.php

@@ -16,7 +16,7 @@
 			1 => '全款',
 			1 => '全款',
 			2 => '预付款',
 			2 => '预付款',
 			3 => '账期',
 			3 => '账期',
-			4 => '货到付款',
+			4 => '货到猎芯付款',
 		],
 		],
 
 
 		// 支付方式
 		// 支付方式

resources/views/detail/changeOrder.blade.php

@@ -54,7 +54,7 @@
                         @if ($order_info['sale_type'] == 1)
                         @if ($order_info['sale_type'] == 1)
                             <label><input class="order_advance_pay" type="radio" name="order_pay_type" value="2">预付首款</label>
                             <label><input class="order_advance_pay" type="radio" name="order_pay_type" value="2">预付首款</label>
                             <label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
                             <label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
-                            <label><input class="order_cod" type="radio" name="order_pay_type" value="4">货到深圳仓付款</label>
+                            <label><input class="order_cod" type="radio" name="order_pay_type" value="4">货到猎芯付款</label>
                         @endif
                         @endif
                     </td>
                     </td>
                 </tr>
                 </tr>