Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -11,8 +11,8 @@ const helpModel = require('../models/help');
  * 主界面
  */
 const index = (req, res) => {
-    let id = req.query.id || "11";
-    helpModel.getHelpDetail("81", 1, 15, "").then(result=> {
+    let id = req.query.id || '11';
+    helpModel.getHelpDetail('81', 1, 15, '').then(result=> {
         let content = {content: result.helpdetail_list[0].content};
         let data = Object.assign(content, helpModel.menuData());
         let nav = [
@@ -31,6 +31,7 @@ const index = (req, res) => {
             content: Object.assign({nav}, data)
         });
     });
+
     /*  let data = Object.assign(getData(id), helpModel.menuData());
      let nav = [
      {
@@ -59,7 +60,7 @@ const getData = (id)=> {
 
     for (var i = 0; i < contentData.length; i++) {
         if (contentData[i].id === id) {
-            return contentData[i]
+            return contentData[i];
         }
     }
 };
@@ -81,7 +82,7 @@ const getNav = (id)=> {
                         }, {
                             name: menuData[i].subsets[j].text
                         }
-                    ]
+                    ];
                 }
             }
         } else {
@@ -90,7 +91,7 @@ const getNav = (id)=> {
                     {
                         name: menuData[i].text
                     }
-                ]
+                ];
             }
         }
     }

@@ -7,6 +7,7 @@
 'use strict';
 
 const api = global.yoho.API;
+
 /**
  * 分类数据
  * @returns {{}}
@@ -15,47 +16,47 @@ const menuData = ()=> {
     return {
         menuData: [
             {
-                id: "1",
-                text: "购物指南"
+                id: '1',
+                text: '购物指南'
             },
             {
-                id: "2",
-                text: "支付方式"
+                id: '2',
+                text: '支付方式'
             },
             {
-                id: "3",
-                text: "配送方式",
+                id: '3',
+                text: '配送方式',
                 subsets: [
                     {
-                        id: "31",
-                        parendId: "3",
-                        text: "配送时间与范围"
+                        id: '31',
+                        parendId: '3',
+                        text: '配送时间与范围'
                     },
                     {
-                        id: "32",
-                        parendId: "3",
-                        text: "商品验收与签收"
+                        id: '32',
+                        parendId: '3',
+                        text: '商品验收与签收'
                     }
                 ]
             },
             {
-                id: "4",
-                text: "售后服务",
+                id: '4',
+                text: '售后服务',
                 subsets: [
                     {
-                        id: "41",
-                        parendId: "4",
-                        text: "投诉与建议"
+                        id: '41',
+                        parendId: '4',
+                        text: '投诉与建议'
                     },
                     {
-                        id: "42",
-                        parendId: "4",
-                        text: "退换货流程"
+                        id: '42',
+                        parendId: '4',
+                        text: '退换货流程'
                     },
                     {
-                        id: "43",
-                        parendId: "4",
-                        text: "退换货政策"
+                        id: '43',
+                        parendId: '4',
+                        text: '退换货政策'
                     }
                 ]
             }
@@ -71,19 +72,19 @@ const contentData = ()=> {
     return {
         content: [
             {
-                id: "11",
-                content: "<h1>你好</h1><p>测试11</p>"
+                id: '11',
+                content: '<h1>你好</h1><p>测试11</p>'
             },
             {
-                id: "12",
-                content: "<h1>你好</h1><p>测试12</p>"
+                id: '12',
+                content: '<h1>你好</h1><p>测试12</p>'
             },
             {
-                id: "13",
-                content: "<h1>你好</h1><p>测试13</p>"
+                id: '13',
+                content: '<h1>你好</h1><p>测试13</p>'
             }
         ]
-    }
+    };
 };
 
 /**

@@ -15,6 +15,7 @@ const help = require(`${cRoot}/help`);
 
 // 帮助中心
 router.get('/', help.index);
+
 // router.get('/search', help.search);
 
 

@@ -367,7 +367,7 @@ function getfilePath(req, res, next) {
 
     req.filePath = filePath;
     req.pipe(uploadStream);
-    uploadStream.on('finish', function () {
+    uploadStream.on('finish', function() {
         next();
     });
 }

@@ -44,8 +44,7 @@ const Search = {
 
         let finalParams = {
             method: 'app.search.li',
-            limit: 45,
-            app_type: 1
+            limit: 45
         };
 
         Object.assign(finalParams, _paramHanlde(params));
@@ -55,8 +54,7 @@ const Search = {
     queryProductOfBrand(params) {
         let finalParams = {
             method: 'app.search.li',
-            limit: 45,
-            app_type: 1
+            limit: 45
         };
 
         Object.assign(finalParams, _paramHanlde(params));
@@ -66,8 +64,7 @@ const Search = {
     queryNewProduct(params) {
         let finalParams = {
             method: 'app.search.newProduct',
-            limit: 45,
-            app_type: 1
+            limit: 45
         };
 
         Object.assign(finalParams, _paramHanlde(params));
@@ -76,8 +73,7 @@ const Search = {
     },
     queryAllSort(params) {
         return api.get('', _.assign({
-            method: 'web.regular.groupsort',
-            app_type: 1
+            method: 'web.regular.groupsort'
         }, params), {code: 200});
     }
 };

@@ -44,13 +44,15 @@ const Payment = {
     beforePay(user, order, method) {
         return Promise.all([
             OrderData.updateOrderPayment(order.orderCode, method, user.uid),
+            PayData.savePrePayInfo(order.orderCode, method, user.uid),
             PayData.getBankByOrder(order.orderCode)
         ]).then(result => {
             let paymentRecord = result[0];
-            let bankRecord = result[1];
+            let prePayResult = result[1];
+            let bankRecord = result[2];
             let bankCode = '';  // 暂时写成'', 参考php代码 Payment.php:564
 
-            if (!paymentRecord || paymentRecord.code !== 200) {
+            if (!paymentRecord || paymentRecord.code !== 200 || !prePayResult || prePayResult.code !== 200) {
                 let message = paymentRecord && paymentRecord.message ? paymentRecord.message : '系统繁忙，请稍后再试';
 
                 return {code: 400, message: message};

@@ -55,6 +55,15 @@ const sendPayConfirm = (code, payment, uid) => {
     });
 };
 
+const savePrePayInfo = (code, payment, uid) => {
+    return api.get('', {
+        method: 'app.order.savePrePayInfo',
+        orderCode: code,
+        payment: payment,
+        uid: uid
+    });
+};
+
 const sendMessage = (mobile, template, codes) => {
     return api.get('', {
         method: 'app.message.sendMsg',
@@ -71,5 +80,6 @@ module.exports = {
     setOrderPayBank,
     updateOrderPayBank,
     sendPayConfirm,
+    savePrePayInfo,
     sendMessage
 };

@@ -150,6 +150,21 @@ const updateOrderPayBank = (code, payment, bankCode) => {
 };
 
 /**
+ * 选择支付，校验时间间隔，插入数据
+ * @param code
+ * @param payment
+ * @param uid
+ */
+const savePrePayInfo = (code, payment, uid) => {
+    return co(function *() {
+        let data = yield api.savePrePayInfo(code, payment, uid);
+
+        return data;
+    })();
+};
+
+
+/**
  * 支付确认
  * @param code
  * @param payment
@@ -228,6 +243,7 @@ module.exports = {
     updateOrderPayBank,
     sendPayConfirm,
     procOrderData,
+    savePrePayInfo,
     payments
 };
 

@@ -61,7 +61,7 @@
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.28"
+    "yoho-node-lib": "0.0.30"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",

@@ -4,34 +4,34 @@
  * @date: 2016/07/25
  */
 
-var queryId = location.search.split("=")[1] || "1";
-var $cate = $(".cateId-" + queryId);//当前分类
-var $subsets=$(".subsets");
+var queryId = location.search.split('=')[1] || '1';
+var $cate = $('.cateId-' + queryId);// 当前分类
+var $subsets = $('.subsets');
 
 /**
  * 目录切换
  */
 
-$subsets.click(function () {
+$subsets.click(function() {
     var $this = $(this);
-    var className = $this.attr("class").split(" ")[1];
-    var parentId = "parentId-" + className.split("-")[1];
-    var $child = $this.parent().find("." + parentId);//当前子分类
+    var className = $this.attr('class').split(' ')[1];
+    var parentId = 'parentId-' + className.split('-')[1];
+    var $child = $this.parent().find('.' + parentId);// 当前子分类
 
 
-    if ($this.hasClass("open")) {
+    if ($this.hasClass('open')) {
         $child.hide();
-        $this.removeClass("open").children('.plus').css("background-image", "url('../img/help/plus.png')");
+        $this.removeClass('open').children('.plus').css('background-image', 'url(\'../img/help/plus.png\')');
     } else {
         $child.show();
-        $this.addClass("open").children('.plus').css("background-image", "url('../img/help/minus.png')");
+        $this.addClass('open').children('.plus').css('background-image', 'url(\'../img/help/minus.png\')');
     }
 });
 
-if (!$cate.hasClass("big-category")) {
+if (!$cate.hasClass('big-category')) {
     var parentId = queryId.substr(0, 1);
-    $(".parentId-" + parentId).show();
-    $(".cateId-" + parentId).find(".plus").css("background-image", "url('../img/help/minus.png')");
+    $('.parentId-' + parentId).show();
+    $('.cateId-' + parentId).find('.plus').css('background-image', 'url(\'../img/help/minus.png\')');
 }