合并ma分支解决冲突

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

@@ -42,46 +42,37 @@
         <Button @click="delAll">批量下架</Button>
         <!-- <Button @click="upAll" >批量上架</Button> -->
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <!-- <Button
-              type="info"
-              size="small"
-              style="margin-right: 10px"
-              @click="receiveInfo(row)"
-              >查看</Button
-            > -->
-            <Button
-              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-              type="primary"
-              size="small"
-              style="margin-right: 10px"
-              @click="edit(row)"
-            >编辑
-            </Button
-            >
-            <Button
-              v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
-              type="error"
-              size="small"
-              style="margin-right: 10px"
-              @click="remove(row)"
-            >下架
-            </Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+            type="primary"
+            size="small"
+            style="margin-right: 10px"
+            @click="edit(row)"
+          >编辑
+          </Button
+          >
+          <Button
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            type="error"
+            size="small"
+            style="margin-right: 10px"
+            @click="remove(row)"
+          >下架
+          </Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"

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

@@ -72,9 +72,7 @@
           </div>
           <h4>适用品类范围</h4>
           <div>
-            <Row>
-              <Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-            </Row>
+            <Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
             <Row type="flex" justify="end" class="page">
               <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
                 size="small" show-total show-elevator show-sizer></Page>

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

@@ -70,7 +70,7 @@
 
             <FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')">选择商品</Button>
+                <Button type="primary" @click="openSkuList">选择商品</Button>
                 <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
               </div>
               <Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
@@ -392,6 +392,14 @@ export default {
       );
       this.$router.go(-1);
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     changeSelect(e) {
       // 已选商品批量选择
       this.selectedGoods = e;
@@ -424,25 +432,19 @@ export default {
     },
     selectedGoodsData(item) {
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
             originalPrice: e.price,
             quantity: e.quantity,
             storeId: e.storeId,
-            sellerName: e.sellerName,
+            storeName: e.storeName,
             skuId: e.id,
           });
