feat

src/api/setting.js

@@ -25,4 +25,28 @@ export const updateSavePushMessageStatus = (params) => {
 // 获取运力推荐、屏蔽
 export const getDeliveryFloorList = (params) => {
   return get('app/delivery/floor/list', params)
-}
+}
+// 常用地址列表
+export const getAddressList = (params) => {
+  return get('app/address/getAddressList', params)
+}
+// 删除地址
+export const deleteAddress = (params) => {
+  return post('app/address/delete', params)
+}
+// 更新地址
+export const updateAddress = (params) => {
+  return post('app/address/update', params)
+}
+// 添加地址
+export const addAddress = (params) => {
+  return post('app/address/add', params)
+}
+// 地址详情
+export const getAddressDetail = (params) => {
+  return get('app/address/info', params)
+}
+// 设为默认地址
+export const defaultAddress = (params) => {
+  return post('app/address/default', params)
+}

src/components/manualCreate.vue

@@ -145,6 +145,7 @@
 </template>
 <script>
 import orderMap from "./orderComponents/orderAMap.vue";
+import addressManagement from "../components/settingComponents/addressManagement.vue"
 import { getProductList } from "../api/shop.js";
 import { sendValuation, saveOrder, getAddressList } from "../api/order.js";
 import sendOrderPopup from "../components/orderComponents/sendOrderPopup.vue";
