Merge branch 'master' into feature/https

@@ -143,6 +143,8 @@ const submit = (req, res, next) => {
         userAgent: userAgent
     });
 
+    params.udid = req.cookies._yasvd || 'yoho_pc';
+
     if (params.sku) { // 快捷结算
         easypayModel.easypayOrderSubmit(uid, 'ordinary', params, remoteIp).then(result => {
             res.json(result);

@@ -172,6 +172,12 @@ const easypayOrderSubmitAsync = (uid, cartType, addressId, deliveryTime, deliver
         }
     }
 
+    if (other.udid) {
+        Object.assign(param, {
+            udid: other.udid
+        });
+    }
+
     return api.get('', param, {
         headers: {'X-Forwarded-For': remoteIp || ''}
     });

@@ -167,6 +167,12 @@ const orderSubmitAsync = (uid, cartType, addressId, deliveryTime, deliveryWay, p
         });
     }
 
+    if (other.udid) {
+        Object.assign(param, {
+            udid: other.udid
+        });
+    }
+
     // 友盟有关信息的传递
     if (other.qhyUnion) {
         Object.assign(param, {

@@ -71,6 +71,7 @@ const modifyAddress = (req, res, next) => {
             return '';
         }
     }());
+    let udid = req.cookies._yasvd || 'yoho_pc';
 
     if (!orderId || !userName || !areaCode || !address) {
         return res.json({
@@ -79,7 +80,7 @@ const modifyAddress = (req, res, next) => {
         });
     }
 
-    ordersService.updateDeliveryAddress(orderId, userName, areaCode, address, mobile, phone, uid)
+    ordersService.updateDeliveryAddress(orderId, userName, areaCode, address, mobile, phone, uid, udid)
         .then(result => res.json(result))
         .catch(next);
 };

@@ -153,7 +153,7 @@ exports.closeReasons = ()=>{
      * @param type address_id
      * @return type
      */
-exports.updateDeliveryAddress = (orderId, userName, areaCode, address, mobile, phone, uid)=>{
+exports.updateDeliveryAddress = (orderId, userName, areaCode, address, mobile, phone, uid, udid)=>{
     let options = {
         method: 'app.SpaceOrders.updateDeliveryAddress',
         order_code: orderId,
@@ -171,6 +171,10 @@ exports.updateDeliveryAddress = (orderId, userName, areaCode, address, mobile, p
         Object.assign(options, {phone: phone});
     }
 
+    if (udid) {
+        Object.assign(options, {udid: udid});
+    }
+
     return api.get('', options);
 };
 

@@ -322,7 +322,8 @@ const _getSkuDataByProductBaseInfo = (data) => {
                 goodsDetail.thumbs.push({
                     url: '',
                     shower: good.image_url,
-                    img: good.image_url
+                    img: good.image_url,
+                    title: goodsDetail.title
                 });
             }
         });

@@ -3,7 +3,7 @@
         {{#if homeUrl}}
             <div class="center-content clearfix">
                 <a class="pull-left" href="{{homeUrl}}">
-                    <img src="{{image2 logo w=45 h=45}}">
+                    <img src="{{image2 logo w=45 h=45}}" alt="{{brandName}}">
                 </a>
 
                 <div class="opt pull-right">

@@ -4,7 +4,7 @@
         {{#each colors}}
             <li class="{{#if focus}}focus{{/if}} {{#if disable}}disable{{/if}} pull-left"
                 title="{{title}}" data-color="{{name}}" data-total="{{total}}">
-                    <img src="{{image2 src w=25 h=32}}"><span class="color-name">{{name}}</span>
+                    <img src="{{image2 src w=25 h=32}}" alt="{{title}}"><span class="color-name">{{name}}</span>
             </li>
         {{/each}}
     </ul>

@@ -31,7 +31,7 @@
             </div>
 
             <div id="min-img">
-                <img id="img-show" class="img-show" src="{{image2 img w=420 h=560}}">
+                <img id="img-show" class="img-show" src="{{image2 img w=420 h=560}}" alt="{{name}}">
                 <div class="magnifier move-object hide"></div>
                 <div class="magnifier move-over"></div>
                 <div id="max" class="magnifier max hide">
@@ -49,12 +49,14 @@
                     {{#if focus}}
                         {{# thumbs}}
                             <img class="thumb {{#if @first}}active{{/if}}" src="{{image2 img w=75 h=100}}"
+                                 alt="{{title}}"
                                  data-shower="{{image2 shower w=420 h=560}}"
                                  data-origin="{{image2 shower w=750 h=1000}}">
                         {{/ thumbs}}
                     {{^}}
                         {{# thumbs}}
                             <img class="thumb lazy"
+                                 alt="{{title}}"
                                  data-original="{{image2 img w=75 h=100}}"
                                  data-shower="{{image2 shower w=420 h=560}}"
                                  data-origin="{{image2 shower w=750 h=1000}}">

@@ -92,7 +92,7 @@ const applysave = (req, res, next) => {
 
     try {
         for (let key in req.body) {
-            if (req.body.hasOwnProperty(key)) {
+            if (req.body[key]) {
                 key = key + '';
                 param[_.camelCase(key)] = req.body[key];
             }

@@ -6,9 +6,9 @@
             <li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
                 <a href="{{url}}" target= "_blank" title="{{title}}">
                     {{#if @first}}
-                    <img src="{{image2 src w=1150 h=450}}">
+                    <img src="{{image2 src w=1150 h=450}}"  alt="{{title}}－YOHO!BUY有货">
                     {{^}}
-                    <img class="lazy" data-original="{{image2 src w=1150 h=450}}" alt="{{alt}}">
+                    <img class="lazy" data-original="{{image2 src w=1150 h=450}}" alt="{{title}}－YOHO!BUY有货">
                     {{/if}}
                 </a>
                 {{# tips}}