From 0df3c99a23b6774c39abf16af51cf20bbfefc8a5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 五月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/changePassword/changePassword.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/h5/pages/changePassword/changePassword.vue b/h5/pages/changePassword/changePassword.vue
index f79f54c..af61ae5 100644
--- a/h5/pages/changePassword/changePassword.vue
+++ b/h5/pages/changePassword/changePassword.vue
@@ -1,9 +1,5 @@
<template>
<view class="box">
- <view class="box_tips">
- <image src="@/static/ic_tip@2x.png" mode="widthFix"></image>
- <text>濡傞仐蹇樺瘑鐮侊紝璇疯仈绯诲洯鍖虹郴缁熺鐞嗗憳閲嶇疆</text>
- </view>
<view class="list">
<view class="list_item">
<view class="list_item_label">
@@ -20,7 +16,7 @@
<text>*</text>
</view>
<view class="list_item_content">
- <input type="number" maxlength="11" placeholder="璇疯緭鍏�6-18浣嶆暟瀛椼�佸瓧姣嶇粍鍚堟柊瀵嗙爜" placeholder-style="color: #999999;" />
+ <input type="number" maxlength="11" placeholder="璇疯緭鍏�6-18浣嶆暟瀛椼�佸瓧姣嶇粍鍚�" placeholder-style="color: #999999;" />
</view>
</view>
<view class="list_item">
@@ -29,9 +25,13 @@
<text>*</text>
</view>
<view class="list_item_content">
- <input type="number" maxlength="11" placeholder="璇疯緭鍏�6-18浣嶆暟瀛椼�佸瓧姣嶇粍鍚堟柊瀵嗙爜" placeholder-style="color: #999999;" />
+ <input type="number" maxlength="11" placeholder="璇峰啀杈撲竴娆℃柊瀵嗙爜" placeholder-style="color: #999999;" />
</view>
</view>
+ </view>
+ <view class="box_tips">
+ <u-icon name="info-circle" class="mr12" color="#4d99a8"></u-icon>
+ <text>濡傚瘑鐮侀仐蹇橈紝璇疯仈绯诲洯鍖虹郴缁熺鐞嗗憳閲嶇疆</text>
</view>
<view class="footer-box">
<view class="submit-button">鎻愪氦</view>
@@ -70,7 +70,7 @@
text {
font-size: 26rpx;
font-weight: 400;
- color: #E0312A;
+ color: #4c99a7;
}
}
.list {
@@ -135,8 +135,7 @@
}
.footer-box {
width: 100%;
- position: fixed;
- bottom: 30rpx;
+ margin-top: 48rpx;
height: 80rpx;
display: flex;
justify-content: center;
@@ -145,7 +144,7 @@
width: calc(100% - 60rpx);
height: 88rpx;
line-height: 88rpx;
- background: #025eef;
+ background: #4d99a8;
border-radius: 4rpx;
color: #fff;
border-radius: 44rpx;
--
Gitblit v1.9.3