Merge branch 'gray' into 'master'

Gray



See merge request !356

@@ -10,7 +10,7 @@
             <div class="block-title">收货信息<span id="new-address-btn" class="right">新增收货地址 <i>+</i></span></div>
             <div id="addr-list" class="addr-list clearfix">
                 {{# deliveryAddress}}
-                    <div class="addr-item{{#isY is_default}} addr-default{{/isY}}{{#if selected}} addr-select{{/if}}" data-id="{{id}}" data-consignee="{{consignee}}" data-mobile="{{mobile}}" data-phone="{{phone}}" data-area="{{area}}" data-code="{{area_code}}" data-address="{{address}}"{{#isY is_default}} data-default="1"{{/isY}}{{#isY is_delivery}} data-delivery="1"{{/isY}}{{#isY is_cash_delivery}} data-cashdelivery="1"{{/isY}}>
+                    <div class="addr-item{{#isY is_default}} addr-default{{/isY}}{{#if selected}} addr-select{{/if}}" data-id="{{id}}" data-consignee="{{consignee}}" data-mobile="{{mobile}}" data-phone="{{phone}}" data-area="{{area}}" data-code="{{area_code}}" data-address="{{address}}"{{#isY is_default}} data-default="1"{{/isY}}{{#isY is_support}} data-delivery="1"{{/isY}}{{#isY is_cash_delivery}} data-cashdelivery="1"{{/isY}}>
                         <p class="name">
                             {{{consignee}}}
                             <span class="right">{{mobile}}</span>

@@ -62,6 +62,7 @@ exports.saveComment = (req, res, next) => {
     // get post args
     let data = {
         uid: req.user.uid.toString(),
+        orderCode: req.body.orderCode,
         productSkn: req.body.productSkn,
         productId: req.body.productId,
         content: req.body.content,

 {
   "name": "yohobuy-node",
-  "version": "6.6.10",
+  "version": "6.6.11",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -254,7 +254,7 @@ function handelAddrInfo(data, reqData, $el) {
             mobile: reqData.mobile,
             code: reqData.areaCode,
             phone: reqData.phone,
-            delivery: data.is_delivery === 'Y',
+            delivery: data.is_support === 'Y',
             cashdelivery: data.is_cash_delivery === 'Y'
         });
 
@@ -279,7 +279,7 @@ function handelAddrInfo(data, reqData, $el) {
             mobile: data.mobile,
             code: data.area_code,
             phone: data.phone,
-            delivery: data.is_delivery === 'Y',
+            delivery: data.is_support === 'Y',
             cashdelivery: data.is_cash_delivery === 'Y'
         };