Merge branch 'dev' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin into dev

src/views/order/franchisee/index.vue

@@ -0,0 +1,14 @@
+<template>
+    <div class="franchisee">
+        加盟商兑换专区订单
+    </div>
+</template>
+
+<script>
+import { halfOrder, halfOrderRe } from "@/api/order"
+export default {
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/order/merchant/index.vue

@@ -0,0 +1,14 @@
+<template>
+    <div class="merchant">
+        商家兑换专区订单
+    </div>
+</template>
+
+<script>
+import { halfOrder, halfOrderRe } from "@/api/order"
+export default {
+}
+</script>
+
+<style lang="scss" scoped>
+</style>