Merge branch 'hotfix/pay' into 'master'

order-btn-fuck



See merge request !856

@@ -116,7 +116,9 @@ const _getOrderStatus = (order) => {
         return {};
         return {};
     }
     }
 
 
-    if (parseInt(order.attribute, 10) === 9) {
+    let attribute = _.parseInt(order.attribute);
+
+    if (attribute === 9 || attribute === 11) {
         /* 预售商品，不能进行任何操作 */
         /* 预售商品，不能进行任何操作 */
         orderBtn.push({
         orderBtn.push({
             isAdvance: true
             isAdvance: true

@@ -57,7 +57,9 @@ const _getOrderStatus = (order, showLogistics) => {
         return {};
         return {};
     }
     }
 
 
-    if (parseInt(order.attribute, 10) === 9) {
+    let attribute = _.parseInt(order.attribute);
+
+    if (attribute === 9 || attribute === 11) {
         /* 预售商品，不能进行任何操作 */
         /* 预售商品，不能进行任何操作 */
         orderBtn.push({
         orderBtn.push({
             isAdvance: true
             isAdvance: true

@@ -6,7 +6,7 @@
                 <li><span class="hours">{{leftTime}}</span></li>
                 <li><span class="hours">{{leftTime}}</span></li>
             </ul>
             </ul>
         {{else if isAdvance}}
         {{else if isAdvance}}
-            <span class="order-opt-info">*定金预售订单只能在APP端操作</span>
+            <span class="order-opt-info">*此订单只能在APP端操作</span>
         {{else if refundApply}}
         {{else if refundApply}}
             <span class="btn refund">申请退款</span>
             <span class="btn refund">申请退款</span>
         {{else if modifyAddress}}
         {{else if modifyAddress}}