Merge branch 'feature/refundApply' into 'release/5.5'

修改地址优化



See merge request !353

@@ -260,9 +260,15 @@ const orderDetailData = (uid, orderCode) => {
             }
             }
 
 
             // 判断是否可以修改地址
             // 判断是否可以修改地址
-            if (orderDetail.canUpdateDeliveryAddress === 'Y') {
+            if (orderDetail.canUpdateDeliveryAddress === 'Y' && orderDetail.isSupportChangeProvince === 'Y') {
                 orderDetail = _.assign(orderDetail, {
                 orderDetail = _.assign(orderDetail, {
-                    changeable: true
+                    changeable: true,
+                    addressModify: true
+                });
+            } else if (orderDetail.canUpdateDeliveryAddress === 'Y' && orderDetail.isSupportChangeProvince !== 'Y') {
+                orderDetail = _.assign(orderDetail, {
+                    changeable: false,
+                    addressModify: true
                 });
                 });
             }
             }
 
 

@@ -123,7 +123,7 @@
 
 
         <div class="opt block">
         <div class="opt block">
             {{!-- 修改地址 --}}
             {{!-- 修改地址 --}}
-            {{#if changeable}}
+            {{#if addressModify}}
                 <a href="{{newUrl}}" class="btn">修改地址</a>
                 <a href="{{newUrl}}" class="btn">修改地址</a>
             {{/if}}
             {{/if}}
             {{#if isDepositAdvance}}
             {{#if isDepositAdvance}}