提交促销以己部分页面商家端功能迁移，接口对接

manager/src/views/logistics/index.vue

@@ -1,32 +1,30 @@
 <template>
-  <Card>
-    <Tabs :value="type">
-        <TabPane label="物流公司" name="company">
-          <company/>
-        </TabPane>
-        <TabPane label="物流模版" name="template">
-          <!-- <shipTemplate/> -->
-        </TabPane>
-    </Tabs>
-  </Card>
+  <div>
+    <Card class="mb_10">
+      <h2 class="mb_10">运费模版</h2>
+      <shipTemplate />
+    </Card>
+    <Card>
+      <h2 class="mb_10">物流公司</h2>
+      <company />
+    </Card>
+  </div>
 </template>
 
 <script>
 import company from './company.vue'
 import shipTemplate from './shipTemplate.vue';
-  export default {
-    components:{
-      company,
-      shipTemplate
-    },
-    data(){
-      return{
-        type:'company'
-      }
+export default {
+  components: {
+    company,
+    shipTemplate
+  },
+  data() {
+    return {
+
     }
   }
+}
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>