From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/login/index.wxml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 0ad9d90..78c244f 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -1,24 +1,24 @@
<view class="container">
- <image class="avatar" src=""></image>
+ <image class="avatar" src="../../static/icon/logo.png"></image>
<view class="home_title">蹇楅偊浼樺</view>
<view class="placeholder9">鏈�鎳備綘鐨勮惀閿�鍔╂墜</view>
<!-- -->
<view class="btns">
<block wx:if="{{ status == '0' }}">
- <button class="btn speedy" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
+ <button hover-class="none" class="btn speedy" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
<button wx:else class="btn speedy" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">鎵嬫満鍙峰揩鎹风櫥褰�</button>
<view bindtap="changeStatus" class="btn">鎵嬫満楠岃瘉鐮佺櫥褰�</view>
</block>
<block wx:if="{{ status == '1' }}">
<view class="line">
<image class="icon" src="../../static/login_ic_phone@2x.png" mode="widthFix"></image>
- <van-field class="input" maxlength="{{ 11 }}" border="{{false}}" model:value="{{ phone }}" placeholder="璇疯緭鍏ユ墜鏈哄彿" />
+ <van-field class="input" type="number" maxlength="{{ 11 }}" border="{{false}}" model:value="{{ phone }}" placeholder="璇疯緭鍏ユ墜鏈哄彿" />
<view bindtap="getCode" wx:if="{{ countDown === 0 }}" class="get_code primary">鑾峰彇楠岃瘉鐮�</view>
<view wx:else class="placeholder9">{{ countDown }}s</view>
</view>
<view class="line">
<image class="icon" src="../../static/login_ic_password@2x.png" mode="widthFix"></image>
- <van-field class="input" maxlength="{{ 6 }}" border="{{false}}" model:value="{{ code }}" placeholder="璇疯緭鍏ラ獙璇佺爜" />
+ <van-field type="number" class="input" maxlength="{{ 6 }}" border="{{false}}" model:value="{{ code }}" placeholder="璇疯緭鍏ラ獙璇佺爜" />
</view>
<view bindtap="loginPhone" class="btn speedy sub_btn">绔嬪嵆鐧诲綍</view>
</block>
@@ -35,7 +35,14 @@
<!-- -->
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <view class="content">
+ <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
+ </view>
+ <view style="bottom: {{ bottomLift }}px" class="btns">
+ <view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
+ <view data-flag="{{false}}" bindtap="handleJudge" class="reject">涓嶅悓鎰忓苟閫�鍑�</view>
+ </view>
</view>
</van-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.3