1

11 months ago · 63fcdd2a69
parent 21d60ea748
commit 63fcdd2a69
8 changed files with 1031 additions and 944 deletions
--- a/common/globalJs/request.js
+++ b/common/globalJs/request.js
@ -10,9 +10,9 @@ class Request {
 		this.config = {};
 		this.config.baseUrl = config.baseUrl ? config.baseUrl : "";
 		this.config.dataType = config.dataType ? config.dataType : "json";
-    this.config.responseType = config.responseType
-      ? config.responseType
-      : "text";
+		this.config.responseType = config.responseType ?
+			config.responseType :
+			"text";
 		this.config.header = config.header ? config.header : {};
 		this.reqInterceptors = null;
 		this.resInterceptors = null;
@ -67,12 +67,14 @@ class Request {
 				header: header,
 				async complete(response) {
 					let res = response;
+					if ((response.errMsg == 'request:ok')) {
+
 						if (response.statusCode == 404) {
 							$.toast("请求地址不存在");
 						} else if (response.statusCode == 500) {
 							$.toast("服务器内部错误");
 						} else {
-            console.log("response", response.statusCode);
+							// console.log("response", response.statusCode);
 							let res = response;
 							if (
 								_this.resInterceptors &&
@ -112,6 +114,10 @@ class Request {
 							}
 						}
 						resolve(res.data);
+					}else{
+						reject()
+					}
+
 				},
 			});
 		});
