Merge branch 'fengjiaming' of http://47.108.105.48:3000/java_porject/wj_nft_small_pro into zhang

# Conflicts:
#	pages/login/login.vue

.gitignore

@@ -1,3 +1,3 @@
-test
-unpackage
+test
+unpackage
 unpackage/*

pages.json

@@ -75,4 +75,4 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}

pages/login/login.vue

@@ -13,30 +13,30 @@
 			}
 		},
 		methods: {
-			login(item){
-				console.log(item);
-				// uni.getUserInfo({
-				// 	success: (res) => {
-				// 		console.log(res);
-				// 	}
-				// })
-				uni.getUserProfile({
-					desc: '用于获取用户信息',
-					success: (res) => {
-						console.log(res);
-						
-					},
-				})
-			},
-			getPhoneNumber(e) {
-				console.log(e,'点击');
-				if (!e.target.iv) {
-			    uni.showModal({
-			      content: '获取手机号失败！',
-			      showCancel: false
-			    })
-					return;
-				}
+			login(item){
+				console.log(item);
+				// uni.getUserInfo({
+				// 	success: (res) => {
+				// 		console.log(res);
+				// 	}
+				// })
+				uni.getUserProfile({
+					desc: '用于获取用户信息',
+					success: (res) => {
+						console.log(res);
+						
+					},
+				})
+			},
+			getPhoneNumber(e) {
+				console.log(e,'点击');
+				if (!e.target.iv) {
+			    uni.showModal({
+			      content: '获取手机号失败！',
+			      showCancel: false
+			    })
+					return;
+				}
 			}
 		}
 	}