From b9d0de6dc355ea09258840e7333dea2e4fbbc11c Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Mon, 1 Feb 2021 15:38:54 +0800
Subject: [PATCH] =?UTF-8?q?2021-2-1UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index/index.js   | 36 ++++++++++++++++++++++++++++--------
 pages/home/index/index.wxml | 31 +++++++++++++++++++------------
 pages/home/index/index.wxss | 19 +++++++++++--------
 3 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 73d15c1..3da0b07 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -44,6 +44,11 @@ Component({
           height: app.globalData.safeFragmentHeight,
           userInfo: app.globalData.userInfo
         })
+        if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
+          this.setData({
+            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt.memberExpiredAt
+          })
+        }
       }
       this.fetchUserInfo()
       this.data.firstShow = true
@@ -82,11 +87,16 @@ Component({
           userInfo: app.globalData.userInfo,
           userName: nickname
         })
+        if(this.data.userInfo.isVIP==1){
+          this.setData({
+            'userInfo.memberExpiredAt':util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt), 'Y-M-D') 
+          })
+        }
       })
       getBalanceInfo().then(result => {
         this.setData({
           accountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney),
-          frozenMoney:result.data.frozenMoney
+          frozenMoney: result.data.frozenMoney
         })
       })
       getMessageNumber().then(result => {
@@ -118,22 +128,32 @@ Component({
         util.navigateTo('/pages/home/setting/index')
       } else if (e.currentTarget.id == 'tovip') {
         util.navigateTo('/pages/ztbvip/index')
-      }else if (e.currentTarget.id == 'myCus') {
+      } else if (e.currentTarget.id == 'myCus') {
         util.navigateTo('/pages/home/service/index')
-      }else if (e.currentTarget.id == 'qnLogistic') {
+      } else if (e.currentTarget.id == 'qnLogistic') {
         util.navigateTo('/pages/html/logistics/index')
       } else if (e.currentTarget.id == 'toMyMoney') {
         util.navigateTo('/pages/bank/bill/index')
       } else if (e.currentTarget.id == 'agent50') {
-        wx.navigateTo({ url: '/pages/agent/order/index?status=50&tabIndex=1' })
+        wx.navigateTo({
+          url: '/pages/agent/order/index?status=50&tabIndex=1'
+        })
       } else if (e.currentTarget.id == 'agent51') {
-        wx.navigateTo({ url: '/pages/agent/order/index?status=51&tabIndex=2' })
+        wx.navigateTo({
+          url: '/pages/agent/order/index?status=51&tabIndex=2'
+        })
       } else if (e.currentTarget.id == 'agent53') {
-        wx.navigateTo({ url: '/pages/agent/order/index?status=53&tabIndex=3' })
+        wx.navigateTo({
+          url: '/pages/agent/order/index?status=53&tabIndex=3'
+        })
       } else if (e.currentTarget.id == 'agent54') {
-        wx.navigateTo({ url: '/pages/agent/order/index?status=54&tabIndex=4' })
+        wx.navigateTo({
+          url: '/pages/agent/order/index?status=54&tabIndex=4'
+        })
       } else if (e.currentTarget.id == 'agent55') {
-        wx.navigateTo({ url: '/pages/agent/order/index?status=55&tabIndex=5' })
+        wx.navigateTo({
+          url: '/pages/agent/order/index?status=55&tabIndex=5'
+        })
       }
     },
     toUserInfo: function () {
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index b939dae..64eb38a 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -7,18 +7,18 @@
 				<image style="width:156rpx;height:156rpx;border-radio:30px" slot="loading" src="/assets/myinfo/user-icon.png"></image>
 			</wux-image>
 			<view class="topText" bindtap="toUserInfo">
-				<view wx:if="{{userInfo}}" style="width:208rpx;height:158rpx">
-					<text class="textType1">{{userName}}\n</text>
+				<view wx:if="{{userInfo}}" style="height:158rpx">
+					<view>
+						<text class="textType1">{{userInfo.realName}}</text>
+						<image class="img-auth2" src="{{userInfo.isAuth == 1 ? '/assets/myinfo/ysmicon.png' : '/assets/myinfo/wsmicon.png'}}">
+						</image>
+					</view>
 					<text class="textType2">{{userInfo.mobile}}</text>
 				</view>
 				<view wx:else style="width:208rpx;height:158rpx">
 					<text class="textType1">点击登录\n</text>
 					<text class="textType2">登陆解锁更多功能</text>
 				</view>
-				<view class="img-auth2-view" wx:if="{{userInfo}}" catchtap="toAuthor">
-					<image class="img-auth2" src="{{userInfo.isAuth == 1 ? '/assets/myinfo/ysmicon.png' : '/assets/myinfo/wsmicon.png'}}">
-					</image>
-				</view>
 			</view>
 			<view class="topIconRight">
 				<view class="topIconRightIcon1" id="message" is-link bindtap="toPage">
@@ -38,7 +38,7 @@
 				<text style="font-size: 26rpx;color: #DBC189;letter-spacing: 0.5rpx;line-height: 37rpx;float:right;margin-top:-4rpx">VIP会员</text>
 			</view>
 			<view class="vipBjSmallTextMid">
-				<text wx:if="{{userInfo.isVIP==1}}" class="textMid">{{userInfo.memberExpiredAt}}</text>
+				<text wx:if="{{userInfo.isVIP==1}}" class="textMid">到期时间：{{userInfo.memberExpiredAt}}</text>
 				<text wx:else class="textMid">立即开通会员 尊享特权</text>
 			</view>
 			<view class="vipRightImg">
@@ -48,11 +48,15 @@
 		<view class="topButtomVipBJ2">
 			<image class="vipBjImg2" src="/assets/myinfo/vipTopBj.png">
 			</image>
-			<text class="vipImgText">开通会员</text>
+			<text wx:if="{{userInfo.isVIP==1}}" class="vipImgText">立即续费</text>
+			<text wx:else class="vipImgText">开通会员</text>
 		</view>
 	</view>
 	<view class="dmArea">
-		<text class="daAreaTietleText">代卖订单</text>
+		<view class="boderLine">
+			<text class="daAreaTietleText">代卖订单</text>
+			<text style="float:right">查看更多订单></text>
+		</view>
 		<view class="dmAreaConten" id="agent50" is-link bindtap="toPage">
 			<view class="sonConten1">
 				<view class="iconArea">
@@ -88,7 +92,7 @@
 	</view>
 
 	<view class="dmArea2">
-		<view id="balance" is-link bindtap="toPage">
+		<view class="boderLine" id="balance" is-link bindtap="toPage">
 			<text class="daAreaTietleText">我的钱包</text>
 			<text class="dmArea2Text">进入钱包></text>
 		</view>
@@ -102,7 +106,7 @@
 				<text style="font-family: PingFangSC-Regular;font-size: 26rpx;color: rgba(0,0,0,0.65);letter-spacing: 0;">提现中的金额</text>
 			</view>
 			<view class="moneyTextArea3" id="toMyMoney" is-link bindtap="toPage">
-				<view class="btnView"><text style="font-size: 10px;color: rgba(0,0,0,0.85);">查看账单</text></view>
+				<view class="btnView"><text style="font-size: 8px;color: rgba(0,0,0,0.85);">查看账单</text></view>
 				<text style="font-family: PingFangSC-Regular;font-size: 26rpx;color: rgba(0,0,0,0.65);letter-spacing: 0;margin-top:25rpx;margin-left:15rpx">我的账单</text>
 			</view>
 		</view>
@@ -122,7 +126,10 @@
 		</view>
 	</view>
 	<view class="dmArea4">
-		<text class="daAreaTietleText">其他工具</text>
+		<view class="boderLine">
+			<text class="daAreaTietleText ">其他工具</text>
+		</view>
+
 		<view class="dmAreaConten">
 			<view class="dmArea4sonConten1" id="bidding" is-link bindtap="toPage">
 				<view class="dmArea4iconArea">
diff --git a/pages/home/index/index.wxss b/pages/home/index/index.wxss
index eec0fa4..5b34024 100644
--- a/pages/home/index/index.wxss
+++ b/pages/home/index/index.wxss
@@ -36,7 +36,6 @@
   top: 96rpx;
   padding: 32rpx;
   width: 100%;
-  height: 170rpx;
   overflow: hidden;
 }
 
@@ -44,6 +43,7 @@
   position: absolute;
   top: 70rpx;
   left: 208rpx;
+  width: 400rpx;
 }
 
 .textType1 {
@@ -245,14 +245,14 @@
 }
 
 .btnView {
-  width: 150rpx;
-  height: 50rpx;
+  width: 100rpx;
+  height: 38rpx;
   background: #FFFFFF;
   border: 1px solid rgba(0, 0, 0, 0.50);
-  border-radius: 10rpx;
-  border-radius: 10rpx;
-  padding: 5rpx 28rpx 5rpx 28rpx;
+  border-radius: 18.75rpx;
+  border-radius: 18.75rpx;
   text-align: center;
+  margin-left: 18rpx;
 }
 
 .dmArea3 {
@@ -290,14 +290,14 @@
 
 .dmArea4sonConten1 {
   float: left;
-  width: 110rpx;
+  width: 120rpx;
   height: 154rpx;
 }
 
 .dmArea4sonConten2 {
   float: left;
   margin-left: 42rpx;
-  width: 110rpx;
+  width: 120rpx;
   height: 154rpx;
 }
 
@@ -310,4 +310,7 @@
 .dmArea4iconAreaIMG {
   width: 68rpx;
   height: 68rpx;
+}
+.boderLine{
+  border-bottom:1px solid r;
 }
\ No newline at end of file