bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/sanji' into sanji

This commit is contained in:
liheng 2018-05-12 17:12:45 +08:00
parent a1245e737f c61608873a
commit 635699cbd2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/default/controllers/DataController.php
View File

@ -1192,7 +1192,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
* @param int $userid * @param int $userid
*/ */
function todownloadAction() { function todownloadAction() {
$this->_helper->layout->setLayout('layout');
$this->view->pageID = "account-dataorder"; $this->view->pageID = "account-dataorder";
$this->_helper->viewRenderer('onlineapp-download'); $this->_helper->viewRenderer('onlineapp-download');
@ -1498,6 +1498,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
*/ */
function downloadAction() function downloadAction()
{ {
$this->_helper->layout->setLayout('layout');
$uuid=$this->_request->getParam('uuid'); $uuid=$this->_request->getParam('uuid');
$onlineappid=$this->_request->getParam('onlineappid'); $onlineappid=$this->_request->getParam('onlineappid');
$this->view->pageID = "account-dataorder"; $this->view->pageID = "account-dataorder";