Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

pages/mine/index.vue

@@ -124,7 +124,11 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 export default {
+	computed: {
+		...mapState(['hasLogin', 'token'])
+	},
     data() {
         return {
             userInfo: {},
@@ -136,6 +140,12 @@ export default {
 		}
 	},
 	onShow() {
+		// 尝试登录
+		if (!this.hasLogin) {
+			uni.navigateTo({
+				url: "../../pageA/login/login"
+			})
+		}
 		this.getUserInfo();
 	},
 	// 下拉刷新
@@ -165,7 +175,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .mine {
-	min-height: calc(calc(100vh - var(--window-top)) - 50px);
+	min-height: calc(calc(100vh - var(--window-top)));
 	background: #ECECEC;
     .mine-top {
 		// width: 100%;
@@ -300,7 +310,7 @@ export default {
 				$content-padding-top: 22rpx, 
 				$content-padding-bottom: 30rpx, 
 				$image-height: 36rpx,
-				$image-width: 36rpx,
+				$image-width: 36rpx
 			);
 			.title {
 				justify-content: space-between;
@@ -342,7 +352,7 @@ export default {
 				$content-padding-top: 8rpx,
 				$content-padding-bottom: 25rpx, 
 				$image-height: 71rpx,
-				$image-width: 71rpx,
+				$image-width: 71rpx
 			);
 			.content {
 				> view:not(:last-child) {
@@ -355,7 +365,7 @@ export default {
 				$content-padding-top: 8rpx, 
 				$content-padding-bottom: 48rpx, 
 				$image-height: 71rpx,
-				$image-width: 71rpx,
+				$image-width: 71rpx
 			);
 			.content {
 				> view:not(:last-child) {