Merge branch 'master' into dev

app-hd/controllers/GhsController.php

@@ -436,7 +436,10 @@ class GhsController extends BaseController
         if (empty($custom)) {
             util::fail('没有找到客户');
         }
-        StatVisitClass::addGhsCustomVisit($info, $custom);
+        if ($custom->black == 2) {
+            //没有列入黑名单的，增加访客记录
+            StatVisitClass::addGhsCustomVisit($info, $custom);
+        }
         util::complete();
     }
 

app-pt/views/main/app.php

@@ -236,8 +236,8 @@
             }
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1262.apk', // 销花宝APP下载链接
-                'huazhanggui': 'https://api.shop.hzghd.com/208.apk', // 花掌柜APP下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1263.apk', // 销花宝APP下载链接
+                'huazhanggui': 'https://api.shop.hzghd.com/214.apk', // 花掌柜APP下载链接
                 'huazhanggui_cashier': 'https://api.shop.hzghd.com/185.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/147.apk' // 销花宝收银下载链接
             };