tanxue 2 ヶ月 前
コミット
f8efe1498f

+ 25 - 7
common/styles/global/components.scss

@@ -1,5 +1,9 @@
 /******************** 这里放组件样式 ********************/
-
+/***** uni组件颜色覆盖 *****/
+// select选项面包 确定按钮
+.uni-picker-container .uni-picker-action.uni-picker-action-confirm{color: #30c190!important;}
+.uni-calendar-item__weeks-box .uni-calendar-item--checked{background-color: #30c190!important;}
+.uni-date-changed .uni-datetime-picker--btn{background-color: #30c190!important;}
 /***** view *****/
 view{box-sizing: border-box;}
 
@@ -354,7 +358,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	width: 100%;display: flex;justify-content: space-between;align-items: center;
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
-	.form-label-require{color: #ff0101;margin-right: 6rpx;display: inline-block;}
+	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
 	.phone-form-label{min-width: 180rpx;}
 	input{text-align: right;flex: 1;}
 	.is-input-border{border:0!important;}
@@ -372,7 +376,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 6rpx 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
-	.phone-form-label{min-width: 180rpx;line-height:52rpx;}
+	.phone-form-label{min-width: 180rpx;line-height:60rpx;flex-shrink: 0;}
 	.form-radio-group{display: flex;flex-wrap: wrap;flex: 1;}
 	.form-radio-double-group{justify-content: space-between;}
 	.form-radio-item{
@@ -405,15 +409,23 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	width: 100%;display: flex;justify-content: space-between;
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
+	.select-picker-box{width: 100%;display: flex;align-items: center;justify-content: flex-end;}
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
-	.phone-form-label{min-width: 180rpx;line-height:60rpx;}
+	.phone-form-label{min-width: 180rpx;line-height:60rpx;flex-shrink: 0;}
 	.form-radio-picker{width:auto!important;flex: unset!important;display: flex;align-items: center;}
 	.form-radio-select{
 		display: flex;align-items: center;
+		>view{flex: 1;}
 		icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
 			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
 			transform: rotate(270deg);margin-left: 4rpx;}
 	}
+	
+	// 日期
+	.uni-date{
+		display: flex;align-items: center;
+		.uni-date-editor{flex: 1;display: flex;justify-content: flex-end;}
+	}
 }
 
 // label-switch
@@ -422,15 +434,21 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
-	.phone-form-label{min-width: 180rpx;line-height:52rpx;}
+	.phone-form-label{min-width: 180rpx;line-height:52rpx;flex-shrink: 0;}
 }
 
 /***** admin上传  *****/
-.admin-upload-btn-box{
-	width: 100px;height: 100px;border: 1rpx dashed #ccc;margin: 0 auto;
+.admin-upload-btn-box,.sfz-upload-box{
+	width: 200rpx;height: 200rpx;border: 1rpx dashed #ccc;margin: 0 auto;
 	display: flex;align-items: center;justify-content: center;border-radius: 8rpx;
 	text{font-size: 42rpx;color:#d7d7d7;}
 }
+.sfz-upload-box{
+	width: 360rpx;height: 220rpx;
+	text{color:#888;}
+	.sfz-content{font-size: 32rpx;color:#888;}
+	.sfz-image{width: 360rpx;max-height: 220rpx;}
+}
 .upload-bottom-text {font-size: 24rpx;color: #666;text-align: center;margin-top: 10rpx;}
 
 /***** 通用弹窗  *****/		

+ 11 - 0
common/styles/global/pages.scss

@@ -611,6 +611,15 @@
 		margin: 20rpx 8rpx 0;display: flex;justify-content: center;padding: 32rpx 0;background-color: #fff;
 		.phone-white-btn,.phone-green-btn{width: 36%;font-size: 28rpx;margin: 0 16rpx;}
 	}
+	.phone-radio-group{
+		display: flex;flex-wrap: wrap;flex: 1;padding: 0;
+		.phone-radio-item{width: 29%;margin:10rpx 2%;padding: 0 6rpx;}
+	} 
+	.change-icon{
+		width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();transform: unset;
+		background-image: url("@/static/images/common/change-icon.svg");
+		display: inline-block;vertical-align: middle;margin-left: 8rpx;
+	}
 	// 照片资料
 	.ziliao-upload-box{
 		background-color: #fff;display: flex;padding: 32rpx;
@@ -623,6 +632,8 @@
 		padding: 42rpx 0 24rpx;border-top: 1rpx solid #f8f9fd;margin-top: 24rpx;}
 		.scbg-btn{font-size: 28rpx;margin: 20rpx 8rpx 10rpx;}
 	}
+	
+	
 }
 
 /*** 消息列表 ***/

+ 3 - 3
pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -1,7 +1,7 @@
 <template>
-	<view v-if="changjingType =='shenfenzheng'" class="admin-upload-btn-box" @click="showActionSheet">
-		<text v-if="!imageUrl">+</text>
-		<image v-else style="width: 100rpx;height: 100rpx;"   :src="imageUrl" mode=""></image>
+	<view v-if="changjingType =='shenfenzheng'" class="sfz-upload-box" @click="showActionSheet">
+		<view v-if="!imageUrl" class="sfz-content"><text>+</text> 添加身份证</view>
+		<image class="sfz-image" v-else :src="imageUrl" mode=""></image>
 	</view>
 	
 	<view v-else-if="changjingType =='more'" class="admin-upload-btn-box" @click="showActionSheet">

+ 17 - 16
pages/admin/Jiazheng/gerenZiliao.vue

@@ -18,27 +18,28 @@
 				<text class="form-label-require">*</text>
 				<text v-if="formData.idtype ==1">身份证号</text>
 				<text v-if="formData.idtype ==2">护照号</text>
-				<text @click="idCardChange">切换</text>
+				<icon @click="idCardChange" class="change-icon">切换</icon>
 			</view>
 			<uni-easyinput v-model="formData.idcard" placeholder="请输入身份证号或护照号" maxlength="18" />
 		</view>
 
-		<view class="form-label-input">
+		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
 			<uni-datetime-picker type="line" v-model="formData.birthday">
 				<view class="form-radio-select">
-					{{formData.birthday}}
+					<view>{{formData.birthday}}</view>
 					<icon></icon>
 				</view>
 			</uni-datetime-picker>
 		</view>
 
-		<view class="form-label-input">
+		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>籍贯</view>
 			<picker mode="multiSelector" :range="multiArray" :range-key="'label'" :value="multiIndex"
-				@columnchange="bindMultiPickerColumnChange" @change="onPickerConfirm">
-				<view class="picker">
-					{{ formData.jiguanShengName}} {{formData.jiguanShiName}} 箭头
+				@columnchange="bindMultiPickerColumnChange" @change="onPickerConfirm" class="select-picker-box">
+				<view class="form-radio-select">
+					<view>{{ formData.jiguanShengName}} {{formData.jiguanShiName}}</view>
+					<icon></icon>
 				</view>
 			</picker>
 		</view>
@@ -46,10 +47,10 @@
 			<view class="phone-form-label"><text class="form-label-require">*</text>身份证地址</view>
 			<uni-easyinput v-model="formData.hujiDizhi" placeholder="请输入身份证地址" />
 		</view>
-		<view class="form-label-input">
+		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>民族</view>
 			<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
-				@change="minzuChange" @cancel="minzuCancel">
+				@change="minzuChange" @cancel="minzuCancel" class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{ formData.minzu.name }}</view>
 					<icon></icon>
@@ -68,23 +69,23 @@
 		<view class="form-label-radio form-top-margin flex-start-row">
 			<view class="phone-form-label"><text class="form-label-require">*</text>学历</view>
 			<dataChecked :list="xueliList" :selectedIds='formData.xueli.id' mode="single" :showAdd="false"
-				@change="selectChangeXueliList" />
+				@change="selectChangeXueliList"/>
 		</view>
 		<view class="form-label-radio flex-start-row">
-			<view class="phone-form-label"><text></text>婚姻 </view>
+			<view class="phone-form-label"><text class="form-label-require"></text>婚姻 </view>
 			<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
 				@change="selectChangeHunyinList" />
 		</view>
 
 		<view class="form-label-input form-top-margin flex-start-row">
-			<view class="phone-form-label"><text></text>通讯地址</view>
+			<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
 			<textarea v-model="formData.juzhuDizhi" placeholder="请输入通讯地址" class="form-textarea-box" />
 		</view>
 
 		<view class="form-label-select">
-			<view class="phone-form-label"><text></text>星座</view>
+			<view class="phone-form-label"><text class="form-label-require"></text>星座</view>
 			<picker :range="xingzuoList" mode='selector' :value="formData.xingzuoIndex" range-key="name"
-				@change="xingzuoChange" @cancel="xingzuoCancel">
+				@change="xingzuoChange" @cancel="xingzuoCancel" class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{ formData.xingzuo.name  }}</view>
 					<icon></icon>
@@ -92,9 +93,9 @@
 			</picker>
 		</view>
 		<view class="form-label-select">
-			<view class="phone-form-label"><text></text>属相</view>
+			<view class="phone-form-label"><text class="form-label-require"></text>属相</view>
 			<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
-				@change="shuxiangChange" @cancel="shuxiangCancel">
+				@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{ formData.shuxiang.name  }}</view>
 					<icon></icon>