roose 4 years ago
parent
commit
813a9aacc3

+ 9 - 1
pages/finishInfo/finishInfo.js

@@ -283,7 +283,15 @@ Page({
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
           console.log(res, "0000");
           console.log(res, "0000");
-
+          wx.showModal({
+            showCancel: false,
+            content: '提交成功',
+            success() {
+              wx.switchTab({
+                url: '/pages/index/index',
+              })
+            }
+          })
         }
         }
       }
       }
     })
     })

+ 34 - 24
pages/finishInfo/finishInfo.wxml

@@ -1,3 +1,4 @@
+<image src="/images/wanshan.png" style="width: 100%; height: 300rpx;"></image>
 <view class="home">
 <view class="home">
 	<view class="title" bindtap="goOcr">
 	<view class="title" bindtap="goOcr">
 		<image src="/images/saoma.png" style="width: 40rpx; height: 40rpx;"></image>
 		<image src="/images/saoma.png" style="width: 40rpx; height: 40rpx;"></image>
@@ -8,51 +9,60 @@
 	<form bindsubmit="formSubmit">
 	<form bindsubmit="formSubmit">
 		<view class="box">
 		<view class="box">
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">姓名</view>
 				<view class="small-box">姓名</view>
-				<input name='userName' value="{{userName}}" class="weui-input" placeholder="请输入" />
 			</view>
 			</view>
+			<input name='userName' value="{{userName}}" class="weui-input" placeholder="请输入" />
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">性别</view>
 				<view class="small-box">性别</view>
-				<radio-group name="sex">
-					<label wx:for="{{parameter}}">
-						<radio checked="{{item.checked}}" color='#009FE9' value="{{ item.name }}">{{item.name}}</radio>
-					</label>
-				</radio-group>
 			</view>
 			</view>
+			<radio-group name="sex">
+				<label wx:for="{{parameter}}">
+					<radio checked="{{item.checked}}" color='#009FE9' value="{{ item.name }}">{{item.name}}</radio>
+				</label>
+			</radio-group>
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">身份证号</view>
 				<view class="small-box">身份证号</view>
-				<input name='idCardNumber' value="{{idCardNumber}}" class="weui-input" placeholder="请输入" />
 			</view>
 			</view>
+			<input name='idCardNumber' value="{{idCardNumber}}" class="weui-input" placeholder="请输入" />
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">年龄</view>
 				<view class="small-box">年龄</view>
-				<input name='age' value="{{age}}" class="weui-input" placeholder="请输入" />
 			</view>
 			</view>
+			<input name='age' value="{{age}}" class="weui-input" placeholder="请输入" />
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">职务</view>
 				<view class="small-box">职务</view>
-				<picker bindchange="postListChange" name="job" value="{{postList[postindex].name}}" range-key="{{'name'}}" range="{{postList}}">
-					<view class="picker">
-						{{postList[postindex].name}} <text class="wenzi">{{posttext}}</text>
-					</view>
-				</picker>
 			</view>
 			</view>
+			<picker bindchange="postListChange" name="job" value="{{postList[postindex].name}}" range-key="{{'name'}}" range="{{postList}}">
+				<view class="picker">
+					{{postList[postindex].name}} <text class="wenzi">{{posttext}}</text>
+				</view>
+			</picker>
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">收入</view>
 				<view class="small-box">收入</view>
-				<picker bindchange="incomeListChange" name="income" value="{{incomeList[incomeindex].name}}" range-key="{{'name'}}" range="{{incomeList}}">
-					<view class="picker">
-						{{incomeList[incomeindex].name}} <text class="wenzi">{{incometext}}</text>
-					</view>
-				</picker>
 			</view>
 			</view>
+			<picker bindchange="incomeListChange" name="income" value="{{incomeList[incomeindex].name}}" range-key="{{'name'}}" range="{{incomeList}}">
+				<view class="picker">
+					{{incomeList[incomeindex].name}} <text class="wenzi">{{incometext}}</text>
+				</view>
+			</picker>
 			<view class="flex-box">
 			<view class="flex-box">
+				<view class="shu"></view>
 				<view class="small-box">学历</view>
 				<view class="small-box">学历</view>
-				<picker bindchange="educationListChange" name="education" value="{{educationList[educationindex].name}}" range-key="{{'name'}}" range="{{educationList}}">
-					<view class="picker">
-						{{educationList[educationindex].name}} <text class="wenzi">{{educationtext}}</text>
-					</view>
-				</picker>
+
 			</view>
 			</view>
+
+			<picker bindchange="educationListChange" name="education" value="{{educationList[educationindex].name}}" range-key="{{'name'}}" range="{{educationList}}">
+				<view class="picker">
+					{{educationList[educationindex].name}} <text class="wenzi">{{educationtext}}</text>
+				</view>
+			</picker>
 			<view class="register">
 			<view class="register">
-				<button formType="submit">提交</button>
+				<button formType="submit">提交完成</button>
 			</view>
 			</view>
 		</view>
 		</view>
 	</form>
 	</form>

+ 30 - 11
pages/finishInfo/finishInfo.wxss

@@ -11,7 +11,6 @@
   color: rgba(31, 135, 247, 1);
   color: rgba(31, 135, 247, 1);
   font-size: 28rpx;
   font-size: 28rpx;
   margin-top: 40rpx;
   margin-top: 40rpx;
