Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/controllers/Index.php

@@ -110,16 +110,16 @@ class IndexController extends \Our\Controller_Abstract  {
         exit;
     }
     public function getInvateHtmlAction(){
-//        $req=$this->getRequest()->getQuery();
-//        if(empty($req['params'] )){
-//            echo 'error';exit;
-//        }
-//        $params=base64_decode($req['params']);
-        $params['name']='陈传文4';
-        $params['telephone']='18305954587';
-        $params['qrcodeUrl']='//static.shenbd.com/www/index/2018/img/card/code.jpg';
-        $params['areaManage']='区域经理';
-       // $params=\Our\Common::paramToJson($params);
+        $req=$this->getRequest()->getQuery();
+        if(empty($req['params'] )){
+            echo 'error';exit;
+        }
+        $params=base64_decode($req['params']);
+//        $params['name']='陈传文4';
+//        $params['telephone']='18305954587';
+//        $params['qrcodeUrl']='//static.shenbd.com/www/index/2018/img/card/code.jpg';
+//        $params['areaManage']='区域经理';
+        $params=\Our\Common::paramToJson($params);
        // $params['areaManage']='经理';
         $this->_view->assign("params", $params);