Merge branch 'feature/cart' of http://git.yoho.cn/fe/yohobuywap-node into feature/cart

@@ -288,10 +288,17 @@ const orderDetailData = (uid, orderCode) => {
 
 
              // 为支付的拆单配送信息
              // 为支付的拆单配送信息
             if (orderDetail.isMultiPackage && orderDetail.isMultiPackage === 'Y') {
             if (orderDetail.isMultiPackage && orderDetail.isMultiPackage === 'Y') {
-                orderDetail = _.assign(orderDetail, {
-                    isJit: true
+                let jitInfo = {
+                    deliveryId: orderDetail.deliveryId,
+                    paymentType: orderDetail.paymentType,
+                    couponCode: orderDetail.couponCode,
+                    yohoCoin: orderDetail.yohoCoin,
+                    cartType: 'ordinary'
+                };
 
 
-                   // jitDetailUrl: '/cart/index/jitDetailUrl'
+                orderDetail = _.assign(orderDetail, {
+                    isJit: true,
+                    jitDetailUrl: helpers.urlFormat('/cart/index/new/jitDetail', jitInfo)
                 });
                 });
             }
             }
 
 

@@ -9,27 +9,6 @@ const crypto = global.yoho.crypto;
  *  地址数据
  *  地址数据
  *  @param uid
  *  @param uid
  *  @return
  *  @return
- *  {
- *  "code":200,
- *  "data":[
- *      {
- *          "area":"江苏省 南京市 浦口区",
- *          "address":"沿江街道******,
- *          "consignee":"孟令阶",
- *          "is_support":"Y",
- *          "area_code":"320111",
- *          "mobile":"180****2255",
- *          "address_id":"6117354",   // 会被加密
- *          "is_default":"N",
- *          "is_delivery":"Y",
- *          "zip_code":"",
- *          "uid":"14616040",
- *          "phone":"",
- *          "email":""}
- *          ],
- *      "md5":"c35872955397cd0aabff4583cd41ac4b",
- *      "message":"Address List"
- *  }
  */
  */
 exports.addressData = (uid) => {
 exports.addressData = (uid) => {
     let params = {
     let params = {
@@ -38,7 +17,7 @@ exports.addressData = (uid) => {
     };
     };
 
 
     let options = {
     let options = {
-        cache: true
+        cache: false
     };
     };
 
 
     return api.get('', params, options)
     return api.get('', params, options)

@@ -698,12 +698,11 @@
         height: 510px;
         height: 510px;
         background-color: #fff;
         background-color: #fff;
         z-index: 2;
         z-index: 2;
-        margin: auto;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
         border-radius: 10px;
         border-radius: 10px;
+        left: 50%;
+        margin-left: -270px;
+        top: 50%;
+        margin-top: -255px;
 
 
         .yoho-coin-title {
         .yoho-coin-title {
             font-size: 34px;
             font-size: 34px;