diff --git a/config/request.js b/config/request.js
index b25aa22..2b649d1 100644
--- a/config/request.js
+++ b/config/request.js
@@ -2,6 +2,7 @@ import config from '@/config/index.js';
 import store from '@/store/index.js';
 
 const apiHost = config.apiHost;
+const env = config.env;
 const systemInfo = wx.getSystemInfoSync();
 
 // 此vm参数为页面的实例，可以通过它引用vuex中的变量
@@ -19,6 +20,7 @@ module.exports = vm => {
       wechatVersion: systemInfo.version, // 微信版本
       SDKVersion: systemInfo.SDKVersion, // 基础库版本
       platform: 'mp', // 当前运行平台
+      env: env, //环境
     };
     return config;
   });
diff --git a/pages.json b/pages.json
index 5f0be10..d72f565 100644
--- a/pages.json
+++ b/pages.json
@@ -167,7 +167,7 @@
 				{
 					"path": "search-address",
 					"style": {
-						"navigationBarTitleText": "查询地址"
+						"navigationBarTitleText": "选择地址"
 					}
 				}
 			]
diff --git a/pages/global/search-address.vue b/pages/global/search-address.vue
index e63de66..bc7f355 100644
--- a/pages/global/search-address.vue
+++ b/pages/global/search-address.vue
@@ -1,12 +1,27 @@
 <template>
   <Page name="search-address">
     <template #header>
-      <search-bar v-model="searchForm.query" placeholder="请输入需要搜索的地址关键词" auto @confirm="onSearch" />
+      <view style="display: flex; align-items: center">
+        <view style="flex: 1"><search-bar v-model="searchForm.query" placeholder="请输入需要搜索的地址关键词" auto @confirm="onSearch" /></view>
+        <view @click="selectLocation" style="width: 50px; padding-left: 10px; display: flex; align-items: center">
+          <span> <u-icon name="map-fill"></u-icon></span>地图
+        </view>
+      </view>
     </template>
     <template #content>
+      <template v-if="list.length === 0 && hisList.length > 0">
+        <view class="search-history">历史地址</view>
+        <template v-for="(item, index) in hisList">
+          <zui-cell :key="index" :title="item.address" :label="`${item.cityName}${item.areaName}`" @click="onSelect(item, index)"></zui-cell>
+        </template>
+      </template>
       <List ref="list" v-model="list" :api="searchAPI">
         <template v-for="(item, index) in list">
-          <zui-cell :key="index" :title="item.name" :label="`${item.cityname}${item.adname}${item.address}`" @click="onSelect(item, index)"></zui-cell>
+          <zui-cell :key="index" :title="item.name" :label="`${item.cityName}${item.areaName}${item.address}`" @click="onSelect(item, index)"></zui-cell>
+        </template>
+        <template #empty>
+          <view v-if="hisList.length > 0"></view>
+          <u-empty v-else icon="https://download.shjiuze.cn/assets/image/empty/list.png" text="暂无数据"></u-empty>
         </template>
       </List>
     </template>
