冲突

@@ -4,15 +4,28 @@
  * @date: 2016/09/26
  */
 
-var express = require('express');
+var express = require('express'),
+    path = require('path');
 
 var app = express();
 
+// set view engin
+var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
+
 app.on('mount', function(parent) {
     delete parent.locals.settings; // 不继承父 App 的设置
     Object.assign(app.locals, parent.locals);
 });
 
+app.use(global.yoho.hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: doraemon,
+    partialsDir: path.join(__dirname, 'views/partial'),
+    views: path.join(__dirname, 'views/action'),
+    helpers: global.yoho.helpers
+}));
+
 // for zookeeper, inject locals
 app.use((req, res, next) => {
     req.app.locals.wap = app.locals.wap;
@@ -24,3 +37,4 @@ app.use((req, res, next) => {
 app.use(require('./router'));
 
 module.exports = app;
+

@@ -212,8 +212,7 @@ seckillObj = {
         var focusElem = $el.$navUl.find('>li.focus');
 
         if (focusElem.length) {
-            location.reload();
-
+            history.go(0);
             // that.refreshProductList(
             //     focusElem.find('input.activityId').val(),
             //     focusElem.find('input.date').val()