Merge branch 'master' into ls

app-ghs/controllers/ProductController.php

@@ -197,7 +197,7 @@ class ProductController extends BaseController
                 //打价格
                 $price = $info->skPrice ?? 0;
                 $price = floatval($price);
-                $content .= '<TEXT x="35" y="150" font="12" w="4" h="4" r="0">' . $price . '元</TEXT>';
+                $content .= '<TEXT x="35" y="150" font="12" w="4" h="4" r="0">' . $price . '</TEXT>';
             } else {
                 //打价码
                 $content .= '<QR x="35"  y="100"  e="L"  w="5">' . Yii::$app->params['mallHost'] . "/item/show-info?id=" . $id . '</QR>';

app-ghs/controllers/PurchaseOrderController.php

@@ -250,7 +250,7 @@ class PurchaseOrderController extends BaseController
                     //打价格
                     $price = $infoList[$productId] && $infoList[$productId]['skPrice'] ? $infoList[$productId]['skPrice'] : 0;
                     $price = floatval($price);
-                    $content .= '<TEXT x="35" y="150" font="12" w="4" h="4" r="0">' . $price . '元</TEXT>';
+                    $content .= '<TEXT x="35" y="150" font="12" w="4" h="4" r="0">' . $price . '</TEXT>';
                 } else {
                     $content .= '<QR x="35"  y="100"  e="L"  w="5">' . Yii::$app->params['mallHost'] . "/item/show-info?id=" . $productId . '</QR>';
                     $content .= '<TEXT x="40" y="270" font="12" w="1" h="1" r="0">扫码看价格</TEXT>';

app-hd/controllers/GoodsController.php

@@ -47,7 +47,7 @@ class GoodsController extends BaseController
         $content = '<TEXT x="30" y="45" font="12" w="2" h="2" r="0">' . $name . '</TEXT>';
         $content .= '<BC128 x="30" y="115" h="75" s="1" r="0" n="3" w="10">' . $goodsSn . '</BC128>';
         if ($flower == 0 && $price > 0) {
-            $content .= '<TEXT x="30" y="250" font="12" w="2" h="2" r="0">' . $price . '元</TEXT>';
+            $content .= '<TEXT x="30" y="250" font="12" w="2" h="2" r="0">' . $price . '</TEXT>';
         }
         $p->times = $num;
         $p->printLabelMsg($content);

app-hd/controllers/PlantCgController.php

@@ -44,7 +44,7 @@ class PlantCgController extends BaseController
             if ($key % 2 == 1) {
                 $content .= '<TEXT x="6" y="0" font="12" w="2" h="2" r="0">.</TEXT>';
             }
-            //$content .= '<TEXT x="30" y="250" font="11" w="2" h="2" r="0">' . $price . '元</TEXT>';
+            //$content .= '<TEXT x="30" y="250" font="11" w="2" h="2" r="0">' . $price . '</TEXT>';
             $p->times = $num;
             $p->printLabelMsg($content);
         }
@@ -78,7 +78,7 @@ class PlantCgController extends BaseController
         //$price = floatval($item->price) ?? 0;
         $content = '<TEXT x="30" y="45" font="12" w="2" h="2" r="0">' . $name . '</TEXT>';
         $content .= '<BC128 x="30" y="115" h="75" s="1" r="0" n="3" w="10">' . $goodsSn . '</BC128>';
-        //$content .= '<TEXT x="30" y="250" font="12" w="2" h="2" r="0">' . $price . '元</TEXT>';
+        //$content .= '<TEXT x="30" y="250" font="12" w="2" h="2" r="0">' . $price . '</TEXT>';
         $p->times = $num;
         $p->printLabelMsg($content);
         util::complete();