Merge branch 'hcy_pcb_20181221-r' into development

app/Http/Controllers/WebController.php

@@ -155,7 +155,7 @@ class WebController extends Controller
         }
         }
         //拼接订单详细信息
         //拼接订单详细信息
         $orderInfo = objectToArray($orderInfo);
         $orderInfo = objectToArray($orderInfo);
-        $orderInfo['teshu'] = ($orderInfo['sp_half_hole'] == 1 ? "是":"否").($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
+        $orderInfo['teshu'] = "是否有半孔工艺:".($orderInfo['sp_half_hole'] == 1 ? "是":"否")." 是否要金手指:".($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
 
 
         $data['orderBase'] = $orderBase;
         $data['orderBase'] = $orderBase;
         $data['purchase'] = $purchase;
         $data['purchase'] = $purchase;
@@ -234,7 +234,7 @@ class WebController extends Controller
         }
         }
         //拼接订单详细信息
         //拼接订单详细信息
         $orderInfo = objectToArray($orderInfo);
         $orderInfo = objectToArray($orderInfo);
-        $orderInfo['teshu'] = ($orderInfo['sp_half_hole'] == 1 ? "是":"否").($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
+        $orderInfo['teshu'] = "是否有半孔工艺:".($orderInfo['sp_half_hole'] == 1 ? "是":"否")." 是否要金手指:".($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
 
 
         $data['orderBase'] = $orderBase;
         $data['orderBase'] = $orderBase;
         $data['purchase'] = $purchase;
         $data['purchase'] = $purchase;