浏览代码

登录后自动跳转原页面

MaiXinRong 6 年之前
父节点
当前提交
4f59f4c23d
共有 5 个文件被更改,包括 388 次插入250 次删除
  1. 3 5
      app/controller/login_controller.js
  2. 1 1
      app/middleware/session_auth.js
  3. 383 242
      app/view/tender/detail.ejs
  4. 1 1
      config/config.qa.js
  5. 0 1
      package.json

+ 3 - 5
app/controller/login_controller.js

@@ -7,6 +7,7 @@
  * @date 2017/11/15
  * @version
  */
+const URL = require('url');
 
 module.exports = app => {
 
@@ -50,11 +51,8 @@ module.exports = app => {
                 const needBoot = await ctx.service.customer.isNeedBoot(ctx.request.body);
                 const url = needBoot ? '/boot' : '/dashboard';
 
-                if (ctx.request.header.referer !== '/' && ctx.request.header.referer !== '/login') {
-                    ctx.redirect(url)
-                } else {
-                    ctx.redirect(ctx.request.header.referer);
-                }
+                const query = URL.parse(ctx.request.header.referer, true).query;
+                ctx.redirect(query.referer ? query.referer : url);
             } catch (error) {
                 this.log(error);
                 ctx.session.loginError = '用户名或密码错误';

+ 1 - 1
app/middleware/session_auth.js

@@ -38,7 +38,7 @@ module.exports = options => {
                     data: '',
                 };
             } else {
-                return this.redirect('/');
+                return this.redirect('/login?referer=' + this.url);
             }
         }
         yield next;

+ 383 - 242
app/view/tender/detail.ejs

@@ -89,264 +89,405 @@
                 </div>
                 <!--标段属性-->
                 <div id="shuxing" class="tab-pane">
-                    <!--操作-->
-                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-primary">编辑</button></div>
-                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 提交</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-danger"><i class="fa fa-close"></i>  取消</button></div>
-                    <!--合同信息-->
-                    <legend class="mt-3">合同信息</legend>
-                    <!--默认显示-->
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">建设项目名称</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="项目A" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">合同编号</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">合同名称</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!--参建单位-->
-                    <legend class="mt-3">参建单位</legend>
-                    <!--编辑模式-->
-                    <div class="form-group">
-                        <label>建设单位:</label>
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">单位名称</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">法人代表</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">签订日期</span>
-                                    </div>
-                                    <input type="date" class="form-control" value="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>承包单位1:</label>
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">单位名称</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">法人代表</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">签订日期</span>
-                                    </div>
-                                    <input type="date" class="form-control" value="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>承包单位2:</label>
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">单位名称</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">法人代表</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">签订日期</span>
-                                    </div>
-                                    <input type="date" class="form-control" value="">
-                                </div>
+                    <div class="row my-3">
+                        <div class="col-2">
+                            <div class="nav flex-column nav-pills" >
+                                <a class="nav-link active" id="v-pills-agi-tab" data-toggle="pill" href="#v-pills-agi" role="tab">属性</a>
+                                <a class="nav-link" id="v-pills-count-tab" data-toggle="pill" href="#v-pills-count" role="tab">计算参数</a>
+                                <a class="nav-link" id="v-pills-display-tab" data-toggle="pill" href="#v-pills-display" role="tab">显示设置</a>
                             </div>
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label>监理单位1:</label>
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">单位名称</span>
+                        <div class="col">
+                            <div class="tab-content">
+                                <div class="tab-pane fade show active" id="v-pills-agi" role="tabpanel">
+                                    <!--操作-->
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-primary">编辑</button></div>
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 提交</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-danger"><i class="fa fa-close"></i>  取消</button></div>
+                                    <!--合同信息-->
+                                    <legend class="mt-3">合同信息</legend>
+                                    <!--默认显示-->
+                                    <div class="form-group">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">建设项目名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="项目A" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">合同编号</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">合同名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">法人代表</span>
+                                    <!--参建单位-->
+                                    <legend class="mt-3">参建单位</legend>
+                                    <!--编辑模式-->
+                                    <div class="form-group">
+                                        <label>建设单位:</label>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">单位名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">法人代表</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">签订日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">签订日期</span>
+                                    <div class="form-group">
+                                        <label>承包单位1:</label>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">单位名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">法人代表</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">签订日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="date" class="form-control" value="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>监理单位2:</label>
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">单位名称</span>
+                                    <div class="form-group">
+                                        <label>承包单位2:</label>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">单位名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">法人代表</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">签订日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">法人代表</span>
+                                    <div class="form-group">
+                                        <label>监理单位1:</label>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">单位名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">法人代表</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">签订日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">签订日期</span>
+                                    <div class="form-group">
+                                        <label>监理单位2:</label>
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">单位名称</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">法人代表</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">签订日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="date" class="form-control" value="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!--技术参数-->
-                    <legend class="mt-3">技术参数</legend>
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">公路等级</span>
-                                    </div>
-                                    <select class="form-control" disabled="">
-                                        <option>高速公路</option>
-                                        <option>一级公路</option>
-                                        <option>二级公路</option>
-                                        <option>三级公路</option>
-                                        <option>四级公路</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">长度(KM)</span>
+                                    <!--技术参数-->
+                                    <legend class="mt-3">技术参数</legend>
+                                    <div class="form-group">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">公路等级</span>
+                                                    </div>
+                                                    <select class="form-control" disabled="">
+                                                        <option>高速公路</option>
+                                                        <option>一级公路</option>
+                                                        <option>二级公路</option>
+                                                        <option>三级公路</option>
+                                                        <option>四级公路</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">长度(KM)</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">起始桩号</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">终止桩号</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">起始桩号</span>
-                                    </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">终止桩号</span>
+                                    <div class="form-group">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">车道数</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">合同工期</span>
+                                                    </div>
+                                                    <input type="text" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">开工日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">计划完工日期</span>
+                                                    </div>
+                                                    <input type="date" class="form-control" value="" readonly="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="" readonly="">
                                 </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">车道数</span>
