Merge branch 'feature/bugfix61' into release/6.1

@@ -381,7 +381,8 @@ class payModel extends global.yoho.BaseModel {
         return Promise.all([
             this._getBanner(param),
             this._getOthersBuy(param),
-            this.getOtherDetail(param)
+            this.getOtherDetail(param),
+            this.getPayResultText(param)
         ]).then((result) => {
 
             let resu = {
@@ -405,7 +406,7 @@ class payModel extends global.yoho.BaseModel {
             }
 
             if (result && result[2] && result[2].data && result[2].data.payment_amount) {
-                resu.packageTitle = _.get(result[2], 'data.package_title', '');
+                resu.packageTitle = _.get(result[3], 'data.notice', '');
 
                 resu.payment = result[2].data.payment_amount;
 
@@ -430,6 +431,19 @@ class payModel extends global.yoho.BaseModel {
             return resu;
         });
     }
+
+    /**
+     * 获取支付结果信息
+     */
+    getPayResultText(params) {
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.getOrderExNotice',
+                order_code: params.orderCode,
+                uid: params.uid
+            }
+        });
+    }
 }
 
 module.exports = payModel;

@@ -85,6 +85,7 @@ class Reg {
         let inviteCode = req.body.inviteCode || '';
         let isFromMy = _.get(req.session, 'phoneReg.isFromMy', '0');
         let token = req.body.token;
+        let clientIp = req.yoho.clientIp || '';
         let from = req.cookies.from || 'yohobuy';
 
         // 购物车key
@@ -122,7 +123,7 @@ class Reg {
             }
 
             let regMobileAesResult = yield RegService.regMobileAes(area, mobile, password,
-                shoppingKey, smsCode, inviteCode, isFromMy, from);
+                shoppingKey, smsCode, inviteCode, isFromMy, clientIp, from);
 
             if (regMobileAesResult.code !== 200 || !regMobileAesResult.data ||
                 !regMobileAesResult.data.uid) {

@@ -335,7 +335,7 @@ class SmsLogin {
         let resultCopy = null;
 
         RegService.regMobileAes(area, mobile, password,
-            shoppingKey, registerCode, null, clientIp, from).then(result => {
+            shoppingKey, registerCode, '0', clientIp, from).then(result => {
             if (!result.code || result.code !== 200) {
                 return res.send(result);
             }

@@ -39,7 +39,7 @@ const BindService = {
             code: code
         });
     },
-    bindMobile(openId, sourceType, mobile, area, password, nickname, from) {
+    bindMobile(openId, sourceType, mobile, area, password, from, nickname) {
         let params = {
             method: 'app.passport.bind',
             mobile: mobile,

@@ -51,7 +51,7 @@ exports.serverError = () => {
         forceNoCache(res);
 
         if (err && err.code === 401) {
-            logger.error(`401 error info:client_type=${req.query.client_type},req.user=${JSON.stringify(req.user)},req.query=${JSON.stringify(req.query)},cookies=${JSON.stringify(req.cookies)}`); // eslint-disable-line
+            logger.warn(`401 warn info:client_type=${req.query.client_type},req.user=${JSON.stringify(req.user)},req.query=${JSON.stringify(req.query)},cookies=${JSON.stringify(req.cookies)}`); // eslint-disable-line
 
             if (req.xhr) {
                 return res.status(401).json(err);

@@ -6,11 +6,16 @@
 
     .top-tip {
         width: 100%;
-        height: 240px;
         border-bottom: solid 1px #e0e0e0;
         text-align: center;
         background-color: #fff;
         z-index: 2;
+        padding-bottom: 20px;
+
+        p {
+            padding-left: 25px;
+            padding-right: 25px;
+        }
 
         .img-c {
             margin-top: 25px;