Merge branch 'feature/refundApply' into release/5.5

@@ -335,8 +335,7 @@ const getOrders = (params) => {
                     });
                     });
 
 
                     // 如果不允许修改省
                     // 如果不允许修改省
-                    if (value.is_support_change_province !== 'Y' &&
-                    !_.get(value, 'delivery_address.province_area_code', false)) {
+                    if (value.is_support_change_province !== 'Y') {
                         modifyAddress.modifyAddressUrl += '&provinceAreaCode=' +
                         modifyAddress.modifyAddressUrl += '&provinceAreaCode=' +
                             _.get(value, 'delivery_address.province_area_code', '');
                             _.get(value, 'delivery_address.province_area_code', '');
                     }
                     }

@@ -305,8 +305,9 @@ const orderDetailData = (uid, orderCode) => {
             });
             });
 
 
             // 如果不允许修改省
             // 如果不允许修改省
-            if (orderDetail.isSupportChangeProvince !== 'Y' && orderDetail.provinceAreaCode) {
-                orderDetail.newUrl = orderDetail.newUrl + '&provinceAreaCode=' + orderDetail.provinceAreaCode;
+            if (orderDetail.isSupportChangeProvince !== 'Y') {
+                orderDetail.newUrl = orderDetail.newUrl + '&provinceAreaCode=' +
+                    _.get(orderDetail, 'deliveryAddress.provinceAreaCode', '');
             }
             }
 
 
              // 为支付的拆单配送信息
              // 为支付的拆单配送信息

@@ -25,8 +25,7 @@
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">
             <label for="address" class="label-address">详细地址：</label>
             <label for="address" class="label-address">详细地址：</label>
-            <textarea name="address" type="text" value="" maxlength="255">{{address}}
-            </textarea>
+            <textarea name="address" type="text" value="" maxlength="255">{{address}}</textarea>
         </div>
         </div>
         <input type="hidden" name="orderCode" value="{{orderCode}}">
         <input type="hidden" name="orderCode" value="{{orderCode}}">
     </form>
     </form>

@@ -9,7 +9,7 @@
                 </div>
                 </div>
             </section>
             </section>
         {{else}}
         {{else}}
-            <section class="owner-info block" data-changeable="{{changeable}}" data-url="{{url}}">
+            <section class="owner-info block" data-changeable="{{false}}" data-url="{{url}}">
                 <span class="iconfont">&#xe637;</span>
                 <span class="iconfont">&#xe637;</span>
 
 
                 <div class="beside-icon">
                 <div class="beside-icon">
@@ -122,6 +122,10 @@
          {{/if}}
          {{/if}}
 
 
         <div class="opt block">
         <div class="opt block">
+            {{!-- 申请退款 --}}
+            {{#if refundApply}}
+                    <span class="btn btn-refund">申请退款</span>
+            {{/if}}
             {{!-- 修改地址 --}}
             {{!-- 修改地址 --}}
             {{#if addressModify}}
             {{#if addressModify}}
                 <a href="{{newUrl}}" class="btn">修改地址</a>
                 <a href="{{newUrl}}" class="btn">修改地址</a>
@@ -160,11 +164,6 @@
                         <span class="btn btn-check-logistics">查看二维码</span>
                         <span class="btn btn-check-logistics">查看二维码</span>
                     </a>
                     </a>
                 {{/if}}
                 {{/if}}
-
-                {{!-- 申请退款 --}}
-                {{#if refundApply}}
-                        <span class="btn btn-refund">申请退款</span>
-                {{/if}}
             {{/if}}
             {{/if}}
         </div>
         </div>
     </div>
     </div>

@@ -13,9 +13,6 @@ var $ = require('yoho-jquery'),
 var $navLi = $('#order-nav > li'),
 var $navLi = $('#order-nav > li'),
     $orderContainer = $('#order-container');
     $orderContainer = $('#order-container');
 
 
-var $sureClose = $('.cancel'); // 删除订单按钮
-var $sureRefund = $('.refund'); // 申请退款按钮
-
 var $curContainer = $orderContainer.children('.orders:not(.hide)');// 保存当前显示的order-container
 var $curContainer = $orderContainer.children('.orders:not(.hide)');// 保存当前显示的order-container
 
 
 var winH = $(window).height();
 var winH = $(window).height();
@@ -246,11 +243,28 @@ orderHammer.on('tap', function(e) {
         });
         });
     } else if ($cur.closest('.cancel').length > 0) {
     } else if ($cur.closest('.cancel').length > 0) {
         // 取消订单
         // 取消订单
-        // $reaMask.css('visibility', 'visible');
+        dialog.showDialog({
+            dialogText: '取消订单后，本单享有的优惠可能会一并取消，确定申请吗？',
+            hasFooter: {
+                leftBtnText: '返回',
+                rightBtnText: '确定'
+            }
+        }, function() {
+            dialog.hideDialog();
+            $reaMask.css('visibility', 'visible');
+        });
     } else if ($cur.closest('.refund').length > 0) {
     } else if ($cur.closest('.refund').length > 0) {
-
         // 申请退款
         // 申请退款
-        // $refundReaMask.css('visibility', 'visible');
+        dialog.showDialog({
+            dialogText: '申请退款后，本单享有的优惠可能会一并取消，确定申请吗？',
+            hasFooter: {
+                leftBtnText: '返回',
+                rightBtnText: '确定'
+            }
+        }, function() {
+            dialog.hideDialog();
+            $refundReaMask.css('visibility', 'visible');
+        });
 
 
         /**
         /**
          * 埋点
          * 埋点
@@ -465,34 +479,6 @@ $reaMask.on('touchend', function(event) {
     event.stopPropagation();
     event.stopPropagation();
 });
 });
 
 
-// 弹出取消订单提示框
-$sureClose.on('click', function() {
-    dialog.showDialog({
-        dialogText: '取消订单后，本单享有的优惠可能会一并取消，确定申请吗？',
-        hasFooter: {
-            leftBtnText: '返回',
-            rightBtnText: '确定'
-        }
-    }, function() {
-        dialog.hideDialog();
-        $reaMask.css('visibility', 'visible');
-    });
-});
-
-// 弹出申请退款提示框
-$sureRefund.on('click', function() {
-    dialog.showDialog({
-        dialogText: '申请退款后，本单享有的优惠可能会一并取消，确定申请吗？',
-        hasFooter: {
-            leftBtnText: '返回',
-            rightBtnText: '确定'
-        }
-    }, function() {
-        dialog.hideDialog();
-        $refundReaMask.css('visibility', 'visible');
-    });
-});
-
 // 申请退款
 // 申请退款
 $refundReaMask.on('touchend', function(event) {
 $refundReaMask.on('touchend', function(event) {
     if (event.target.className !== 'refund-reason-mask') {
     if (event.target.className !== 'refund-reason-mask') {