Merge branch 'gyj' of SH-Arbitrate/miniapp into dev

pages/index.vue

@@ -54,7 +54,7 @@
 		    <view class="badge">{{dataCount.caseApplyEvidence}}</view>
 		    <view class="cardMain">
 		    </view>
-		    <view class="cardMain">
+		    <view class="cardMain" style="margin-top: 75rpx;">
 		      <view class="imgTitle">待案件质证</view>
 		    </view>    
 		</view>

pages/realName.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="page-body">
 		<view class="action-btn">
-		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击进行实名认证</button>
+		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击身份证实名认证</button>
+		</view>
+		<view class="action-btn">
+		  <button @click="handlePassport()" class="register-btn cu-btn block bg-blue lg round">点击护照实名注册</button>
 		</view>
 	</view>
 </template>
@@ -17,7 +20,8 @@
 	export default{
 		data(){
 			return{
-				eidToken: ""
+				eidToken: "",
+				vals:1
 			}
 		},
 		methods:{
@@ -58,6 +62,12 @@
 						})
 					},
 				});
+			},
+			// 点击护照注册
+			handlePassport(){
+				uni.navigateTo({
+					url: `/pages/register?valus=${this.vals}`
+				});
 			}
 		},
 		onLoad() {

pages/register.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="input-item flex align-center">
 				<uni-data-select
-						style="text-align: left;"
+						style="text-align: left;width: 200px;"
 						v-model="registerForm.idType"
 				       :localdata="certificate"
 					   @change="certificateValue"
@@ -30,7 +30,7 @@
 			</view>
 			<view class="input-item flex align-center">
 				<uni-data-select
-						style="text-align: left;"
+						style="text-align: left;width: 200px;"
 						v-model="registerForm.nationality"
 				       :localdata="nationality"
 				     ></uni-data-select>
@@ -116,21 +116,30 @@ import constant from '../utils/constant'
 				nationality: [
 					{ value: 0, text: "国内" },
 					{ value: 1, text: "国外" },
-				],
+				],
+				passportVal:{}
 			}
 		},
 		created() {
 			this.getCode()
 		},
-		onLoad(option) {
-			let {
-				params
-			} = option
-			// this.improvedetail = JSON.parse(improvedetail)
-			let paramsObj = JSON.parse(params);
-			this.registerForm.name = paramsObj.nickName;
-			this.registerForm.identityNo = paramsObj.idCard
-			this.registerForm.id = paramsObj.id
+		onLoad(option) {
+			this.sysType = uni.getStorageSync('sysType');
+			// this.passportVal = option;
+			if(option.valus==1){
+				this.registerForm.idType =1
+				this.registerForm.nationality =1
+			}else{
+				let {
+					params
+				} = option
+				// this.improvedetail = JSON.parse(improvedetail)
+				let paramsObj = JSON.parse(params);
+				this.registerForm.name = paramsObj.nickName;
+				this.registerForm.identityNo = paramsObj.idCard
+				this.registerForm.id = paramsObj.id
+			}
+			
 		},
 		methods: {
 			// 获取手机验证码
@@ -228,10 +237,7 @@ import constant from '../utils/constant'
 			certificateValue(e){
 				this.registerForm.idType = e
 			}
-		},
-		onLoad(){
-			this.sysType = uni.getStorageSync('sysType');
-		}
+		},
 	}
 </script>
 
@@ -244,7 +250,14 @@ import constant from '../utils/constant'
 	}
 	::v-deep .uni-icons[data-v-a2e81f6e]{
 		display: none;
-	}
+	}
+	.uni-icons{
+		display: none;
+	}
+	// ::v-deep .uni-select{
+	// 	border: none;
+	// 	width: 200%;
+	// }
 	.normal-login-container {
 		width: 100%;
 		background-color: #ffffff;

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -348,7 +348,7 @@
 
 	.uni-select {
 		font-size: 14px;
-		border: 1px solid $uni-border-3;
+		// border: 1px solid $uni-border-3;
 		box-sizing: border-box;
 		border-radius: 4px;
 		padding: 0 5px;
@@ -360,7 +360,7 @@
 		/* #endif */
 		flex-direction: row;
 		align-items: center;
-		border-bottom: solid 1px $uni-border-3;
+		// border-bottom: solid 1px $uni-border-3;
 		width: 100%;
 		flex: 1;
 		height: 35px;