From f650319d7175f764cd5286c383a72d6e6d2e8a87 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 18 七月 2025 14:53:18 +0800
Subject: [PATCH] 调接口
---
small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml b/small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
index c2e23ad..485ce6d 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
@@ -1,5 +1 @@
-<<<<<<< HEAD
-<view class="box data-v-b237504c"><view class="box-title data-v-b237504c">娆㈣繋浣跨敤杩戝揩</view><view class="box-tips data-v-b237504c">璇风櫥褰�</view><view class="box-btn data-v-b237504c"><block wx:if="{{agree}}"><button class="box-btn data-v-b237504c" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhone',['$event']]]]]}}" bindgetphonenumber="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block><block wx:if="{{!agree}}"><button data-event-opts="{{[['tap',[['tipAgree',['$event']]]]]}}" class="box-btn data-v-b237504c" bindtap="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block></view><view class="box-footer data-v-b237504c"><block wx:if="{{!agree}}"><image src="/static/icon/ic_notagree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><block wx:if="{{agree}}"><image src="/static/icon/ic_agree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><text data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c">鎴戝凡闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬶紝銆婇殣绉佸崗璁斂绛栥��</text></view></view>
-=======
-<view class="box data-v-b237504c"><view class="box-title data-v-b237504c">娆㈣繋浣跨敤杩戝揩</view><view class="box-tips data-v-b237504c">璇风櫥褰�</view><view class="box-btn data-v-b237504c"><block wx:if="{{agree}}"><button class="box-btn data-v-b237504c" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhone',['$event']]]]]}}" bindgetphonenumber="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block><block wx:if="{{!agree}}"><button data-event-opts="{{[['tap',[['tipAgree',['$event']]]]]}}" class="box-btn data-v-b237504c" bindtap="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block></view><view class="box-footer data-v-b237504c"><block wx:if="{{!agree}}"><image src="/static/icon/ic_notagree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><block wx:if="{{agree}}"><image src="/static/icon/ic_agree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><text data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c">鎴戝凡闃呰骞跺悓鎰�<text data-event-opts="{{[['tap',[['jumpService',[4]]]]]}}" bindtap="__e" class="data-v-b237504c">銆婄敤鎴峰崗璁��</text>锛�<text data-event-opts="{{[['tap',[['jumpService',[5]]]]]}}" bindtap="__e" class="data-v-b237504c">銆婇殣绉佸崗璁斂绛栥��</text></text></view></view>
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
+<view class="box data-v-b237504c"><view class="box-title data-v-b237504c">娆㈣繋浣跨敤杩戝揩</view><view class="box-tips data-v-b237504c">璇风櫥褰�</view><view class="box-btn data-v-b237504c"><block wx:if="{{agree}}"><button class="box-btn data-v-b237504c" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhone',['$event']]]]]}}" bindgetphonenumber="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block><block wx:if="{{!agree}}"><button data-event-opts="{{[['tap',[['tipAgree',['$event']]]]]}}" class="box-btn data-v-b237504c" bindtap="__e">鎵嬫満鍙蜂竴閿櫥褰�</button></block></view><view class="box-footer data-v-b237504c"><block wx:if="{{!agree}}"><image src="/static/icon/ic_notagree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><block wx:if="{{agree}}"><image src="/static/icon/ic_agree@2x.png" mode="widthFix" data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c"></image></block><text data-event-opts="{{[['tap',[['agreeDo',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c">鎴戝凡闃呰骞跺悓鎰�<text data-event-opts="{{[['tap',[['jumpService',[4]]]]]}}" bindtap="__e" class="data-v-b237504c">銆婄敤鎴峰崗璁��</text>锛�<text data-event-opts="{{[['tap',[['jumpService',[5]]]]]}}" bindtap="__e" class="data-v-b237504c">銆婇殣绉佸崗璁斂绛栥��</text></text></view></view>
\ No newline at end of file
--
Gitblit v1.9.3