按照梦体要求修改提示

core/CoreApp/controllers/Fullorder.php

@@ -1636,14 +1636,14 @@ class Fullorder extends Start_Controller {
 		$this->data['qc'] = $qc;
 
 		//新增row_total和sub_total
-		$row_total = $sub_total = "-";
-// 		if(!empty($fullorder['extra_price'])){
-// 			$extra_price = json_decode($fullorder['extra_price']);
-// 			foreach($extra_price as $k=>$v){
-// 				$row_total .= sprintf("%.2f",($v['qty']* $v['price'])).";";
-// 				$sub_total .= sprintf("%.2f",$v['sub_total']).";";
-// 			}
-// 		}
+		$row_total = $sub_total = "";
+		if(!empty($fullorder['extra_price'])){
+			$extra_price = json_decode($fullorder['extra_price'],true);
+			foreach($extra_price as $k=>$v){
+				$row_total .= sprintf("%.2f",($v['qty']* $v['price'])).";";
+				$sub_total .= sprintf("%.2f",$v['sub_total']).";";
+			}
+		}
 		$this->data['row_total'] = trim($row_total,",");
 		$this->data['sub_total'] = trim($sub_total,",");
 		$this->_Template('fullorder_edit',$this->data);

core/CoreApp/controllers/Systemfout.php

@@ -590,7 +590,7 @@ class Systemfout extends Start_Controller {
     				   	//规定实际重量不允许超过 净重为1kg
         				if($numweight -($y['jweight']/1000) > 1 )
         				{
-        					echo json_encode(array('msg'=>'称重重量和净重相差过大，请找成会或梦体处理！','success'=>false));exit;
+        					echo json_encode(array('msg'=>'称重重量和净重相差过大，请找成会处理！','success'=>false));exit;
         				}
     				}