From 4201a2237ac7b724989e93f8ac4ae16da2800528 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 17:00:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/index/index.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 927da79..3c1ace0 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -56,8 +56,8 @@
},
onShow() {
let that = this
- const member = wx.getStorageSync('member')
- if (member && (member.authStatus == '1' || member.authStatus == '2')) {
+ const member = wx.getStorageSync('member') || {}
+ if (member && member.id) {
getMemberInfo().then(res => {
this.setData({
member: res.data
@@ -233,9 +233,13 @@
})
},
bannerbindload(e) {
- const height = e.detail.height
+ const {
+ height,
+ width
+ } = e.detail
+ let activeHeight = height * 670 / width
this.setData({
- bannerImgHeight: height
+ bannerImgHeight: activeHeight
})
},
consultbindload(e) {
@@ -245,7 +249,7 @@
} = e.detail
let activeHeight = height * 670 / width
this.setData({
- consultImgHeight: activeHeight
+ consultImgHeight: activeHeight + 100
})
},
consultClick(e) {
--
Gitblit v1.9.3