-
 }
 }
 
 
 .saoma {
 .saoma {
@@ -27,16 +26,19 @@
 .flex-box {
 .flex-box {
   display: flex;
   display: flex;
   margin-top: 40rpx;
   margin-top: 40rpx;
+  margin-bottom: 20rpx;
 }
 }
 
 
 .small-box {
 .small-box {
   width: 180rpx;
   width: 180rpx;
+  margin-left: 20rpx;
 }
 }
 
 
 input {
 input {
-  border: 1px solid rgba(227, 229, 235, 1);
   border-radius: 5px;
   border-radius: 5px;
-  width: 500rpx;
+  width: 100%;
+  border-bottom: 1rpx solid #F2F2F2;
+  padding-bottom: 10rpx;
 }
 }
 
 
 button:not([size='mini']) {
 button:not([size='mini']) {
@@ -46,7 +48,8 @@ button:not([size='mini']) {
   color: white;
   color: white;
   background: #1989FA;
   background: #1989FA;
   font-size: 28rpx;
   font-size: 28rpx;
- 
+  border-radius: 50rpx;
+
 }
 }
 
 
 .register {
 .register {
@@ -54,20 +57,36 @@ button:not([size='mini']) {
 }
 }
 
 
 .picker {
 .picker {
-  border: 1px solid rgba(227, 229, 235, 1);
+  border-bottom: 1rpx solid #F2F2F2;
   border-radius: 5px;
   border-radius: 5px;
-  width: 500rpx;
-}
-radio:last-child {
-  margin-left: 20rpx;
+  width: 100%;
 }
 }
 
 
+radio-group  label:last-child {
+  margin-left: 50rpx;
+}
 .wenzi {
 .wenzi {
   color: #808080;
   color: #808080;
 }
 }
+
 .home {
 .home {
   font-size: 28rpx;
   font-size: 28rpx;
+  border: 1px solid #E4F0FE;
+  box-shadow: 0px 3px 20px 0px rgba(32, 123, 242, 0.08);
+  border-radius: 20px;
+  position: absolute;
+  left: 4%;
+  top: 40rpx;
+  background: #FFFFFF;
+  padding-bottom: 60rpx;
+  width: 92%;
+  margin-bottom: 60rpx;
 }
 }
-.image {
-  
+
+.shu {
+  height: 36rpx;
+  width: 14rpx;
+  background: #2087F7;
+  border-radius: 4px;
+
 }
 }

+ 3 - 3
pages/love/love.js

@@ -152,7 +152,7 @@ Page({
         },
         },
         success: (res) => {
         success: (res) => {
           // 如果上传不是人脸图片 则没有score
           // 如果上传不是人脸图片 则没有score
-          if (res.data && res.data.data && res.data.data.score ) {
+          if (res.data && res.data.data && res.data.data.score) {
             console.log(res.data.data.score, "分数是");
             console.log(res.data.data.score, "分数是");
             if (res.data.data.score > 80) {
             if (res.data.data.score > 80) {
               console.log("比对成功了");
               console.log("比对成功了");
@@ -240,8 +240,8 @@ Page({
       success: function (res) {
       success: function (res) {
         console.log(res, "0000000");
         console.log(res, "0000000");
         // 返回当前定位的经纬度
         // 返回当前定位的经纬度
-        var latitude = parseFloat(res.latitude);
-        var longitude = parseFloat(res.longitude);
+        var latitude = parseFloat(res.latitude).toFixed(5);
+        var longitude = parseFloat(res.longitude).toFixed(5);
         that.setData({
         that.setData({
           lng: longitude, //经度
           lng: longitude, //经度
           lat: latitude, //纬度        
           lat: latitude, //纬度        

+ 0 - 1
pages/love/love.wxml

@@ -62,7 +62,6 @@
 			<van-icon size='23' name="clear" class="close" data-index="{{index}}" bindtap="closeImage"/>
 			<van-icon size='23' name="clear" class="close" data-index="{{index}}" bindtap="closeImage"/>
 		</view>
 		</view>
 		</view>
 		</view>
-	
 			<view class="register">
 			<view class="register">
 				<button formType="submit">提交</button>
 				<button formType="submit">提交</button>
 			</view>
 			</view>

+ 4 - 2
pages/love/love.wxss

@@ -3,6 +3,7 @@
   margin: 0 auto;
   margin: 0 auto;
   font-weight: 500;
   font-weight: 500;
   font-size: 28rpx;
   font-size: 28rpx;
+  padding-bottom: 40rpx;
 }
 }
 
 
 .title {
 .title {
@@ -26,8 +27,9 @@
   background-color: #429EFF;
   background-color: #429EFF;
   margin-left: 10rpx;
   margin-left: 10rpx;
   font-size: 24rpx;
   font-size: 24rpx;
-  padding: 5rpx 10rpx;
+  padding: 0 10rpx ;
   border-radius: 10rpx;
   border-radius: 10rpx;
+  line-height: 50rpx;
 
 
 }
 }
 
 
@@ -85,4 +87,4 @@ button:not([size='mini']) {
 }
 }
 .img-box:nth-child(2) {
 .img-box:nth-child(2) {
   margin-left: 20rpx;
   margin-left: 20rpx;
-}
+}