diff --git a/common/globalJs/request.js b/common/globalJs/request.js
index f631c22..de684b1 100644
--- a/common/globalJs/request.js
+++ b/common/globalJs/request.js
@@ -1,459 +1,464 @@
-/**
- * 请求封装
- */
-import $ from "./globalJs";
-const tokenKey = "token";
-const tokenKeyValue = "";
-
-class Request {
-  constructor(config = {}) {
-    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.header = config.header ? config.header : {};
-    this.reqInterceptors = null;
-    this.resInterceptors = null;
-    this.interceptors = {
-      request: (fn) => {
-        this.reqInterceptors = fn;
-      },
-      response: (fn) => {
-        this.resInterceptors = fn;
-      },
-    };
-  }
-  setConfig(config = {}) {
-    this.config = this._deepCopy(this._merge(this.config, config));
-  }
-  // 请求封装
-  globalRequest(url, config, method, isForm = "") {
-    const _this = this;
-    let newConfig = this._deepCopy(this._merge(this.config, config));
-    let lastConfig = {};
-    if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
-      let reqInterceptors = this.reqInterceptors(newConfig);
-      if (!reqInterceptors && process.env.NODE_ENV === "development") {
-        console.log("请求被拦截，此消息仅在开发环境显示。");
-        return false;
-      } else if (
-        Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
-      ) {
-        return reqInterceptors;
-      }
-      lastConfig = this._deepCopy(reqInterceptors);
-    } else {
-      lastConfig = this._deepCopy(newConfig);
-    }
-    let header = {};
-    let tokenData = $.getData("token");
-    if (tokenData) {
-      header[tokenKey] = tokenKeyValue + tokenData;
-    }
-    if (isForm) {
-      header["content-type"] = "application/x-www-form-urlencoded";
-    }
-    let fullUrl = this._formatUrl(lastConfig.baseUrl, url);
-    if (url.indexOf("http") != -1) {
-      fullUrl = url;
-    }
-    return new Promise((resolve, reject) => {
-      uni.request({
-        url: fullUrl,
-        method: method,
-        data: config,
-        header: header,
-        async complete(response) {
-          let res = response;
-          if (response.statusCode == 404) {
-            $.toast("请求地址不存在");
-          } else if (response.statusCode == 500) {
-            $.toast("服务器内部错误");
-          } else {
-            console.log("response", response.statusCode);
-            let res = response;
-            if (
-              _this.resInterceptors &&
-              typeof _this.resInterceptors === "function"
-            ) {
-              let resInterceptors = _this.resInterceptors(res);
-              // console.log('resInterceptors-----------------',resInterceptors)
-              if (
-                resInterceptors.statusCode == 401 ||
-                resInterceptors.data.code == 403
-              ) {
-                $.toast("登录信息已过期，请重新登录");
-                $.removeData("token");
-                setTimeout(() => {
-                  $.openNew("/pages/logIn/logIn");
-                }, 1500);
-                return;
-              } else if (resInterceptors.statusCode != 200) {
-                $.toast(resInterceptors.data.message);
-              }
-              if (!resInterceptors && resInterceptors != "") {
-                reject("返回值已被您拦截！");
-                return;
-              } else if (
-                Object.prototype.toString.call(resInterceptors) ===
-                "[object Promise]"
-              ) {
-                try {
-                  let promiseRes = await resInterceptors;
-                  resolve(promiseRes);
-                } catch (error) {
-                  reject(error);
-                }
-              } else {
-                res = resInterceptors;
-              }
-            }
-          }
-          resolve(res.data);
-        },
-      });
-    });
-  }
-
-  addFile(file, success, progress) {
-    const _this = this;
-    let newConfig = this._deepCopy(this._merge(this.config, {}));
-    let lastConfig = {};
-    if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
-      let reqInterceptors = this.reqInterceptors(newConfig);
-      if (!reqInterceptors && process.env.NODE_ENV === "development") {
-        console.log("请求被拦截，此消息仅在开发环境显示。");
-        return false;
-      } else if (
-        Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
-      ) {
-        return reqInterceptors;
-      }
-      lastConfig = this._deepCopy(reqInterceptors);
-    } else {
-      lastConfig = this._deepCopy(newConfig);
-    }
-    let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
-    let header = {
-      // 'content-Type':'multipart/form-data'
-    };
-    return new Promise((resolve, reject) => {
-      const UploadTask = uni.uploadFile({
-        url: fullUrl,
-        filePath: file[0].path,
-        header: header,
-        name: $.fileImgKey,
-        formData: {},
-        async complete(response) {
-          let res = response;
-          if (
-            _this.resInterceptors &&
-            typeof _this.resInterceptors === "function"
-          ) {
-            let resInterceptors = _this.resInterceptors(res);
-            if (!resInterceptors && resInterceptors != "") {
-              reject("返回值已被您拦截！");
-              return;
-            } else if (
-              Object.prototype.toString.call(resInterceptors) ===
-              "[object Promise]"
-            ) {
-              try {
-                let promiseRes = await resInterceptors;
-                resolve(promiseRes);
-              } catch (error) {
-                reject(error);
-              }
-            } else {
-              res = resInterceptors;
-            }
-          }
-          success(JSON.parse(res.data));
-        },
-      });
-      // 监听上传进度
-      if (progress) {
-        UploadTask.onProgressUpdate((res) => {
-          progress(res.progress);
-        });
-      }
-    });
-  }
-
-  // 上传图片
-  addImg(length = 1, success, progress, type = 1) {
-    // 获取本地图片的路径
-    uni.chooseImage({
-      count: length,
-      // original原图compressed压缩图
-      sizeType: ["compressed"], // 可以指定是原图还是压缩图，默认二者都有
-      // camera相机album相册
-      sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有
-      success: (res) => {
-        // 显示上传动画
-        $.showLoading("图片上传中...");
-        var imgs;
-        imgs = res.tempFilePaths;
-        // #ifdef H5
-        // 调用上传图片的函数
-        // 处理多选
-        // if (imgs.length > length) {
-        //   imgs = imgs.slice(0, length);
-        // }
-        this.fileImg(imgs, 0, success, progress, type);
-        // #endif
-        // #ifdef APP
-        console.log("imgs", imgs);
-        // 将新添加的图片添加到imgs_arr中
-        uni.compressImage({
-          src: imgs[0],
-          quality: 60, // 仅对jpg有效
-          success: (ress) => {
-            this.fileImg([ress.tempFilePath], 0, success, progress, type);
-          },
-          fail: (err) => {
-            $.hideLoading("图片上传中...");
-          },
-          complete: (msg) => {},
-        });
-        // #endif
-      },
-      complete: (err) => {},
-    });
-  }
-  fileImg(imgs, index, success, progress, type) {
-    const _this = this;
-    let newConfig = this._deepCopy(this._merge(this.config, {}));
-    let lastConfig = {};
-    if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
-      let reqInterceptors = this.reqInterceptors(newConfig);
-      if (!reqInterceptors && process.env.NODE_ENV === "development") {
-        console.log("请求被拦截，此消息仅在开发环境显示。");
-        return false;
-      } else if (
-        Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
-      ) {
-        return reqInterceptors;
-      }
-      lastConfig = this._deepCopy(reqInterceptors);
-    } else {
-      lastConfig = this._deepCopy(newConfig);
-    }
-    let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
-    if (type == 2) {
-      fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUserIdUrl);
-    }
-    let header = {
-      token: $.getData("token"),
-    };
-    // 如果数组长度大于下标，说明没有上传完
-    if (imgs.length > index) {
-      var src = imgs[index];
-      return new Promise((resolve, reject) => {
-        const UploadTask = uni.uploadFile({
-          url: fullUrl,
-          filePath: src,
-          header: header,
-          name: $.fileImgKey,
-          formData: {},
-          async complete(response) {
-            let res = response;
-            if (
-              _this.resInterceptors &&
-              typeof _this.resInterceptors === "function"
-            ) {
-              let resInterceptors = _this.resInterceptors(res);
-              // console.log('resInterceptors',resInterceptors)
-              let datasJSON = JSON.parse(resInterceptors.data);
-              if (datasJSON.code == 1101) {
-              }
-              if (!resInterceptors && resInterceptors != "") {
-                reject("返回值已被您拦截！");
-                return;
-              } else if (
-                Object.prototype.toString.call(resInterceptors) ===
-                "[object Promise]"
-              ) {
-                try {
-                  let promiseRes = await resInterceptors;
-                  resolve(promiseRes);
-                } catch (error) {
-                  reject(error);
-                }
-              } else {
-                res = resInterceptors;
-              }
-            }
-            success(JSON.parse(res.data));
-            _this.fileImg(imgs, index + 1, progress);
-          },
-        });
-        // 监听上传进度
-        if (progress) {
-          UploadTask.onProgressUpdate((res) => {
-            progress(res.progress);
-          });
-        }
-      });
-      // #ifdef H5
-      // 压缩
-      // lrz(src, {
-      //     quality: 0.7,
-      // }).then((rst) => { // fieldName 为 formData 中多媒体的字段名
-
-      // })
-      // #endif
-      // #ifdef APP-PLUS
-      // #endif
-    } else {
-      $.hideLoading();
-    }
-  }
-
-  // 上传视频
-  addVideo(url, success, progress) {
-    // 获取本地视频的路径
-    uni.chooseVideo({
-      sourceType: ["album", "camera"], // 选择方式
-      success: (res) => {
-        if (res.size > $.videoSize) {
-          let size = parseInt($.videoSize / 1024000);
-          $.toast("上传视频过大，大小请不要超过" + size + "M");
-        } else {
-          // 显示上传动画
-          $.showLoading("视频上传中...");
-          // 调用上传视频的函数
-          this.fileVideo(res.tempFilePath, url, success, progress);
-        }
-      },
-      fail: (res) => {
-        console.log(JSON.stringify(res));
-      },
-    });
-  }
-  fileVideo(src, url, success, progress) {
-    const _this = this;
-    let newConfig = this._deepCopy(this._merge(this.config, {}));
-    let lastConfig = {};
-    if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
-      let reqInterceptors = this.reqInterceptors(newConfig);
-      if (!reqInterceptors && process.env.NODE_ENV === "development") {
-        console.log("请求被拦截，此消息仅在开发环境显示。");
-        return false;
-      } else if (
-        Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
-      ) {
-        return reqInterceptors;
-      }
-      lastConfig = this._deepCopy(reqInterceptors);
-    } else {
-      lastConfig = this._deepCopy(newConfig);
-    }
-    let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
-    //上传视频
-    return new Promise((resolve, reject) => {
-      const UploadTask = uni.uploadFile({
-        url: fullUrl,
-        filePath: src,
-        name: $.fileVideoKey,
-        async complete(response) {
-          let res = response;
-          if (
-            _this.resInterceptors &&
-            typeof _this.resInterceptors === "function"
-          ) {
-            let resInterceptors = _this.resInterceptors(res);
-            // console.log('resInterceptors',resInterceptors)
-            if (!resInterceptors && resInterceptors != "") {
-              reject("返回值已被您拦截！");
-              return;
-            } else if (
-              Object.prototype.toString.call(resInterceptors) ===
-              "[object Promise]"
-            ) {
-              try {
-                let promiseRes = await resInterceptors;
-                resolve(promiseRes);
-              } catch (error) {
-                reject(error);
-              }
-            } else {
-              res = resInterceptors;
-            }
-          }
-          success(JSON.parse(res.data));
-          $.hideLoading();
-        },
-        success: (res) => {
-          success(JSON.parse(res.data));
-          // 关闭上传动画
-        },
-        fail: (e) => {
-          // 关闭上传动画
-          $.hideLoading();
-          $.toast("上传超时！");
-        },
-      });
-      // 监听上传进度
-      if (progress) {
-        UploadTask.onProgressUpdate((res) => {
-          progress(res.progress);
-        });
-      }
-    });
-  }
-
-  _formatUrl(baseUrl, url) {
-    if (!baseUrl) return url;
-    let formatUrl = "";
-    const baseUrlEndsWithSlash = baseUrl.endsWith("/");
-    const urlStartsWithSlash = url.startsWith("/");
-    if (baseUrlEndsWithSlash && urlStartsWithSlash) {
-      formatUrl = baseUrl + url.substring(1);
-    } else if (baseUrlEndsWithSlash || urlStartsWithSlash) {
-      formatUrl = baseUrl + url;
-    } else {
-      formatUrl = baseUrl + "/" + url;
-    }
-    return formatUrl;
-  }
-  _merge(oldConfig, newConfig) {
-    let mergeConfig = this._deepCopy(oldConfig);
-    if (!newConfig || !Object.keys(newConfig).length) return mergeConfig;
-    for (let key in newConfig) {
-      if (key !== "header") {
-        mergeConfig[key] = newConfig[key];
-      } else {
-        if (
-          Object.prototype.toString.call(newConfig[key]) === "[object Object]"
-        ) {
-          for (let headerKey in newConfig[key]) {
-            mergeConfig[key][headerKey] = newConfig[key][headerKey];
-          }
-        }
-      }
-    }
-    return mergeConfig;
-  }
-  _deepCopy(obj) {
-    let result = Array.isArray(obj) ? [] : {};
-    for (let key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        if (typeof obj[key] === "object") {
-          result[key] = this._deepCopy(obj[key]);
-        } else {
-          result[key] = obj[key];
-        }
-      }
-    }
-    return result;
-  }
-}
-
-if (!global.$request) {
-  global.$request = new Request();
-}
-
-export default global.$request;
+/**
+ * 请求封装
+ */
+import $ from "./globalJs";
+const tokenKey = "token";
+const tokenKeyValue = "";
+
+class Request {
+	constructor(config = {}) {
+		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.header = config.header ? config.header : {};
+		this.reqInterceptors = null;
+		this.resInterceptors = null;
+		this.interceptors = {
+			request: (fn) => {
+				this.reqInterceptors = fn;
+			},
+			response: (fn) => {
+				this.resInterceptors = fn;
+			},
+		};
+	}
+	setConfig(config = {}) {
+		this.config = this._deepCopy(this._merge(this.config, config));
+	}
+	// 请求封装
+	globalRequest(url, config, method, isForm = "") {
+		const _this = this;
+		let newConfig = this._deepCopy(this._merge(this.config, config));
+		let lastConfig = {};
+		if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
+			let reqInterceptors = this.reqInterceptors(newConfig);
+			if (!reqInterceptors && process.env.NODE_ENV === "development") {
+				console.log("请求被拦截，此消息仅在开发环境显示。");
+				return false;
+			} else if (
+				Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
+			) {
+				return reqInterceptors;
+			}
+			lastConfig = this._deepCopy(reqInterceptors);
+		} else {
+			lastConfig = this._deepCopy(newConfig);
+		}
+		let header = {};
+		let tokenData = $.getData("token");
+		if (tokenData) {
+			header[tokenKey] = tokenKeyValue + tokenData;
+		}
+		if (isForm) {
+			header["content-type"] = "application/x-www-form-urlencoded";
+		}
+		let fullUrl = this._formatUrl(lastConfig.baseUrl, url);
+		if (url.indexOf("http") != -1) {
+			fullUrl = url;
+		}
+		return new Promise((resolve, reject) => {
+			uni.request({
+				url: fullUrl,
+				method: method,
+				data: config,
+				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);
+							let res = response;
+							if (
+								_this.resInterceptors &&
+								typeof _this.resInterceptors === "function"
+							) {
+								let resInterceptors = _this.resInterceptors(res);
+								// console.log('resInterceptors-----------------',resInterceptors)
+								if (
+									resInterceptors.statusCode == 401 ||
+									resInterceptors.data.code == 403
+								) {
+									$.toast("登录信息已过期，请重新登录");
+									$.removeData("token");
+									setTimeout(() => {
+										$.openNew("/pages/logIn/logIn");
+									}, 1500);
+									return;
+								} else if (resInterceptors.statusCode != 200) {
+									$.toast(resInterceptors.data.message);
+								}
+								if (!resInterceptors && resInterceptors != "") {
+									reject("返回值已被您拦截！");
+									return;
+								} else if (
+									Object.prototype.toString.call(resInterceptors) ===
+									"[object Promise]"
+								) {
+									try {
+										let promiseRes = await resInterceptors;
+										resolve(promiseRes);
+									} catch (error) {
+										reject(error);
+									}
+								} else {
+									res = resInterceptors;
+								}
+							}
+						}
+						resolve(res.data);
+					}else{
+						reject()
+					}
+
+				},
+			});
+		});
+	}
+
+	addFile(file, success, progress) {
+		const _this = this;
+		let newConfig = this._deepCopy(this._merge(this.config, {}));
+		let lastConfig = {};
+		if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
+			let reqInterceptors = this.reqInterceptors(newConfig);
+			if (!reqInterceptors && process.env.NODE_ENV === "development") {
+				console.log("请求被拦截，此消息仅在开发环境显示。");
+				return false;
+			} else if (
+				Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
+			) {
+				return reqInterceptors;
+			}
+			lastConfig = this._deepCopy(reqInterceptors);
+		} else {
+			lastConfig = this._deepCopy(newConfig);
+		}
+		let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
+		let header = {
+			// 'content-Type':'multipart/form-data'
+		};
+		return new Promise((resolve, reject) => {
+			const UploadTask = uni.uploadFile({
+				url: fullUrl,
+				filePath: file[0].path,
+				header: header,
+				name: $.fileImgKey,
+				formData: {},
+				async complete(response) {
+					let res = response;
+					if (
+						_this.resInterceptors &&
+						typeof _this.resInterceptors === "function"
+					) {
+						let resInterceptors = _this.resInterceptors(res);
+						if (!resInterceptors && resInterceptors != "") {
+							reject("返回值已被您拦截！");
+							return;
+						} else if (
+							Object.prototype.toString.call(resInterceptors) ===
+							"[object Promise]"
+						) {
+							try {
+								let promiseRes = await resInterceptors;
+								resolve(promiseRes);
+							} catch (error) {
+								reject(error);
+							}
+						} else {
+							res = resInterceptors;
+						}
+					}
+					success(JSON.parse(res.data));
+				},
+			});
+			// 监听上传进度
+			if (progress) {
+				UploadTask.onProgressUpdate((res) => {
+					progress(res.progress);
+				});
+			}
+		});
+	}
+
+	// 上传图片
+	addImg(length = 1, success, progress, type = 1) {
+		// 获取本地图片的路径
+		uni.chooseImage({
+			count: length,
+			// original原图compressed压缩图
+			sizeType: ["compressed"], // 可以指定是原图还是压缩图，默认二者都有
+			// camera相机album相册
+			sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有
+			success: (res) => {
+				// 显示上传动画
+				$.showLoading("图片上传中...");
+				var imgs;
+				imgs = res.tempFilePaths;
+				// #ifdef H5
+				// 调用上传图片的函数
+				// 处理多选
+				// if (imgs.length > length) {
+				//   imgs = imgs.slice(0, length);
+				// }
+				this.fileImg(imgs, 0, success, progress, type);
+				// #endif
+				// #ifdef APP
+				console.log("imgs", imgs);
+				// 将新添加的图片添加到imgs_arr中
+				uni.compressImage({
+					src: imgs[0],
+					quality: 60, // 仅对jpg有效
+					success: (ress) => {
+						this.fileImg([ress.tempFilePath], 0, success, progress, type);
+					},
+					fail: (err) => {
+						$.hideLoading("图片上传中...");
+					},
+					complete: (msg) => {},
+				});
+				// #endif
+			},
+			complete: (err) => {},
+		});
+	}
+	fileImg(imgs, index, success, progress, type) {
+		const _this = this;
+		let newConfig = this._deepCopy(this._merge(this.config, {}));
+		let lastConfig = {};
+		if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
+			let reqInterceptors = this.reqInterceptors(newConfig);
+			if (!reqInterceptors && process.env.NODE_ENV === "development") {
+				console.log("请求被拦截，此消息仅在开发环境显示。");
+				return false;
+			} else if (
+				Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
+			) {
+				return reqInterceptors;
+			}
+			lastConfig = this._deepCopy(reqInterceptors);
+		} else {
+			lastConfig = this._deepCopy(newConfig);
+		}
+		let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
+		if (type == 2) {
+			fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUserIdUrl);
+		}
+		let header = {
+			token: $.getData("token"),
+		};
+		// 如果数组长度大于下标，说明没有上传完
+		if (imgs.length > index) {
+			var src = imgs[index];
+			return new Promise((resolve, reject) => {
+				const UploadTask = uni.uploadFile({
+					url: fullUrl,
+					filePath: src,
+					header: header,
+					name: $.fileImgKey,
+					formData: {},
+					async complete(response) {
+						let res = response;
+						if (
+							_this.resInterceptors &&
+							typeof _this.resInterceptors === "function"
+						) {
+							let resInterceptors = _this.resInterceptors(res);
+							// console.log('resInterceptors',resInterceptors)
+							let datasJSON = JSON.parse(resInterceptors.data);
+							if (datasJSON.code == 1101) {}
+							if (!resInterceptors && resInterceptors != "") {
+								reject("返回值已被您拦截！");
+								return;
+							} else if (
+								Object.prototype.toString.call(resInterceptors) ===
+								"[object Promise]"
+							) {
+								try {
+									let promiseRes = await resInterceptors;
+									resolve(promiseRes);
+								} catch (error) {
+									reject(error);
+								}
+							} else {
+								res = resInterceptors;
+							}
+						}
+						success(JSON.parse(res.data));
+						_this.fileImg(imgs, index + 1, progress);
+					},
+				});
+				// 监听上传进度
+				if (progress) {
+					UploadTask.onProgressUpdate((res) => {
+						progress(res.progress);
+					});
+				}
+			});
+			// #ifdef H5
+			// 压缩
+			// lrz(src, {
+			//     quality: 0.7,
+			// }).then((rst) => { // fieldName 为 formData 中多媒体的字段名
+
+			// })
+			// #endif
+			// #ifdef APP-PLUS
+			// #endif
+		} else {
+			$.hideLoading();
+		}
+	}
+
+	// 上传视频
+	addVideo(url, success, progress) {
+		// 获取本地视频的路径
+		uni.chooseVideo({
+			sourceType: ["album", "camera"], // 选择方式
+			success: (res) => {
+				if (res.size > $.videoSize) {
+					let size = parseInt($.videoSize / 1024000);
+					$.toast("上传视频过大，大小请不要超过" + size + "M");
+				} else {
+					// 显示上传动画
+					$.showLoading("视频上传中...");
+					// 调用上传视频的函数
+					this.fileVideo(res.tempFilePath, url, success, progress);
+				}
+			},
+			fail: (res) => {
+				console.log(JSON.stringify(res));
+			},
+		});
+	}
+	fileVideo(src, url, success, progress) {
+		const _this = this;
+		let newConfig = this._deepCopy(this._merge(this.config, {}));
+		let lastConfig = {};
+		if (this.reqInterceptors && typeof this.reqInterceptors === "function") {
+			let reqInterceptors = this.reqInterceptors(newConfig);
+			if (!reqInterceptors && process.env.NODE_ENV === "development") {
+				console.log("请求被拦截，此消息仅在开发环境显示。");
+				return false;
+			} else if (
+				Object.prototype.toString.call(reqInterceptors) === "[object Promise]"
+			) {
+				return reqInterceptors;
+			}
+			lastConfig = this._deepCopy(reqInterceptors);
+		} else {
+			lastConfig = this._deepCopy(newConfig);
+		}
+		let fullUrl = this._formatUrl(lastConfig.baseUrl, $.imgUrl);
+		//上传视频
+		return new Promise((resolve, reject) => {
+			const UploadTask = uni.uploadFile({
+				url: fullUrl,
+				filePath: src,
+				name: $.fileVideoKey,
+				async complete(response) {
+					let res = response;
+					if (
+						_this.resInterceptors &&
+						typeof _this.resInterceptors === "function"
+					) {
+						let resInterceptors = _this.resInterceptors(res);
+						// console.log('resInterceptors',resInterceptors)
+						if (!resInterceptors && resInterceptors != "") {
+							reject("返回值已被您拦截！");
+							return;
+						} else if (
+							Object.prototype.toString.call(resInterceptors) ===
+							"[object Promise]"
+						) {
+							try {
+								let promiseRes = await resInterceptors;
+								resolve(promiseRes);
+							} catch (error) {
+								reject(error);
+							}
+						} else {
+							res = resInterceptors;
+						}
+					}
+					success(JSON.parse(res.data));
+					$.hideLoading();
+				},
+				success: (res) => {
+					success(JSON.parse(res.data));
+					// 关闭上传动画
+				},
+				fail: (e) => {
+					// 关闭上传动画
+					$.hideLoading();
+					$.toast("上传超时！");
+				},
+			});
+			// 监听上传进度
+			if (progress) {
+				UploadTask.onProgressUpdate((res) => {
+					progress(res.progress);
+				});
+			}
+		});
+	}
+
+	_formatUrl(baseUrl, url) {
+		if (!baseUrl) return url;
+		let formatUrl = "";
+		const baseUrlEndsWithSlash = baseUrl.endsWith("/");
+		const urlStartsWithSlash = url.startsWith("/");
+		if (baseUrlEndsWithSlash && urlStartsWithSlash) {
+			formatUrl = baseUrl + url.substring(1);
+		} else if (baseUrlEndsWithSlash || urlStartsWithSlash) {
+			formatUrl = baseUrl + url;
+		} else {
+			formatUrl = baseUrl + "/" + url;
+		}
+		return formatUrl;
+	}
+	_merge(oldConfig, newConfig) {
+		let mergeConfig = this._deepCopy(oldConfig);
+		if (!newConfig || !Object.keys(newConfig).length) return mergeConfig;
+		for (let key in newConfig) {
+			if (key !== "header") {
+				mergeConfig[key] = newConfig[key];
+			} else {
+				if (
+					Object.prototype.toString.call(newConfig[key]) === "[object Object]"
+				) {
+					for (let headerKey in newConfig[key]) {
+						mergeConfig[key][headerKey] = newConfig[key][headerKey];
+					}
+				}
+			}
+		}
+		return mergeConfig;
+	}
+	_deepCopy(obj) {
+		let result = Array.isArray(obj) ? [] : {};
+		for (let key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (typeof obj[key] === "object") {
+					result[key] = this._deepCopy(obj[key]);
+				} else {
+					result[key] = obj[key];
+				}
+			}
+		}
+		return result;
+	}
+}
+
+if (!global.$request) {
+	global.$request = new Request();
+}
+
+export default global.$request;
\ No newline at end of file
diff --git a/components/no-data.vue b/components/no-data.vue
index b3cc468..a50668b 100644
--- 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;
   }
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 9135a29..0b0db8a 100644
--- 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) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f25cfd3..4b59f3f 100644
--- 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;
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 6d919b4..9009af4 100644
--- 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;
diff --git a/pages/logIn/logIn.vue b/pages/logIn/logIn.vue
index 9d6dd5d..f3b1be2 100644
--- a/pages/logIn/logIn.vue
+++ b/pages/logIn/logIn.vue
@@ -1,307 +1,337 @@
-<template>
-  <view id="page">
-    <view class="Width100 Box" :style="bgUrl1">
-      <view class="Content MarginAuto">
-        <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'">
-              {{ item.label }}</text>
-            <view class="Line BG_0064FF PositionA" v-show="currNav == item.type"></view>
-          </view>
-          <view class="ClearB"></view>
-        </view>
-        <!-- <view class="TypeBox MarginT_60rpx" v-if="currNav == 1">
-          <view class="Unit FloatL" v-for="(item,index) in typeList" @click="chooseType(item.type)">
-            <view class="Point FloatL" v-show="currType == item.type">
-              <image :src="$.imgSrc + '/scimg/choose_y1.png'" mode="aspectFit" class="Block Width100 Height100"></image>
-            </view>
-            <view class="Point Border FloatL BorderR_50 InsideB" v-show="currType != item.type"></view>
-            <text class="Block MarginL_20rpx FontS_32rpx FloatL">{{item.label}}</text>
-            <view class="ClearB"></view>
-          </view>
-          <view class="ClearB"></view>
-        </view> -->
-        <view class="InputBox" :class="currNav == 1 ? 'MarginT_40rpx' : 'MarginT_80rpx'">
-          <view class="Input MarginT_40rpx BG_F6F7FB">
-<!--            <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">
-            <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">
-            <view class="CodeBox FloatR MarginR_60rpx" @click="getCode">
-              <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">
-            <view class="ClearB"></view>
-          </view>
-        </view>
-       <!-- <view class="Agree Width100 MarginT_60rpx" @click="chooseAgree">
-          <view class="Point FloatL" v-if="isAgree">
-            <image :src="$.imgSrc + '/scimg/choose_y1.png'" mode="aspectFit" class="Block Width100 Height100"></image>
-          </view>
-          <view class="Point Border FloatL BorderR_50 InsideB" v-else></view>
-          <text class="Block FloatL MarginL_20rpx Color_605F72 FontS_26rpx">本人已同意</text>
-          <text class="Block FloatL Color_0064FF FontS_26rpx" @click.stop="checkAgree(2)">《用户协议》</text>
-          <text class="Block FloatL Color_605F72 FontS_26rpx">与</text>
-          <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>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  // 组件
-  components: {},
-  data() {
-    return {
-      // 公用的js
-      $: this.$,
-      bgUrl1:'', // 登录信息背景图
-      isAgree:false,
-      navList:[
-        // {type:1,label:'注册'},
-        {type:2,label:'登录'},
-      ],
-      currNav:2,
-      currType:1,
-      isDisabled:false,
-      logInData:{
-        phone:'', //
-        validateCode:'', //
-        password:'', //
-      }, //
-      btnText:'获取验证码',
-      times:null,
-      seconds:60,
-      isCodeDisabled:false,
-    }
-  },
-  // 页面加载
-  onLoad(e) {
-    if(typeof(e.type) != 'undefined'){
-      this.currNav = e.type
-    }
-  },
-  // 页面显示
-  onShow() {
-    // 顶部背景图
-    this.bgUrl1 = "background-image:url('" + this.$.imgSrc + "/scimg/bg1.png');background-repeat: no-repeat;background-position: center top;background-size:100% 472rpx;"
-  },
-  // 计算属性
-  computed: {},
-  // 方法
-  methods: {
-    checkAgree(type){
-      let urlKey = 'portalTextType'
-      this.$.open('/pages/logIn/agree?type=' + type)
-    },
-    getCode(){
-      if(!this.$.isEmpty(this.logInData.phone)){
-        this.$.toast('请输入手机号')
-        return
-      }
-      let datas = {
-        phone:this.logInData.phone,
-        type:2
-      }
-      this.isCodeDisabled = true
-      this.$request.globalRequest('/hyjg-admin/mapi/account/sendSmsCode', datas, 'POST').then(res => {
-        if(res.code == 0){
-          this.timeDown()
-        }else{
-          this.$.toast(res.msg)
-          this.isCodeDisabled = false
-        }
-      })
-    },
-    timeDown(){
-      this.times = setInterval(() => {
-        if(this.seconds > 0){
-          this.seconds --
-          this.btnText = this.seconds + 'S'
-        }else {
-          this.seconds = 60
-          this.isCodeDisabled = false
-          this.btnText = '获取验证码'
-          clearInterval(this.times)
-        }
-      },1000)
-    },
-    // 提交
-    confirmSub(){
-      // this.$.setData('token','1')
-      // this.$.openTab('/pages/index/index')
-      // return
-      // this.$.open('/pages/logIn/userInfo')
-      let url = '/hyjg-admin/mapi/account/register'
-      if(!this.$.isEmpty(this.logInData.phone)){
-        this.$.toast('请填写用户名')
-        return
-      }
-      if(!this.$.isEmpty(this.logInData.password)){
-        this.$.toast('请填写密码')
-        return
-      }
-      // if(!this.isAgree){
-      //   this.$.toast('请勾选用户协议和隐私协议')
-      //   return
-      // }
-      let datas = {
-        nuserid: this.logInData.phone,
-        cuserpwd: this.logInData.password,
-      }
-      url = '/hiddenDanger/auth/login'
-      this.$.showLoading('登录中...')
-      this.isDisabled = true
-      this.$request.globalRequest(url, datas, 'POST').then(res => {
-        if(res.code === 200){
-          this.$.toast('登录成功')
-          this.$.setData('token',res.result.nuserid)
-          this.$.setData('userInfo', { username: res.result.nuserid,role:res.result.role })
-          setTimeout(() => {
-            this.$.hideLoading('登录中...')
-            this.isDisabled = false
-            this.$.openTab('/pages/index/index')
-          },1500)
-        }else{
-          this.$.toast(res.message)
-          this.isDisabled = false
-        }
-      })
-    },
-    // 找回密码
-    findPsw(){
-      this.$.open('/pages/logIn/findPsw')
-    },
-    chooseAgree(){
-      this.isAgree = !this.isAgree
-    },
-    chooseNav(type){
-      this.currNav = type
-    },
-    chooseType(type){
-      this.currType = type
-    },
-    // 跳转页面
-    skipPage(even){
-      this.$.open(even)
-    },
-  },
-  onReady() {
-  },
-  // 页面卸载
-  onUnload() {
-
-  },
-  // 触发下拉刷新
-  onPullDownRefresh() {
-    // 延迟关闭刷新动画
-    setTimeout(() => {
-      uni.stopPullDownRefresh();
-    }, 1500);
-  },
-  // 页面上拉触底事件的处理函数
-  onReachBottom() {
-  },
-}
-</script>
-
-<style>
-	page {
-	  background:#FFFFFF;
-	}
-</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%);
-          bottom: -26rpx;
-          width: 74rpx;
-          height: 10rpx;
-          border-radius: 6rpx;
-        }
-      }
-    }
-    .TypeBox{
-      .Unit{
-        margin-right: 108rpx;
-        .Point{
-          width: 46rpx;
-          height: 46rpx;
-        }
-        .Border{
-          width: 46rpx;
-          height: 46rpx;
-          border: 4rpx solid #B3BACB;
-        }
-      }
-    }
-    .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;
-      background: linear-gradient(90deg, #0064FF 0%, #2D99FD 100%);
-      box-shadow: 0rpx 6rpx 10rpx 0rpx rgba(194,218,255,1);
-      border-radius: 54rpx;
-      line-height: 108rpx;
-    }
-  }
-}
-</style>
+<template>
+	<view id="page">
+		<view class="Width100 Box" :style="bgUrl1">
+			<view class="Content MarginAuto">
+				<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'">
+							{{ item.label }}</text>
+						<view class="Line BG_0064FF PositionA" v-show="currNav == item.type"></view>
+					</view>
+					<view class="ClearB"></view>
+				</view>
+				<!-- <view class="TypeBox MarginT_60rpx" v-if="currNav == 1">
+          <view class="Unit FloatL" v-for="(item,index) in typeList" @click="chooseType(item.type)">
+            <view class="Point FloatL" v-show="currType == item.type">
+              <image :src="$.imgSrc + '/scimg/choose_y1.png'" mode="aspectFit" class="Block Width100 Height100"></image>
+            </view>
+            <view class="Point Border FloatL BorderR_50 InsideB" v-show="currType != item.type"></view>
+            <text class="Block MarginL_20rpx FontS_32rpx FloatL">{{item.label}}</text>
+            <view class="ClearB"></view>
+          </view>
+          <view class="ClearB"></view>
+        </view> -->
+				<view class="InputBox" :class="currNav == 1 ? 'MarginT_40rpx' : 'MarginT_80rpx'">
+					<view class="Input MarginT_40rpx BG_F6F7FB">
+						<!--            <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">
+						<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">
+						<view class="CodeBox FloatR MarginR_60rpx" @click="getCode">
+							<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">
+						<view class="ClearB"></view>
+					</view>
+				</view>
+				<!-- <view class="Agree Width100 MarginT_60rpx" @click="chooseAgree">
+          <view class="Point FloatL" v-if="isAgree">
+            <image :src="$.imgSrc + '/scimg/choose_y1.png'" mode="aspectFit" class="Block Width100 Height100"></image>
+          </view>
+          <view class="Point Border FloatL BorderR_50 InsideB" v-else></view>
+          <text class="Block FloatL MarginL_20rpx Color_605F72 FontS_26rpx">本人已同意</text>
+          <text class="Block FloatL Color_0064FF FontS_26rpx" @click.stop="checkAgree(2)">《用户协议》</text>
+          <text class="Block FloatL Color_605F72 FontS_26rpx">与</text>
+          <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>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		// 组件
+		components: {},
+		data() {
+			return {
+				// 公用的js
+				$: this.$,
+				bgUrl1: '', // 登录信息背景图
+				isAgree: false,
+				navList: [
+					// {type:1,label:'注册'},
+					{
+						type: 2,
+						label: '登录'
+					},
+				],
+				currNav: 2,
+				currType: 1,
+				isDisabled: false,
+				logInData: {
+					phone: '', //
+					validateCode: '', //
+					password: '', //
+				}, //
+				btnText: '获取验证码',
+				times: null,
+				seconds: 60,
+				isCodeDisabled: false,
+			}
+		},
+		// 页面加载
+		onLoad(e) {
+			if (typeof(e.type) != 'undefined') {
+				this.currNav = e.type
+			}
+		},
+		// 页面显示
+		onShow() {
+			// 顶部背景图
+			this.bgUrl1 = "background-image:url('" + this.$.imgSrc +
+				"/scimg/bg1.png');background-repeat: no-repeat;background-position: center top;background-size:100% 472rpx;"
+		},
+		// 计算属性
+		computed: {},
+		// 方法
+		methods: {
+			checkAgree(type) {
+				let urlKey = 'portalTextType'
+				this.$.open('/pages/logIn/agree?type=' + type)
+			},
+			getCode() {
+				if (!this.$.isEmpty(this.logInData.phone)) {
+					this.$.toast('请输入手机号')
+					return
+				}
+				let datas = {
+					phone: this.logInData.phone,
+					type: 2
+				}
+				this.isCodeDisabled = true
+				this.$request.globalRequest('/hyjg-admin/mapi/account/sendSmsCode', datas, 'POST').then(res => {
+					if (res.code == 0) {
+						this.timeDown()
+					} else {
+						this.$.toast(res.msg)
+						this.isCodeDisabled = false
+					}
+				})
+			},
+			timeDown() {
+				this.times = setInterval(() => {
+					if (this.seconds > 0) {
+						this.seconds--
+						this.btnText = this.seconds + 'S'
+					} else {
+						this.seconds = 60
+						this.isCodeDisabled = false
+						this.btnText = '获取验证码'
+						clearInterval(this.times)
+					}
+				}, 1000)
+			},
+			// 提交
+			confirmSub() {
+				// this.$.setData('token','1')
+				// this.$.openTab('/pages/index/index')
+				// return
+				// this.$.open('/pages/logIn/userInfo')
+				let url = '/hyjg-admin/mapi/account/register'
+				if (!this.$.isEmpty(this.logInData.phone)) {
+					this.$.toast('请填写用户名')
+					return
+				}
+				if (!this.$.isEmpty(this.logInData.password)) {
+					this.$.toast('请填写密码')
+					return
+				}
+				// if(!this.isAgree){
+				//   this.$.toast('请勾选用户协议和隐私协议')
+				//   return
+				// }
+				let datas = {
+					nuserid: this.logInData.phone,
+					cuserpwd: this.logInData.password,
+				}
+				url = '/hiddenDanger/auth/login'
+				this.$.showLoading('登录中...')
+				this.isDisabled = true
+				this.$request.globalRequest(url, datas, 'POST').then(res => {
+					if (res.code === 200) {
+						this.$.toast('登录成功')
+						this.$.setData('token', res.result.nuserid)
+						this.$.setData('userInfo', {
+							username: res.result.nuserid,
+							role: res.result.role
+						})
+						setTimeout(() => {
+							this.$.hideLoading('登录中...')
+							this.isDisabled = false
+							this.$.openTab('/pages/index/index')
+						}, 1500)
+					} else {
+						this.$.toast(res.message)
+						this.isDisabled = false
+					}
+				}).catch(() => {
+					this.isDisabled = false
+					this.$.toast('连接服务器失败')
+				})
+			},
+			// 找回密码
+			findPsw() {
+				this.$.open('/pages/logIn/findPsw')
+			},
+			chooseAgree() {
+				this.isAgree = !this.isAgree
+			},
+			chooseNav(type) {
+				this.currNav = type
+			},
+			chooseType(type) {
+				this.currType = type
+			},
+			// 跳转页面
+			skipPage(even) {
+				this.$.open(even)
+			},
+		},
+		onReady() {},
+		// 页面卸载
+		onUnload() {
+
+		},
+		// 触发下拉刷新
+		onPullDownRefresh() {
+			// 延迟关闭刷新动画
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1500);
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom() {},
+	}
+</script>
+
+<style>
+	page {
+		background: #FFFFFF;
+	}
+</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%);
+						bottom: -26rpx;
+						width: 74rpx;
+						height: 10rpx;
+						border-radius: 6rpx;
+					}
+				}
+			}
+
+			.TypeBox {
+				.Unit {
+					margin-right: 108rpx;
+
+					.Point {
+						width: 46rpx;
+						height: 46rpx;
+					}
+
+					.Border {
+						width: 46rpx;
+						height: 46rpx;
+						border: 4rpx solid #B3BACB;
+					}
+				}
+			}
+
+			.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;
+				background: linear-gradient(90deg, #0064FF 0%, #2D99FD 100%);
+				box-shadow: 0rpx 6rpx 10rpx 0rpx rgba(194, 218, 255, 1);
+				border-radius: 54rpx;
+				line-height: 108rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 2d61da3..44c65f0 100644
--- 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')
diff --git a/pages/mine/password.vue b/pages/mine/password.vue
index da5025b..a958b2f 100644
--- a/pages/mine/password.vue
+++ b/pages/mine/password.vue
@@ -1,161 +1,196 @@
-<template>
-  <view id="page" class="password-box">
-    <view class="Width100 Box BorderBox">
-      <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" class="form" labelWidth="100">
-        <!-- <u-form-item label="原密码" prop="password" borderBottom>
-          <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-form-item>
-        <u-form-item label="确认密码" prop="confirmPassword" borderBottom>
-          <u--input v-model="form.confirmPassword" border="none"></u--input>
-        </u-form-item>
-      </u--form>
-      <view @click="submit" class="Unit FontBold BorderBox TextCenter Width100 MarginT_30rpx BorderR_30rpx submit">
-        提交
-      </view>
-      <!-- <uni-forms :modelValue="formData" border>
-        <uni-forms-item label="道路类型">
-          <input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.roadType"
-            placeholder="请输入道路类型" />
-          <text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-            formData.roadType
-          }}</text>
-        </uni-forms-item>
-      </uni-forms > -->
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        // 公用的js
-        $: this.$,
-        rules: {
-          // 'password': {
-          //   type: 'string',
-          //   required: true,
-          //   message: '请填写原密码',
-          //   trigger: ['blur', 'change']
-          // },
-
-        },
-        form: {
-          confirmPassword: "",
-          password: ""
-        },
-      }
-    },
-    // 页面加载
-    onLoad(e) {
-
-    },
-    // 页面显示
-    onShow() {
-    },
-    // 计算属性
-    computed: {},
-    // 方法
-    methods: {
-      // sexSelect(e) {
-      //   this.model1.userInfo.sex = e.name
-      //   this.$refs.uForm.validateField('userInfo.sex')
-      // },
-    },
-    onReady() {
-      //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-      this.$refs.uForm.setRules(this.rules)
-    },
-    // 页面卸载
-    onUnload() {
-
-    },
-    methods: {
-      //修改密码
-      submit() {
-        if (!this.form.password) {
-          this.$.toast('请输入密码')
-        }
-        else if (this.form.password != this.form.confirmPassword) {
-          this.$.toast('两次密码不一致')
-        } else {
-          this.$request
-            .globalRequest(
-              "/hiddenDanger/auth/updatePwd",
-              {
-                cusername: this.$.getData('userInfo').username,
-                nuserid: this.$.getData("token"),
-                nuserpwd: this.form.password,
-              },
-              "POST",
-              true
-            )
-            .then((res) => {
-
-              if (res.code === 200) {
-                this.$.toast('密码修改成功~')
-                setTimeout(() => {
-                  uni.navigateBack({
-                    delta: 1,
-                  });
-                }, 2000);
-              } else {
-                this.$.toast(res.message)
-              }
-
-            });
-        }
-
-      },
-    },
-    // 触发下拉刷新
-    onPullDownRefresh() {
-
-    },
-    // 页面上拉触底事件的处理函数
-    onReachBottom() {
-    },
-  }
-</script>
-
-<style>
-</style>
-<style lang="scss" scoped>
-  page {
-    background: #F6F8FA;
-  }
-
-  .password-box {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    background-color: #F6F8FA;
-    padding: 10rpx 30rpx;
-
-    .form {
-      width: 690rpx;
-    }
-
-    /deep/ .u-form-item__body {
-      padding: 30rpx 10rpx;
-    }
-
-    .submit {
-      /* background: #E1EDFF; */
-      background: linear-gradient(90deg, #0064FF 0%, #2D99FD 100%);
-      color: #ffffff;
-      width: 690rpx !important;
-      height: 94rpx;
-      line-height: 94rpx;
-      border-radius: 13rpx;
-      margin-top: 70rpx;
-      font-weight: 500;
-      margin-left: 0;
-      font-size: 32rpx;
-      letter-spacing: 4rpx;
-    }
-  }
+<template>
+	<view id="page" class="password-box">
+		<view class="Width100 Box BorderBox">
+			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" class="form" labelWidth="100">
+				<!-- <u-form-item label="原密码" prop="password" borderBottom>
+          <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" :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" :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>
+			<!-- <uni-forms :modelValue="formData" border>
+        <uni-forms-item label="道路类型">
+          <input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.roadType"
+            placeholder="请输入道路类型" />
+          <text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
+            formData.roadType
+          }}</text>
+        </uni-forms-item>
+      </uni-forms > -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 公用的js
+				$: this.$,
+				rules: {
+					// 'password': {
+					//   type: 'string',
+					//   required: true,
+					//   message: '请填写原密码',
+					//   trigger: ['blur', 'change']
+					// },
+
+				},
+				form: {
+					confirmPassword: "",
+					password: ""
+				},
+				isPassword: true
+			}
+		},
+		// 页面加载
+		onLoad(e) {
+
+		},
+		// 页面显示
+		onShow() {},
+		// 计算属性
+		computed: {},
+		// 方法
+		methods: {
+			// sexSelect(e) {
+			//   this.model1.userInfo.sex = e.name
+			//   this.$refs.uForm.validateField('userInfo.sex')
+			// },
+		},
+		onReady() {
+			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+			this.$refs.uForm.setRules(this.rules)
+		},
+		// 页面卸载
+		onUnload() {
+
+		},
+		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.isValidPassword(this.form.password)){
+					this.$.toast('密码格式不正确')
+				} else if (this.form.password != this.form.confirmPassword) {
+					this.$.toast('两次密码不一致')
+				} else {
+					this.$request
+						.globalRequest(
+							"/hiddenDanger/auth/updatePwd", {
+								cusername: this.$.getData('userInfo').username,
+								nuserid: this.$.getData("token"),
+								nuserpwd: this.form.password,
+							},
+							"POST",
+							true
+						)
+						.then((res) => {
+
+							if (res.code === 200) {
+								this.$.toast('密码修改成功~')
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 1,
+									});
+								}, 2000);
+							} else {
+								this.$.toast(res.message)
+							}
+
+						});
+				}
+
+			},
+		},
+		// 触发下拉刷新
+		onPullDownRefresh() {
+
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom() {},
+	}
+</script>
+
+<style>
+</style>
+<style lang="scss" scoped>
+	page {
+		background: #F6F8FA;
+	}
+
+	.password-box {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		background-color: #F6F8FA;
+		padding: 10rpx 30rpx;
+
+		.form {
+			width: 690rpx;
+		}
+		.tip{
+			font-size:24rpx;
+			top:10rpx;
+			position:relative;
+			color:#e01515;
+		}
+
+		/deep/ .u-form-item__body {
+			padding: 30rpx 10rpx;
+		}
+
+		.submit {
+			/* background: #E1EDFF; */
+			background: linear-gradient(90deg, #0064FF 0%, #2D99FD 100%);
+			color: #ffffff;
+			width: 690rpx !important;
+			height: 94rpx;
+			line-height: 94rpx;
+			border-radius: 13rpx;
+			margin-top: 70rpx;
+			font-weight: 500;
+			margin-left: 0;
+			font-size: 32rpx;
+			letter-spacing: 4rpx;
+		}
+	}
 </style>
\ No newline at end of file