提交中文展示

core/CoreApp/controllers/Whlabel.php

@@ -36,6 +36,7 @@ class Whlabel extends Start_Controller {
 		$this->load->_model('Model_whlabel_type','whlabel_type');
 		$this->load->_model('Model_company','company');
 		$this->load->_model('Model_whlabel_list','whlabel_list');
+		$this->load->_model("Model_logic_whlabel","logic_whlabel");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -1555,7 +1556,8 @@ class Whlabel extends Start_Controller {
 			$info_list = $this->whlabel->find_pc($where.$fjnr,'sku,purchase,features,warehouse','id,warehouse,purchase,sku,title,details,shop,cpbz,type,features,number,sm',$order_str,$start,$perpage);//改这需要修改_gbhtype
 			
             //取得信息列表
-           
+			$info_list = $this->logic_whlabel->dataTran($info_list,['pm']);
+			
 			$rows = array();$list = array();
 			foreach ($info_list as $key=>$value) 
 		    {
@@ -1689,10 +1691,31 @@ class Whlabel extends Start_Controller {
 				}
 				**/
 		    }
+			$final_all_list = [];
+			foreach($info_list as $k=>$v){
+				$final_all_list[] = [
+					'id'=>$v['id'],
+					"warehouse"=>$v["warehouse"],
+					"purchase"=>$v["purchase"],
+					"sku"=>$v["sku"],
+					"title"=>$v["title"]."<br/>".$v["pm"],
+					"details"=>$v["details"],
+					"shop"=>$v["shop"],
+					"cpbz"=>$v["cpbz"],
+					"type"=>$v["type"],
+					"features"=>$v["features"],
+					"number"=>$v["number"],
+					"sm"=>$v["sm"],
+					"x"=>$v["x"],
+					"t"=>$v["t"],
+					"z"=>$v["z"]
+				];
+			}
+			
 		    $total = count($this->whlabel->find_pc($where.$fjnr,'sku,purchase,features,warehouse','id,warehouse,sku,title,features,number'));
 		    $pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);
-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($final_all_list));
 		    echo json_encode($rows);exit;
 		}
 		$wlshop = $this->shop->find_all('1=1 and '.rtrim($sid,'or'));

core/CoreApp/models/Model_logic_weight.php

@@ -56,7 +56,7 @@ class Model_logic_weight extends Lin_Model {
         }
 
         $sku_str = implode("-",$sku);
-        var_dump($sku_str);
+
         $weight_info = $this->weight->get_features($sku_str);
         if(empty($weight_info)){
             return 0;