From 80232d691dd9c4989985b570ce4d745e5d2bc3f7 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 20 三月 2024 18:34:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/personalCenter/index.wxml | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 8af8bde..e5396f0 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,13 +1,12 @@
-<<<<<<< HEAD
-<view class="background {{ isWhite ? 'white':''}}">
+<view style="width: 100%; height: {{barHeight}}px;"></view>
+<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
<text class="text">涓汉涓績</text>
</view>
<view class="home-page">
<view class="bg">
<image src="/static/images/personal/my-bg.png" mode="heightFix" class="image" />
</view>
- <image class="background" src="/static/images/personal/my-bg.png" mode="heightFix" />
- <t-user-center-card userInfo="{{userInfo}}" isPhoneHide="{{true}}" name-class="custom-name-class" phone-class="custom-phone-class" avatar-class="customer-avatar-class" currAuthStep="{{currAuthStep}}" bind:gotoUserEditPage="gotoUserEditPage" />
+ <t-user-center-card userInfo="{{userInfo}}" isPhoneHide="{{true}}" name-class="custom-name-class" phone-class="custom-phone-class" avatar-class="customer-avatar-class" currAuthStep="{{currAuthStep}}" bind:gotoUserEditPage="gotoUserEditPage" bind:editUserType="editUserType" />
<view class="content-wrapper">
<view class="topBox">
<view class="teacherBox">
@@ -17,8 +16,8 @@
<view class="no" wx:if="{{teacherState.state == 'Reject'}}">宸查┏鍥�</view>
<view class="wait" wx:if="{{teacherState.state == ''}}">寰呰璇�</view>
<view class="title"><text>鏁欏笀璁よ瘉</text>
- <text class="change-info" wx:if="{{teacherState.state == ''}}">璁よ瘉</text>
- <text class="change-info" wx:if="{{teacherState.state == 'Normal' || teacherState.state == 'Reject'}}">淇敼</text>
+ <text class="change-info" wx:if="{{teacherState.state == ''}}" bindtap="toCertification">璁よ瘉</text>
+ <text class="change-info" wx:if="{{teacherState.state == 'Normal' || teacherState.state == 'Reject'}}" bindtap="toCertification">淇敼</text>
</view>
</view>
<view>
@@ -68,8 +67,19 @@
</view>
</view>
</view>
-</view>
-=======
-<!--pages/personalCenter/index.wxml-->
-<text>pages/personalCenter/index.wxml</text>
->>>>>>> master
+ <t-popup visible="{{visible}}" bind:visible-change="onVisibleChange" placement="bottom">
+ <view class="block">
+ <view class="header">
+ <view class="title">璇烽�夋嫨鎮ㄧ殑鐢ㄦ埛绫诲瀷</view>
+ </view>
+ <view class="body">
+ <view wx:for="{{userTypeList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="tabUserTypeClick" :class="item.value == userTypeActive ? 'activeItem item hover' : 'item hover'">
+ {{ item.lable }}
+ </view>
+ </view>
+ <view class="footer">
+ <button class="submit" bindtap="submit">鎻愪氦</button>
+ </view>
+ </view>
+ </t-popup>
+</view>
\ No newline at end of file
--
Gitblit v1.9.1