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_jiaxuan/pages/auth/auth.wxml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 824c3df..feed215 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -1,9 +1,4 @@
<view>
- <van-nav-bar title="鎺堟潈鐧诲綍">
- <view slot="left">
- <van-icon name="arrow-left" size="22px" color="#000000" />
- </view>
- </van-nav-bar>
<view class="container">
<view class="logo_wrap">
<image src="../../static/icon/logo.png"></image>
@@ -15,12 +10,26 @@
<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 class="btn">鎵嬫満鍙峰揩鎹风櫥褰�</view>
+ <button hover-class="none" class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
+ <button hover-class="none" wx:else class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">鎵嬫満鍙峰揩鎹风櫥褰�</button>
</view>
</view>
+ <!-- -->
+ <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
+ <view class="modal">
+ <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="btn">涓嶅悓鎰忓苟閫�鍑�</view>
+ </view>
+ </view>
+ </van-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.3