Merge branch 'master' of http://120.79.166.78:7071/zhongzheng-edu/zz--front

common/httpList/userInfo.js

@@ -38,20 +38,6 @@ export default {
 			data: data,
 		})
 	},
-	studyRecord(data) {
-		return myRequest({
-			url: '/study/record',
-			method: 'post',
-			data: data,
-		})
-	},
-	studyRecordList(data) {
-		return myRequest({
-			url: '/study/record/list',
-			method: 'get',
-			data: data,
-		})
-	},
 	rankList(data) {
 		return myRequest({
 			url: '/app/user/rankingList',

components/my.vue

@@ -47,9 +47,12 @@
 						<view class="head_t1">
 							学习排名
 						</view>
-						<view  class="head_t2">
+						<view  class="head_t2" v-if="rank>0">
 							NO.{{rank}}
 						</view>
+						<view  class="head_t2" v-else>
+							暂未上榜
+						</view>
 						</navigator>
 					</u-col>
 				</u-row>
@@ -143,8 +146,10 @@
 		},
 		methods: {
 			haveQD(){
+				let date = new Date()
+				let num_today = date.getDate()
 				let num = uni.getStorageSync("qd_day");
-				if(num){
+				if(num==num_today){
 					this.isQd = true
 				}
 			},

pages.json

@@ -4,7 +4,6 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "中正云学堂",
-				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false //禁用原生导航栏  

pages2/wd/avatar.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-cell-group>
 				<u-cell-item  title="头像" @click="editAvatar">
-					<image :src="userInfo!=null?$method.splitImgHost(avatarUrl):''" class="avatar"></image>
+					<image :src="avatarUrl" class="avatar"></image>
 				</u-cell-item>
 				<u-cell-item  title="昵称" :value="nickname" @click="editNickName"></u-cell-item>
 			</u-cell-group>
@@ -26,14 +26,12 @@
 			return {
 				show: false,
 				avatarUrl:'',
-				nickname:''
+				nickname:'',
+				url:''
 			}
 		},
 		onLoad(option) {
-			
-		},
-		onShow(){
-			this.avatarUrl = this.userInfo.avatar
+			this.avatarUrl = this.$method.splitImgHost(this.userInfo.avatar)
 			this.nickname = this.userInfo.nickname
 		},
 		methods: {
@@ -91,6 +89,10 @@
 							},
 							success: result => {
 								if (result.statusCode === 200) {
+									uni.showToast({
+										title: '成功',
+										icon: 'none'
+									});
 									self.userInfo.avatar = ossToken.dir;
 									resolve();
 								} else {

pages2/wd/ranking.vue

@@ -19,11 +19,15 @@
 						</view>
 					</u-col>
 					<u-col span="5" v-if="current==0">
-						<view style="color: #0183FE;font-size: 28rpx;">
-							<view style="line-height: 80rpx;">
+						<view style="color: #0183FE;font-size: 28rpx;" >
+							<view style="line-height: 80rpx;" v-if="info.rank>0">
 								<text>第{{info.rank}}名</text>
 								<text style="margin-left: 30rpx;">{{info.hourse}}h</text>
 							</view>
+							<view style="line-height: 80rpx;" v-else>
+								<text>暂未上榜</text>
+								
+							</view>
 						</view>
 					</u-col>
 					<u-col span="5" v-if="current==1">
@@ -127,8 +131,8 @@
 			}
 		},
 		onLoad(option) {
-		//	this.rankList()
-		//	this.rankList2()
+			this.rankList()
+			this.rankList2()
 		},
 		onShow(){
 		},
@@ -139,15 +143,15 @@
 			rankList(){
 				let self = this
 				this.$api.rankList({status:0}).then(res => {
-			//		self.info = res.data.data
-			//		self.list2 = res.data.data.ranKingUsers
+					self.info = res.data.data
+					self.list2 = res.data.data.ranKingUsers
 				});
 			},
 			rankList2(){
 				let self = this
 				this.$api.rankList({status:1}).then(res => {
-			//		self.info2 = res.data.data
-			//		self.list3 = res.data.data.ranKingUsers
+					self.info2 = res.data.data
+					self.list3 = res.data.data.ranKingUsers
 					console.log(self.info2,333)
 				});
 			},