merge

@@ -16,10 +16,10 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',
     domains: {
     domains: {
-        api: 'http://api.yoho.yohoops.org/',
-        service: 'http://service.yoho.yohoops.org/',
-        liveApi: 'http://api.live.yoho.cn/',
-        singleApi: 'http://single.yoho.cn/'
+        api: 'http://api-test3.yohops.com:9999/',
+        service: 'http://service-test3.yohops.com:9999/',
+        liveApi: 'http://testapi.live.yohops.com:9999/',
+        singleApi: 'http://api-test3.yohops.com:9999/'
         
         
         // api: 'http://api.yoho.cn/',
         // api: 'http://api.yoho.cn/',
         // service: 'http://service.yoho.cn/',
         // service: 'http://service.yoho.cn/',

@@ -3,15 +3,19 @@ const path = require('path');
 
 
 const changeFiles = {
 const changeFiles = {
     js: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .js$', {silent: true}).stdout,
     js: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .js$', {silent: true}).stdout,
-    css: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .css$', {silent: true}).stdout
+    css: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .css$', {silent: true}).stdout,
+    vue: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .vue$', {silent: true}).stdout,
 };
 };
+
 const lintPath = {
 const lintPath = {
     js: path.resolve('./node_modules/.bin/eslint'),
     js: path.resolve('./node_modules/.bin/eslint'),
     css: path.resolve('./node_modules/.bin/stylelint')
     css: path.resolve('./node_modules/.bin/stylelint')
 };
 };
 const lintResult = {
 const lintResult = {
     js: {},
     js: {},
-    css: {}
+    css: {},
+    vueScript: {},
+    vueStyle: {}
 };
 };
 
 
 const ext = process.platform === 'win32' ? '.cmd' : ''; // Windows 平台需要加后缀
 const ext = process.platform === 'win32' ? '.cmd' : ''; // Windows 平台需要加后缀
@@ -28,9 +32,17 @@ if (changeFiles.js) {
 
 
 if (changeFiles.css) {
 if (changeFiles.css) {
     changeFiles.css = changeFiles.css.replace(/\n/g, ' ');
     changeFiles.css = changeFiles.css.replace(/\n/g, ' ');
-    lintResult.css = shelljs.exec(`${lintPath.css}${ext} --config .stylelintrc ${changeFiles.css}`);
+    lintResult.css = shelljs.exec(`${lintPath.css}${ext} --syntax scss --config .stylelintrc ${changeFiles.css}`);
+}
+
+if (changeFiles.vue) {
+    changeFiles.vue = changeFiles.vue.replace(/\n/g, ' ');
+    lintResult.vueScript = shelljs.exec(`${lintPath.js}${ext} -c .eslintrc --cache --fix ${changeFiles.vue}`);
+    lintResult.vueStyle = shelljs.exec(`${lintPath.css}${ext} --syntax scss --extract --config .stylelintrc ${changeFiles.vue}`); // eslint-disable-line
 }
 }
 
 
-if (lintResult.js.code || lintResult.css.code) {
-    process.exit(lintResult.js.code || lintResult.css.code); // eslint-disable-line
+const errorCode = lintResult.js.code || lintResult.css.code || lintResult.vueScript.code || lintResult.vueStyle.code;
+
+if (errorCode) {
+    process.exit(errorCode); // eslint-disable-line
 }
 }

@@ -389,6 +389,10 @@ $(function() {
     }
     }
 });
 });
 
 
+$(document).on('input', '#tb_name, #tb_cert_no', function() {
+    changeSuccess();
+});
+
 // data-aslider-in="education|fade"
 // data-aslider-in="education|fade"
 $(document).on('click', '#s-education .s-item', function() {
 $(document).on('click', '#s-education .s-item', function() {
     $('#s-education-tb').val($.trim($(this).html()));
     $('#s-education-tb').val($.trim($(this).html()));

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