Merge branch 'master' into dev

app-hd/controllers/ClearController.php

@@ -109,7 +109,20 @@ class ClearController extends BaseController
     public function actionGetFullInfo()
     {
         $id = Yii::$app->request->get('id');
+        $salt = Yii::$app->request->get('salt');
         $info = ClearClass::getById($id);
+        if (empty($info)) {
+            util::fail('没有结账单');
+        }
+        if (empty($salt)) {
+            if (!isset($info['customShopId']) || $info['customShopId'] != $this->shopId) {
+                util::fail('不是你的结账信息');
+            }
+        } else {
+            if (!isset($info['salt']) || $info['salt'] != $salt) {
+                util::fail('不是你的结账信息哦');
+            }
+        }
         $respond = ClearClass::getCgInfo($info);
         util::success($respond);
     }
@@ -202,4 +215,4 @@ class ClearController extends BaseController
 
     }
 
-}
+}

app-pt/views/main/app.php

@@ -235,8 +235,8 @@
             }
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1310.apk', // 销花宝APP下载链接
-                'huazhanggui': 'https://api.shop.hzghd.com/245.apk', // 花掌柜APP下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1312.apk', // 销花宝APP下载链接
+                'huazhanggui': 'https://api.shop.hzghd.com/246.apk', // 花掌柜APP下载链接
                 'huazhanggui_cashier': 'https://api.shop.hzghd.com/200.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/159.apk' // 销花宝收银下载链接
             };