5-24-1

pages/public/wxLogin.vue

@@ -194,6 +194,9 @@
 						obj.login();
 						// 保存返回用户数据
 						obj.setUserInfo(data);
+						uni.setStorageSync(
+							'jynickname',1
+						)
 						if (data.mobile == null || !data.mobile) {
 							obj.MaskShow = true;
 						} else {

pages/user/model/phb.vue

@@ -137,7 +137,6 @@
 					time: navitem.time,
 					times: navitem.times
 				}).then(res => {
-					console.log(res);
 					navitem.list = res.data
 					navitem.loaded = true
 				}).catch(err => {

pages/user/teamph.vue

@@ -14,7 +14,7 @@
 					<view class="item-logo yj-logo">
 						<image :src="navList[currentIndex].list[1].avatar || ''" mode="" class="avt"></image>
 					</view>
-					<view class="item-name">
+					<view class="item-name clamp">
 						{{navList[currentIndex].list[1].nickname || '暂无'}}
 					</view>
 					<view class="item-id">
@@ -31,7 +31,7 @@
 					<view class="item-logo gj-logo">
 						<image :src="navList[currentIndex].list[0].avatar || ''" mode="" class="avt"></image>
 					</view>
-					<view class="item-name">
+					<view class="item-name clamp">
 						{{navList[currentIndex].list[0].nickname || '暂无'}}
 					</view>
 					<view class="item-id">
@@ -48,7 +48,7 @@
 					<view class="item-logo jj-logo">
 						<image :src="navList[currentIndex].list[2].avatar || ''" mode="" class="avt"></image>
 					</view>
-					<view class="item-name">
+					<view class="item-name clamp">
 						{{navList[currentIndex].list[2].nickname || '暂无'}}
 					</view>
 					<view class="item-id">
@@ -64,7 +64,8 @@
 			</view>
 			<image src="../../static/icon/yy.png" mode="" class="yy"></image>
 		</view>
-		<scroll-view scroll-y="true" class="grop-list" :style="{'height': max_height}" @scrolltolower="getInviterRanking()">
+		<scroll-view scroll-y="true" class="grop-list" :style="{'height': max_height}"
+			@scrolltolower="getInviterRanking()">
 			<view class="grop-item flex" v-for="(item,index) in showList" v-if="index !=0 && index != 1 && index != 2">
 				<view class="item-xh">
 					{{index + 1}}
@@ -93,15 +94,19 @@
 </template>
 
 <script>
-	import { getInviterRanking } from '@/api/user.js'
+	import {
+		getInviterRanking
+	} from '@/api/user.js'
 	export default {
 		data() {
 			return {
 				max_height: '',
 				navList: [{
 					title: '周排行',
-					time: ((new Date().setHours(0, 0, 0) - (new Date().getDay() - 1) *24 * 60 * 60 *1000)/1000).toFixed(0),
-					times: ((new Date().setHours(0, 0, 0) + (7 - new Date().getDay()) *24 * 60 * 60 *1000)/1000).toFixed(0),
+					time: ((new Date().setHours(0, 0, 0) - (new Date().getDay() - 1) * 24 * 60 * 60 * 1000) / 1000)
+						.toFixed(0),
+					times: ((new Date().setHours(0, 0, 0) + (7 - new Date().getDay()) * 24 * 60 * 60 * 1000) /
+						1000).toFixed(0),
 					list: [],
 					page: 1,
 					limit: 10,
@@ -109,8 +114,10 @@
 					loaded: false
 				}, {
 					title: '月排行',
-					time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0)).getTime()/1000).toFixed(0),
-					times: ((new Date(new Date().getFullYear(), new Date().getMonth()+ 1, 0).setHours(23, 59, 59, 59))/1000).toFixed(0),
+					time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0))
+						.getTime() / 1000).toFixed(0),
+					times: ((new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).setHours(23, 59, 59,
+						59)) / 1000).toFixed(0),
 					list: [],
 					page: 1,
 					limit: 10,
@@ -129,7 +136,7 @@
 			}
 		},
 		onShow() {
-			
+
 		},
 		onReachBottom() {
 
@@ -155,10 +162,10 @@
 			getInviterRanking() {
 				let that = this
 				let navitem = that.navList[that.currentIndex]
-				if(navitem.loadingType == 'loading' || navitem.loadingType == 'noMore') {
+				if (navitem.loadingType == 'loading' || navitem.loadingType == 'noMore') {
 					return
 				}
-				if(navitem.loaded) {
+				if (navitem.loaded) {
 					return
 				}
 				navitem.loadingType = 'loading'
@@ -166,13 +173,17 @@
 					time: navitem.time,
 					times: navitem.times,
 					page: navitem.page,
-					pageSize: navitem.pageSize
+					pageSize: navitem.limit
 				}).then(res => {
 					console.log(res);
-					navitem.list = navitem.list.concat(res.data.list)
-					if(navitem.limit == res.data.list.length) {
+					// let arr = res.data.list
+					let arr = res.data.list.sort(function(a, b) {
+						return b.count  -a.count
+					})
+					navitem.list = navitem.list.concat(arr)
+					if (navitem.limit == res.data.list.length) {
 						navitem.loadingType = 'more'
-					}else {
+					} else {
 						navitem.loadingType = 'noMore'
 					}
 					navitem.loaded = true
@@ -351,11 +362,13 @@
 			}
 		}
 	}
+
 	.grop-item {
 		margin: auto;
 		width: 702rpx;
-		height:150rpx;
+		height: 150rpx;
 		border-bottom: 1px solid #F0F0F0;
+
 		.item-logo {
 			width: 90rpx;
 			height: 90rpx;
@@ -363,9 +376,11 @@
 			background-color: #eee;
 			margin: 0 20rpx;
 		}
+
 		.item-info {
 			flex-grow: 1;
 		}
+
 		.item-info {
 			.info-name {
 				margin-bottom: 10rpx;
@@ -373,19 +388,23 @@
 				font-weight: bold;
 				color: #3F454B;
 			}
+
 			.info-id {
 				font-size: 24rpx;
 				font-weight: 400;
 				color: #606972;
 			}
 		}
+
 		.item-tg {
 			flex-shrink: 0;
+
 			.tg-tit {
 				font-size: 24rpx;
 				font-weight: 500;
 				color: #999999;
 			}
+
 			.tg-val {
 				font-size: 28rpx;
 				font-weight: 500;
@@ -394,6 +413,6 @@
 				text-align: center;
 			}
 		}
-		
+
 	}
 </style>

pages/userhome/user.vue

@@ -277,7 +277,26 @@
 				const that = this;
 				getUser({}).then((e) => {
 					this.user = e.data;
-					this.setUserInfo(e.data)
+					this.setUserInfo(e.data)
+					let a = uni.getStorageSync(
+						'jynickname'
+					)
+					if (a == 1 && e.data.nickname == '微信用户') {
+						uni.setStorageSync('jynickname', 2)
+						uni.showModal({
+							title: '提示',
+							content: '您的昵称为默认昵称“微信用户”，是否立即修改？',
+							complete(res) {
+								if (res.confirm) {
+									
+									uni.navigateTo({
+										url: '/pages/set/userinfo'
+									})
+					
+								}
+							}
+						})
+					}
 				}).catch((e) => {
 					console.log(e, 'sj');
 				})