From 33615d230f898d8dc48c3baed0570f51aef26330 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期二, 19 三月 2024 09:39:29 +0800 Subject: [PATCH] 组卷购买 --- pages/personalCenter/index.wxml | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml index 479337b..c1a6791 100644 --- a/pages/personalCenter/index.wxml +++ b/pages/personalCenter/index.wxml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD <view class="background {{ isWhite ? 'white':''}}"> <text class="text">涓汉涓績</text> </view> @@ -7,7 +5,7 @@ <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" /> + <!-- <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"> @@ -18,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> @@ -48,8 +46,8 @@ <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"> + <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"> @@ -69,12 +67,4 @@ </view> </view> </view> -</view> -======= -<!--pages/personalCenter/index.wxml--> -<text>pages/personalCenter/index.wxml</text> ->>>>>>> master -======= -<!--pages/personalCenter/index.wxml--> -<text>pages/personalCenter/index.wxml</text> ->>>>>>> master +</view> \ No newline at end of file -- Gitblit v1.9.1