-        }
       });
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getGoodsCategory(e) {
       // 获取级联选择器商品分类id

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

@@ -1,51 +1,45 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <template slot-scope="{ row }" slot="rangeTime">
-                <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
-              </template>
-              <template slot-scope="{ row }" slot="action">
-                <Button
-                  type="error"
-                  ghost
-                  size="small"
-                  :disabled="row.memberCouponStatus != 'NEW'"
-                  @click="remove(row)"
-                  >作废</Button
-                >
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="rangeTime">
+          <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            type="error"
+            ghost
+            size="small"
+            :disabled="row.memberCouponStatus != 'NEW'"
+            @click="remove(row)"
+            >作废</Button
+          >
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 

manager/src/views/promotion/fullCut/full-cut.vue

@@ -43,35 +43,33 @@
           <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
         </Form>
       </Row>
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="promotionType">
-            {{ row.isFullMinus ? "满减" : "满折" }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <div>
-              <Button type="success" size="small" @click="view(row)"
-                >查看</Button
-              >&nbsp;
-            </div>
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="promotionType">
+          {{ row.isFullMinus ? "满减" : "满折" }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <div>
+            <Button type="success" size="small" @click="view(row)"
+              >查看</Button
+            >&nbsp;
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"

manager/src/views/promotion/pintuan/pintuan.vue

@@ -45,7 +45,6 @@
           >
         </Form>
       </Row>
-      <Row class="padding-row">
         <Table
           :loading="loading"
           border
@@ -72,7 +71,6 @@
             </Button>
           </template>
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"

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

@@ -10,10 +10,10 @@
       ></Table>
 
       <h4>商品信息</h4>
-      <Row class="operation">
         <Table
           :loading="loading"
           border
+          class="operation"
           :columns="goodsColumns"
           :data="goodsData"
           ref="table"
@@ -34,7 +34,6 @@
           </template>
         
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"

manager/src/views/promotion/pointsGoods/editPointsGoods.vue

@@ -5,19 +5,19 @@
         <div class="base-info-item">
           <h4>积分商品信息</h4>
           <div class="form-item-view">
-            <FormItem label="商品名称" prop="goodsName">
+            <FormItem label="商品名称">
               <div>{{ form.goodsSku.goodsName }}</div>
             </FormItem>
-            <FormItem label="SKU编码" prop="skuId">
+            <FormItem label="SKU编码">
               <div>{{ form.goodsSku.id }}</div>
             </FormItem>
-            <FormItem label="店铺名称" prop="sellerName">
-              <div>{{ form.goodsSku.sellerName }}</div>
+            <FormItem label="店铺名称">
+              <div>{{ form.goodsSku.storeName }}</div>
             </FormItem>
-            <FormItem label="商品价格" prop="goodsPrice">
+            <FormItem label="商品价格">
               <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
             </FormItem>
-            <FormItem label="库存" prop="quantity">
+            <FormItem label="库存">
               <div>{{ form.goodsSku.quantity }}</div>
             </FormItem>
             <FormItem label="结算价格" prop="settlementPrice">
@@ -90,9 +90,7 @@
             </FormItem>
           </div>
           <div class="footer">
-            <Button @click="closeCurrentPage" style="margin-right: 5px"
-              >返回</Button
-            >
+            <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
             <Button
               type="primary"
               :loading="submitLoading"

manager/src/views/promotion/pointsGoods/pointsGoods.vue

@@ -61,70 +61,68 @@
         <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
 
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-        >
-          <template slot-scope="{ row }" slot="goodsName">
-            <div>
-              <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
-              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                </div>
-                <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
-              </Poptip>
-            </div>
-          </template>
-          <template slot-scope="{ row }" slot="price">
-            <div>{{ row.goodsSku.price | unitPrice("￥") }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="settlementPrice">
-            <div>{{ row.settlementPrice | unitPrice("￥") }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="quantity">
-            <div>{{ row.goodsSku.quantity }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="startTime">
-            <div>{{ row.startTime }}</div>
-            <div>{{ row.endTime }}</div>
-          </template>
-          
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              v-if="row.promotionStatus == 'NEW'"
-              type="info"
-              size="small"
-              @click="edit(row.id)"
-              style="margin-right: 5px"
-              >编辑</Button
-            >
-            <Button
-              v-if="row.promotionStatus == 'START'"
-              type="warning"
-              size="small"
-              @click="statusChanged(row.id, 'CLOSE')"
-              style="margin-right: 5px"
-              >停用</Button
-            >
-            <Button
-              v-if="row.promotionStatus == 'CLOSE'"
-              type="warning"
-              size="small"
-              @click="statusChanged(row.id, 'START')"
-              style="margin-right: 5px"
-              >启用</Button
-            >
-            <Button type="error" size="small" @click="close(row.id)"
-              >删除</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+      >
+        <template slot-scope="{ row }" slot="goodsName">
+          <div>
+            <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
+            <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+              <div slot="content">
+                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+              </div>
+              <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
+            </Poptip>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="price">
+          <div>{{ row.goodsSku.price | unitPrice("￥") }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="settlementPrice">
+          <div>{{ row.settlementPrice | unitPrice("￥") }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="quantity">
+          <div>{{ row.goodsSku.quantity }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="startTime">
+          <div>{{ row.startTime }}</div>
+          <div>{{ row.endTime }}</div>
+        </template>
+        
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus == 'NEW'"
+            type="info"
+            size="small"
+            @click="edit(row.id)"
+            style="margin-right: 5px"
+            >编辑</Button
+          >
+          <Button
+            v-if="row.promotionStatus == 'START'"
+            type="warning"
+            size="small"
+            @click="statusChanged(row.id, 'CLOSE')"
+            style="margin-right: 5px"
+            >停用</Button
+          >
+          <Button
+            v-if="row.promotionStatus == 'CLOSE'"
+            type="warning"
+            size="small"
+            @click="statusChanged(row.id, 'START')"
+            style="margin-right: 5px"
+            >启用</Button
+          >
+          <Button type="error" size="small" @click="close(row.id)"
+            >删除</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber"

manager/src/views/promotion/seckill/addSeckill.vue

@@ -148,11 +148,11 @@ export default {
         }
       });
     },
-    addPeriod() {
+    addPeriod() { // 添加时间段显示input
       this.addPeriodTime();
       this.showAddPeriod = true;
     },
-    addPeriodTime() {
+    addPeriodTime() { // 添加秒杀时间段
       this.showAddPeriod = false;
       if (
         this.periodTime !== null &&
@@ -161,20 +161,10 @@ export default {
         this.form.seckillPeriod.push(this.periodTime);
       }
     },
-    removePeriodTime(event, name) {
+    removePeriodTime(event, name) { // 移除秒杀时间段
       this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name);
     },
-    handleSelectLink(item, index) {
-      // 调起选择链接弹窗
-      if (item) this.selectedNav = item;
-      this.$refs.liliDialog.open('link')
-    },
-    changeScope(val) {
-      if (val === "PORTION_GOODS") {
-        this.handleSelectLink();
-      }
-    },
-    /** 保存平台优惠券 */
+    /** 添加秒杀活动 */
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {

manager/src/views/promotion/seckill/seckill.vue

@@ -53,7 +53,7 @@
       <Row class="operation padding-row">
         <Button type="primary" @click="add">添加活动</Button>
       </Row>
-      <Row>
+
         <Table
           :loading="loading"
           border
@@ -112,7 +112,7 @@
             >
           </template>
         </Table>
-      </Row>
+
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"

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

@@ -29,10 +29,10 @@
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>
-      <Row class="operation">
         <Table
           :loading="loading"
           border
+          class="operation"
           :columns="goodsColumns"
           :data="goodsList"
           ref="table"
@@ -106,7 +106,6 @@
             >
           </template>
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"