新增收货地址模块接口已对接，导入导出接口无

src/router/index.js

@@ -245,6 +245,12 @@ const mainRoutes = {
       meta: { title: "商品管理", isTab: true }
     },
     {
+      path: "/deliveryAddress",
+      component: _import("deliveryAddress/deliveryAddress"),
+      name: "deliveryAddress",
+      meta: { title: "收货地址管理", isTab: true }
+    },
+    {
       path: "/fenxiaoOrder",
       component: _import("selfShop/fenxiaoOrder"),
       name: "fenxiaoOrder",

src/views/coupon/coupon.vue

@@ -381,68 +381,6 @@
             >兑换积分初始值为100，是必填项，不填则默认向所有用户发券</span
           >
         </div>
-        <div v-loading="allShopLoading" v-if="this.shopId == 0">
-          <div style="width: 500px;height: 200px;">
-            <div style="margin-bottom: 10px;">
-              <span
-                style="width: 150px;display: inline-block;text-align: right;"
-                >使用范围：</span
-              >
-              <el-checkbox
-                @change="checkChange($event, '不限制')"
-                v-model="allMerchant"
-                >不限制</el-checkbox
-              >
-              <el-checkbox
-                @change="checkChange($event, '部分商家')"
-                v-model="someMerchant"
-                >部分商家</el-checkbox
-              >
-            </div>
-            <div style="margin:0 0 10px 80px;" v-if="someMerchant">
-              <el-input
-                v-model="selectName"
-                placeholder="请输入商铺名称"
-                style="width:50%;"
-                clearable
-                @change="shopNameSeache"
-              ></el-input>
-              <!-- <el-button
-              style="margin-left: 15px"
-              size="medium"
-              type="primary"
-              icon="document"
-              @click="shopNameSeache"
-              >查询
-            </el-button> -->
-            </div>
-            <div
-              v-if="someMerchant"
-              style="margin:0 0 10px 80px;height: 300px;border: 1px solid #ccc;overflow: auto;"
-              @scroll="handleTreeScroll"
-            >
-              <el-tree
-                class="shop"
-                ref="tree"
-                :data="dataTree"
-                show-checkbox
-                node-key="shopId"
-                :props="defaultProps"
-                @check="treeCheck"
-              ></el-tree>
-              <div style="text-align: center;" v-if="allShopListShow">
-                数据已全部加载完
-              </div>
-            </div>
-            <div style="margin-bottom: 10px;" v-if="someMerchant">
-              <span
-                style="width: 130px;display: inline-block;text-align: right;"
-                >已选择</span
-              ><span style="color: red;">{{ selectMerchant.length }}</span
-              >个商家
-            </div>
-          </div>
-        </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -530,68 +468,6 @@
                 >兑换积分初始值为100，是必填项，不填则默认向所有用户发券</span
               >
             </div>
-            <div v-loading="allShopLoading" v-if="this.shopId == 0">
-              <div style="width: 500px;height: 200px;">
-                <div style="margin-bottom: 10px;">
-                  <span
-                    style="width: 150px;display: inline-block;text-align: right;"
-                    >使用范围：</span
-                  >
-                  <el-checkbox
-                    @change="checkChange($event, '不限制')"
-                    v-model="allMerchant"
-                    >不限制</el-checkbox
-                  >
-                  <el-checkbox
-                    @change="checkChange($event, '部分商家')"
-                    v-model="someMerchant"
-                    >部分商家</el-checkbox
-                  >
-                </div>
-                <div style="margin:0 0 10px 80px;" v-if="someMerchant">
-                  <el-input
-                    v-model="selectName"
-                    placeholder="请输入商铺名称"
-                    style="width:50%;"
-                    clearable
-                    @change="shopNameSeache"
-                  ></el-input>
-                  <!-- <el-button
-              style="margin-left: 15px"
-              size="medium"
-              type="primary"
-              icon="document"
-              @click="shopNameSeache"
-              >查询
-            </el-button> -->
-                </div>
-                <div
-                  v-if="someMerchant"
-                  style="margin:0 0 10px 80px;height: 300px;border: 1px solid #ccc;overflow: auto;"
-                  @scroll="handleTreeScroll"
-                >
-                  <el-tree
-                    class="shop"
-                    ref="tree"
-                    :data="dataTree"
-                    show-checkbox
-                    node-key="shopId"
-                    :props="defaultProps"
-                    @check="treeCheck"
-                  ></el-tree>
-                  <div style="text-align: center;" v-if="allShopListShow">
-                    数据已全部加载完
-                  </div>
-                </div>
-                <div style="margin-bottom: 10px;" v-if="someMerchant">
-                  <span
-                    style="width: 130px;display: inline-block;text-align: right;"
-                    >已选择</span
-                  ><span style="color: red;">{{ selectMerchant.length }}</span
-                  >个商家
-                </div>
-              </div>
-            </div>
           </div>
         </el-form>
       </div>
@@ -1119,26 +995,7 @@ export default {
         return;
       }
 
-      if (this.shopId == 0) {
-        if (!this.allMerchant && !this.someMerchant) {
-          this.$notify({
-            title: "提示",
-            duration: 1800,
-            message: "商家不能为空",
-            type: "warning"
-          });
-          return;
-        }
-      }
-
       if (this.shopId === 0) {
-        this.usedShopId = "";
-        if (this.allMerchant) {
-          this.usedShopId = 0;
-        }
-        if (this.someMerchant) {
-          this.usedShopId = this.selectMerchant.join(",");
-        }
         if (this.needIntegral == "") {
           this.$notify({
             title: "提示",
@@ -1148,8 +1005,6 @@ export default {
           });
           return;
         }
-      } else {
-        this.usedShopId = "";
       }
       this.$http({
         url: this.$http.adornUrl("admin/coupon/issueCoupon"),
@@ -1270,22 +1125,6 @@ export default {
       this.selectMerchant = [];
       console.log(rows);
       this.merchantPage = 1;
-      this.merchantData();
-      if (rows.usedShopId == 0) {
-        this.usedShopId = 0;
-        this.allMerchant = true;
-        this.someMerchant = false;
-      } else if (rows.usedShopId != null && rows.usedShopId != 0) {
-        this.usedShopId = rows.usedShopId;
-        this.selectMerchant = rows.usedShopId.split(",");
-        this.allMerchant = false;
-        this.someMerchant = true;
-      } else {
-        this.usedShopId = "";
-        this.allMerchant = false;
-        this.someMerchant = false;
-      }
-      this.allShopListShow = false;
 
       this.form.couponName = rows.couponName;
       this.form.couponPicture = rows.couponPicture;
@@ -1358,26 +1197,8 @@ export default {
         });
         return;
       }
-      if (this.shopId == 0) {
-        if (!this.allMerchant && !this.someMerchant) {
-          this.$notify({
-            title: "提示",
-            duration: 1800,
-            message: "商家不能为空",
-            type: "warning"
-          });
-          return;
-        }
-      }
 
       if (this.shopId === 0) {
-        this.usedShopId = "";
-        if (this.allMerchant) {
-          this.usedShopId = 0;
-        }
-        if (this.someMerchant) {
-          this.usedShopId = this.selectMerchant.join(",");
-        }
         if (this.needIntegral == "") {
           this.$notify({
             title: "提示",
@@ -1387,8 +1208,6 @@ export default {
           });
           return;
         }
-      } else {
-        this.usedShopId = "";
       }
       this.$http({
         url: this.$http.adornUrl("admin/coupon/updateCoupon"),
@@ -1403,7 +1222,6 @@ export default {
           needIntegral: this.form.needIntegral,
           shopId: this.shopIds,
           sysUserId: this.userId,
-          usedShopId: this.usedShopId
         })
       }).then(({ data }) => {
         if (data.code == 0) {

src/views/deliveryAddress/deliveryAddress.vue

@@ -0,0 +1,710 @@
+<template>
+  <div>
+    <div style="margin:15px 0;display: inline-block;">
+      <span>地址名：</span>
+      <el-input
+        style="width: 180px;"
+        clearable
+        placeholder="请输入地址名"
+        v-model="search.addressDetail"
+      ></el-input
+      >&nbsp;&nbsp;&nbsp;&nbsp;
+    </div>
+    <div style="margin:15px 0;display: inline-block;">
+      <span>创建时间：</span>
+      <el-date-picker
+        v-model="search.createTime"
+        type="datetimerange"
+        unlink-panels
+        range-separator="-"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        format="yyyy-MM-dd HH:mm:ss"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      >
+      </el-date-picker
+      >&nbsp;&nbsp;&nbsp;&nbsp;
+    </div>
+    <div style="position: relative;display: inline-block;margin: 10px 0px;">
+      <span>是否启用：</span>
+      <el-select
+        v-model="search.status"
+        placeholder="请选择"
+        style="width:150px;"
+      >
+        <el-option label="启用" :value="1"></el-option>
+        <el-option label="禁用" :value="0"></el-option> </el-select
+      >&nbsp;&nbsp;&nbsp;&nbsp;
+    </div>
+    <div style="position: relative;display: inline-block;margin: 10px 0px;">
+      <span>骑手站点：</span>
+      <el-select
+        v-model="search.stationId"
+        placeholder="请选择骑手站点"
+        style="width:250px;"
+      >
+        <el-option
+          v-for="item in stationList"
+          :key="item.id"
+          :label="item.stationName"
+          :value="item.id"
+        >
+        </el-option> </el-select
+      >&nbsp;&nbsp;&nbsp;&nbsp;
+    </div>
+    <div style="display: inline-block;">
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="cleans"
+        >重置
+      </el-button>
+    </div>
+    <div style="margin:5px 0 15px 0;">
+      <el-button size="mini" type="primary" icon="document" @click="cleans"
+        >导入
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="cleans"
+        >导出
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="addAddress"
+        >新增
+      </el-button>
+    </div>
+    <!-- <div style="margin:5px 0 15px 0;">
+      <span style="font-size: 17px;">是否开启校内地址：</span>
+      <el-switch
+        v-model="switchValue"
+        @change="switchType"
+        :active-value="1"
+        :inactive-value="0"
+      >
+      </el-switch>
+    </div> -->
+    <el-table v-loading="tableDataLoading" :data="tableData.list">
+      <!-- <el-table-column type="selection">  @selection-change="changeFun"
+			</el-table-column> -->
+      <el-table-column prop="id" label="编号" width="80"></el-table-column>
+      <el-table-column prop="stationName" label="骑手站点"> </el-table-column>
+      <el-table-column prop="province" label="省"> </el-table-column>
+      <el-table-column prop="city" label="市"> </el-table-column>
+      <el-table-column prop="district" label="区/县"> </el-table-column>
+      <el-table-column prop="addressDetail" label="地址名"> </el-table-column>
+      <el-table-column prop="lng" label="经度"> </el-table-column>
+      <el-table-column prop="lat" label="纬度"> </el-table-column>
+      <el-table-column prop="deliveryFee" label="地址配送费" width="150">
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" width="150"> </el-table-column>
+      <el-table-column prop="enableFlag" label="是否启用" width="80">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            @change="changeType($event, scope.row)"
+            :disabled="!isAuth('integral:update')"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="创建时间" width="160">
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="180">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            :disabled="!isAuth('integral:update')"
+            @click="updates(scope.row)"
+            style="margin: 3px;"
+            >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            :disabled="!isAuth('integral:delete')"
+            @click="deleteuser(scope.row)"
+            style="margin: 3px;"
+            v-if="scope.row.id != 14"
+            >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 15, 20, 25]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next"
+        :total="tableData.totalCount"
+      >
+      </el-pagination>
+    </div>
+
+    <el-dialog
+      title="新增收货地址"
+      :visible.sync="addDialog"
+      center
+      width="30%"
+    >
+      <el-form :model="addForm">
+        <el-form-item label="骑手站点：" :label-width="formLabelWidth">
+          <el-select
+            v-model="addForm.stationId"
+            style="width:250px;"
+            placeholder="请选择骑手站点"
+          >
+            <el-option
+              v-for="item in stationList"
+              :key="item.id"
+              :label="item.stationName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="城市：" :label-width="formLabelWidth">
+          <el-cascader
+            :key="componentKey"
+            style="width:250px"
+            size="large"
+            :options="options"
+            ref="cascaderAddr"
+            v-model="storeAddre"
+            :placeholder="storeAddreStr"
+            @change="handleChange"
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="详情地址名：" :label-width="formLabelWidth">
+          <el-input
+            v-model="addForm.addressDetail"
+            style="width: 250px"
+            placeholder="请输入详情地址名"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="地址经度：" :label-width="formLabelWidth">
+          <el-input
+            v-model="addForm.lng"
+            style="width: 250px"
+            placeholder="请输入地址经度"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="地址纬度：" :label-width="formLabelWidth">
+          <el-input
+            v-model="addForm.lat"
+            style="width: 250px"
+            placeholder="请输入地址纬度"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="地址配送费：" :label-width="formLabelWidth">
+          <el-input
+            v-model="addForm.deliveryFee"
+            style="width: 250px"
+            placeholder="请输入套餐内容"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="排序：" :label-width="formLabelWidth">
+          <el-input-number
+            v-model="addForm.sort"
+            label="描述文字"
+            :min="0"
+            style="width: 150px;"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="是否启用：" :label-width="formLabelWidth">
+          <el-switch
+            v-model="addForm.status"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+        </el-form-item>
+      </el-form>
+      <div style="display: flex;flex-direction: row-reverse;">
+        <el-button type="primary" @click="amendAddress">确 定</el-button>
+        <el-button @click="addDialog = false" style="margin-right: 20px;"
+          >取 消</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { quillEditor } from "vue-quill-editor";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+import quillConfig from "../allocation/quill-config.js";
+import { regionData } from "element-china-area-data";
+export default {
+  name: "news",
+  components: {
+    quillEditor
+  },
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      tableDataLoading: false,
+      search: {
+        addressDetail: "",
+        createTime: "",
+        status: "",
+        stationId: ""
+      },
+      stationList: [],
+      tableData: {
+        list: []
+      },
+      switchValue: 0,
+
+      formLabelWidth: "100px",
+      addDialog: false,
+      options: regionData,
+      componentKey: 0,
+
+      storeAddre: [],
+      storeAddreStr: "",
+
+      province: "",
+      city: "", //市
+      district: "", //区
+      addForm: {
+        id: "",
+        stationId: "", //站点id不能为空
+        deliveryFee: "", //配送费用不能小于0
+        addressDetail: "", //地址详情不能为空
+        lng: "", //经度不能为空
+        lat: "", //维度不能为空
+        status: "", //启用状态;1启用、0禁用
+        sort: "" //排序不能为空
+      }
+    };
+  },
+  methods: {
+    switchType() {},
+
+    stationsData() {
+      this.$http({
+        url: this.$http.adornUrl("admin/riderStation/selectStationList"),
+        method: "get",
+        params: this.$http.adornParams({
+          page: 1,
+          size: 1000
+        })
+      }).then(({ data }) => {
+        console.log(data, "骑手站点");
+        let returnData = data.data.list;
+        this.stationList = returnData;
+      });
+    },
+    // 多选
+    changeFun(val) {},
+
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    // 查询
+    select() {
+      this.page = 1;
+      this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      this.page = 1;
+      this.search = {
+        addressDetail: "",
+        createTime: "",
+        status: "",
+        stationId: ""
+      };
+      this.dataSelect();
+    },
+    // 是否启用
+    changeType(flag, row) {
+      console.log(flag, row);
+      this.$http({
+        url: this.$http.adornUrl("admin/inside-address/updateStatus"),
+        method: "post",
+        data: this.$http.adornData({
+          id: row.id,
+          status: flag //启用状态;1启用、0禁用
+        })
+      }).then(({ data }) => {
+        console.log(data, "新增收货地址");
+        if (data.msg == "success") {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.dataSelect();
+            }
+          });
+        }
+      });
+    },
+
+    // 获取省市区
+    handleChange(value) {
+      console.log(value);
+
+      value = this.$refs["cascaderAddr"].currentLabels;
+      this.province = value[0];
+      this.city = value[1];
+      this.district = value[2];
+      if (this.city == "市辖区") {
+        this.city = this.province;
+      }
+      console.log(this.$refs["cascaderAddr"].currentLabels);
+    },
+
+    // 删除
+    deleteuser(row) {
+      let delid = [row.id];
+      this.$confirm(`确定删除此收货地址?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("admin/inside-address/delete"),
+            method: "post",
+            // data: delid
+            data: this.$http.adornData(delid)
+          }).then(({ data }) => {
+            if (data.msg == "success") {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.dataSelect();
+                }
+              });
+            } else {
+              this.$message({
+                message: data.msg,
+                type: "error",
+                duration: 1500,
+                onClose: () => {}
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 获取数据列表
+    dataSelect() {
+      this.tableDataLoading = false;
+      this.$http({
+        url: this.$http.adornUrl("admin/inside-address/pages"),
+        method: "get",
+        params: this.$http.adornParams({
+          page: this.page,
+          limit: this.limit,
+          addressDetail: this.search.addressDetail,
+          status: this.search.status,
+          stationId: this.search.stationId,
+          startTime: this.search.createTime[0],
+          endTime: this.search.createTime[1]
+        })
+      }).then(({ data }) => {
+        console.log(data, "收货地址列表");
+        if (data.msg == "success") {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          this.tableData = returnData;
+        } else {
+          this.$message({
+            message: data.msg,
+            type: "warning",
+            duration: 1500,
+            onClose: () => {}
+          });
+        }
+      });
+    },
+    // 新增收货地址
+    addAddress() {
+      this.storeAddreStr = "请选择省市区";
+      this.storeAddre = [];
+      this.addForm = {
+        id: "",
+        stationId: "", //站点id不能为空
+        deliveryFee: "", //配送费用不能小于0
+        province: "", //省份不能为空
+        city: "", //城市不能为空
+        district: "", //区县不能为空
+        addressDetail: "", //地址详情不能为空
+        lng: "", //经度不能为空
+        lat: "", //维度不能为空
+        status: "", //启用状态;1启用、0禁用
+        sort: "" //排序不能为空
+      };
+      this.addDialog = true;
+    },
+
+    // 编辑
+    updates(row) {
+      console.log(row);
+      this.storeAddre = [];
+      this.addForm = {
+        id: row.id,
+        stationId: row.stationId, //站点id不能为空
+        deliveryFee: row.deliveryFee, //配送费用不能小于0
+        province: row.province, //省份不能为空
+        city: row.city, //城市不能为空
+        district: row.district, //区县不能为空
+        addressDetail: row.addressDetail, //地址详情不能为空
+        lng: row.lng, //经度不能为空
+        lat: row.lat, //维度不能为空
+        status: row.status, //启用状态;1启用、0禁用
+        sort: row.sort //排序不能为空, //排序不能为空
+      };
+      this.addDialog = true;
+      this.storeAddreStr = `${row.province}/${row.city}/${row.district}`;
+    },
+
+    // 确定收货地址
+    amendAddress() {
+      if (this.addForm.stationId == "") {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "站点不能为空",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.addForm.deliveryFee == "" && this.addForm.deliveryFee < 0) {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "配送费不能为空且不能小于0",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.addForm.addressDetail == "") {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "地址详情不能为空",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.addForm.lng == "") {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "经度不能为空",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.addForm.lat == "") {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "纬度不能为空",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.addForm.id) {
+        this.$http({
+          url: this.$http.adornUrl("admin/inside-address/update"),
+          method: "post",
+          data: this.$http.adornData({
+            id: this.addForm.id,
+            stationId: this.addForm.stationId, //站点id不能为空
+            deliveryFee: this.addForm.deliveryFee, //配送费用不能小于0
+            province: this.province, //省份不能为空
+            city: this.city, //城市不能为空
+            district: this.district, //区县不能为空
+            addressDetail: this.addForm.addressDetail, //地址详情不能为空
+            lng: this.addForm.lng, //经度不能为空
+            lat: this.addForm.lat, //维度不能为空
+            status: this.addForm.status, //启用状态;1启用、0禁用
+            sort: this.addForm.sort //排序不能为空
+          })
+        }).then(({ data }) => {
+          console.log(data, "新增收货地址");
+          if (data.msg == "success") {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.addDialog = false;
+                this.dataSelect();
+              }
+            });
+          }
+        });
+      } else {
+        this.$http({
+          url: this.$http.adornUrl("admin/inside-address/add"),
+          method: "post",
+          data: this.$http.adornData({
+            stationId: this.addForm.stationId, //站点id不能为空
+            deliveryFee: this.addForm.deliveryFee, //配送费用不能小于0
+            province: this.province, //省份不能为空
+            city: this.city, //城市不能为空
+            district: this.district, //区县不能为空
+            addressDetail: this.addForm.addressDetail, //地址详情不能为空
+            lng: this.addForm.lng, //经度不能为空
+            lat: this.addForm.lat, //维度不能为空
+            status: this.addForm.status, //启用状态;1启用、0禁用
+            sort: this.addForm.sort //排序不能为空
+          })
+        }).then(({ data }) => {
+          console.log(data, "新增收货地址");
+          if (data.msg == "success") {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.addDialog = false;
+                this.dataSelect();
+              }
+            });
+          }
+        });
+      }
+    }
+  },
+  mounted() {
+    this.dataSelect();
+    this.stationsData();
+  }
+};
+</script>
+
+<style>
+.imgs {
+  position: relative;
+  border-radius: 6px;
+  width: 148px;
+  height: 148px;
+  margin-right: 10px;
+  display: inline-block;
+}
+.times {
+  position: relative;
+  border: 1px dashed rgba(206, 214, 222, 1);
+  width: 28px;
+  height: 28px;
+  border-radius: 3px;
+  background: rgba(245, 246, 247, 1);
+  margin-right: 10px;
+  display: inline-block;
+}
+
+.dels {
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: none;
+}
+
+.dels .el-icon-delete {
+  line-height: 148px;
+  padding-left: 58px;
+  font-size: 25px;
+  color: #fff;
+}
+
+.imgs:hover .dels {
+  width: 100%;
+  height: 100%;
+  background: #000;
+  display: block;
+  opacity: 0.5;
+}
+
+.bqList {
+  padding: 4px 14px;
+  margin: 4px;
+  border: 1px solid #efefef;
+  font-size: 12px;
+  color: #999;
+  border-radius: 4px;
+  margin-right: 15px;
+}
+
+.delss {
+  display: none;
+  position: relative;
+}
+
+.delss .el-icon-delete {
+  position: absolute;
+  top: 0;
+}
+
+.bqList:hover .delss {
+  display: initial;
+  opacity: 0.5;
+}
+
+.tj {
+  padding: 6px !important;
+  margin: 4px;
+  font-size: 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+.el-upload--picture-card {
+  vertical-align: unset !important;
+}
+.tianshang {
+  margin-left: 690px;
+  margin-top: -20px;
+  width: 69px;
+  height: 26px;
+  opacity: 1;
+  border-radius: 5px;
+  background: rgba(62, 142, 247, 1);
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 26px;
+  color: rgba(255, 255, 255, 1);
+  text-align: center;
+}
+</style>

src/views/shopsList/shopsList.vue

@@ -1883,6 +1883,16 @@ export default {
         });
         return;
       }
+      if (this.shopType == "") {
+        this.$notify({
+          title: "提示",
+          duration: 1800,
+          message: "请选择店铺类型",
+          type: "warning"
+        });
+        return;
+      }
+
       if (this.openTime == "") {
         this.$notify({
           title: "提示",