feat: 邮箱+商品限制

src/components/Dialog/YDDialoag.vue

@@ -5,7 +5,6 @@
       v-model="dialogVisible"
       :width="dialogWidth"
       :show-close="showDialogClose"
-      :before-close="handleClose"
       :top="dialogMarginTop"
       :modal="dialogModel"
       :close-on-click-modal="dialogCloseOnClickModal"

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

@@ -2,7 +2,7 @@
   <div id="map" class="mapContainer">
     <div class="mapWrapper">
       <div class="search">
-        <el-form ref="form" label-width="80px">
+        <el-form ref="form" label-width="80px" @submit.prevent>
           <el-form-item label-position="left">
             <el-button @click="handleSearch">搜索</el-button>
             <el-input

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

@@ -408,7 +408,7 @@ export default {
     async addPlace() {
       let params = Object.assign(this.form, {
         take_place_id: this.id, //搜索关键词
-        contact_name:this.form.contactor
+        contact_name: this.form.contactor
       });
       try {
         this.pageLoading = true;

src/pages/Groupmeal/Distrib/index.vue

@@ -9,47 +9,42 @@
           >添加配送员</el-button
         >
       </div>
-      <el-table :data="distribList" border stripe style="width: 100%">
-        <el-table-column
-          align="center"
-          prop="activeName"
-          label="活动名称"
-          width="width"
-        >
+      <el-table :data="distribList" border stripe fit style="width: 100%">
+        <el-table-column align="center" prop="activeName" label="活动名称">
         </el-table-column>
-        <el-table-column align="center" label="配送员数量" width="width">
+        <el-table-column align="center" label="配送员数量">
           <template #default="scope">
             {{ scope.row.list.length }}
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="deliverer_name"
-          label="配送人员"
-          width="width"
-        >
+        <el-table-column align="center" prop="deliverer_name" label="配送人员">
           <template #default="scope">
             {{ scope.row.list.map(item => item.deliverer_name).join("、") }}
           </template>
         </el-table-column>
-        <el-table-column prop="prop" label="操作" width="width" align="center">
+        <el-table-column
+          prop="prop"
+          label="操作"
+          align="center"
+          min-width="100"
+        >
           <template #default="scope">
             <el-button type="primary" @click="handleModify(scope.row)"
               >修改</el-button
             >
-            <el-button
-              type="primary"
-              v-show="scope.row.url"
-              @click="handleDownload(scope.row.url)"
+            <el-button type="primary" @click="handleDownload(scope.row.url)"
               >下载配送路线</el-button
             >
+            <el-button type="primary" @click="handleDownload(scope.row.url)"
+              >发送记录</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <!-- 页码区 -->
       <Pagination
         @current-change="handleCurrentChange"
-        v-model:current-page="page"
+        :current-page="page"
         :page-size="pageSize"
         :total="total"
       ></Pagination>
@@ -237,7 +232,12 @@
       cancelDialogMethodName="showEmailDialogCancel"
       @showEmailDialogCancel="showEmailDialogCancel"
     >
-      <div class="emailListContent">
+      <div
+        class="emailListContent"
+        v-loading="true"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-table :data="emailListTableData" style="width: 100%">
           <el-table-column prop="email" label="接收邮箱" width="180">
           </el-table-column>
@@ -251,9 +251,11 @@
 </template>
 <script>
 import { checkEmailName } from "../../../utils/tools.js";
-import YDDialog from "../../../components/Dialog/YDDialoag.vue";
+import YDDialog from "@/components/Dialog/YDDialoag.vue";
 import Layout from "../layout/index.vue";
 import Pagination from "../components/Pagination/index.vue";
+
+//import Pagination from "../components/Pagination/index.vue";
 import {
   getDelivererList,
   getList,
@@ -275,7 +277,7 @@ export default {
       myEmialInput: "", // email地址
       isEmailRequire: false, // 验证emial非空
       emialHasError: false, // 验证email格式
-      showEmailTableDialogVisible: true, // 展示email发送情况的dialog
+      showEmailTableDialogVisible: false, // 展示email发送情况的dialog
       emailListTableData: [
         {
           email: "2016-05-02",
@@ -422,7 +424,6 @@ export default {
       this.dialogFormAssign = true;
       const { code } = row;
       this.selectActivity = code;
-      console.log(code);
       try {
         const res = await getDelivererList({ code });
         this.deliverer = res.response;
@@ -502,7 +503,6 @@ export default {
         const res = await getDelivererList();
         // this.deliverer.code = res.response.code;
         this.deliverer = res.response;
-        console.log(this.deliverer);
       } catch (error) {
         console.log(error);
       }

src/pages/Groupmeal/components/Pagination/index.vue

-
 <template>
   <div class="block">
     <el-pagination
       class="pagination"
       layout="prev, pager, next, jumper, ->,page , total"
       v-bind="$attrs"
-      v-on="$listener"
     >
     </el-pagination>
   </div>
 </template>
-  <script>
+<script>
 export default {
-  name: 'Pagination'
+  name: "Pagination"
 };
 </script>
-  <style lang="less">
+<style lang="less">
 .block {
   margin-top: 50px;
 }

src/pages/Life-no/index.vue

-
 <template>
   <layout>
     <div class="life-no">
-      <el-form
-        :inline="true"
-        :model="formInline"
-        class="demo-form-inline"
-      >
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="生活号名称">
           <el-input
             class="search_life"
@@ -17,81 +12,47 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="类型">
-          <el-select
-            v-model="life_account.type"
-            placeholder="类型"
-          >
-            <el-option
-              value="0"
-              label="全部"
-            ></el-option>
-            <el-option
-              value="1"
-              label="个人"
-            ></el-option>
-            <el-option
-              value="2"
-              label="企业"
-            ></el-option>
+          <el-select v-model="life_account.type" placeholder="类型">
+            <el-option value="0" label="全部"></el-option>
+            <el-option value="1" label="个人"></el-option>
+            <el-option value="2" label="企业"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            @click="onSearchSubmit"
-          >查询</el-button>
+          <el-button type="primary" @click="onSearchSubmit">查询</el-button>
           <el-button @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        :data="LifeNoList"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="life_account_id"
-          label="ID"
-        > </el-table-column>
-        <el-table-column
-          prop="life_account_name"
-          label="生活号名称"
-        >
+      <el-table :data="LifeNoList" border style="width: 100%">
+        <el-table-column prop="life_account_id" label="ID"> </el-table-column>
+        <el-table-column prop="life_account_name" label="生活号名称">
         </el-table-column>
-        <el-table-column
-          :formatter="hasTypeFormat"
-          label="类型"
-        >
+        <el-table-column :formatter="hasTypeFormat" label="类型">
         </el-table-column>
-        <el-table-column
-          :formatter="hasStatusFormat"
-          label="状态"
-        >
+        <el-table-column :formatter="hasStatusFormat" label="状态">
         </el-table-column>
-        <el-table-column
-          prop="create_time"
-          label="创建时间"
-        > </el-table-column>
+        <el-table-column prop="create_time" label="创建时间"> </el-table-column>
         <el-table-column label="操作">
           <template #default="scope">
             <el-button
               size="mini"
               type="primary"
               @click.stop="toLifeDetail(scope.row)"
-            >查看详情</el-button>
+              >查看详情</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-      <page
-        :totalNum="totalNum"
-        @update="update"
-      />
+      <page :totalNum="totalNum" @update="update" />
     </div>
   </layout>
 </template>
 
 <script>
-import Layout from '@/layouts'
-import page from "../components/Pagination"
+import Layout from "@/layouts";
+// import page from "../components/Pagination";
+import page from "../components/Pagination.vue";
+
 import { getLifeNoList as reqGetLifeNoList } from "../../service/life-no";
 export default {
   name: "LifeNo",
@@ -99,7 +60,7 @@ export default {
     Layout,
     page
   },
-  data () {
+  data() {
     return {
       params: {
         page: 1,
@@ -107,25 +68,25 @@ export default {
       },
       life_account: {
         name: "",
-        type: "",
+        type: ""
       },
       totalNum: null,
       lifeList: [],
       LifeNoList: [],
       formInline: {
-        user: '',
-        region: ''
-      }
+        user: "",
+        region: ""
       }
+    };
   },
-  created () {
-    this.getLifeNoListFn()
+  created() {
+    this.getLifeNoListFn();
   },
   methods: {
-    hasTypeFormat (row) {
-      return row.life_account_type == 1 ? '个人' : '企业'
+    hasTypeFormat(row) {
+      return row.life_account_type == 1 ? "个人" : "企业";
     },
-    hasStatusFormat (row) {
+    hasStatusFormat(row) {
       if (row.life_account_status == 1) {
         return "正常";
       } else if (row.life_account_status == 3) {
@@ -135,39 +96,41 @@ export default {
       }
     },
     //获取列表数据
-    getLifeNoListFn () {
-      let { name, type } = this.life_account
-      let { page, page_size } = this.params
+    getLifeNoListFn() {
+      let { name, type } = this.life_account;
+      let { page, page_size } = this.params;
       let params = {
         page,
         page_size,
         life_account_name: name,
         life_account_type: type
-      }
+      };
       reqGetLifeNoList(params).then(res => {
-        this.totalNum = res.count
-        this.LifeNoList = res.data
-      })
+        this.totalNum = res.count;
+        this.LifeNoList = res.data;
+      });
     },
     //查询
-    onSearchSubmit () {
-      this.getLifeNoListFn()
+    onSearchSubmit() {
+      this.getLifeNoListFn();
     },
     //重置
-    onReset () {
-      this.life_account.name = "",
-        this.life_account.type = ""
-      this.getLifeNoListFn()
-    },
-    update (obj) {
-      Object.assign(this.params, obj)
-      this.getLifeNoListFn(this.params)
+    onReset() {
+      (this.life_account.name = ""), (this.life_account.type = "");
+      this.getLifeNoListFn();
     },
-    toLifeDetail (row) {
-      this.$router.push({ name: 'LifeNoDetail', query: { lifeId: row.life_account_id } });
+    update(obj) {
+      Object.assign(this.params, obj);
+      this.getLifeNoListFn(this.params);
     },
+    toLifeDetail(row) {
+      this.$router.push({
+        name: "LifeNoDetail",
+        query: { lifeId: row.life_account_id }
+      });
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 .life-no {

src/pages/components/Pagination.vue

@@ -14,24 +14,24 @@
 </template>
 <script>
 export default {
-  props: ['totalNum'],
-  data () {
+  props: ["totalNum"],
+  data() {
     return {
       currentPage: 1,
       page_size: 20
-    }
+    };
   },
   methods: {
-    handleSizeChange (size) {
+    handleSizeChange(size) {
       console.log(`每页 ${size} 条`);
-      this.$emit('update', { page_size: size })
+      this.$emit("update", { page_size: size });
     },
-    handleCurrentChange (pageIndex) {
+    handleCurrentChange(pageIndex) {
       console.log(`当前页: ${pageIndex}`);
-      this.$emit('update', { page: pageIndex })
+      this.$emit("update", { page: pageIndex });
     }
-  },
-}
+  }
+};
 </script>
 <style lang="less">
 .block {

vue.config.js

@@ -5,12 +5,20 @@ const isDev = process.env.NODE_ENV === "development";
 module.exports = {
   outputDir: isDev ? "./dist" : path.resolve("./public/dist/"),
   publicPath: isDev ? "/" : "/dist",
-  configureWebpack: {
-    devServer: {
-      proxy: "http://127.0.0.1:8055", //http://localhost:8055
-      hot: true,
-      disableHostCheck: true
-    }
+  configureWebpack: () => {
+    // Object.assign(config, {
+    //   // 开发生产共同配置
+    //   resolve: {
+    //     alias: {
+    //       "@": path.resolve(__dirname, "./src"),
+    //       "@components": path.resolve(__dirname, "./src/components"),
+    //       "@utils": path.resolve(__dirname, "./src/utils"),
+    //       "@pages": path.resolve(__dirname, "./src/pages"),
+    //       "@router": path.resolve(__dirname, "./src/router"),
+    //       "@assets": path.resolve(__dirname, "./src/assets")
+    //     }
+    //   }
+    // });
   },
   chainWebpack: config => {
     // 默认不开启 prefetch
@@ -24,5 +32,10 @@ module.exports = {
       args[0].title = "运营管理系统";
       return args;
     });
+  },
+  devServer: {
+    proxy: "http://127.0.0.1:8055", //http://localhost:8055
+    hot: true,
+    disableHostCheck: true
   }
 };