diff --git a/Utils/Api.js b/Utils/Api.js
index de7dfb9..1063fed 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -127,16 +127,15 @@ export const getDiscountByUserDiscountId = params => {
 export const getUserNormalDiscountList = params => {
 	return POST('GET', `${base}/userDiscount/getUserNormalDiscountList`, params).then(res => res.data);
 }
-//修改密码
-export const sendUserPass = params => {
-	return POST('GET', `${base}/secUser/sendUserPass`, params).then(res => res.data);
+//搜索门店
+export const getStoreList = params => {
+	return POST('GET', `${base}/highMerchantStore/getStoreList`, params).then(res => res.data);
 }
 
 
 
 
 
-
 //**门店//
 export const userLogin = params => {
 	return POST('POST', `${brestBase}/login/userLogin`, params).then(res => res.data);
@@ -172,3 +171,7 @@ export const getAgentSalesCodeList = params => {
 export const getAgentSalesPriceCount = params => {
 	return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentSalesPriceCount`, params).then(res => res.data);
 }
+//修改密码
+export const sendUserPass = params => {
+	return POSTBREST('POST', `${brestBase}/secUser/sendUserPass`, params).then(res => res.data);
+}
diff --git a/components/mehaotian-search-revision/mehaotian-search-revision.vue b/components/mehaotian-search-revision/mehaotian-search-revision.vue
index 741534e..f1ce8ed 100644
--- a/components/mehaotian-search-revision/mehaotian-search-revision.vue
+++ b/components/mehaotian-search-revision/mehaotian-search-revision.vue
@@ -82,7 +82,6 @@
 				}
 			},
 			blur() {
-				console.log('blur');
 				this.isFocus = false;
 				if (!this.inputVal) {
 					this.active = false;
diff --git a/manifest.json b/manifest.json
index bac2548..a21e87d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,5 +71,17 @@
                 "desc" : "你的位置信息将用于小程序定位"
             }
         }
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "title" : "嗨森逛",
+        "router" : {
+            "mode" : "history"
+        },
+        "devServer" : {
+            "port" : 80
+        }
     }
 }
diff --git a/pages.json b/pages.json
index d8c9966..415082a 100644
--- a/pages.json
+++ b/pages.json
@@ -130,7 +130,7 @@
 		{
 			"path": "pages/login/resetpasswd",
 			"style": {
-				"navigationBarTitleText": "重置密码",
+				"navigationBarTitleText": "修改密码",
 				"navigationBarBackgroundColor": "#f06c7a",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
diff --git a/pages/goods/HM-search/HM-search.vue b/pages/goods/HM-search/HM-search.vue
index 3271a6c..d0a48b8 100644
--- a/pages/goods/HM-search/HM-search.vue
+++ b/pages/goods/HM-search/HM-search.vue
@@ -3,7 +3,7 @@
 		<view class="search-box">
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
 			<mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword"
-				@search="doSearch(false)"  @confirm="doSearch(false)" v-model="keyword"></mSearch>
+				@search="doSearch(false)" @confirm="doSearch(false)" v-model="keyword"></mSearch>
 			<!-- 原样式 如果使用原样式，恢复下方注销代码 -->
 			<!-- 						
 			<view class="input-box">
@@ -14,9 +14,9 @@
 			 -->
 			<!-- 原样式 end -->
 		</view>
-		<view class="search-keyword">
-			<scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
-				<block v-for="(row,index) in keywordList" :key="index">
+		<!-- <view class="search-keyword">
+			<view class="keyword-list-box" >
+				<view v-for="(row,index) in keywordList" :key="index">
 					<view class="keyword-entry" hover-class="keyword-entry-tap">
 						<view class="keyword-text" @tap.stop="doSearch(keywordList[index].keyword)">
 							<rich-text :nodes="row.htmlStr"></rich-text>
@@ -25,36 +25,24 @@
 							<image src="/static/HM-search/back.png"></image>
 						</view>
 					</view>
-				</block>
-
-			</scroll-view>
-			<scroll-view class="keyword-box" v-show="!isShowKeywordList" scroll-y>
-				<view class="product-list mart15">
-					<view class="product" v-for="product in productList" :key="product.id" @tap="toGoods(product.id)">
-						<image mode="widthFix" :src="imageUrl+product.couponImg"></image>
-						<view class="name">{{ product.couponName }}</view>
-						<view class="info" v-if="product.payType == 1">
-							<view class="price">￥{{ product.discountPrice}}</view>
-							<view class="slogan" v-if="product.discountPrice !== product.salesPrice">
-								￥{{ product.salesPrice}}</view>
-						</view>
-						<view class="info" v-else>
-							<view class="price">
-									<image style="width: 15px;height: 15px;vertical-align: sub;" src="data:image/png;base64,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"></image> {{ product.discountPrice*100}}</view>
-								<view class="slogan" v-if="product.discountPrice !== product.salesPrice">
-									<image style="width: 15px;height: 15px;vertical-align: sub;" src="data:image/png;base64,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"></image> {{ product.salesPrice*100}}</view>
-						</view>
-					</view>
 				</view>
-			</scroll-view>
-		</view>
-		<view class="loading-text">{{ loadingText }}</view>
+
+			</view> -->
+		<!-- <view class="keyword-box" > -->
+		<view class="product-list mart10">
+			<view class="product" v-for="product in productList" :key="product.id" @tap="toGoods(product)">
+				<image mode="widthFix" :src="imageUrl+product.highMerchant.merchantLogo"></image>
+				<view class="name">{{ product.storeName }}</view>
+			</view>
+		</view>
+	</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getCouponList
+		getCouponList,
+		getStoreList
 	} from "../../../Utils/Api.js";
 	let app = getApp()
 	//引用mSearch组件，如不需要删除即可
@@ -70,10 +58,10 @@
 				forbid: '',
 				isShowKeywordList: false,
 				imageUrl: app.globalData.imgUrl,
-				productList: [],
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
+				productList: [],
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
 				loadingText: ''
 			}
 		},
@@ -83,47 +71,46 @@
 		components: {
 			//引用mSearch组件，如不需要删除即可
 			mSearch
-		},
-		onReachBottom() {
-			this.getCouponList();
 		},
-		methods: {
-			toGoods(e) {
-				uni.navigateTo({
-					url:'../../goods/goods?id='+e
-				});
+		onReachBottom() {
+			this.getStoreList();
+		},
+		methods: {
+			toGoods(e) {
+				uni.navigateTo({
+					url: '../../goods/store-list/store-details?id=' + e.id + '&juli=' + e.distance
+				})
 			},
-			getCouponList() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					this.loadingText = '到底了';
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					regionId: app.globalData.cityId,
-					pageNum: pagenum,
-					couponName: this.keyword,
-					pageSize: this.pageSize
-				}
-				getCouponList(params).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
+			getStoreList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					this.loadingText = '到底了';
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					storeName: this.keyword,
+					pageSize: this.pageSize
+				}
+				getStoreList(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
 						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
 						this.productList = this.productList.concat(res.return_data.list);
-						if(res.return_data.total == (this.pageNum * this.pageSize)){
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
 							this.isNoMoreData = true;
-						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.productList = [];
-						uni.hideLoading()
-					}
-				})
-				
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.productList = [];
+						uni.hideLoading()
+					}
+				})
+
 			},
 			init() {
 				this.loadDefaultKeyword();
@@ -147,7 +134,7 @@
 					}
 				});
 			},
-		
+
 			//监听输入
 			inputChange(event) {
 				//兼容引入组件时传入参数情况
@@ -206,9 +193,11 @@
 			//执行搜索
 			doSearch(keyword) {
 				keyword = keyword === false ? this.keyword : keyword;
-				this.keyword = keyword;
+				this.keyword = keyword;
 				this.pageNum = 1;
-				this.getCouponList();
+				this.isNoMoreData = false;
+				this.productList = [];
+				this.getStoreList();
 			},
 			//保存关键字到历史记录
 			saveKeyword(keyword) {
@@ -248,8 +237,8 @@
 	view {
 		display: block;
 	}
-
-.loading-text {
+
+	.loading-text {
 		width: 100%;
 		display: flex;
 		justify-content: center;
@@ -258,6 +247,7 @@
 		color: #979797;
 		font-size: 24upx;
 	}
+
 	.product-list {
 		width: 92%;
 		padding: 0 4% 3vw 4%;
@@ -365,7 +355,6 @@
 
 	.search-keyword {
 		width: 100%;
-		background-color: rgb(242, 242, 242);
 	}
 
 	.keyword-list-box {
@@ -413,7 +402,7 @@
 	}
 
 	.keyword-box {
-		height: calc(100vh - 110upx);
+		height: calc(100vh - 150upx);
 		border-radius: 20upx 20upx 0 0;
 		background-color: #fff;
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9b0d5db..0b1e925 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -18,8 +18,8 @@
 			</view>
 			<view class="btn mart50" @tap="doLogin">登 录</view>
 			<view class="res flright mart20">
-			<!-- <view @tap="toPage('register')">用户注册</view> -->
-			<!-- <view @tap="toPage('resetpasswd')">重置密码</view> -->
+				<!-- <view @tap="toPage('register')">用户注册</view> -->
+				<!-- <view @tap="toPage('resetpasswd')">重置密码</view> -->
 			</view>
 			<!-- <view class="mart30 flright marRight20 font15  fcorfff">重置密码</view> -->
 		</view>
@@ -40,7 +40,7 @@
 	import md5 from "@/common/SDK/md5.min.js";
 	import {
 		userLogin
-	} from "../../Utils/Api.js";
+	} from "../../Utils/Api.js";
 	let app = getApp();
 	export default {
 		data() {
@@ -54,24 +54,11 @@
 					sinaweibo: false,
 					xiaomi: false
 				},
-				typeId:''
+				typeId: ''
 			}
 		},
 		onShow() {
-
-		},
-		onLoad(options) {
 			let that = this;
-			that.typeId = options.id;
-			if(that.typeId == 1){
-				uni.setNavigationBarTitle({
-					title:'门店登录'
-				})
-			}else{
-				uni.setNavigationBarTitle({
-					title:'代理商登录'
-				})
-			}
 			uni.getStorage({
 				key: 'phoneNum',
 				success(e) {
@@ -84,7 +71,21 @@
 					that.passwd = e.data;
 				}
 			})
-			
+		},
+		onLoad(options) {
+			let that = this;
+			that.typeId = options.id;
+			if (that.typeId == 1) {
+				uni.setNavigationBarTitle({
+					title: '门店登录'
+				})
+			} else {
+				uni.setNavigationBarTitle({
+					title: '代理商登录'
+				})
+			}
+
+
 			//APP显示第三方登录
 			// #ifdef APP-PLUS
 			that.isShowOauth = true;
@@ -196,20 +197,20 @@
 						uni.setStorage({
 							key: "pasNum",
 							data: this.passwd
-						})
+						})
 						uni.hideLoading();
-						if(this.typeId == 1){
+						if (this.typeId == 1) {
 							uni.navigateTo({
 								url: '../user/business/business'
 							})
-						}else{
+						} else {
 							uni.navigateTo({
 								url: '/pages/user/minePromotion/minePromotion'
 							})
-						}
-						app.globalData.brestUserInfo = res.return_data.object.secUser;
+						}
+						app.globalData.brestUserInfo = res.return_data.object.secUser;
 						app.globalData.brestToken = res.return_data.uniqueCode;
-					} else {
+					} else {
 						uni.hideLoading();
 						uni.showToast({
 							title: res.return_msg,
diff --git a/pages/login/resetpasswd.vue b/pages/login/resetpasswd.vue
index e53fcbe..da7329c 100644
--- a/pages/login/resetpasswd.vue
+++ b/pages/login/resetpasswd.vue
@@ -11,12 +11,12 @@
 				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
 			<view class="code">
-				<input placeholder="请输入新密码" v-model="code" placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="请输入新密码" v-model="code"  password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
 			<view class="password">
 				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
-			<view class="btn" @tap="doReset">重置密码</view>
+			<view class="btn" @click="sendUserPass">重置密码</view>
 
 		</view>
 		
@@ -25,6 +25,10 @@
 
 <script>
 	import md5 from "@/common/SDK/md5.min.js";
+		let app = getApp()
+	import {
+		sendUserPass
+	} from "../../Utils/Api.js";
 	export default {
 		data() {
 			return {
@@ -37,7 +41,6 @@
 			}
 		},
 		onLoad() {
-
 		},
 		methods: {
 			Timer(){},
@@ -129,7 +132,45 @@
 				},1000)
 				
 				
-			}
+			},
+			//修改密码
+			sendUserPass() {
+				if(this.phoneNumber == ''){
+					uni.showToast({title: '请输入旧密码',icon:"none"});
+					return false; 
+				}
+				if(this.code == ''){
+					uni.showToast({title: '请输入新密码',icon:"none"});
+					return false; 
+				}
+				if(this.passwd == ''){
+					uni.showToast({title: '请确认新密码',icon:"none"});
+					return false; 
+				}
+				if(this.passwd != this.code){
+					uni.showToast({title: '您输入的两次不相同',icon:"none"});
+					return false; 
+				}
+				let datas = {
+					userId: app.globalData.brestUserInfo.id,
+					oldPassword: this.phoneNumber,
+					password : this.passwd
+				}
+				sendUserPass(datas).then(res => {
+					if (res.return_code == '000000') {
+					uni.setStorage({
+						key: "pasNum",
+						data: this.passwd
+					})
+					uni.navigateBack()
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index bafcbc1..fffd761 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -88,6 +88,7 @@
 				</view>
 			</view>
 		</view>
+		<view class="btnw50 mart50 marb30"  @click="toPage()">修改密码</view>
 	</view>
 </template>
 
@@ -133,6 +134,11 @@
 				uni.navigateTo({
 					url: '../agentCoupons/agentCoupons?id='+item +'&couponsId='+ items
 				})
+			},
+			toPage(page) {
+				uni.navigateTo({
+					url: '../../login/resetpasswd'
+				});
 			}
 		}
 	}
diff --git a/uni.scss b/uni.scss
index a3067e3..4198567 100644
--- a/uni.scss
+++ b/uni.scss
@@ -470,6 +470,18 @@ $uni-font-size-paragraph:30upx;
   margin-top: 40px;
   background-color: #089bf5;
   border-radius: 6px;
+}
+
+.btnw50 {
+  width: 50%;
+  margin-left: 25%;
+  height: 45px;
+  line-height: 45px;
+  color: white;
+  text-align: center;
+  margin-top: 40px;
+  background-color: #f06c7a;
+  border-radius: 6px;
 }
 
 /* 下滑线 */