From 52787adceb282c1914589c7ceb252bdb03e2df36 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 11:26:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/pages/login/index.wxml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 5e6cc05..67069e8 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -1,11 +1,12 @@
<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' }}">
- <view class="btn speedy">鎵嬫満鍙峰揩鎹风櫥褰�</view>
+ <button 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' }}">
@@ -32,9 +33,15 @@
</view>
</view>
<!-- -->
- <van-popup show="{{ showModal }}" round bind:close="onClose">
+ <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <view class="content">
+ <mp-html content="{{activeHtml}}"></mp-html>
+ </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