Merge branch 'zhongqi-delivery'

ghsApp/src/admin/delivery/allDelivery.vue

@@ -211,14 +211,14 @@ export default {
       const item = this.selectedDeliveryItem;
       if (!item) {
           if (this.deliveryList && this.deliveryList.length > 0) {
-              return this.deliveryList[0].price === '暂无报价' ? '0.00' : this.deliveryList[0].price;
+              return this.deliveryList[0].price === '暂无报价' ? 0 : parseInt(this.deliveryList[0].price);
           }
-          return '0.00';
+          return 0;
       }
       if (item.price === '暂无报价') {
-        return '0.00';
+        return 0;
       }
-      return item.price;
+      return parseInt(item.price);
     }
   },
   onLoad(options) {

hdApp/src/admin/order/detail.vue

@@ -27,7 +27,7 @@
               <view class="express-actions">
                 <button class="admin-button-com mini-btn btn-danger" v-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(orderInfo.sendStatus))" @click.stop="cancelMyExpress(orderInfo.id, orderInfo.deliveryId)">取消跑腿</button>
 
-                <button class="admin-button-com mini-btn" v-if="[-1, -2].includes(Number(orderInfo.sendStatus))" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
+                <button class="admin-button-com mini-btn" v-if="[-1, -2].includes(Number(orderInfo.sendStatus)) && orderInfo.status == 2" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
               </view>
             </view>
           </view>