From 366de5b4636679392a1e3d2984fc23bd5eaa5ac3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 27 八月 2024 17:48:03 +0800
Subject: [PATCH] wenti

---
 pages/personalCenter/index.wxml |  174 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 108 insertions(+), 66 deletions(-)

diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 8af8bde..29395d8 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,75 +1,117 @@
-<<<<<<< HEAD
-<view class="background {{ isWhite ? 'white':''}}">
-  <text class="text">涓汉涓績</text>
-</view>
-<view class="home-page">
+<view class="container">
   <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" />
-  <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>
+  <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+    <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="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" />
+    <view class="home-page">
+
+      <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="state wait" wx:if="{{teacherState.state == 'WaitAudit'}}">绛夊緟瀹℃牳</view>
+              <view class="state yes" wx:if="{{teacherState.state == 'Normal'}}">宸茶璇�</view>
+              <view class="state no" wx:if="{{teacherState.state == 'Reject'}}">宸查┏鍥�</view>
+              <view class="state 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="line"></view>
+            <view bindtap="getIntegralList">
+              <view>{{integral}}</view>
+              <view class="title">绉垎</view>
+            </view>
           </view>
-          <view class="label">
-            <text>{{item.title}}</text>
+        </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>
+      <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' : 'item'}}">
+              {{ item.lable }}
+            </view>
+          </view>
+          <view class="footer">
+            <button class="submit" bindtap="submit">纭畾</button>
+          </view>
+        </view>
+      </t-popup>
+      <t-popup visible="{{visibleIntegral}}" bind:visible-change="onVisibleIntegralChange" placement="center">
+        <view class="blockIntegral">
+          <scroll-view class="srcolbox" scroll-y scroll-height-animation="true">
+            <view class="block-content">
+              <view class="tableHeader">
+                <view class="lable">绫诲瀷</view>
+                <view class="value">鏁伴噺</view>
+                <view class="createDate">鏃堕棿</view>
+              </view>
+              <view class="content-item" wx:for="{{recordList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                <view class="lable">{{item.type}}</view>
+                <view class="value yes" wx:if="item.value > 0">{{'+' + item.value}}</view>
+                <view class="value no" wx:else>{{item.value}}</view>
+                <view class="createDate">{{item.createDate ? item.createDate : '-'}}</view>
+              </view>
+              <view class="content-item">
+                <view class="lable">鎬昏</view>
+                <view class="value totle">{{integral}}</view>
+                <view class="createDate"></view>
+              </view>
+            </view>
+          </scroll-view>
+          <t-icon t-class="close-btn" name="close-circle" size="64rpx" color="#fff" bind:tap="onClose" />
+        </view>
+      </t-popup>
+
     </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>
-        </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>
-</view>
-=======
-<!--pages/personalCenter/index.wxml-->
-<text>pages/personalCenter/index.wxml</text>
->>>>>>> master
+  </t-pull-down-refresh>
+</view>
\ No newline at end of file

--
Gitblit v1.9.1