Authored by 陈峰

Merge branch 'hotfix/ensure' into 'gray'

Hotfix/ensure

替换是否支持顺丰字段

See merge request !354
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="block-title">收货信息<span id="new-address-btn" class="right">新增收货地址 <i>+</i></span></div> 10 <div class="block-title">收货信息<span id="new-address-btn" class="right">新增收货地址 <i>+</i></span></div>
11 <div id="addr-list" class="addr-list clearfix"> 11 <div id="addr-list" class="addr-list clearfix">
12 {{# deliveryAddress}} 12 {{# deliveryAddress}}
13 - <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}}> 13 + <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}}>
14 <p class="name"> 14 <p class="name">
15 {{{consignee}}} 15 {{{consignee}}}
16 <span class="right">{{mobile}}</span> 16 <span class="right">{{mobile}}</span>
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "6.6.10", 3 + "version": "6.6.11",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -254,7 +254,7 @@ function handelAddrInfo(data, reqData, $el) { @@ -254,7 +254,7 @@ function handelAddrInfo(data, reqData, $el) {
254 mobile: reqData.mobile, 254 mobile: reqData.mobile,
255 code: reqData.areaCode, 255 code: reqData.areaCode,
256 phone: reqData.phone, 256 phone: reqData.phone,
257 - delivery: data.is_delivery === 'Y', 257 + delivery: data.is_support === 'Y',
258 cashdelivery: data.is_cash_delivery === 'Y' 258 cashdelivery: data.is_cash_delivery === 'Y'
259 }); 259 });
260 260
@@ -279,7 +279,7 @@ function handelAddrInfo(data, reqData, $el) { @@ -279,7 +279,7 @@ function handelAddrInfo(data, reqData, $el) {
279 mobile: data.mobile, 279 mobile: data.mobile,
280 code: data.area_code, 280 code: data.area_code,
281 phone: data.phone, 281 phone: data.phone,
282 - delivery: data.is_delivery === 'Y', 282 + delivery: data.is_support === 'Y',
283 cashdelivery: data.is_cash_delivery === 'Y' 283 cashdelivery: data.is_cash_delivery === 'Y'
284 }; 284 };
285 285