feat:自提点

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -236,11 +236,19 @@ import {
   pindanGoods,
   markGoodsInfo,
   editGoods,
-  marketingInfo,
 } from "../../../../service/Activity/index";
 
 export default {
-  props: ["editInfo"],
+  props: {
+    editInfo: {
+      type: Object,
+      required: () => {},
+    },
+    addProduc: {
+      type: Array,
+      required: () => {},
+    },
+  },
   data() {
     return {
       // 商品列表
@@ -487,17 +495,12 @@ export default {
       }
     },
     // 获取营销活动详情
-    async marketingInfoMet() {
+    marketingInfoMet() {
       let marketingId = this.$route.query.marketing_id;
       if (marketingId == undefined) {
         return;
       }
-      let params = {
-        marketing_id: marketingId,
-        marketing_type: "4",
-      };
-      const res = await marketingInfo(params);
-      this.comTableData = res.result.goods_list;
+      this.comTableData = this.addProduc;
     },
   },
   created() {

src/pages/Activity/releaseProduc/components/infoEditing.vue

@@ -41,7 +41,6 @@
     <el-dialog width="40%" v-model="isShowPopver">
       <el-image :src="popoverImage" fit="fill" style="width: 100%"></el-image>
     </el-dialog>
-    {{ infoEditArr }}
   </div>
 </template>
 
@@ -49,9 +48,8 @@
 import { GOODS_URI } from "../../../../../server/config";
 import { marketingInfo } from "../../../../service/Activity/index";
 export default {
-  //props: ["editInfo"],
   props: {
-    infoEditArr: {
+    editInfo: {
       type: Object,
       required: () => {}
     }
@@ -111,7 +109,6 @@ export default {
   },
   created() {
     this.marketingInfoMet();
-    console.log(this.editInfo);
   }
 };
 </script>

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -47,77 +47,81 @@
               >添加自提点</el-button
             >
           </el-form-item>
-          <span class="checked">已选</span>
-          <!-- 自提点列表 -->
-          <el-table
-            class="tabList"
-            ref="multipleTable"
-            :data="takePlacelist"
-            border
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column align="center" type="selection" width="80">
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="自提点名称"
-              align="center"
-              width="width"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="location"
-              align="center"
-              label="位置"
-              width="width"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              align="center"
-              label="详细地址"
-              width="width"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="contactor"
-              align="center"
-              label="自提点联系人"
-              width="width"
+          <div class="tabla-wrapper">
+            <p class="checked">{{ `已选  ${checkedNum}` }}</p>
+            <!-- 自提点列表 -->
+            <el-table
+              class="tableList"
+              max-height="350"
+              ref="multipleTable"
+              :data="takePlacelist"
+              border
+              tooltip-effect="dark"
+              style="width: 100%"
+              @selection-change="handleSelectionChange"
             >
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              align="center"
-              label="操作"
-              width="width"
-            >
-              <template #default="scope">
-                <el-popconfirm
-                  title="确定要删除此自提点吗？"
-                  @confirm="deleteTakePlace"
-                >
-                  <template #reference>
-                    <el-button
-                      type="primary"
-                      size="small"
-                      @click="handleDelete(scope.row)"
-                      >删除</el-button
-                    >
-                  </template>
-                </el-popconfirm>
-              </template>
-            </el-table-column>
-          </el-table>
+              <el-table-column align="center" type="selection" width="80">
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="自提点名称"
+                align="center"
+                width="width"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="location"
+                align="center"
+                label="位置"
+                width="width"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                align="center"
+                label="详细地址"
+                width="width"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="contactor"
+                align="center"
+                label="自提点联系人"
+                width="width"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                align="center"
+                label="操作"
+                width="width"
+              >
+                <template #default="scope">
+                  <el-popconfirm
+                    title="确定要删除此自提点吗？"
+                    @confirm="deleteTakePlace"
+                  >
+                    <template #reference>
+                      <el-button
+                        type="primary"
+                        size="small"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                      >
+                    </template>
+                  </el-popconfirm>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+
           <!-- 分页 -->
           <div class="pagination-wrapper">
             <el-pagination
               background
               layout="prev, pager, next"
               :total="pageCount"
-              :page-size="5"
+              :page-size="500"
               @current-change="handleCurrentChange"
             >
             </el-pagination>
@@ -208,12 +212,7 @@
     </el-dialog>
 
     <!-- 地图 dialog -->
-    <el-dialog
-      custom-class="mapDialog"
-      v-model="mapDialogVisible"
-      width="100%"
-      :before-close="handleClose"
-    >
+    <el-dialog custom-class="mapDialog" v-model="mapDialogVisible" width="100%">
       <my-map class="my-map" @getMapInfo="getMapInfo" />
       <div class="confirmButton">
         <el-button @click="mapDialogVisible = false">取 消</el-button>
@@ -238,12 +237,6 @@ let checkphone = (rule, value, callback) => {
   }
 };
 export default {
-  props: {
-    infoEditArr: {
-      type: Object,
-      required: () => {}
-    }
-  },
   data() {
     return {
       startDate: "", //开始时间
@@ -272,12 +265,6 @@ export default {
       startMaxTime: "", // 开始时间的最大选择时间
       mapDialogVisible: false,
       pageLoading: false,
-      value1: "",
-      defaultTime: [
-        new Date(2000, 1, 1, 12, 0, 0),
-        new Date(2000, 2, 1, 8, 0, 0)
-      ],
-
       rules: {
         name: [
           { required: true, message: "请输入自提点名称", trigger: "blur" },
@@ -300,9 +287,10 @@ export default {
           { validator: checkphone, trigger: "blur" }
         ]
       },
+      checkedNum: 0, // 勾选自提点数量
       selfLiftingPoint: "", // 自提点搜索关键词
       offset: 0, // 偏移量
-      limit: 5, // 每页条数
+      limit: 500, // 每页条数
       page: 1, //当前页码
       id: "", // 删除自提点id
       pageCount: 0, // 总条数
@@ -429,6 +417,7 @@ export default {
     },
     // 复选框
     handleSelectionChange(val) {
+      this.checkedNum = val.length;
       this.multipleSelection = val;
     },
 
@@ -465,6 +454,15 @@ export default {
   //height: 500px;
   .card-block {
     width: 100%;
+    .tabla-wrapper {
+      > p {
+        margin-left: 10px;
+        text-align: left;
+      }
+      .tableList {
+        height: 500px;
+      }
+    }
   }
   .pagination-wrapper {
     height: 60px;

src/pages/Activity/releaseProduc/index.vue

 <template>
   <div class="releaseProduc">
-    {{ infoEditArr }}
     <h4 class="headTitle">发布活动</h4>
     <el-steps
       class="steps"
       :active="active"
       finish-status="success"
       space="30%"
-      align-center="true"
+      :align-center="true"
     >
       <el-step title="信息编辑"></el-step>
       <el-step title="添加商品"></el-step>
       <el-step title="拼单设置"></el-step>
     </el-steps>
     <div class="content">
-      <infoEditing
-        ref="infoEdit"
-        v-if="active === 1"
-        :infoEditArr="infoEditArr"
-      />
+      <infoEditing ref="infoEdit" v-if="active === 1" :editInfo="infoEditArr" />
       <addProduc
         ref="addProduc"
         v-else-if="active === 2"
-        :editInfo="infoEditArr"
+        :editInfo="testData"
+        :addProduc="addProducArr"
       />
-      <spellOrderSet :infoEditArr="infoEditArr" v-else />
+      <spellOrderSet :spellOrderSet="spellOrderSetArr" v-else />
     </div>
     <div class="stepsBtn">
       <el-button @click="prev" v-show="active >= 2" style="margin-right: 20px"
@@ -47,8 +43,11 @@ import { ElMessage } from "element-plus";
 import infoEditing from "./components/infoEditing.vue";
 import addProduc from "./components/addProduc.vue";
 import spellOrderSet from "./components/spellOrderSet.vue";
-// , marketingInfo
-import { addMarketing, updateMarketing } from "../../../service/Activity/index";
+import {
+  addMarketing,
+  marketingInfo,
+  updateMarketing
+} from "../../../service/Activity/index";
 export default {
   components: {
     infoEditing,
@@ -57,11 +56,11 @@ export default {
   },
   data() {
     return {
-      active: 1, // 步骤条状态
+      active: 3, // 步骤条状态
       infoEditArr: [], // 信息编辑数据
       addProducArr: [], // 添加商品
       goodsSkuIDArr: [], // 接收goods_sku_id
-      // spellOrderSetArr:[]
+      spellOrderSetArr: [],
       startDate: "", // 开始时间
       endDate: "" // 结束时间
     };
@@ -101,19 +100,20 @@ export default {
     },
 
     // 获取营销活动详情
-    // async marketingInfoMet() {
-    //   let marketingId = this.$route.query.marketing_id;
-    //   if (marketingId == undefined) {
-    //     return;
-    //   }
-    //   let params = {
-    //     marketing_id: marketingId,
-    //     marketing_type: "4",
-    //   };
-    //     const res = await marketingInfo(params);
-    //     console.log(res);
-    //     this.infoEditArr = res.result.marketing_info;
-    // },
+    async marketingInfoMet() {
+      let marketingId = this.$route.query.marketing_id;
+      if (marketingId == undefined) {
+        return;
+      }
+      let params = {
+        marketing_id: marketingId,
+        marketing_type: "4"
+      };
+      const res = await marketingInfo(params);
+      this.infoEditArr = res.result.marketing_info;
+      this.addProducArr = res.result.goods_list;
+      this.spellOrderSetArr = res.result.marketing_info;
+    },
 
     // 取消
     cancel() {
@@ -164,7 +164,7 @@ export default {
     }
   },
   created() {
-    // this.marketingInfoMet();
+    this.marketingInfoMet();
   }
 };
 </script>