修改管理端bug

seller/src/views/promotion/pintuan/pintuanGoods.vue

@@ -19,11 +19,14 @@
       <Row class="operation">
         <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
           <template slot-scope="{ row, index }" slot="price">
-            <Input v-model="row.price" @input="goodsData[index].price = row.price" />
+            <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
           </template>
           <template slot-scope="{ row }" slot="QRCode">
             <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
           </template>
+          <template slot-scope="{ index }" slot="action">
+            <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
+          </template>
         </Table>
       </Row>
       <Row type="flex" justify="end" class="page operation">
@@ -138,27 +141,9 @@ export default {
 
         {
           title: "操作",
-          key: "action",
+          slot: "action",
           minWidth: 50,
           align: "center",
-          render: (h, params) => {
-            return h(
-              "Button",
-              {
-                props: {
-                  size: "small",
-                  type: "error",
-                  ghost: true,
-                },
-                on: {
-                  click: () => {
-                    this.delGoods(params.index);
-                  },
-                },
-              },
-              "删除"
-            );
-          },
         },
       ],
       goodsData: [], // 商品列表
@@ -327,9 +312,9 @@ export default {
   margin: 20px 0;
   font-size: 15px;
   &::before{
-    content: '';
-    border: 1px solid $theme_color;
-    height: 10px;
+    content: '|';
+    color: $theme_color;
+    display: inline-block;
     font-weight: bold;
     font-size: 16px;
     margin-right: 5px;

seller/src/views/promotion/seckill/seckill.vue

@@ -64,14 +64,19 @@
           </template>
           <template slot-scope="{ row }" slot="action">
             <Button
-              v-if="
-                row.promotionStatus === 'NEW'
-              "
+              v-if="row.promotionStatus === 'NEW'"
               type="primary"
               size="small"
               @click="manage(row)"
               >管理</Button
             >
+            <Button
+              v-else
+              type="info"
+              size="small"
+              @click="manage(row)"
+              >查看</Button
+            >
           </template>
         </Table>
       </Row>

seller/src/views/promotion/seckill/seckillGoods.vue

@@ -16,7 +16,7 @@
           <Button @click="delAll">批量删除</Button>
         </template>
       </Row>
-      <Row v-show="openTip">
+      <Row v-show="openTip"  v-if="promotionStatus == 'NEW'">
         <Alert show-icon>
           已选择 <span class="select-count">{{ selectCount }}</span> 项
         </Alert>
@@ -101,8 +101,7 @@
               <template slot-scope="{ row, index }" slot="action">
                 <Button
                   type="error"
-                  v-if="row.promotionApplyStatus !== 'PASS'"
-                  :disabled="promotionStatus != 'NEW'"
+                  v-if="promotionStatus === 'NEW'"
                   size="small"
                   ghost
                   @click="delGoods(index, row.id)"
@@ -119,7 +118,7 @@
         <Button
           type="primary"
           :loading="submitLoading"
-          :disabled="promotionStatus != 'NEW'"
+          v-if="promotionStatus === 'NEW'"
           @click="save"
           >提交</Button
         >