Merge remote-tracking branch 'origin/jihan_0413_运动处方和视频功能开发分支' into jihan_0413_运动处方和视频功能开发分支

pages/Viewprescription/Viewprescription.vue

@@ -351,7 +351,7 @@
 				background: #fff;
 				box-shadow: 0px 3px 18px 0px rgba(182, 218, 213, 0.43);
 				width: 90%;
-				margin: 0 auto; // text-align: center;
+				margin: 0 auto 20rpx; // text-align: center;
 				height: 268rpx;
 				border-radius: 10rpx;
 				position: relative;

pages/grade/grade.vue

@@ -44,25 +44,29 @@
 		data() {
 			return {
 				StudentScore: [],
-				studentId: "",
-				// studentIdList:{},
 			}
 		},
 		onShow() {
 			const value = uni.getStorageSync('phone');
-			getInfoByPhone(value).then(res => {
+			if (value) {
-				if (res.code == 200) {
+				getInfoByPhone(value).then(res => {
-					var obj = {
+					if (res.code == 200) {
-						studentIdList: []
+						var obj = {
-					}
+							studentIdList: []
-					res.data.studentInfoList.forEach(e => {
+						}
-						obj.studentIdList.push(e.studentId)
+						res.data.studentInfoList.forEach(e => {
-					})
+							obj.studentIdList.push(e.studentId)
-					getStudentScore(obj).then(res => {
+						})
-						this.StudentScore = res.data
+						getStudentScore(obj).then(res => {
-					})
+							this.StudentScore = res.data
-				} else {}
+						})
-			})
+					} else {}
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			}
 		},
 		methods: {
 			lookbook(item) {
@@ -102,25 +106,6 @@
 					});
 				}
 			},
-			getPhoneNumberp(val) {
-				wx.login({
-					provider: 'weixin',
-					success: function(loginRes) {}
-				});
-			},
-			wxGetUserInfo() {
-				let that = this;
-				uni.getUserProfile({
-					desc: "获取用户信息",
-					lang: "zh_CN",
-					success(res) {
-						that.yonghuwx = res.userInfo
-					},
-					fail(res) {
-						//失败则返回home页面
-					},
-				});
-			},
 		}
 	}
 </script>

pages/prescription/prescription.vue

@@ -143,7 +143,6 @@
 				studentInfoList: [],
 				studentIditem: [],
 				getchildlist: [],
-				studentId: "",
 				batchCode: "",
 				phone: "",
 				studentList: [],
@@ -152,35 +151,41 @@
 		onShow() {
 			let that = this;
 			this.phone = uni.getStorageSync('phone');
-			getInfoByPhone(this.phone).then(res => {
+			if (this.phone) {
-				if (res.code == 200) {
+				getInfoByPhone(this.phone).then(res => {
-					var obj = {
+					if (res.code == 200) {
-						studentIdList: []
+						var obj = {
-					}
+							studentIdList: []
-					res.data.studentInfoList.forEach(e => {
+						}
-						obj.studentIdList.push(e.studentId)
+						res.data.studentInfoList.forEach(e => {
-					})
+							obj.studentIdList.push(e.studentId)
-					let items = JSON.stringify(res.data);
+						})
-					uni.setStorageSync("this.DATAList", items)
+						let items = JSON.stringify(res.data);
-					getChildrenResultScore(obj).then(res => {
+						uni.setStorageSync("this.DATAList", items)
-						this.StudentScore = res.data
+						getChildrenResultScore(obj).then(res => {
-						if (this.StudentScore.length == 1) {
+							this.StudentScore = res.data
-							getMotionPrescription(res.data[0].studentId, res.data[0].batchCode).then(
+							if (this.StudentScore.length == 1) {
-								res => {
+								getMotionPrescription(res.data[0].studentId, res.data[0].batchCode).then(
-									this.studentInfoList = res.data
+									res => {
-									this.studentInfoList.forEach(e => {
+										this.studentInfoList = res.data
-										e.motionPrescriptionVideoInfoVOList.forEach(el => {
+										this.studentInfoList.forEach(e => {
-											el.count = 0
+											e.motionPrescriptionVideoInfoVOList.forEach(el => {
-											el.prescriptionVideoUrl = baseurl + el
+												el.count = 0
-												.prescriptionVideoUrl
+												el.prescriptionVideoUrl = baseurl + el
+													.prescriptionVideoUrl
+											})
 										})
 									})
-								})
+								this.infolist();
-							this.infolist();
+							}
-						}
+						})
-					})
+					} else {}
-				} else {}
+				})
-			})
+			} else {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			}
 		},
 		methods: {
 			look(uitem) {