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

@@ -498,6 +498,12 @@ const getOrderDetail = (uid, code) => {
             title: '订单详情'
         };
 
+        detail.orderGoods.forEach(good => {
+            let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
+
+            good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`);
+        });
+
         detail.createTime = _convertUnixTime(detail.createTime);
 
         if (detail.isCancel === 'N' &&

@@ -148,14 +148,24 @@ const _editInfo = (uid, nickName, username, gender, birthday)=> {
  * @private
  */
 const _editUserContactInfo = (uid, areaCode, mobile, fullAddress, zipCode)=> {
-    return api.get('', {
+    let param = {
         method: 'web.passport.modifyUserContacts',
-        uid: uid,
-        area_code: areaCode,
-        mobile: mobile,
-        full_address: fullAddress,
-        zip_code: zipCode
-    }).then(result => result);
+        uid: uid
+    };
+
+    if (mobile) {
+        param.mobile = mobile;
+    }
+    if (zipCode) {
+        param.zip_code = zipCode;
+    }
+    if (areaCode) {
+        param.area_code = areaCode;
+    }
+    if (fullAddress) {
+        param.full_address = fullAddress;
+    }
+    return api.get('', param).then(result => result);
 };
 
 /**
@@ -170,7 +180,9 @@ const editUserInfo = (uid, info) => {
         _editUserContactInfo(uid, info.area_code, info.mobile, info.full_address, info.zip_code)
     ];
 
-    return Promise.all(getData).then(result => result);
+    return Promise.all(getData).then(result => {
+        return result;
+    });
 };
 
 /**

@@ -43,7 +43,7 @@
 
             <div class="success-text">
                 <div class="small-title">恭喜您设置完成，请妥善保存您的密码！</div>
-                <div class="time">页面将在&nbsp;<span id="count-down" class="blue">5</span>&nbsp;秒后将跳转至首页</div>
+                <div class="time">页面将在&nbsp;<span id="count-down" class="blue">5</span>&nbsp;秒后将跳转至登录页面</div>
             </div>
         </ul>
 </div>

@@ -4,6 +4,7 @@ var _alert = dialog.Alert;
 
 
 require('../../common/foreach-polyfill');
+
 // 添加.check方法
 require('../../plugins/check');