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

manager/src/views/logistics/company.vue

@@ -54,13 +54,13 @@
           </i-switch>
         </FormItem>
 
-        <FormItem label="禁用状态" prop="disabled">
+        <!-- <FormItem label="禁用状态" prop="disabled">
 
           <i-switch true-value="OPEN" false-value="CLOSE" v-model="form.disabled" size="large">
             <span slot="open">开启</span>
             <span slot="close">禁用</span>
           </i-switch>
-        </FormItem>
+        </FormItem> -->
       </Form>
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
@@ -99,7 +99,7 @@
         form: {
           // 添加或编辑表单对象初始化数据
           name: "",
-          disabled:"CLOSE"
+          disabled:"OPEN"
         },
         // 表单验证规则
         formValidate: {
@@ -125,12 +125,7 @@
             minWidth: 120,
             sortable: false,
           },
-          {
-            title: "状态",
-            key: "disabled",
-            width: 150,
-            slot: "disableSlot",
-          },
+          
           {
             title: "创建时间",
             key: "createTime",
@@ -246,7 +241,7 @@
             if (this.modalTitle == "添加") {
               // 添加 避免编辑后传入id等数据 记得删除
               delete this.form.id;
-
+              this.form.disabled = 'OPEN'
 
               addLogistics(this.form).then((res) => {
                 this.submitLoading = false;
@@ -257,6 +252,7 @@
                 }
               });
             } else {
+              this.form.disabled = 'OPEN'
               // 编辑
               updateLogistics(this.id, this.form).then((res) => {
                 this.submitLoading = false;
@@ -292,7 +288,8 @@
 
 
 
-        this.form.disabled = v.disabled
+        // this.form.disabled = v.disabled
+        this.form.disabled = 'OPEN'
       },
       // 删除物流公司
       remove(v) {

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>