he2802 4 жил өмнө
parent
commit
0ae0f447ac

+ 1 - 1
common/httpList/login.js

@@ -6,7 +6,7 @@ export default {
 	//登录
 	login(data) {
 		return myRequest({
-			url: '/testLogin',
+			url: '/login',
 			method: 'post',
 			data: data,
 			noToken: true

+ 9 - 3
common/httpList/record.js

@@ -3,12 +3,18 @@ import {
 } from '../request.js'
 export default {
 
-	appuserInfo(data) {
+	studyRecord(data) {
 		return myRequest({
-			url: '/study/record/add',
+			url: '/study/record',
 			method: 'post',
 			data: data,
 		})
 	},
-	
+	studyRecordList(data) {
+		return myRequest({
+			url: '/study/record/list',
+			method: 'get',
+			data: data,
+		})
+	},
 }

+ 1 - 1
common/request.js

@@ -1,4 +1,4 @@
-const BASE_URL = 'http://192.168.0.222:8088'   //
+const BASE_URL = 'https://api.xyyxt.net'   //
 // const BASE_URL = 'http://192.168.0.145:8088'   //
 import store from '@/store/index.js'
 import api from './api.js'

+ 4 - 2
components/my.vue

@@ -48,7 +48,7 @@
 							学习排名
 						</view>
 						<view  class="head_t2">
-							NO.3
+							NO.{{rank}}
 						</view>
 						</navigator>
 					</u-col>
@@ -134,7 +134,8 @@
 				content:'此功能暂未开放',
 				show:false,
 				collectTotal:0,
-				isQd:false
+				isQd:false,
+				rank:0
 			};
 		},
 		mounted(){
@@ -170,6 +171,7 @@
 				let self = this
 				this.$api.appInfoAttached().then(res => {
 					self.collectTotal = res.data.data.collectTotal
+					self.rank = res.data.data.rank
 				});
 				this.studyRecordList()
 			},

+ 3 - 3
pages2/bank/detail.vue

@@ -26,7 +26,7 @@
 										<view class="t1">总题数</view>
 										<view class="t3">300</view>
 										<view class="t1">已答过</view>
-										<view class="t3">204</view>
+										<view class="t3">0</view>
 									</view>
 								</u-col>
 							</u-row>
@@ -35,7 +35,7 @@
 					<view class="box2">
 						<view style="height: 100%;display: flex;flex-direction: column;justify-content: center;">
 							<view style="text-align: center;" @click="jumpQuestion">
-								<view class="big_num">35</view>
+								<view class="big_num">0</view>
 								<view class="t4">
 									错题集
 									<u-icon name="arrow-right" size="28"></u-icon>
@@ -46,7 +46,7 @@
 					<view class="box2">
 						<view style="height: 100%;display: flex;flex-direction: column;justify-content: center;">
 							<view style="text-align: center;">
-								<view class="big_num">126</view>
+								<view class="big_num">0</view>
 								<view class="t4">
 									收藏集
 									<u-icon name="arrow-right" size="28"></u-icon>

+ 11 - 1
pages2/course/detail.vue

@@ -181,6 +181,7 @@
 </template>
 
 <script>
+	import {mapGetters} from 'vuex';
 export default {
 	data() {
 		return {
@@ -250,6 +251,7 @@ export default {
 			
 		}	
 	},
+	computed: {...mapGetters(['userInfo'])},
 	onLoad(option) {
 		const Verify = require('@/wxcomponents/verify_mpsdk/main.js');
 		Verify.init();
@@ -480,11 +482,19 @@ export default {
 			});
 		},
 		startVideo() {
-			if (!uni.getStorageSync('union_id') && this.$store.state.token === '') {
+			if (!uni.getStorageSync('union_id')) {
 				uni.navigateTo({
 					url: '/pages/login/login'
 				});
 			} else {
+				if(this.userInfo.certified!=1){
+					uni.showToast({
+						title: '请先实名认证',
+						icon: 'none',
+						duration: 2000
+					});
+					return
+				}
 				//模拟今天是否人脸识别
 				if (!this.faceGetState) {
 					let time = (new Date()).getTime()/1000

+ 2 - 1
pages2/wd/edu_info.vue

@@ -127,7 +127,8 @@
 				this.fileList = lists;
 			},
 			submitForm(){
-				if(this.schoolInfo.schoolName==''){
+				console.log(this.schoolInfo)
+				if(!this.schoolInfo.schoolName){
 					uni.showModal({
 						title: "提示",
 						content: '学校名不能为空',

+ 15 - 9
pages2/wd/ranking.vue

@@ -114,15 +114,21 @@
 					name: '总榜'
 				}],
 				current: 0,
-				list2:[1,1,1,1,1,1,1,1,1,1,1],
+				list2:[],
 				list3:[],
-				info:{},
-				info2:{},
+				info:{
+					hourse:0,
+					rank:0
+				},
+				info2:{
+					hourse:0,
+					rank:0
+				},
 			}
 		},
 		onLoad(option) {
-			this.rankList()
-			this.rankList2()
+		//	this.rankList()
+		//	this.rankList2()
 		},
 		onShow(){
 		},
@@ -133,15 +139,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)
 				});
 			},