合并master

manager/src/views/promotion/coupon/coupon.vue

@@ -90,16 +90,15 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-
+          width: 120,
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-
-          tooltip: true,
-        },
-        {
+          width: 120,
+          tooltip: true
+        }, {
           title: "面额/折扣",
           key: "price",
           width: 120,
@@ -121,10 +120,9 @@ export default {
           width: 150,
           render: (h, params) => {
             return h(
-              "div",
-              params.row.receivedNum + "/" + params.row.publishNum
-            );
+              "div", params.row.receivedNum + "/" + params.row.publishNum)
           },
+          minWidth:130,
         },
         {
           title: "优惠券类型",
@@ -168,6 +166,7 @@ export default {
               },
             });
           },
+          minWidth:150,
         },
         {
           title: "状态",
@@ -202,13 +201,14 @@ export default {
               ),
             ]);
           },
+          minWidth:70,
         },
         {
           title: "操作",
           slot: "action",
           align: "center",
           fixed: "right",
-          width: 100,
+          minWidth: 140
         },
       ],
       data: [], // 表单数据

seller/src/views/goods/goods-seller/goods.vue

@@ -224,7 +224,7 @@ export default {
         {
           title: "商品编号",
           key: "sn",
-          width: 200,
+          width: 100,
           tooltip: true,
         },
         {
@@ -336,6 +336,7 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: "right",
           width: 200,
           render: (h, params) => {
             let enableOrDisable = "";

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -313,7 +313,10 @@
               </Input>
             </FormItem>
             <FormItem class="form-item-view-el" label="运费" prop="skuList">
-                <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateChange" v-model="baseInfoForm.freightPayer">
+              <RadioGroup type="button" button-style="solid"
+                @on-change="logisticsTemplateChange"
+                v-model="baseInfoForm.freightPayer"
+              >
                 <Radio label="STORE">
                   <span>卖家承担运费</span>
                 </Radio>
@@ -322,14 +325,22 @@
                 </Radio>
               </RadioGroup>
             </FormItem>
-              <FormItem class="form-item-view-el" label="物流模板" prop="templateId" v-if="logisticsTemplateShow">
+            <FormItem
+              class="form-item-view-el"
+              label="物流模板"
+              prop="templateId"
+              v-if="logisticsTemplateShow"
+            >
               <Select v-model="baseInfoForm.templateId" style="width: 200px">
-                  <Option v-for="item in logisticsTemplate" :value="item.id" :key="item.id">{{ item.name }}
+                <Option
+                  v-for="item in logisticsTemplate"
+                  :value="item.id"
+                  :key="item.id"
+                >{{ item.name }}
                 </Option>
               </Select>
             </FormItem>
           </div>
-          </div>
           <h4>其他信息</h4>
           <div class="form-item-view">
             <FormItem class="form-item-view-el" label="商品发布" prop="release">

seller/src/views/order/order/exportOrderDeliver.vue

@@ -40,8 +40,12 @@
 </template>
 
 <script>
-import { downLoadDeliverExcel } from "@/api/order.js";
+import JsonExcel from "vue-json-excel";
+import { getLogisticsChecked } from "@/api/order.js";
 export default {
+  components: {
+    "download-excel": JsonExcel,
+  },
   data() {
     return {
       // 步骤集合
@@ -75,8 +79,8 @@ export default {
     },
 
    async downLoad() {
-      let res = await downLoadDeliverExcel({ orderIds: "1402886442132217857" });
-      console.log(res);
+     let res = await  getLogisticsChecked()
+
     },
   },
 };

seller/src/views/promotion/coupon/coupon.vue

@@ -143,13 +143,13 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-          minWidth: 120,
+          width: 120,
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-          minWidth: 120,
+          width: 120,
           tooltip: true
         }, {
           title: "面额/折扣",
@@ -170,11 +170,11 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
-          width: 100,
           render: (h, params) => {
             return h(
               "div", params.row.receivedNum + "/" + params.row.publishNum)
-          }
+          },
+          minWidth:130,
         },
         {
           title: "优惠券类型",
@@ -210,18 +210,17 @@ export default {
         },
         {
           title: "活动时间",
-          minWidth: 120,
           render: (h, params) => {
             return h("div", {
               domProps:
                 {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
             });
           },
+          minWidth:150,
         },
         {
           title: "状态",
           key: "promotionStatus",
-          width: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
@@ -248,16 +247,17 @@ export default {
                   },
                 },
                 text
-              )
+              ),
             ]);
-          }
+          },
+          minWidth:70,
         },
         {
           title: "操作",
           slot: "action",
           align: "center",
           fixed: "right",
-          minWidth: 80,
+          minWidth: 140
         },
       ],
       data: [], // 表单数据