From bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/login/index.wxml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 9fe6288..5e6cc05 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -6,30 +6,35 @@
<view class="btns">
<block wx:if="{{ status == '0' }}">
<view class="btn speedy">鎵嬫満鍙峰揩鎹风櫥褰�</view>
- <view class="btn">鎵嬫満楠岃瘉鐮佺櫥褰�</view>
+ <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" border="{{false}}" model:value="{{ phone }}" placeholder="璇疯緭鍏ユ墜鏈哄彿" />
+ <van-field class="input" 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" border="{{false}}" model:value="{{ password }}" placeholder="璇疯緭鍏ラ獙璇佺爜" />
+ <van-field class="input" maxlength="{{ 6 }}" border="{{false}}" model:value="{{ code }}" placeholder="璇疯緭鍏ラ獙璇佺爜" />
</view>
- <view class="btn speedy sub_btn">绔嬪嵆鐧诲綍</view>
+ <view bindtap="loginPhone" class="btn speedy sub_btn">绔嬪嵆鐧诲綍</view>
</block>
<view class="protocol">
<van-checkbox value="{{ agreementFalg }}" checked-color="{{primary}}" shape="round" bind:change="agreementChange"></van-checkbox>
<view class="content">
<text>鎴戝凡闃呰骞跺悓鎰�</text>
- <text class="primary">銆奪BOM鐢ㄦ埛鏈嶅姟鍗忚銆�</text>
+ <text data-index="0" bindtap="onOpen" class="primary">銆奪BOM鐢ㄦ埛鏈嶅姟鍗忚銆�</text>
<text>鍙�</text>
- <text class="primary">銆奪BOM鐢ㄦ埛闅愮鏀跨瓥銆�</text>
+ <text data-index="1" bindtap="onOpen" class="primary">銆奪BOM鐢ㄦ埛闅愮鏀跨瓥銆�</text>
</view>
</view>
</view>
-
+ <!-- -->
+ <van-popup show="{{ showModal }}" round bind:close="onClose">
+ <view class="modal">
+ <rich-text nodes="{{activeHtml}}"></rich-text>
+ </view>
+ </van-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.3