Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

api/jiazheng.js

@@ -266,3 +266,16 @@ export function jiazhengIdcard(data = {}) {
   })
 }
 
+
+export function jiazhengCheck(data = {}) {
+  return request({
+    url: '/app/user/jiazheng/check',
+    headers: {
+      isToken: true
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}
+

common/styles/global/components.scss

@@ -368,6 +368,9 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	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;}
+		
+		// 文字行
+		.input-text-row{height:60rpx;display: flex;align-items: center;flex: 1;justify-content: flex-end;}
 }
 
 // label-radio

common/styles/global/pages.scss

@@ -146,7 +146,8 @@
 		background-color: #fff;border-radius: 8rpx;padding:10rpx 24rpx;box-sizing:border-box;
 		.tongzhi-num{
 			width: 80rpx;height: 80rpx;color: #3fd2a1;@include ezy-no-repeat-cover;text-align: center;flex-shrink: 0;
-			background-image: url("@/static/images/index/tz-icon.png");padding-top: 36rpx;box-sizing:border-box;
+			background-image: url("@/static/images/index/tz-icon.png");padding-top: 42rpx;box-sizing:border-box;
+			font-size: 28rpx;
 			}
 		.tongzhi-content{
 			height: 84rpx;padding:0 10rpx 0 20rpx;box-sizing: border-box;@include multi-line-ellipsis(2);line-height: 1.5;
@@ -649,6 +650,37 @@
 		.reset-btn{background-color: #3fd2a1;color: #fff;padding: 5rpx 20rpx;font-size: 24rpx;border-radius: 8rpx;line-height: 1.2;}
 		.tip-content-box{margin-bottom: 12rpx;font-size: 26rpx;}
 	}
+	// 办证信息list
+	.bzxx-list-page{
+		width:100%;height: 100vh;background-color: #f8f9fd;
+		.bzxx-wrap-box{flex: 1;overflow: auto;height: calc(100vh - 288rpx - var(--status-bar-height));padding-bottom: 20rpx;}
+		.bzxx-card-box{background-color: #fff;padding:24rpx 38rpx;font-size: 28rpx;color: #666;line-height: 1;margin-top: 20rpx;}
+		.name-btn-box{
+			font-size: 32rpx;color: #000;display: flex;justify-content: space-between;align-items: center;margin-bottom: 16rpx;
+			.name-btn{font-size: 26rpx;padding: 8rpx 20rpx;border-radius: 8rpx;line-height: 1.1;}
+			.editer-btn{background-color: #fff;color: #3fd2a1;border: 1rpx solid #3fd2a1;margin-left: auto;}
+			.delete-btn{background-color: #3fd2a1;color: #fff;margin-left: 20rpx;}
+			}
+		.bzxx-zy-row{
+			display: flex;align-items: center;margin-bottom: 16rpx;padding: 0 32rpx;box-sizing: border-box;
+			icon{width: 28rpx;height: 28rpx;@include ezy-no-repeat-cover;margin-right: 12rpx;flex-shrink: 0;}
+			text{color: #333;}
+			.zy-icon{background-image: url("@/static/images/common/zymc-icon.png");}
+			.zydj-icon{background-image: url("@/static/images/common/zydj-icon.png");}
+		}
+		.bzxx-zy-row +.bzxx-zy-row{margin-top: 6rpx;}	
+		.bzxx-time-row{
+			display: flex;align-items: center;
+			background-color:#f4f6fa;box-sizing: border-box;padding: 16rpx 32rpx;border-radius: 8rpx;font-size: 24rpx;
+			.time-icon{width: 20rpx;height: 20rpx;@include ezy-no-repeat-cover();
+			vertical-align: top;margin-right: 10rpx;flex-shrink: 0;background-image: url("@/static/images/common/time-icon.png");}
+		}
+		.bzxx-btn-box{
+			position: fixed;width: 100%;bottom: var(--window-bottom);left: 0;right: 0;
+			margin: 20rpx 0 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;}
+		}
+	}
 }
 
 /*** 消息列表 ***/
@@ -787,4 +819,11 @@
 		.bottom-text{font-size: 24rpx;color: #333;}
 	}
 	
+}
+
+/*** 地图浮层 ***/
+.map-popup-box{
+	height: 100vh;
+	.map-card-list{}
+	.map-card-box{}
 }

components/customMap/customMap.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="map-popup-box">
 		<view class="icon-title-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">选择地址</text>
@@ -13,10 +13,10 @@
 		</view>
 		<map style="width: 100%; height: 300px;" :latitude="data.latitude" :longitude="data.longitude"
 			:markers="data.covers" :show-location="true"> </map>
-		<view  v-if="result"  v-for="(item,index) in result.data.data" key="index">
-			<view @click="xuanzeAdress(item)">
-				<view :class="index==0?'xxxactive':''" >{{item.title}}</view>
-				<view>{{item.address}}</view>
+		<view  v-if="result"  v-for="(item,index) in result.data.data" key="index" class="map-card-list">
+			<view @click="xuanzeAdress(item)" class="map-card-box">
+				<view class="map-card-title" :class="index==0?'xxxactive':''">{{item.title}}</view>
+				<view class="map-card-address">{{item.address}}</view>
 			</view>
 
 		</view>

pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -1,22 +1,20 @@
 <template>
-	<view class="admin-jiazheng-page">
-		<view @click="addBanzheng">添加</view>
-		<view v-for="(item,index) in list" :key="index">
-			<view>
-				报证机构:{{item.jgName}}
+	<view class="bzxx-list-page">
+		<view class="bzxx-wrap-box">
+			<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
+				<view class="name-btn-box">
+					<view>报证机构:{{item.jgName}}</view>
+					<view class="name-btn editer-btn" @click="goEdit(item,index)">编辑</view>
+					<view class="name-btn delete-btn" @click="deleteFun(item,index)">删除</view>
+				</view>
+				<view class="bzxx-zy-row"><icon class="zy-icon"></icon>职业名称：<text>{{item.zyName}}</text></view>
+				<view class="bzxx-zy-row"><icon class="zydj-icon"></icon>职业等级：<text>{{item.zyLevelName}}</text></view>
+				<view class="bzxx-time-row"><icon class="time-icon"></icon><text>申报时间：{{item.createTime}}</text></view>
 			</view>
-			<view @click="goEdit(item,index)">
-				编辑
-			</view>
-			<view @click="deleteFun(item,index)">
-				删除
-			</view>
-			<view>职业名称:{{item.zyName}}</view>
-			<view>职业等级:{{item.zyLevelName}}</view>
-			<view>申报时间:{{item.createTime}}</view>
 		</view>
-		<view @click="saveBanzheng">
-			保存
+		<view class="bzxx-btn-box">
+			<button type="default" @click="addBanzheng" class="phone-white-btn">添加</button>
+			<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
 		</view>
 	</view>
 </template>

pages/admin/Jiazheng/gerenZiliao.vue

@@ -78,10 +78,12 @@
 		</view>
 
 
-	<view class="form-label-select">
+	<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
-			<view>{{formData.juzhuDizhi}}</view>
-			<view @click="openMap">点击</view>
+			<view @click="openMap" class="input-text-row">
+				<view >{{formData.juzhuDizhi}}</view>
+				<icon></icon>
+			</view>
 		<!-- 	<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
 				@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
 				<view class="form-radio-select">
@@ -89,7 +91,6 @@
 					<icon></icon>
 				</view>
 			</picker> -->
-				<icon></icon>
 		</view>
 
 		<view class="form-label-select">
@@ -344,17 +345,18 @@
 			// 确认选择时获取完整数据
 			onPickerConfirm() {
 				const [provinceIndex, cityIndex] = this.multiIndex;
-
+	
 				const selectedProvince = this.multiArray[0][provinceIndex];
 				const selectedCity = this.multiArray[1][cityIndex];
-				this.formData.jiguanShengId = selectedProvince.value
-				this.formData.jiguanShiId = selectedCity.value
-				this.formData.jiguanShiName = selectedCity.label
-				this.formData.jiguanShengName = selectedProvince.label
-				this.formData.jiguanObj.jiguanShengId = selectedProvince.value
-				this.formData.jiguanObj.jiguanShiId = selectedCity.value
 				console.log("选中的省份完整数据：", selectedProvince);
-				console.log("选中的城市完整数据：", selectedCity);
+						console.log("选中的城市完整数据：", selectedCity);
+				this.formData.jiguanShengId = selectedProvince?selectedProvince.value:''
+				this.formData.jiguanShiId = selectedCity?selectedCity.value:''
+				this.formData.jiguanShiName =selectedCity?selectedCity.label:''
+				this.formData.jiguanShengName = selectedProvince?selectedProvince.label:''
+				this.formData.jiguanObj.jiguanShengId = selectedProvince?selectedProvince.value:''
+				this.formData.jiguanObj.jiguanShiId = selectedCity?selectedCity.value:''
+		
 			},
 			setSelectedCity(cityId) {
 				for (let i = 0; i < this.allData.length; i++) {

pages/admin/Jiazheng/index.vue

@@ -67,7 +67,7 @@
 			</scroll-view>
 		</view>
 		<view>
-			<search-dialog ref="searchDialogRef" @search-btn="dialogSearchBtn"
+			<search-dialog ref="searchDialogRef"  @search-btn="dialogSearchBtn"
 				@reset-search="dialogSearchReset"></search-dialog>
 		</view>
 		<customTabbarAdminVue :current-tab="1"></customTabbarAdminVue>
@@ -318,8 +318,9 @@
 	function getLeixing() {
 		let req = {}
 		getJiazhengLeixing(req).then(res => {
+			res.data.unshift("全部类型");
 			allType = dataConversionObject(res.data)
-			console.log('allType', allType.value);
+			console.log('allType', allType);
 		})
 	}
 

pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -92,6 +92,7 @@
 			this.pageInfo.status = data.status
 			this.pageInfo.id = data.id
 			this.pageInfo.userId = data.userId
+			this.pageInfo.from = data.from
 			this.getJianliInfo()
 		},
 		methods: {
@@ -135,9 +136,16 @@
 				})
 			},
 			goUpPage() {
-				uni.redirectTo({
-					url: "/pages/admin/ShouYe/shouye"
-				})
+				if(this.pageInfo.from =='banzheng'){
+					uni.redirectTo({
+						url: "/pages/admin/banzheng/list"
+					})
+				}else{
+					uni.redirectTo({
+						url: "/pages/admin/Jiazheng/index"
+					})
+				}
+			
 			},
 
 		}

pages/admin/banzheng/list.vue

@@ -108,7 +108,8 @@
 		let pageInfo = {
 			status:'edit',
 			id:'',
-			userId:item.userId
+			userId:item.userId,
+			from:'banzheng'
 		}
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=`+JSON.stringify(pageInfo)