From 05f9aab3c362c0c563cfb039acd60f697a1178d3 Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Wed, 12 May 2021 22:39:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E4=BF=AE=E6=94=B9=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=202.=E5=AF=B9=E6=8E=A5=E6=90=9C=E7=B4=A2=E9=97=A8?=
=?UTF-8?q?=E5=BA=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Utils/Api.js | 11 +-
.../mehaotian-search-revision.vue | 1 -
manifest.json | 12 ++
pages.json | 2 +-
pages/goods/HM-search/HM-search.vue | 139 ++++++++----------
pages/login/login.vue | 49 +++---
pages/login/resetpasswd.vue | 49 +++++-
pages/user/minePromotion/minePromotion.vue | 6 +
uni.scss | 12 ++
9 files changed, 172 insertions(+), 109 deletions(-)
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 @@
+ @search="doSearch(false)" @confirm="doSearch(false)" v-model="keyword">
-
-
-
+
+
+
+
+
+ {{ product.storeName }}
+
+
+
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 @@
+ 修改密码
@@ -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;
}
/* 下滑线 */