+                                <div class="tab-pane fade" id="v-pills-count" role="tabpanel" >
+                                    <!--操作-->
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-primary">编辑</button></div>
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 提交</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-danger"><i class="fa fa-close"></i>  取消</button></div>
+                                    <!--小数位数-->
+                                    <legend class="mt-3">小数位数</legend>
+                                    <div class="form-group">
+                                        <label>全局设置</label>
+                                        <div class="row">
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">数量</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="3">
+                                                </div>
+                                            </div>
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">金额</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="2">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">合同工期</span>
+                                    <div class="form-group">
+                                        <label>单独设置</label>
+                                        <div class="row">
+                                            <div class="col-auto">
+                                                <div class="form-group form-check mt-1">
+                                                    <input type="checkbox" class="form-check-input" id="exampleCheck1" checked="">
+                                                    <label class="form-check-label" for="exampleCheck1">签约清单</label>
+                                                </div>
+                                            </div>
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">数量</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="3">
+                                                </div>
+                                            </div>
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">金额</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="2">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-auto">
+                                                <div class="form-group form-check mt-1">
+                                                    <input type="checkbox" class="form-check-input" id="exampleCheck2">
+                                                    <label class="form-check-label" for="exampleCheck2">合同支付</label>
+                                                </div>
+                                            </div>
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">数量</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="3" readonly="">
+                                                </div>
+                                            </div>
+                                            <div class="col-2">
+                                                <div class="input-group input-group-sm">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text">金额</span>
+                                                    </div>
+                                                    <input type="number" class="form-control" value="2" readonly="">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" value="" readonly="">
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">开工日期</span>
+                                    <legend class="mt-3">合同参数</legend>
+                                    <!--默认显示-->
+                                    <div class="form-group">
+                                        <label>全局设置</label>
+                                        <div class="col-3">
+                                            <div class="input-group input-group-sm">
+                                                <div class="input-group-prepend">
+                                                    <span class="input-group-text">签约合同价</span>
+                                                </div>
+                                                <input type="number" class="form-control" value="">
+                                            </div>
+                                        </div>
+                                        <div class="col-3 my-3">
+                                            <div class="input-group input-group-sm">
+                                                <div class="input-group-prepend">
+                                                    <span class="input-group-text">签约开工预付款</span>
+                                                </div>
+                                                <input type="number" class="form-control" value="">
+                                            </div>
+                                        </div>
+                                        <div class="col-3">
+                                            <div class="input-group input-group-sm">
+                                                <div class="input-group-prepend">
+                                                    <span class="input-group-text">签约材料预付款</span>
+                                                </div>
+                                                <input type="number" class="form-control" value="">
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="date" class="form-control" value="" readonly="">
                                 </div>
-                            </div>
-                            <div class="col">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">计划完工日期</span>
+                                <div class="tab-pane fade" id="v-pills-display" role="tabpanel" >
+                                    <!--操作-->
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-primary">编辑</button></div>
+                                    <div class="d-flex justify-content-end mt-3"><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 提交</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-danger"><i class="fa fa-close"></i>  取消</button></div>
+                                    <legend class="mt-3">台帐列显示</legend>
+                                    <div class="form-group">
+                                        <div class="form-group">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="form-group form-check">
+                                                        <input type="checkbox" class="form-check-input" id="exampleCheck3" checked="">
+                                                        <label class="form-check-label" for="exampleCheck3">设计数量</label>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <input type="date" class="form-control" value="" readonly="">
                                 </div>
                             </div>
                         </div>

+ 1 - 1
config/config.qa.js

@@ -46,7 +46,7 @@ module.exports = appInfo => {
     // session配置
     config.session = {
         key: 'ZHC_SESS',
-        maxAge: 5*1000, //8 * 3600 * 1000, // 8小时
+        maxAge: 8 * 3600 * 1000, // 8小时
         httpOnly: true,
         encrypt: true,
     };

+ 0 - 1
package.json

@@ -41,7 +41,6 @@
   },
   "scripts": {
     "start": "egg-scripts start --daemon --port 7002",
-    "start-test": "set EGG_SERVER_ENV=test&&egg-scripts start --deamon --port 7002",
     "stop": "egg-scripts stop",
     "dev": "egg-bin dev --port 7002",
     "dev-local": "set EGG_SERVER_ENV=qa&&egg-bin dev --port 7002",