Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-mall/controllers/OrderController.php

@@ -141,6 +141,9 @@ class OrderController extends BaseController
         $freight = ['first' => 5, 'add' => 2];
         $mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
         $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $shop];
+        Yii::info(json_encode($shop));
+        Yii::info($shop['shopName']);
+        Yii::info('111111');
         util::success($out);
     }