@ -267,8 +273,7 @@ class Request {
 							let resInterceptors = _this.resInterceptors(res);
 							// console.log('resInterceptors',resInterceptors)
 							let datasJSON = JSON.parse(resInterceptors.data);
-              if (datasJSON.code == 1101) {
-              }
+							if (datasJSON.code == 1101) {}
 							if (!resInterceptors && resInterceptors != "") {
 								reject("返回值已被您拦截！");
 								return;
--- a/components/no-data.vue
+++ b/components/no-data.vue
@ -51,8 +51,8 @@ export default {

 <style scoped lang="scss">
  .Img{
-    width: 360rpx;
-    height: 300rpx;
+    width: 320rpx;
+    height: 280rpx;
    margin: 0 auto;
    margin-bottom: 30rpx;
  }
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@ -601,7 +601,7 @@ console.log({
      uni.chooseImage({
        count: 6, //默认9
        sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
-        sourceType: ["album"], //从相册选择
+        sourceType: ["album",'camera'], //从相册选择
        success: async (res) => {
          console.log(res);
          if (res.tempFilePaths && res.tempFilePaths.length) {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -60,11 +60,11 @@
 				<view v-else class="List Width100 BorderBox">
 					<view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF" v-for="item in list"
 						:key='item.id' @click='handleClick(item)'>
-						<image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image>
+						<!-- <image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image> -->
 						<view class="right">
 							<view class="title">{{ item.name }}</view>
 							<view class="type">
-								<text>排查</text>
+								<text>{{ item.enumname || '--' }}</text>
 								<text>{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
@ -410,7 +410,7 @@
 		}

 		.Unit {
-			padding: 12rpx;
+			padding: 24rpx 12rpx;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@ -53,12 +53,13 @@
 				<view v-else class="List Width100 BorderBox">
 					<view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF" v-for="(item,index) in list"
 						:key='item.businessId+index' @click='handleClick(item)'>
-						<image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image>
+						<!-- <image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image> -->
 						<view class="right">
 							<view class="title">{{ item.name }}</view>
 							<view class="type">
-								<text v-if="tab === 1">排查</text>
-								<text v-if="tab === 3">治理</text>
+								<!-- <text v-if="tab === 1">排查</text>
+								<text v-if="tab === 3">治理</text> -->
+								<text>{{ item.enumname || '--' }}</text>
 								<text>{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
@ -223,6 +224,12 @@
 						} else {
 							this.$.toast(res.message)
 						}
+						if(this.status==10){
+							this.$set(this.totalData,'UnderInvestigation',res.result.total)
+						}
+						if(this.status==20){
+							this.$set(this.totalData,'InGovernance',res.result.total)
+						}
 					}).catch((err) => {
 						this.loadmorestatus = 'nomore'
 						uni.stopPullDownRefresh();
@ -431,7 +438,7 @@
 		}

 		.Unit {
-			padding: 12rpx;
+			padding:20rpx  12rpx;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@ -459,7 +466,7 @@
 				.title {
 					font-size: 16px;
 					width: 380rpx;
-					min-height: 80rpx;
+					min-height: 60rpx;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					display: -webkit-box;
--- a/pages/logIn/logIn.vue
+++ b/pages/logIn/logIn.vue
@ -5,7 +5,8 @@
 				<image :src="$.imgSrc + '/scimg/logo1.png'" mode="aspectFit" class="Block Logo"></image>
 				<view class="NavBox Width100 MarginT_60rpx">
 					<view class="Unit FloatL PositionR" v-for="(item,index) in navList" @click="chooseNav(item.type)">
-            <text class="Block" :class="currNav == item.type ? 'FontS_46rpx Color_1A1F39 FontBold':'FontS_42rpx Color_B4BAC9'">
+						<text class="Block"
+							:class="currNav == item.type ? 'FontS_46rpx Color_1A1F39 FontBold':'FontS_42rpx Color_B4BAC9'">
 							{{ item.label }}</text>
 						<view class="Line BG_0064FF PositionA" v-show="currNav == item.type"></view>
 					</view>
@ -27,18 +28,22 @@
 						<!--            <view class="Num FloatL TextLeft MarginL_60rpx">-->
 						<!--              <text class="InlineBlock FontS_34rpx Color_1A1F39 FontBold">+86</text>-->
 						<!--            </view>-->
-            <input type="text" placeholder="请输入用户名" v-model="logInData.phone" class="Height100 Input1 FloatL MarginL_60rpx FontS_32rpx">
+						<input type="text" placeholder="请输入用户名" v-model="logInData.phone"
+							class="Height100 Input1 FloatL MarginL_60rpx FontS_32rpx">
 						<view class="ClearB"></view>
 					</view>
 					<view class="Input MarginT_40rpx BG_F6F7FB" v-if="currNav == 1">
-            <input type="text" v-model="logInData.validateCode" placeholder="请输入验证码" class="Height100 Input1 FloatL MarginL_60rpx FontS_32rpx">
+						<input type="text" v-model="logInData.validateCode" placeholder="请输入验证码"
+							class="Height100 Input1 FloatL MarginL_60rpx FontS_32rpx">
 						<view class="CodeBox FloatR MarginR_60rpx" @click="getCode">
-              <text class="Block FontS_28rpx" :class="isCodeDisabled ? 'Color_B4BAC9':'Color_0064FF'">{{ btnText }}</text>
+							<text class="Block FontS_28rpx"
+								:class="isCodeDisabled ? 'Color_B4BAC9':'Color_0064FF'">{{ btnText }}</text>
 						</view>
 						<view class="ClearB"></view>
 					</view>
 					<view class="Input MarginT_40rpx BG_F6F7FB">
-            <input type="password" v-model="logInData.password" placeholder="请输入您的密码" class="Height100 Input2 FloatL MarginL_60rpx FontS_32rpx">
+						<input type="password" v-model="logInData.password" placeholder="请输入您的密码"
+							class="Height100 Input2 FloatL MarginL_60rpx FontS_32rpx">
 						<view class="ClearB"></view>
 					</view>
 				</view>
@ -53,8 +58,11 @@
          <text class="Block FloatL Color_0064FF FontS_26rpx" @click.stop="checkAgree(3)">《隐私协议》</text>
          <view class="ClearB"></view>
        </view> -->
-        <button type="button" :disabled="isDisabled" class="Btn Block Width100 Color_FFFFFF FontS_36rpx FontBold" @click="confirmSub">{{ currNav == 1 ? '注册':'登录' }}</button>
-        <text @click="findPsw" class="Block MarginT_40rpx TextCenter FontS_26rpx Color_0064FF" v-if="currNav == 2">找回密码？</text>
+				<button type="button" :disabled="isDisabled"
+					class="Btn Block Width100 Color_FFFFFF FontS_36rpx FontBold"
+					@click="confirmSub">{{ currNav == 1 ? '注册':'登录' }}</button>
+				<text @click="findPsw" class="Block MarginT_40rpx TextCenter FontS_26rpx Color_0064FF"
+					v-if="currNav == 2">找回密码？</text>
 			</view>
 		</view>
 	</view>
@ -72,7 +80,10 @@ export default {
 				isAgree: false,
 				navList: [
 					// {type:1,label:'注册'},
-        {type:2,label:'登录'},
+					{
+						type: 2,
+						label: '登录'
+					},
 				],
 				currNav: 2,
 				currType: 1,
@ -97,7 +108,8 @@ export default {
 		// 页面显示
 		onShow() {
 			// 顶部背景图
-    this.bgUrl1 = "background-image:url('" + this.$.imgSrc + "/scimg/bg1.png');background-repeat: no-repeat;background-position: center top;background-size:100% 472rpx;"
+			this.bgUrl1 = "background-image:url('" + this.$.imgSrc +
+				"/scimg/bg1.png');background-repeat: no-repeat;background-position: center top;background-size:100% 472rpx;"
 		},
 		// 计算属性
 		computed: {},
@ -169,7 +181,10 @@ export default {
 					if (res.code === 200) {
 						this.$.toast('登录成功')
 						this.$.setData('token', res.result.nuserid)
-          this.$.setData('userInfo', { username: res.result.nuserid,role:res.result.role })
+						this.$.setData('userInfo', {
+							username: res.result.nuserid,
+							role: res.result.role
+						})
 						setTimeout(() => {
 							this.$.hideLoading('登录中...')
 							this.isDisabled = false
@ -179,6 +194,9 @@ export default {
 						this.$.toast(res.message)
 						this.isDisabled = false
 					}
+				}).catch(() => {
+					this.isDisabled = false
+					this.$.toast('连接服务器失败')
 				})
 			},
 			// 找回密码
@ -199,8 +217,7 @@ export default {
 				this.$.open(even)
 			},
 		},
-  onReady() {
-  },
+		onReady() {},
 		// 页面卸载
 		onUnload() {

@ -213,8 +230,7 @@ export default {
 			}, 1500);
 		},
 		// 页面上拉触底事件的处理函数
-  onReachBottom() {
-  },
+		onReachBottom() {},
 	}
 </script>

@ -224,19 +240,22 @@ export default {
 	}
 </style>
 <style lang="scss" scoped>
-
 	.Box {
 		padding-top: var(--status-bar-height);
+
 		.Content {
 			width: calc(100% - 176rpx);
 			padding: 132rpx 0rpx 180rpx 0rpx;
+
 			.Logo {
 				width: 150rpx;
 				height: 150rpx;
 			}
+
 			.NavBox {
 				.Unit {
 					margin-right: 110rpx;
+
 					.Line {
 						left: 50%;
 						transform: translateX(-50%);
@ -247,13 +266,16 @@ export default {
 					}
 				}
 			}
+
 			.TypeBox {
 				.Unit {
 					margin-right: 108rpx;
+
 					.Point {
 						width: 46rpx;
 						height: 46rpx;
 					}
+
 					.Border {
 						width: 46rpx;
 						height: 46rpx;
@ -261,39 +283,47 @@ export default {
 					}
 				}
 			}
+
 			.InputBox {
 				.Input {
 					height: 110rpx;
 					border-radius: 56rpx;
+
 					.CodeBox {
 						text {
 							line-height: 110rpx;
 						}
 					}
+
 					.Num {
 						width: 110rpx;
 						border-right: 4rpx solid #DADADA;
 						margin-top: 34rpx;
 					}
+
 					.Input1 {
 						width: calc(100% - 260rpx);
 					}
+
 					.Input2 {
 						width: calc(100% - 120rpx);
 					}
 				}
 			}
+
 			.Agree {
 				.Point {
 					width: 34rpx;
 					height: 34rpx;
 				}
+
 				.Border {
 					width: 34rpx;
 					height: 34rpx;
 					border: 2rpx solid #B3BACB;
 				}
 			}
+
 			.Btn {
 				margin-top: 196rpx;
 				height: 108rpx;
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@ -6,7 +6,7 @@

 			<view class="name FontS_50rpx FontBold MarginL_15rpx"
 				@click="checkObjEmpty(userInfo) ? $.open('/pages/logIn/userInfo'):$.open('/pages/logIn/logIn')">
-				{{ userInfo.realName || userInfo.username || '请登录'}}
+				{{ dataInfo.cusername || userInfo.username || '请登录'}}
 			</view>

 			<!-- <u-row justify="space-between" gutter="12" class="static-box">
@ -43,9 +43,10 @@
 			</u-row> -->
 		</view>
 		<u-cell-group class="margin-top">
-			<u-cell icon="order" title="警号" :value="dataInfo.policeid" isLink></u-cell>
-			<u-cell icon="account" title="身份证号" :value="dataInfo.cdescription" isLink> </u-cell>
-			<u-cell icon="phone" title="联系方式" :value="dataInfo.phone" isLink></u-cell>
+			<u-cell icon="order" title="警号" :value="dataInfo.policeid"></u-cell>
+			<u-cell icon="account" title="身份证号" :value="dataInfo.cdescription"> </u-cell>
+			<u-cell icon="phone" title="联系方式" :value="dataInfo.phone"></u-cell>
+			<u-cell icon="coupon" title="所属部门" :value="dataInfo.cdepartmentname"></u-cell>
 		</u-cell-group>
 		<u-cell-group style="margin-top:20rpx;padding:10rpx 20rpx">
 			<u-cell icon="lock" title="修改密码" isLink @click='possword'></u-cell>
@ -59,9 +60,9 @@

 <script>
 	import tabFun from '@/libs/function/tabbar.js'
-	const base64Avatar =
-		"data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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";
-
+	// const base64Avatar =
+	// 	"data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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";
+const base64Avatar ='data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkYwQjdBNUI1OTNGMzExRTk5OEMyRUJEREM0NTA0NzFEIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkYwQjdBNUI2OTNGMzExRTk5OEMyRUJEREM0NTA0NzFEIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjBCN0E1QjM5M0YzMTFFOTk4QzJFQkREQzQ1MDQ3MUQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RjBCN0E1QjQ5M0YzMTFFOTk4QzJFQkREQzQ1MDQ3MUQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6ceP8WAAAFRUlEQVR42sxYa0xbVRzvvb29bS9taQvtYBQ63kxhsBlw6mbwQZyabE4H6geTZfOR+MFPiyZO4jRxiYl+UOOXOdTERxyLcxs+trkFxbGxwZgb22CAPDoKpQ8ofVFa7q3/g7ekK33ce9st/pNfbnLPOf/zyzn/839hoVBIJEBKAHWAdYACQA5Azo7NAywAE+Aq4CJgmO8GGA9iFGA7YBugiOc+I4BjgJ8AvnQREwOaAC8DMkWpyRzgIKAVQKdCDF3TB4C1ovRKP2Ave90xBU+weDPgmztASsTq/JbdgxexJwEfATJEd04odo+nuF7lw+wCXHR3hAHsAXQkImZkr4/iorHvHxv13cl+fdf1KbXPHxSH/5OEmKkqznY3PV5urV9f4MKwpKrQS30JMB6LGFL8dTKbYpiQ6LeuUfWP7YP6ayN25ZI9YFho59OV5qK8TL911idpaevL884HCTSWp1P4n60vs+54pMwhlxJMkgexM/xaI6+riYuh/3B6IPu9lnPFYVLLRvlA4WzXtSnV5mqDi4ogYLZ5ZJ8d7i34+PvuPA4P4vlo46dYP5VU6u7JdeMx7iZHmxEkJWIGkZKRxAofdV9FjpuD+t1hMwoT287VeZYY1AsNdUbbbdcbCmG79p8oz9crF97/6rzxltUtjxwvK9B4tmwsdHJQn8lyWbaxVj5hxulZEL/24akytBQdXiBIwyH+d4oSAmdoOoRRMoImxHgI4fXnasw1pXofR/UofDUhAy3lG/vUCikNRi4FAxcnm4sehlYlW+ShHnEpRcRqhTifrZuKrRaHj7wxZlcgktHuEMgHy41ar05NBQpWqQI81dciYpVCiP15eUJjc/rI0nyNt7Io24PjWAg9CoZl6JjzS64M2ZRZmbKgAPVViFihEGKrwT9N2j2yG6MOJSDuvNxshVuA+jXoVeqFENt4b64rnfOiRI9zDT/RAt7ckSGXJMypYHwRzRMS4AUHaoVcwry6rXoi0RwYN6N5QvTjXFPdWPJiQ4UdQpEtZt4E/9G4QNU+RMyaSs7y7q4HTcg1RLsK9D8FtVZEbCwVYl5Id7Co2IlcBgpTKagdQ+6iD9DAZ5VnPoh3XjWregYsio7LE9rP9zw2+PeQjfqk9ZIR2d0T969xvtD889oN5XoXBG/PQ+vyXDxtrQ8R6+Y62zbrIz493Lu6vfdWFoqP4f+nLoyraTihhQCNO91+4gTka6ZplxzhaMfwKikpZurX5zveaNwwqdNQXMJTN1I+xAbOhHK6ezyz8Z22ypMXxnSRpJYMwumT7KgvtZcYNN5N1YY564yPjBxHhNG6pua2yjM948myGMRlKLzB8UQz4dqUzQfOFkemz5HSUGt0nr8+pRyemM34/eKYZvfWKgsKUSvsEYJ+84HO4nN9k4oE2x2PzMeOsMVoTIHrM9BMfGM+9tdwloJ1tih9bj1zM5uJM3+RZjDIaA1xVLlYLsvEkC9ribexFDLTRCd69opZq5CTS8SMOSr/L50juoR1Q/wXezDsV4mIn4fYenJF3v/l3i2DR/4Y0rZfMmkGTDMZ4UIj8hR6+i1KJUUuznkWCMuMVxqtA9JtBrJf7+Yag7Px0fJYjvcmy0F4+TZl90igyCCnoSKanvGSyLgpmYSGrJVBX5PFJSMIPAS5WDBHSwUgEwkYdMoA2J2g8u1/VfDG2hxN2McuuBuk9kWTStS7+BXwZioBnkugBrzF7iWoDbUfUJFmUgOAtxO1ofg07l4BqFIkhPzUF+lo3N2WGwKeYVudfOuEUbbVeRTlAOnuwSZrDlMRtpNyc/hfAQYAFFwdv9Iba+4AAAAASUVORK5CYII='
 	import TopTitle from "../../components/top-title";
 	import Tabbar from "../../components/tabbar.vue";
 	export default {
@ -146,11 +147,20 @@
 					.then((res) => {
 						if (res.code === 200) {
 							this.dataInfo = res.result;
+							this.$set(this.dataInfo,'cdescription',this.processIDCard(res.result.cdescription))
 						} else {
 							this.$.toast(res.message)
 						}
 					});
 			},
+			processIDCard(idCard) {
+				if (idCard.length !== 18) {
+
+					return idCard
+				}
+				// 使用'********'替换前14位，然后拼接上后4位  
+				return '********' + idCard.slice(-4);
+			},
 			//修改密码
 			possword() {
 				// this.$.openNew('/pages/mine/password')
--- a/pages/mine/password.vue
+++ b/pages/mine/password.vue
@ -6,13 +6,26 @@
          <u--input v-model="form.password" border="none"></u--input>
        </u-form-item> -->
 				<u-form-item label="新密码" prop="password" borderBottom>
-          <u--input v-model="form.password" border="none"></u--input>
+					<u--input v-model="form.password" border="none" :password="isPassword">
+						<template slot="suffix">
+							<u-icon name="eye-off" v-if="isPassword" @click="isPassword=!isPassword"></u-icon>
+							<u-icon name="eye-fill" v-else @click="isPassword=!isPassword"></u-icon>
+						</template>
+					</u--input>
 				</u-form-item>
 				<u-form-item label="确认密码" prop="confirmPassword" borderBottom>
-          <u--input v-model="form.confirmPassword" border="none"></u--input>
+					<u--input v-model="form.confirmPassword" border="none" :password="isPassword">
+						<template slot="suffix">
+							<u-icon name="eye-off" v-if="isPassword" @click="isPassword=!isPassword"></u-icon>
+							<u-icon name="eye-fill" v-else @click="isPassword=!isPassword"></u-icon>
+						</template>
+					</u--input>
 				</u-form-item>
+					<text class="tip"> 密码需要包含数字、大小写字母、特殊符号中3种以上组合。</text>
 			</u--form>
-      <view @click="submit" class="Unit FontBold BorderBox TextCenter Width100 MarginT_30rpx BorderR_30rpx submit">
+		
+			<view @click="submit"
+				class="Unit FontBold BorderBox TextCenter Width100 MarginT_30rpx BorderR_30rpx submit">
 				提交
 			</view>
 			<!-- <uni-forms :modelValue="formData" border>
@ -47,6 +60,7 @@
 					confirmPassword: "",
 					password: ""
 				},
+				isPassword: true
 			}
 		},
 		// 页面加载
@ -54,8 +68,7 @@

 		},
 		// 页面显示
-    onShow() {
-    },
+		onShow() {},
 		// 计算属性
 		computed: {},
 		// 方法
@ -74,18 +87,35 @@

 		},
 		methods: {
+			isValidPassword(password) {
+				// 定义正则表达式  
+				const hasDigit = /\d/.test(password);
+				const hasUpper = /[A-Z]/.test(password);
+				const hasLower = /[a-z]/.test(password);
+				const hasSpecial = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password); // 示例特殊字符集  
+
+				// 计算满足条件的类型数量  
+				let count = 0;
+				if (hasDigit) count++;
+				if (hasUpper) count++;
+				if (hasLower) count++;
+				if (hasSpecial) count++;
+
+				// 返回是否满足至少3种组合  
+				return count >= 3;
+			},
 			//修改密码
 			submit() {
 				if (!this.form.password) {
 					this.$.toast('请输入密码')
-        }
-        else if (this.form.password != this.form.confirmPassword) {
+				} else if(!this.isValidPassword(this.form.password)){
+					this.$.toast('密码格式不正确')
+				} else if (this.form.password != this.form.confirmPassword) {
 					this.$.toast('两次密码不一致')
 				} else {
 					this.$request
 						.globalRequest(
-              "/hiddenDanger/auth/updatePwd",
-              {
+							"/hiddenDanger/auth/updatePwd", {
 								cusername: this.$.getData('userInfo').username,
 								nuserid: this.$.getData("token"),
 								nuserpwd: this.form.password,
@ -116,8 +146,7 @@

 		},
 		// 页面上拉触底事件的处理函数
-    onReachBottom() {
-    },
+		onReachBottom() {},
 	}
 </script>

@ -138,6 +167,12 @@
 		.form {
 			width: 690rpx;
 		}
+		.tip{
+			font-size:24rpx;
+			top:10rpx;
+			position:relative;
+			color:#e01515;
+		}

 		/deep/ .u-form-item__body {
 			padding: 30rpx 10rpx;