wangguoyu 6 月之前
父節點
當前提交
9b6566ecfc
共有 3 個文件被更改,包括 58 次插入57 次删除
  1. 1 1
      package.json
  2. 56 52
      pages.json
  3. 1 4
      pages/login.vue

+ 1 - 1
package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {},
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 12"
   },
   "repository": {
     "type": "git",

+ 56 - 52
pages.json

@@ -3,8 +3,7 @@
 		{
 			"path": "pages/login",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
@@ -14,71 +13,76 @@
 			}
 		},
 		{
-			"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": "麦塔软件",
@@ -86,4 +90,4 @@
 	},
 
 	"uniIdRouter": {}
-}
+}

+ 1 - 4
pages/login.vue

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