@@ -17,15 +32,38 @@
 import { urlParam } from '@/utils/param';
 
 export default {
+  props: {
+    getHisFun: Function,
+  },
   data() {
     return {
       searchForm: {
-        query: ''
+        query: '',
       },
       list: [],
-    }
+      hisList: [],
+      lng: '',
+      lat: '',
+    };
+  },
+  onLoad(options) {
+    this.lng = options.lng || '';
+    this.lat = options.lat || '';
+    this.queryHis(options.type);
   },
   methods: {
+    queryHis(type) {
+      if (type === 'getStartLatestAddress') {
+        uni.$u.api.freightOrder.getStartLatestAddress({}).then(res => {
+          this.hisList = res.result || [];
+        });
+      }
+      if (type === 'getEndLatestAddress') {
+        uni.$u.api.freightOrder.getEndLatestAddress({}).then(res => {
+          this.hisList = res.result || [];
+        });
+      }
+    },
     searchAPI() {
       if (!this.searchForm.query) {
         return new Promise(resolve => {
@@ -47,7 +85,22 @@ export default {
           success: response => {
             const data = response.data ?? {};
             const pois = data.pois ?? [];
-            resolve({ result: pois, totalCount: pois.length });
+            let result = pois.map(item => {
+              const lnglatArr = `${item.location || ''}`.split(',');
+              return {
+                name: item.name,
+                provinceCode: item.pcode,
+                provinceName: item.pname,
+                areaCode: item.adcode,
+                areaName: item.adname,
+                cityCode: `${item.adcode}`.substring(0, 4) + '00',
+                cityName: item.cityname,
+                address: item.adname === item.address && item.name ? item.name : item.address || item.name,
+                lng: lnglatArr[0],
+                lat: lnglatArr[1],
+              };
+            });
+            resolve({ result: result, totalCount: result.length });
           },
           fail: () => {
             uni.showToast({ title: '没有查询到结果', icon: 'none' });
@@ -57,22 +110,39 @@ export default {
       });
     },
     onSelect(item) {
-      const params = this.$params;
-      if (params.mode === 'select') {
-        const lnglatArr = `${item.location || ''}`.split(',');
-        const waypoint = {
-          areaCode: item.adcode,
-          areaName: item.adname,
-          cityCode: `${item.adcode}`.substring(0, 4) + '00',
-          cityName: item.cityname,
-          address: item.adname === item.address && item.name ? item.name : item.address || item.name,
-          lng: lnglatArr[0],
-          lat: lnglatArr[1],
-        };
-        uni.$emit('select-detail', waypoint);
-        uni.navigateBack();
-      }
-    }
+      uni.$emit('select-detail', item);
+      uni.navigateBack();
+    },
+    // 地图选点
+    selectLocation() {
+      uni.$once('webview-select', location => {
+        this.onSelect(location);
+      });
+      const url = 'https://zeyi-tms-product.oss-cn-hangzhou.aliyuncs.com/webview/location-wx-freight.html';
+      const params = {
+        lat: this.lat ? Number(this.lat) : '',
+        lng: this.lng ? Number(this.lng) : '',
+      };
+      uni.navigateTo({ url: `/pages/common/webview?url=${url}&query=${JSON.stringify(params)}` });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.page-search-address {
+  &__header {
+    padding: 16rpx 32rpx !important;
+  }
+  .search-history {
+    padding: 0 32rpx 32rpx 32rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+  }
+  .zui-cell {
+    padding: 12rpx 32rpx;
+  }
+  .zui-cell__label {
+    padding-top: 8rpx;
   }
 }
-</script>
+</style>
diff --git a/pages/order/add.vue b/pages/order/add.vue
index f52015b..3c46c38 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -18,10 +18,10 @@
           </u-form-item>
         </view>
         <view class="card">
-          <u-form-item label="装货地址" required @click="() => selectLocation(0)">
+          <u-form-item label="装货地址" required @click="() => selectAddress(0)">
             <u-input :value="form.waypoints[0].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
-          <u-form-item label="卸货地址" required @click="() => selectLocation(1)">
+          <u-form-item label="卸货地址" required @click="() => selectAddress(1)">
             <u-input v-model="form.waypoints[1].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
         </view>
@@ -345,6 +345,31 @@ export default {
         })}`,
       });
     },
+    selectAddress(index) {
+      uni.$once('select-detail', location => {
+        let station = {
+          lng: location.lng,
+          lat: location.lat,
+          provinceCode: location.provinceCode,
+          provinceName: location.provinceName,
+          cityCode: location.cityCode,
+          cityName: location.cityName,
+          areaCode: location.areaCode,
+          areaName: location.areaName,
+          address: (location.provinceName || '') + (location.cityName || '') + (location.areaName || '') + (location.address || ''),
+        };
+        let waypoints = index === 0 ? [station, this.form.waypoints[1]] : [this.form.waypoints[0], station];
+        this.form = {
+          ...this.form,
+          waypoints,
+        };
+        this.computedDistance();
+      });
+      let type = index === 0 ? 'getStartLatestAddress' : 'getEndLatestAddress';
+      let lat = this.form.waypoints[index].lat ? Number(this.form.waypoints[index].lat) : '';
+      let lng = this.form.waypoints[index].lng ? Number(this.form.waypoints[index].lng) : '';
+      uni.navigateTo({ url: `/pages/global/search-address?type=${type}&lng=${lng}&lat=${lat}` });
+    },
     // 地图选点
     selectLocation(index) {
       uni.$once('webview-select', location => {
--
libgit2 0.21.0