修改

components/tabbar/index.vue

@@ -24,8 +24,8 @@
   bottom: 0;
   flex-direction: row;
   /* #ifndef */
-  padding-bottom: constant(safe-area-inset-top);
-  padding-bottom: env(safe-area-inset-top);
+  /* padding-bottom: constant(safe-area-inset-top);
+  padding-bottom: env(safe-area-inset-top); */
   /* #endif */
   display: flex;
   left: 0;
@@ -245,24 +245,32 @@ export default {
       }, 3000);
     }
     this.activeHandler();
-    let port = uni.getSystemInfoSync().platform
-    switch (port) {
-      case 'android':
-        this.height = '140'
-        this.paddingBottom = '20'
-        console.log('运行Android上',port);//android
-        break;
-      case 'ios':
-        this.height = '160'
-        this.paddingBottom = '58'
-        console.log('运行iOS上',port);//ios
-        break;
-      default:
-        this.height = '160'
-        this.paddingBottom = '58'
-        console.log('运行在开发者工具上');//devtools
-        break;
-    }
+	let that=this
+	wx.getSystemInfo({
+		success(res) {
+			let lift=res.screenHeight-res.safeArea.bottom
+			that.paddingBottom = Number(lift)+10
+			console.log(lift)
+		}
+	})
+    // let port = uni.getSystemInfoSync().platform
+    // switch (port) {
+    //   case 'android':
+    //     this.height = '140'
+    //     this.paddingBottom = '20'
+    //     console.log('运行Android上',port);//android
+    //     break;
+    //   case 'ios':
+    //     this.height = '160'
+    //     this.paddingBottom = '58'
+    //     console.log('运行iOS上',port);//ios
+    //     break;
+    //   default:
+    //     this.height = '160'
+    //     this.paddingBottom = '58'
+    //     console.log('运行在开发者工具上');//devtools
+    //     break;
+    // }
   },
   // activated(){
   //   if(uni.getStorageSync("navs")){

pages/address/address2.vue

@@ -61,7 +61,11 @@
 			<view class="school-bg">
 				<text>
 					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
+<<<<<<< HEAD
 					<text class="school">{{title}}</text>
+=======
+					<text class="school font24">选择就读学校</text>
+>>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
 				</text>
 			</view>
 			<!-- <view class="search">
@@ -97,7 +101,12 @@
 		<u-popup v-model="show4" mode="right" length="80%">
 			<view class="school-bg">
 				<text>
+<<<<<<< HEAD
 					<text class="school">选择校区</text>
+=======
+					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
+					<text class="school font24">选择校区</text>
+>>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
 				</text>
 			</view>
 			<scroll-view scroll-y="true" style="height:100%;">
@@ -169,7 +178,7 @@
 			// 提交表单
 			registered() {
 				let that = this;
-				testCmd = "/api/WeChatPublic/CreateStudent";
+				testCmd = "/api/WeChatPublic/CreateMallStudent";//WeChatPublic/CreateStudent
 				postMsg = {
 					OpenId: that.u.OpenId, //	openId	是	[string]		查看
 					UnionId: that.u.Unoinid,
@@ -319,6 +328,10 @@
 		font-size: 22rpx;
 	}
 
+	.school.font24{
+		font-size: 24rpx;
+	}
+
 	.search {
 		margin-bottom: 20rpx;
 	}
@@ -349,13 +362,13 @@
 	.list2 {
 		color: #138BF9;
 	}
-
+	
 	.list {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		border-bottom: solid 1px #999;
-		height: 60rpx;
+		border-bottom: solid 1px #D9D9D9;
+		padding:20rpx 0;
 		padding-left: 20rpx;
 		padding-right: 20rpx;
 		font-size: 24rpx;
@@ -375,7 +388,7 @@
 
 	.school-bg {
 		background-color: #EEF1FA;
-		height: 50rpx;
+		padding: 20rpx 0;
 		display: flex;
 		align-items: center;
 		padding-left: 50rpx;

pages/index/index.vue

@@ -455,7 +455,7 @@
 				}
 			}
 			//测试方法
-			this.testJJSWApi();
+			// this.testJJSWApi();
 			uni.showNavigationBarLoading();
 		},
 		created() {

uni_modules/uni-calendar/components/uni-calendar/i18n/en.json

 {
-	"uni-calender.ok": "ok",
-	"uni-calender.cancel": "cancel",
-	"uni-calender.today": "today",
-	"uni-calender.MON": "MON",
-	"uni-calender.TUE": "TUE",
-	"uni-calender.WED": "WED",
-	"uni-calender.THU": "THU",
-	"uni-calender.FRI": "FRI",
-	"uni-calender.SAT": "SAT",
-	"uni-calender.SUN": "SUN"
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
 }