@@ -223,6 +224,9 @@ export default {
   watch: {
     sendType(newVal, oldVal) {
       this.searchKey = "";
+      Object.keys(this.form.sendAddress).map((v) => {
+        this.form.sendAddress[v] = "";
+      });
       this.getData();
     },
   },
@@ -315,13 +319,7 @@ export default {
             });
           }
           if (!this.sendType || this.addressType === 2) {
-            console.log(2222);
             this.addressList = res.data.personal;
-            if (!this.sendType) {
-              Object.keys(this.form.sendAddress).map((v) => {
-                this.form.sendAddress[v] = "";
-              });
-            }
           }
         } else {
           this.$message({

src/components/orderComponents/orderAMap.vue

@@ -211,7 +211,10 @@ export default {
     },
     // 点击地图选点
     onMapClick(e) {
-      console.log(e);
+      // 只有选点才可以点击地图选点
+      if (!this.showSearch) {
+        return;
+      }
       if (e.lnglat) {
         this.lng = e.lnglat.lng;
         this.lat = e.lnglat.lat;

src/components/orderComponents/orderDetail.vue

@@ -77,7 +77,7 @@
         <div class="title">送达时间：</div>
         <div class="cont cont2">{{ !orderDetail.exceptTime ? '立即送达' : orderDetail.exceptTime}}</div>
       </div>
-      <div class="info2 info4" v-if="orderDetail.deliveryTime && buttonStatus === 10">
+      <div class="info2 info4" v-if="orderDetail.deliveryTime && buttonStatus === 10 && !orderDetail.waimaiOrderId">
         <div class="title">预约发单时间：</div>
         <div class="cont cont2">{{ orderDetail.deliveryTime}}</div>
       </div>
@@ -101,7 +101,6 @@
         <div class="title">{{takeOUtType(orderDetail.orderType)}}订单编号：</div>
         <div class="cont">{{orderDetail.outOrderId}}</div>
       </div>
-
     </div>
   </div>
 

src/components/orderComponents/orderList.vue

@@ -90,7 +90,8 @@
                   立即送达
                 </div>
                 <div class="sign_d" v-if="item.buttonStatus === 10 && item.timeTxt">{{item.timeTxt}}自动发起配送</div>
-                <!-- <div class="sign_d">预约 09/10 17:30自动发起配送</div> -->
+
+                <div v-if="item.buttonStatus === 10 && !item.waimaiOrderId" class="sign_d">{{item.deliveryTime.slice(5)}}自动发起配送</div>
               </div>
               <!-- 新订单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 0">

src/components/set.vue

@@ -29,7 +29,7 @@ export default {
       tabList: [
         { name: "自动接单/语音设置", index: 0,activeName: 'voiceSetting' },
         { name: "推荐/屏蔽运力", index: 1,activeName: 'deliverySetting' },
-        // { name: "常用地址", index: 2,activeName: 'addressManagement' },
+        { name: "常用地址", index: 2,activeName: 'addressManagement' },
       ],
       tabNum: 0,
       activeName: "voiceSetting",

src/components/settingComponents/addressManagement.vue

@@ -1,47 +1,237 @@
 <template>
-<div>11111111</div>
+  <div class="address-management">
+    <div class="header">
+      <div class="num">已保存<span>{{addressList.length}}</span>/100条,最多还可以添加<span>{{100-addressList.length}}</span>条</div>
+      <el-button class="btn" @click="showAddress(false)" size="small" type="primary" plain>添加</el-button>
+    </div>
+    <el-table :data="addressList" stripe style="width: 100%">
+      <el-table-column prop="contact" label="姓名">
+      </el-table-column>
+      <el-table-column prop="phone" label="电话">
+      </el-table-column>
+      <el-table-column prop="address" label="地址">
+      </el-table-column>
+      <el-table-column label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="showAddress(true,scope.row)">编辑</el-button>
+          <el-button @click="deleteAddress(scope.row)" type="text" size="small">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- //新增编辑地址 -->
+    <el-dialog :title="isEdit ? '编辑地址': '新增地址'" :visible.sync="centerDialogVisible" width="600px" center>
+      <el-form ref="form" :model="form" label-width="100px" label-position="left" size="small">
+        <el-form-item label="位置" prop="address">
+          <el-input v-model="form.address" placeholder="请选择位置！" disabled>
+            <el-image @click="showMap" slot="append" class="map" src="../../static/image/icon_map.png"></el-image>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="门牌号" prop="street">
+          <el-input v-model="form.street" placeholder="请填写楼层、单元、门牌号！"></el-input>
+        </el-form-item>
+        <el-form-item label="联系人姓名" prop="contact">
+          <el-input v-model="form.contact" placeholder="请填写联系人姓名！"></el-input>
+        </el-form-item>
+        <el-form-item label="联系人电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请填写联系人电话！"></el-input>
+        </el-form-item>
+        <el-form-item label="设为默认地址" prop="isDefault">
+          <el-switch v-model="form.isDefault" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cancel">取 消</el-button>
+        <el-button size="small" type="primary" @click="addAddress">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 通过地图选择地理位置 -->
+    <order-map @getAddressDetail="getAddressDetail" ref="orderMap"></order-map>
+  </div>
 </template>
 
 <script>
+import orderMap from "../orderComponents/orderAMap.vue";
+import {
+  getAddressList,
+  deleteAddress,
+  addAddress,
+  updateAddress,
+  getAddressDetail,
+  defaultAddress,
+} from "../../api/setting.js";
 export default {
   name: "addressManagement",
-  data () {
+  data() {
     return {
+      addressList: [],
+      centerDialogVisible: false,
+      isEdit: false,
+      form: {
+        id: "",
+        address: "",
+        cityCode: "",
+        cityName: "",
+        contact: "",
+        districtName: "",
+        isDefault: 0,
+        lat: "",
+        lng: "",
+        phone: "",
+        provinceName: "",
+        street: "",
+      },
     };
   },
+  components: {
+    orderMap,
+  },
   // 监听属性 类似于data概念
   computed: {},
   // 监控data中的数据变化
   watch: {},
   // 生命周期 - 创建完成（可以访问当前this实例）
   created() {
-
+    this.getAddressList();
   },
-  // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-
-  },
-  // 生命周期 - 创建之前
-  beforeCreate() {}, 
-  // 生命周期 - 挂载之前
-  beforeMount() {}, 
-  // 生命周期 - 更新之前
-  beforeUpdate() {}, 
-  // 生命周期 - 更新之后
-  updated() {}, 
-  // 生命周期 - 销毁之前
-  beforeDestroy() {}, 
-  // 生命周期 - 销毁完成
-  destroyed() {}, 
-  // 如果页面有keep-alive缓存功能，这个函数会触发
-  activated() {},
+  mounted() {},
   // 方法集合
   methods: {
-
-  }, 
-  }
+    cancel() {
+      this.centerDialogVisible = false;
+      this.getAddressList();
+    },
+    changeDefault() {
+      defaultAddress({ addressId: this.form.id }).then((res) => {
+        if (res.code === 200) {
+          this.getAddressList();
+        } else {
+          this.$message({
+            type: "error",
+            message: res.msg,
+          });
+        }
+      });
+    },
+    addAddress() {
+      if (this.isEdit) {
+        updateAddress(this.form).then((res) => {
+          if (res.code === 200) {
+            this.response();
+          } else {
+            this.$message({
+              type: "success",
+              message: res.msg,
+            });
+          }
+        });
+      } else {
+        addAddress(this.form).then((res) => {
+          if (res.code === 200) {
+            this.response();
+          } else {
+            this.$message({
+              type: "success",
+              message: res.msg,
+            });
+          }
+        });
+      }
+    },
+    response() {
+      this.$message({
+        type: "success",
+        message: `${this.isEdit ? "编辑" : "新增"}地址成功！`,
+      });
+      this.centerDialogVisible = false;
+      this.getAddressList();
+    },
+    deleteAddress(row) {
+      this.$confirm("此操作将删除该地址, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        center: true,
+        type: "warning",
+      }).then(() => {
+        deleteAddress({ addressId: row.id }).then((res) => {
+          if (res.code === 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+            this.getAddressList();
+          } else {
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        });
+      });
+    },
+    showMap() {
+      this.$refs.orderMap.chooseLocation();
+    },
+    getAddressDetail(v, lng, lat) {
+      this.form.address = v.address;
+      this.form.provinceName = v.province;
+      this.form.cityName = v.city;
+      this.form.cityCode = v.citycode;
+      this.form.districtName = v.district;
+      this.form.lng = lng;
+      this.form.lat = lat;
+    },
+    showAddress(flag, row) {
+      this.isEdit = flag;
+      if (flag) {
+        this.$nextTick(() => {
+          this.form = row;
+        });
+      } else {
+        this.$refs["form"].resetFields();
+      }
+      this.centerDialogVisible = true;
+    },
+    getAddressList() {
+      getAddressList().then((res) => {
+        if (res.code === 200) {
+          this.addressList = res.data.personal;
+        } else {
+          this.$message({
+            type: "error",
+            message: res.msg,
+          });
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped  type="text/css">
-
+.btn {
+  background: #fc7200;
+  color: #fff;
+  border: #fc7200;
+}
+/deep/ .el-button--text {
+  color: #fc7200;
+}
+.map {
+  width: 20px;
+  height: 20px;
+}
+.address-management {
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+    .num {
+      font-size: 14px;
+      span {
+        color: #fc7200;
+      }
+    }
+  }
+}
 </style>

src/components/shopCompoents/shopList.vue

@@ -25,7 +25,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="200" align="center">
+      <el-table-column fixed="right" label="操作" width="200" align="center">
         <template slot-scope="scope">
           <el-button class="btn" size="mini" @click.stop="addShop(2, scope.row)">修改</el-button>
           <!-- <el-button type="danger" size="mini" @click.stop="deleteItem(scope.row)">删除</el-button> -->