Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev

zhanghua

5 天以前 1113721c0e068c57adbc15149cce15563960a7f2

 pages/order/orderDetail.vue

@@ -260,7 +260,7 @@
</template>

<script>
import '@/uview-components/uview-ui'
import '@/components/uview-components/uview-ui'
import { getExpress, getPackage } from "@/api/trade.js";
import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";