From 88d80c9f40935c6ce7ea51683c6cdc1a80d1997b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 22 三月 2024 11:17:45 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/personalCenter/index.wxml | 131 +++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 54 deletions(-)
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index af3efc5..4a4b851 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,63 +1,86 @@
-<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" />
-<view class="content-wrapper">
- <view class="topBox">
- <view class="teacherBox">
- <view>
- <view class="wait" wx:if="{{teacherState.state == 'WaitAudit'}}">绛夊緟瀹℃牳</view>
- <view class="yes" wx:if="{{teacherState.state == 'Normal'}}">宸茶璇�</view>
- <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>
- </view>
- </view>
- <view>
- <view>{{integral}}</view>
- <view class="title">绉垎</view>
- </view>
- </view>
+<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>
- <view class="domainBox">
- <view class="title">
- <text>甯哥敤鍔熻兘</text>
- </view>
- <view class="domainList">
- <view wx:for="{{menuData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
- <view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
+ <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">
+ <view>
+ <view class="wait" wx:if="{{teacherState.state == 'WaitAudit'}}">绛夊緟瀹℃牳</view>
+ <view class="yes" wx:if="{{teacherState.state == 'Normal'}}">宸茶璇�</view>
+ <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 == ''}}" bindtap="toCertification">璁よ瘉</text>
+ <text class="change-info" wx:if="{{teacherState.state == 'Normal' || teacherState.state == 'Reject'}}" bindtap="toCertification">淇敼</text>
+ </view>
</view>
- <view class="label">
- <text>{{item.title}}</text>
+ <view>
+ <view>{{integral}}</view>
+ <view class="title">绉垎</view>
+ </view>
+ </view>
+ </view>
+ <view class="domainBox">
+ <view class="title">
+ <text>甯哥敤鍔熻兘</text>
+ </view>
+ <view class="domainList">
+ <view wx:for="{{menuData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
+ <view class="icon">
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ </view>
+ <view class="label">
+ <text>{{item.title}}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="domainBox">
+ <view class="title">
+ <text>鏇村鍔熻兘</text>
+ </view>
+ <view class="domainList1">
+ <view wx:for="{{moreMenu}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
+ <view class="icon">
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ </view>
+ <view class="label">
+ <text>{{item.title}}</text>
+ </view>
+ </view>
+ </view>
+ <view class="domainList2">
+ <view wx:for="{{moreMenu1}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
+ <view class="icon">
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ </view>
+ <view class="label">
+ <text>{{item.title}}</text>
+ </view>
</view>
</view>
</view>
</view>
- <view class="domainBox">
- <view class="title">
- <text>鏇村鍔熻兘</text>
- </view>
- <view class="domainList1">
- <view wx:for="{{moreMenu}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
- <view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
- </view>
- <view class="label">
- <text>{{item.title}}</text>
- </view>
+ <t-popup visible="{{visible}}" bind:visible-change="onVisibleChange" placement="bottom">
+ <view class="block">
+ <view class="header">
+ <view class="title">璇烽�夋嫨鎮ㄧ殑鐢ㄦ埛绫诲瀷</view>
</view>
- </view>
- <view class="domainList2">
- <view wx:for="{{moreMenu1}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
- <view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
- </view>
- <view class="label">
- <text>{{item.title}}</text>
- </view>
- </view>
- </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' : 'item'}}">
+ {{ 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