Commit 6f574514 by 孙龙

标签换行

parent d848284d
...@@ -234,7 +234,7 @@ Class AjaxController extends Controller ...@@ -234,7 +234,7 @@ Class AjaxController extends Controller
return $this->ajaxReturn(-1,"模板名称已经存在,请修改模板名称再提交!"); return $this->ajaxReturn(-1,"模板名称已经存在,请修改模板名称再提交!");
} }
} }
//dd($data['html']);
$data['t_id'] = intval($id); $data['t_id'] = intval($id);
try{ try{
DB::Connection("label")->transaction(function () use($data,$request) { DB::Connection("label")->transaction(function () use($data,$request) {
...@@ -264,7 +264,7 @@ Class AjaxController extends Controller ...@@ -264,7 +264,7 @@ Class AjaxController extends Controller
} }
exit; exit;
} }
//dd($data);
// --------------------------新增模板------------------------------------------------------------ // --------------------------新增模板------------------------------------------------------------
//新增模板 //新增模板
......
...@@ -126,6 +126,7 @@ class LabelService { ...@@ -126,6 +126,7 @@ class LabelService {
} }
$html = str_replace("箜"," ",$html); $html = str_replace("箜"," ",$html);
$html = str_replace("蒯"," %0A ",$html);
$dom = HtmlDomParser::str_get_html( $html ); $dom = HtmlDomParser::str_get_html( $html );
...@@ -168,7 +169,8 @@ class LabelService { ...@@ -168,7 +169,8 @@ class LabelService {
if(empty($erweima->datatypes)){ if(empty($erweima->datatypes)){
$erweima->datatypes = "暂无数据"; $erweima->datatypes = "暂无数据";
} }
$b = 'data:image/png;base64,' . DNS2D::getBarcodePNG($erweima->datatypes, "QRCODE"); // dump($erweima->datatypes);
$b = 'data:image/png;base64,' . DNS2D::getBarcodePNG(urldecode($erweima->datatypes), "QRCODE");
$c = preg_replace('/background: url\((.*?)\) 0% 0% \/ 100% 100%/'," background: url({$b}) 0% 0% / 100% 100% ",$a); $c = preg_replace('/background: url\((.*?)\) 0% 0% \/ 100% 100%/'," background: url({$b}) 0% 0% / 100% 100% ",$a);
$erweima->style = $c; $erweima->style = $c;
}catch(\Exception $e){ }catch(\Exception $e){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment