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,12 +44,11 @@
 		data() {
 			return {
 				StudentScore: [],
-				studentId: "",
-				// studentIdList:{},
 			}
 		},
 		onShow() {
 			const value = uni.getStorageSync('phone');
+			if (value) {
 				getInfoByPhone(value).then(res => {
 					if (res.code == 200) {
 						var obj = {
@@ -63,6 +62,11 @@
 						})
 					} 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,6 +151,7 @@
 		onShow() {
 			let that = this;
 			this.phone = uni.getStorageSync('phone');
+			if (this.phone) {
 				getInfoByPhone(this.phone).then(res => {
 					if (res.code == 200) {
 						var obj = {
@@ -181,6 +181,11 @@
 						})
 					} else {}
 				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			}
 		},
 		methods: {
 			look(uitem) {