Merge branch 'hotfix/brand' into 'gray'

Hotfix/brand



See merge request !1388

@@ -73,7 +73,8 @@ class payModel extends global.yoho.BaseModel {
                     _.get(result, 'data.payment_amount'),
                     _.get(result, 'data.payment_amount'),
                 pay_expire: _.get(result, 'data.order_detail_info.ext.pay_expire') ||
                 pay_expire: _.get(result, 'data.order_detail_info.ext.pay_expire') ||
                     _.get(result, 'data.pay_expire'),
                     _.get(result, 'data.pay_expire'),
-                order_goods: _.get(result, 'data.order_goods')
+                order_goods: _.get(result, 'data.order_goods'),
+                package_info: _.get(result, 'data.package_info', [])
             }
             }
         };
         };
     }
     }
@@ -84,6 +85,8 @@ class payModel extends global.yoho.BaseModel {
             return Promise.resolve({});
             return Promise.resolve({});
         }
         }
 
 
+        param.uid.appVersion = _.get(global, 'yoho.config.appVersion');
+
         return this.get({data: {
         return this.get({data: {
             method: 'app.SpaceOrders.detail',
             method: 'app.SpaceOrders.detail',
             uid: param.uid,
             uid: param.uid,

@@ -172,6 +172,8 @@ module.exports = class extends global.yoho.BaseModel {
             return Promise.resolve({});
             return Promise.resolve({});
         }
         }
 
 
+        uid.appVersion = _.get(global, 'yoho.config.appVersion');
+
         return this.get({
         return this.get({
             data: {
             data: {
                 method: 'app.SpaceOrders.detail',
                 method: 'app.SpaceOrders.detail',

@@ -42,7 +42,7 @@ const domains = {
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
-    appVersion: '6.5.3', // 调用api的版本
+    appVersion: '6.6.0', // 调用api的版本
     appName: 'yohobuywap-node',
     appName: 'yohobuywap-node',
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',