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 | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 5d23db3..feed215 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -5,7 +5,6 @@
</view>
<view class="title">娆㈣繋鏉ュ埌蹇楅偊瀹跺眳閫夊織閭︼紝瀹炵幇鎮ㄥ瀹剁殑缇庡ソ鎯宠薄</view>
<view class="placeholder9">鎮ㄥ枩娆㈢殑鏍峰瓙锛屾垜閮芥湁锝�</view>
- <view>{{ test }}</view>
<view class="main_footer">
<view class="line">
<van-checkbox value="{{ agreementFalg }}" checked-color="{{primary}}" shape="round" bind:change="agreementChange"></van-checkbox>
@@ -16,14 +15,21 @@
<text data-index="1" bindtap="onOpen" class="primary">銆奪BOM鐢ㄦ埛闅愮鏀跨瓥銆�</text>
</view>
</view>
- <button class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
- <button wx:else class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">鎵嬫満鍙峰揩鎹风櫥褰�</button>
+ <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">
- <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="btn">涓嶅悓鎰忓苟閫�鍑�</view>
+ </view>
</view>
</van-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.3