From a8c03746e6bd8ac1d46dc48c1b10bceff543664f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:12 +0800
Subject: [PATCH] ll
---
h5/pages/staffLogin/login.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 13adeca..b20464b 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -1,5 +1,5 @@
<template>
- <view class="login">
+ <view class="login" :style="{height: windowHeight + 'px'}">
<image class="login_bg" src="@/static/login_bg@2x.png" mode="widthFix" />
<image class="login_logo" src="@/static/logo@2x.png" mode="widthFix" />
<view class="login_title">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
@@ -30,7 +30,7 @@
>
</view>
- <view class="deal_wrap" v-show="!showKeyboard">
+ <view class="deal_wrap">
<image
@click="changeFalg"
v-if="ProtocolFlag"
@@ -44,6 +44,7 @@
src="@/static/meeting/icon/ic_choose@2x.png"
mode="widthFix"
class="checked"
+
></image>
<text>鐧诲綍鍗冲悓鎰�</text>
<text class="deal" @click="showContent">銆婂畨娉扮墿娴佺敤鎴峰崗璁��</text>
@@ -52,19 +53,22 @@
<u-popup
:show="isShowProtocol"
@close="isShowProtocol = false"
+ closeable
:round="8"
mode="center"
>
<view class="modal">
<!-- <view v-html="htmlText"></view> -->
- <mp-html :content="htmlText" />
+ <view class="content">
+ <mp-html :content="htmlText" />
+ </view>
</view>
</u-popup>
</view>
</template>
<script>
-import { loginPost, loginCaptcha, getUserInfo, getSystemDictData } from '@/api'
+import { loginPost, loginCaptcha, getUserInfo, getSystemDictData, saveHkUserOpenid } from '@/api'
import { mapState, mapMutations } from 'vuex'
export default {
name: 'login',
@@ -81,12 +85,16 @@
isShowProtocol: false,
ProtocolFlag: false,
captcha: {},
- htmlText: ''
+ htmlText: '',
+ windowHeight: ''
}
},
onLoad() {
this.initCaptcha()
+ const result = uni.getWindowInfo()
+ this.windowHeight = result.windowHeight
+ console.log('result', result);
},
onBackPress(options) {
uni.redirectTo({
@@ -148,6 +156,7 @@
url: "/pages/staff/index"
})
})
+ saveHkUserOpenid({})
}
})
}
@@ -163,6 +172,7 @@
box-sizing: border-box;
align-items: center;
flex-direction: column;
+ position: relative;
background: linear-gradient(
180deg,
rgba(39, 155, 170, 0.2) 0%,
@@ -247,7 +257,7 @@
}
}
.deal_wrap {
- position: fixed;
+ position: absolute;
width: 100%;
left: 0;
text-align: center;
@@ -263,13 +273,20 @@
margin-right: 12rpx;
}
}
+ .rela_wrap{
+ position: relative;
+ margin-top: 360rpx;
+ }
}
.modal {
width: 690rpx;
- min-height: 820rpx;
- max-height: 720px;
+ max-height: 80vh;
border-radius: 24rpx;
- padding: 32rpx;
+ padding: 30rpx 30rpx;
overflow: auto;
+ // .content{
+ // height: 100%;
+ // overflow: auto;
+ // }
}
</style>
--
Gitblit v1.9.3