wangguoyu 10 ヶ月 前
コミット
611def069d
2 ファイル変更56 行追加57 行削除
  1. 52 56
      pages.json
  2. 4 1
      pages/login.vue

+ 52 - 56
pages.json

@@ -3,7 +3,8 @@
 		{
 			"path": "pages/login",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -13,76 +14,71 @@
 			}
 		},
 		{
-			"path" : "pages/exam/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "考试"
+			"path": "pages/exam/index",
+			"style": {
+				"navigationBarTitleText": "考试"
 			}
 		},
 		{
-			"path" : "pages/my/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "我的"
+			"path": "pages/my/index",
+			"style": {
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
-			"path" : "pages/demo/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "demo"
+			"path": "pages/demo/index",
+			"style": {
+				"navigationBarTitleText": "demo"
 			}
 		},
 		{
-			"path" : "pages/course/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "课程"
+			"path": "pages/course/index",
+			"style": {
+				"navigationBarTitleText": "课程"
 			}
 		},
 		{
-			"path" : "pages/score/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "成绩"
+			"path": "pages/score/index",
+			"style": {
+				"navigationBarTitleText": "成绩"
 			}
 		}
 	],
 	"tabBar": {
-			"color": "#565656",
-			"selectedColor": "#0856E6",
-			"borderStyle": "black",
-			"backgroundColor": "#ffffff",
-			"fontSize": "13px",
-			"iconWidth": "28px",
-			"spacing": "0px",
-			"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/images/tabbar/unselect/index-sj.png",
-				"selectedIconPath": "static/images/tabbar/select/index-sj.png",
-				"text": "首页"
-			}, {
-				"pagePath": "pages/exam/index",
-				"iconPath": "static/images/tabbar/unselect/exam-sj.png",
-				"selectedIconPath": "static/images/tabbar/select/exam-sj.png",
-				"text": "考试"
-			}, {
-				"pagePath": "pages/course/index",
-				"iconPath": "static/images/tabbar/unselect/kecheng-sj.png",
-				"selectedIconPath": "static/images/tabbar/select/kecheng-sj.png",
-				"text": "课程"
-			}, {
-				"pagePath": "pages/score/index",
-				"iconPath": "static/images/tabbar/unselect/score-sj.png",
-				"selectedIconPath": "static/images/tabbar/select/score-sj.png",
-				"text": "成绩"
-			}, {
-				"pagePath": "pages/my/index",
-				"iconPath": "static/images/tabbar/unselect/my-sj.png",
-				"selectedIconPath": "static/images/tabbar/unselect/my-sj.png",
-				"text": "我的"
-			}]
-		},
+		"color": "#565656",
+		"selectedColor": "#0856E6",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"fontSize": "13px",
+		"iconWidth": "28px",
+		"spacing": "0px",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/images/tabbar/unselect/index-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/index-sj.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/exam/index",
+			"iconPath": "static/images/tabbar/unselect/exam-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/exam-sj.png",
+			"text": "考试"
+		}, {
+			"pagePath": "pages/course/index",
+			"iconPath": "static/images/tabbar/unselect/kecheng-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/kecheng-sj.png",
+			"text": "课程"
+		}, {
+			"pagePath": "pages/score/index",
+			"iconPath": "static/images/tabbar/unselect/score-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/score-sj.png",
+			"text": "成绩"
+		}, {
+			"pagePath": "pages/my/index",
+			"iconPath": "static/images/tabbar/unselect/my-sj.png",
+			"selectedIconPath": "static/images/tabbar/unselect/my-sj.png",
+			"text": "我的"
+		}]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "麦塔软件",
@@ -90,4 +86,4 @@
 	},
 
 	"uniIdRouter": {}
-}
+}

+ 4 - 1
pages/login.vue

@@ -18,7 +18,7 @@
 			<view class="login-change">
 				<checkbox-group>
 					<label class="checkbox-zhanghao">
-						<checkbox value="cb" color="#0550e5" checked="true" />记住此账号
+						<checkbox style="transform:scale(0.7)"  value="cb" color="#0550e5" checked="true" />记住此账号
 					</label>
 				</checkbox-group>
 				<text class="checkbox-zhanghao">
@@ -160,8 +160,11 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			height: 48rpx;
 
 			.checkbox-zhanghao {
+				height: 48rpx;
+				line-height: 48rpx;
 				font-size: 24rpx;
 				color: #565656;