From b0a4d23b83b9cdbdee15263acdd4e7353a8286a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 07 八月 2024 18:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/auth/auth.wxml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 2e7e623..e1b98e0 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -15,15 +15,16 @@
<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">
<view class="content">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <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>
--
Gitblit v1.9.3