Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

src/pages/index/index.vue

@@ -164,7 +164,6 @@
 			let {
 				proxy
 			} = getCurrentInstance();
-			proxy.$isLogin();
 			let data = reactive({
 				ActiveMsg: {
 					pageIndex: 1,
@@ -250,11 +249,6 @@
 		onShow() {
 			this.getActivityData();
 		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: "首页",
-			});
-		},
 		onShareAppMessage() {
 			return {
 				title: "甲小鹤",

src/pages/word/studyComplete.vue

@@ -189,13 +189,10 @@
 		provide,
 	} from "vue";
 	export default {
-		components: {
-
-		},
-		onLoad(options) {
-
-		},
 		setup(props) {
+			let {
+				proxy
+			} = getCurrentInstance();
 			let data = reactive({
 				stars: 2
 			})
@@ -209,6 +206,9 @@
 					uni.switchTab({
 						url: '/pages/index/index'
 					});
+				},
+				getTest(){
+					
 				}
 			}
 			onMounted(() => {

src/pages/word/word.vue

@@ -68,13 +68,12 @@
 					})
 				},
 				swiperChange(val) {
-					console.log(63, val.detail.current,'study', data.StudyList.length)
+					data.current=val.detail.current
 					if (data.current <= data.StudyList.length) {
 						methods.completeRead(val.detail.current)
-					} else if (data.current > data.StudyList.length && data.current <= data.ReviewList.length) {
+					} else if (data.current <= (data.ReviewList.length+data.StudyList.length)) {
 						methods.completeReview(val.detail.current)
 					}
-
 					const total = data.StudyList.length + data.ReviewList.length + 1
 					if (val.detail.current + 1 == total && total > 1) {
 						uni.navigateTo({
@@ -83,18 +82,16 @@
 					}
 				},
 				completeRead(n) {
-					console.log(74, n)
-					// data.readMsg.StudyNum = n
-					// proxy.$request('/AppletWords/SetStuWordsPrep', data.readMsg).then(res => {
-					// 	c
-					// })
+					data.readMsg.StudyNum = n
+					proxy.$request('/AppletWords/SetStuWordsPrep', data.readMsg).then(res => {
+						console.log(74, res)
+					})
 				},
 				completeReview(n) {
-					console.log(75, n-data.StudyList.length)
-					// data.readMsg.ReviewNum = n
-					// proxy.$request('/AppletWords/SetStuWordsReview', data.reviewMsg).then(res => {
-						
-					// })
+					data.readMsg.ReviewNum = n-data.StudyList.length
+					proxy.$request('/AppletWords/SetStuWordsReview', data.reviewMsg).then(res => {
+						console.log(75, res)
+					})
 				}
 
 			}