Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/mallManagement/order/order_detail/index.vue

@@ -36,6 +36,8 @@
                   </template>
                   <template v-if="['SPTG', 'DFH'].includes(orderDetail.orderStatus)">
                     <el-button size="small" type="primary" @click="showDialog('send')">发货</el-button>
+                  </template>
+                  <template v-if="['DFH'].includes(orderDetail.orderStatus)">
                     <el-popconfirm title="确定取消订单吗？" @confirm="cancelOrder" style="margin-left: 10px">
                       <el-button slot="reference" size="small" type="danger">取消订单</el-button>
                     </el-popconfirm>