登陆授权

office/news/news.css

@@ -97,7 +97,7 @@ page{background: #fff;}
 	.sel-ht-ac{
 		height: 62rpx;
 		line-height: 62rpx;
-		background: #FFF0E5;
+		background: #E1FFF4;
 		border-radius: 31rpx 31rpx 31rpx 31rpx;
 		opacity: 1;
 		font-size: 24rpx;

office/team/index.css

@@ -24,7 +24,7 @@ page{
 .cons-b{margin: 10rpx 30rpx 30rpx;background: #fff;border-radius: 20rpx;}
 .tab{padding: 26rpx 30rpx;}
 .tab .li{min-width: 88rpx;height: 48rpx;background: #fff;border-radius: 24rpx;font-size: 24rpx;color: #000;text-align: center;line-height: 48rpx;margin-right: 30rpx;box-sizing: border-box;padding: 0 20rpx;}
-.tab .li.active{background: #FFF0E5;color: #FF7000;}
+.tab .li.active{background: #E1FFF4;color: #FF7000;}
 .list .li{padding: 40rpx 30rpx 45rpx;border-bottom: 1rpx solid rgba(174, 174, 174, 0.2);}
 .list .li:last-child{border-bottom: none;}
 .userimg{width: 66rpx;height: 66rpx;border-radius: 50%;margin-right: 12rpx;}
@@ -150,7 +150,7 @@ page{
 .team-rank{
 	width: 689rpx;
 	height: 136rpx;
-	background: #FFFFFF;
+	background: #E1FFF4;
 	border-radius: 15rpx 15rpx 15rpx 15rpx;
 	opacity: 1;
 	margin:26rpx auto 0;
@@ -160,7 +160,7 @@ page{
 .team-logo{
 	width: 90rpx;
 	height: 90rpx;
-	background: #FFF0E5;
+	background: #E1FFF4;
 	border-radius: 15rpx 15rpx 15rpx 15rpx;
 	margin-right: 32rpx;
 }

office/team/index.vue

@@ -237,8 +237,6 @@
 			this.opt = options;
 			await req.silenceLogin(options.tjuid?options.tjuid:'', '');
 			this.getTeamInfo();
-			this.getTeamRank()
-			this.getMyRank()
 			this.getOfficeList();
 			this.userInfo = req.getStorage('userInfo');
 			this.isOpenWeRunData = req.getStorage('isOpenWeRunData')
@@ -271,49 +269,6 @@
 			};
 		},
 		methods: {
-			getTeamRank(){
-				let queryParams = {
-					groupId:this.opt.id,
-					page:1,
-					limit:3,
-					searchType:2
-				}
-				const now = new Date();
-				const year = now.getFullYear();
-				const month = now.getMonth();
-				const date = now.getDate(); // 获取日期
-				const day = now.getDay(); // 获取周几，0-6，0表示周日
-				const _day = day==0?7:day;
-				// 获取周一日期
-				const snow = new Date(year,month,date - _day + 1).setHours(0, 0, 0,0);
-				// 获取周日日期
-				const enow = new Date(new Date(snow).getTime() + 6*24*3600*1000).setHours(23, 59, 59,0);
-				queryParams.startTime = snow/1000
-				queryParams.endTime = enow/1000
-				req.getRequest('/api/v3/wxRun/timeRangeRunRanking',queryParams,data=>{
-					this.teamRank = data.list?data.list:[];
-				})
-			},
-			getMyRank(){
-				let queryParams = {}
-				const now = new Date();
-				const year = now.getFullYear();
-				const month = now.getMonth();
-				const date = now.getDate(); // 获取日期
-				const day = now.getDay(); // 获取周几，0-6，0表示周日
-				const _day = day==0?7:day;
-				// 获取周一日期
-				const snow = new Date(year,month,date - _day + 1).setHours(0, 0, 0,0);
-				// 获取周日日期
-				const enow = new Date(new Date(snow).getTime() + 6*24*3600*1000).setHours(23, 59, 59,0);
-				queryParams.startTime = snow/1000
-				queryParams.endTime = enow/1000
-				queryParams.groupId = this.opt.id
-				queryParams.searchType = 2
-				req.getRequest('/api/v3/wxRun/timeRangeInfo',queryParams,res=>{
-					this.myRank = res
-				})
-			},
 			getTeamInfo(){
 				req.getRequest(api.user_team_info+this.opt.id,{},data=>{
 					this.teamInfo = data;

pages/authorize/authorize.vue

@@ -295,6 +295,7 @@ export default {
 				// console.log(json);
 				that.setData(params);
 				let url = req.getStorage('REDIRECT_URL');
+				if (json.token) req.setStorage('AUTH_TOKEN', json.token);
 				req.setStorage('userInfo', json);
 
 				// req.removeStorage('MERCHANT')

pages/index/index.css

@@ -670,9 +670,11 @@ page{background: #fff;}
 .lpgs-content{
 	box-sizing: border-box;
 	width: 440rpx;
+	height: 430rpx;
 	background: #FBFBFB;
 	border-radius: 0rpx 0rpx 10rpx 10rpx;
 	padding: 20rpx;
+	overflow: hidden;
 }
 .lpgs-item-content{
 	padding-bottom: 20rpx;

pages/index/index.vue

@@ -115,9 +115,12 @@
 			<view>
 				<view class="tbal-nav ddflex">
 					<view :class="'tbal-nav-item '+(tbalIndex==index?'tbal-nav-item-active':'' )"
-						v-for="item,index in tbalList" @click="changeTbalTab(index)">
+						v-for="item,index in tbalList" @click="changeTbalTab(index)" :key="index">
 						<view>{{item.name}}</view>
-						<view class="tbal-nav-label">20~30岁</view>
+						<view class="tbal-nav-label" v-if="index==0">20~30岁</view>
+						<view class="tbal-nav-label" v-else-if="index==1">25-35岁</view>
+						<view class="tbal-nav-label" v-else-if="index==2">30-50岁</view>
+						<view class="tbal-nav-label" v-else-if="index==3">50-65岁</view>
 					</view>
 					<!-- <view class="tbal-nav-item">
 						<view>形成期</view>
@@ -181,11 +184,11 @@
 				<scroll-view scroll-x="true" class="map-acs ddflex" style="height: 430rpx;">
 					<view class="lpgs-item" v-for="items,indexs in lpalList ">
 						<image class="lpgs-icon" src="../../static/images/lpgs_icon.png"></image>
-						<view :class="'lpgs-header '+(indexs%2==0?'lpgs-header-c':'')">
+						<view :class="'lpgs-header '+(indexs%2==0?'':'lpgs-header-c')">
 							<view>{{items.name}}</view>
 						</view>
 						<view class="lpgs-content" v-if="items.contentList&&items.contentList.length>0">
-							<view class="lpgs-item-content ddflex" v-for="item in items.contentList"
+							<view class="lpgs-item-content ddflex" v-for="item,index in items.contentList" :key="index"
 								@click="jumpUrl('/topic/content/content?id='+item.id)">
 								<view class="flex" style="min-width: 0;">
 									<view class="lpgs-item-content-title tovers">{{item.title}}</view>

topics/detail/detail.css

@@ -48,7 +48,7 @@ page{background: #fff;}
 .end .lis view{position: relative;z-index: 2;}
 .end .lis view.percent{position: absolute;top: 0;bottom: 0;left: 0;background: #F0F0F0;z-index: 0;}
 .end .lis.active{color: var(--main);}
-.end .lis.active view.percent{background: #FFF0E5;}
+.end .lis.active view.percent{background: #E1FFF4;}
 .vote-can{font-size: 22rpx;color: #999;margin-top: 15rpx;}
 .vote-can text{margin-right: 15rpx;}
 .create{position: fixed;right: 30rpx;bottom: 170rpx;width: 110rpx;height: 110rpx;background: var(--mina);box-shadow: 0 4rpx 24rpx rgba(255, 209, 59, 0.4);border-radius: 50%;font-size: 24rpx;color: #fff;text-align: center;z-index: 50;box-sizing: border-box;padding-top: 20rpx;}

topics/home/home.vue

@@ -284,7 +284,6 @@ export default {
 		this.userInfo = req.getStorage('userInfo');
 		this.getOfficeList();
 		this.getUserTeam()
-		this.getExreciseOpen()
 		this.getUserMatchList()
 	},
 
@@ -551,15 +550,6 @@ export default {
 				this.exreciseData = data
 			})
 		},
-		// 获取用户是否开启运动开关
-		getExreciseOpen(){
-			req.getRequest('/api/user/getRunData', {userId:this.userId}, data => {
-				this.isOpenWeRunData = data.weRunData?true:false
-				if(this.isOpenWeRunData){
-					this.getExreciseData()
-				}
-			})
-		},
 		// 获取用户已参加活动
 		getUserMatchList(){
 			req.getRequest('/api/match/user', {uid:this.userId,type:'ycs'}, data => {