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

@@ -541,7 +541,7 @@ const getOrderDetail = (uid, code) => {
 
 
         detail.paymentTypeStr = paymentTypeStr[detail.paymentType];
         detail.paymentTypeStr = paymentTypeStr[detail.paymentType];
 
 
-        detail.address = detail.area + detail.address;
+        detail.allAddress = detail.area + detail.address;
 
 
         detail.expressInfo = express;
         detail.expressInfo = express;
         detail.expressInfo.addressList = _convertAddress(express.expressDetail, detail.createTime);
         detail.expressInfo.addressList = _convertAddress(express.expressDetail, detail.createTime);

 <div class="user-info info-box" data-area="{{areaCode}}">
 <div class="user-info info-box" data-area="{{areaCode}}">
     <h4 class="status-title">收货人信息</h4>
     <h4 class="status-title">收货人信息</h4>
     <p class="text user-name-sel" data-name="{{userName}}">收货人：{{userName}}</p>
     <p class="text user-name-sel" data-name="{{userName}}">收货人：{{userName}}</p>
-    <p class="text user-addr-sel" data-address="{{address}}">收货地址：{{address}}</p>
+    <p class="text user-addr-sel" data-address="{{address}}">收货地址：{{allAddress}}</p>
     <p class="text user-mo-sel" data-mobile="{{mobile}}">联系电话：{{mobile}}</p>
     <p class="text user-mo-sel" data-mobile="{{mobile}}">联系电话：{{mobile}}</p>
     <p class="text user-ph-sel hide" data-phone="{{phone}}">联系电话：{{phone}}</p>
     <p class="text user-ph-sel hide" data-phone="{{phone}}">联系电话：{{phone}}</p>
 </div>
 </div>

@@ -33,7 +33,7 @@
             </div>
             </div>
             <div class="form-group">
             <div class="form-group">
                 <label class="label-name">手机:</label>
                 <label class="label-name">手机:</label>
-                {{#if info.verify_mobile}}
+                {{#if info.mobile}}
                     <input id="mobile" class="input no-edit" value="{{info.mobile}}">
                     <input id="mobile" class="input no-edit" value="{{info.mobile}}">
                     <a class="blue  operation" href="{{stepUrl}}/modifyMobile">修改</a>
                     <a class="blue  operation" href="{{stepUrl}}/modifyMobile">修改</a>
                 {{else}}
                 {{else}}

@@ -150,7 +150,7 @@ const shop = {
                         };
                         };
 
 
                         res.display('shop-list', _.assign(data, {
                         res.display('shop-list', _.assign(data, {
-                            products: DataHelper.handleProductList(ret.productList, q),
+                            products: DataHelper.handleProductList(ret.productList, q, false),
                             order: q.order
                             order: q.order
                         }));
                         }));
                     } else {
                     } else {

@@ -407,7 +407,9 @@ const helpers = {
      * @param list
      * @param list
      * @returns {*}
      * @returns {*}
      */
      */
-    handleProductList(list, q) {
+    handleProductList(list, q, showBrand) {
+        showBrand = typeof showBrand === 'undefined' ? true : showBrand;
+
         if (_.isArray(list)) {
         if (_.isArray(list)) {
             list.forEach(g => {
             list.forEach(g => {
                 let goodsList = g.goodsList;
                 let goodsList = g.goodsList;
@@ -426,6 +428,7 @@ const helpers = {
                 }
                 }
                 g.salesPrice = g.salesPrice || g.marketPrice;
                 g.salesPrice = g.salesPrice || g.marketPrice;
                 g.defaultImages = defaultImages;
                 g.defaultImages = defaultImages;
+                g.showBrand = showBrand;
                 if (g.salesPrice === g.marketPrice) {
                 if (g.salesPrice === g.marketPrice) {
                     delete g.marketPrice;
                     delete g.marketPrice;
                 }
                 }

@@ -6,9 +6,11 @@
                     <img class="lazy" data-original="{{image defaultImages 263 344}}" width="263" height="344" alt="">
                     <img class="lazy" data-original="{{image defaultImages 263 344}}" width="263" height="344" alt="">
                 </a>
                 </a>
             </div>
             </div>
+            {{#if showBrand}}
             <div class="goods-brand">
             <div class="goods-brand">
                 <a href="/product/shop/{{brandDomain}}" target="_self">{{brandName}}</a>
                 <a href="/product/shop/{{brandDomain}}" target="_self">{{brandName}}</a>
             </div>
             </div>
+            {{/if}}
             <div class="goods-name">
             <div class="goods-name">
                 <a href="{{url}}" target="_blank">{{productName}}</a>
                 <a href="{{url}}" target="_blank">{{productName}}</a>
             </div>
             </div>

@@ -31,6 +31,8 @@ var disableSMSBtn = function() {
 var validatePhoneNumLocal = function(phoneNum) {
 var validatePhoneNumLocal = function(phoneNum) {
     var length = phoneNum.length;
     var length = phoneNum.length;
 
 
+    phoneNum = parseInt(phoneNum, 10);
+
     if (length === 0) {
     if (length === 0) {
         new _alert('请输入手机号码！').show();
         new _alert('请输入手机号码！').show();
         return false;
         return false;

@@ -29,7 +29,7 @@
     }
     }
 
 
     .no-edit {
     .no-edit {
-        width: 80px;
+        width: 100px;
         border: none;
         border: none;
     }
     }
 
 

@@ -311,7 +311,7 @@
                 }
                 }
             }
             }
             .goods-name {
             .goods-name {
-                padding: 5px;
+                padding: 10px;
                 width: 265px;
                 width: 265px;
                 overflow: hidden;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
@@ -319,7 +319,7 @@
             }
             }
 
 
             .goods-price {
             .goods-price {
-                padding: 15px;
+                padding: 10px;
                 font-size: 16px;
                 font-size: 16px;
                 font-weight: 700;
                 font-weight: 700;
 
 

@@ -15,7 +15,7 @@
     <div class="input-row necessary">
     <div class="input-row necessary">
         <span class="asterisk">*</span>
         <span class="asterisk">*</span>
         <label for="user-address">详细地址：</label>
         <label for="user-address">详细地址：</label>
-        <input class="input validate" class="long" type="text" id="user-address" placeholder="街道名称或小区名称" value={{address}}>
+        <input class="input validate" class="long" type="text" id="user-address" placeholder="街道名称或小区名称" value="{{address}}">
     </div>
     </div>
     <div class="input-row necessary">
     <div class="input-row necessary">
         <span class="asterisk">*</span>
         <span class="asterisk">*</span>