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:
avene 2018-05-12 16:36:17 +08:00
parent 48dbd9190d bdef44427d
commit f30ff25a53
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1656,6 +1656,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
*/
function orderAction()
{
$this->_helper->layout->setLayout('layout');
$this->view->pageID = "account-dataorder";
$ac = $this->_request->getParam('ac');

6
application/default/views/scripts/data/index.phtml
View File

@ -10,9 +10,11 @@ $this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css');
<div class="container">
<div class="col-sm-12">
<div class="form-group">
<input type="text" class="form-control" placeholder="搜素关键词">
<form action="/search" id="search-form">
<input type="text" name="q" id="q" class="form-control" placeholder="搜素关键词">
</form>
</div>
<i></i>
<i onclick="$('#search-form').submit()"></i>
</div>
</div>
</div>

7
application/default/views/scripts/data/order.phtml
View File

@ -8,7 +8,6 @@
$this->theme->AppendPlus($this,'uploadify');
$this->theme->AppendModel($this,'offlineapp-uploader');
?>
<?= $this->render('breadcrumbs.phtml') ?>
<div class="row">
<div class="span3">
@ -35,9 +34,9 @@
</ul>
<!-- content -->
<?php if (!empty($this->paginator)) : ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
<?php if ($this->tabID=='order-offline2') { ?>
<div class="well alert alert-error">重要说明：完成一个订单需要三个步骤，即<strong>生成pdf</strong>、<strong>上传签字后的pdf</strong>、<strong>确认订单</strong>。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。</div>
<div class="pagenavi"><?= $this->paginator; ?></div>
<?php if ($this->tabID=='order-offline2') { ?>
<div class="well alert alert-error">重要说明：完成一个订单需要三个步骤，即<strong>生成pdf</strong>、<strong>上传签字后的pdf</strong>、<strong>确认订单</strong>。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。</div>
<?php } ?>
<table class="table table-bordered table-striped">
<thead>

13
application/default/views/scripts/sanji-header.phtml
View File

@ -19,19 +19,18 @@
<li><a href="/about" class="scroll-link">关于本站</a></li>
<li><a href="/author" class="scroll-link">数据提交</a></li>
<li class="search">
<input type="text" class="form-control" placeholder="搜索">
<i></i>
<form action="/search" id="search-form">
<input type="text" name="q" id="q" class="form-control" placeholder="搜索">
<i onclick="$('#search-form').submit()"></i>
</form>
</li>
<?php
$auth = Zend_Auth::getInstance();
if($auth->hasIdentity())
{
$user = $auth->getIdentity();
echo '<li class="pull-right"><a href="/account">'.$user->username.'</a></li>';
if ($user->usertype=="administrator") echo '<li class="pull-right"><a href="/admin"><i class="icon-cog"></i>后台</a></li>';
echo '<li class="pull-right"><a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮</a></li><li class="pull-right"><a href="/account/logout">注销</a></li>';
echo '<li><a href="/data/order">数据篮</a></li>';
} else {
echo '<li id="login">登录</li>';
echo '<li id="login" onclick="self.location = \'/account/login\'">登录</li>';
} ?>
</ul>
</div>