From 69a844b48cb105b59c1770327d1b521ec02051b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 3 Apr 2023 15:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index/index.js    |  4 ++--
 manifest.json         |  5 +++--
 pages.json            | 12 ------------
 pages/home/home.vue   | 12 ++++++++++--
 pages/index/index.vue |  3 ---
 pages/phone/phone.vue | 15 ++++++++++-----
 6 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/api/index/index.js b/api/index/index.js
index 7d2a94d..8ebaafb 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -2,8 +2,8 @@ import request from "../request.js"
 
 export function getPreOrderById(data, data2) {
 	return request({
-		url: `/kindergarten/applet/appletLogin?loginCode=${data}&phoneCode=${data2}`,
-		method: 'GET'
+		url: `/kindergarten/applet/kindergartenLogin?loginCode=${data}&phoneCode=${data2}`,
+		method: 'POST'
 	})
 }
 //查看
diff --git a/manifest.json b/manifest.json
index e113993..9caf4a5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "yer",
+    "name" : "智慧幼儿体质评估与促进系统",
     "appid" : "__UNI__D9D6FB7",
     "description" : "",
     "versionName" : "1.0.0",
@@ -79,5 +79,6 @@
         "enable" : false,
         "version" : "2"
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "fallbackLocale" : "zh-Hans"
 }
diff --git a/pages.json b/pages.json
index 9fa5e8e..9044938 100644
--- a/pages.json
+++ b/pages.json
@@ -3,15 +3,6 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		// {
-		//     "path" : "pages/login/login",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// },
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -30,9 +21,6 @@
 			}
 		}
 	],
-	// "tabBar": {
-
-	// },
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ad8fda5..42c6f94 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -66,11 +66,12 @@
 					title: '获取报告中'
 				});
 				var that = this
-				uni.downloadFile({
+				wx.downloadFile({
 					url: baseurl + item.downloadAddress,
 					success: function(res) {
+						console.log(res)
 						var filePath = res.tempFilePath;
-						uni.openDocument({
+						wx.openDocument({
 							filePath: filePath,
 							showMenu: true,
 							success: function(res) {
@@ -80,6 +81,13 @@
 								uni.hideLoading();
 							}
 						});
+					},
+					fail: function(err) {
+						uni.hideLoading();
+						that.$refs.uToast.show({
+							title: '请求报告失败',
+							type: 'error'
+						})
 					}
 				});
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2a2b942..cfd70aa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -201,12 +201,10 @@
 							this.tip = false
 							this.top2 = true
 							this.top = false
-							// this.mask2 = false;
 						}
 					}
 				})
 			},
-
 			getPhoneNumberp(val) {
 				this.phonecode = val.detail.code
 				let that = this;
@@ -237,7 +235,6 @@
 					},
 				});
 			},
-
 			getInfoByPhoneinfo() {
 				var that = this
 				getInfoByPhone(this.phone).then(res => {
diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue
index 0107c8c..93ad359 100644
--- a/pages/phone/phone.vue
+++ b/pages/phone/phone.vue
@@ -22,9 +22,10 @@
 						</view>
 						<input type="text" v-model="data.cardNo" maxlength="18">
 					</view>
-					<view class="" style="margin:50rpx 0 0 15rpx;font-size: 32rpx;line-height: 50rpx;">
+					<view class="" style="margin:50rpx 0 0 15rpx;font-size: 28rpx;line-height: 50rpx;">
 						<checkbox value="cb" :checked="checked" />我已阅读并同意
-						<view class="" style="display: inline-block;color:#4D8CE9;border-bottom:1rpx solid #4D8CE9;" @tap='maskshow=true'>
+						<view class="" style="display: inline-block;color:#4D8CE9;border-bottom:1rpx solid #4D8CE9;"
+							@tap='maskshow=true'>
 							《隐私保护协议》
 						</view>
 						<!-- <u-checkbox-group @change="checkboxGroupChange">
@@ -275,7 +276,8 @@
 	.name,
 	.id,
 	.phone {
-		width: 96%;
+		font-size: 34rpx;
+		width: 100%;
 		margin: 0 auto;
 		display: flex;
 		height: 130rpx;
@@ -284,11 +286,14 @@
 
 		input {
 			height: 130rpx;
+			width: 65%;
 			line-height: 130rpx;
-			padding-left: 30rpx;
+			// padding-left: 30rpx;
 		}
 
-		.bindtitle {}
+		.bindtitle {
+			width: 35%;
+		}
 	}
 
 	.btn {