Merge branch 'master' into dev

app-pt/views/main/app.php

@@ -238,8 +238,8 @@
             const downloadUrls = {
                 'xiaohuabao': 'https://api.shop.hzghd.com/1278.apk', // 销花宝APP下载链接
                 'huazhanggui': 'https://api.shop.hzghd.com/229.apk', // 花掌柜APP下载链接
-                'huazhanggui_cashier': 'https://api.shop.hzghd.com/198.apk', // 花掌柜收银下载链接
-                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/156.apk' // 销花宝收银下载链接
+                'huazhanggui_cashier': 'https://api.shop.hzghd.com/199.apk', // 花掌柜收银下载链接
+                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/157.apk' // 销花宝收银下载链接
             };
             const url = downloadUrls[appType];
             if (url && url !== '#') {

biz-ghs/order/classes/OrderClass.php

@@ -1507,7 +1507,7 @@ class OrderClass extends BaseClass
         }
         if ($showPrice == 1) {
             if (floatval($unitPrice) == 0.01) {
-                $content .= $productNum . ' = ' . $productPrice . '元（赠送价）<BR>';
+                $content .= $productNum . ' = ' . $productPrice . '元 赠送价<BR>';
             }else{
                 $content .= $productNum . ' = ' . $productPrice . '元<BR>';
             }