From 388229b588bef7c553cf14677115d8689e51de7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Fri, 14 Feb 2025 17:36:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |    3 +-
 sub/task/enforce.vue                          |   29 +-
 .../uni-easyinput/uni-easyinput.vue           | 1462 +++++++++--------
 3 files changed, 822 insertions(+), 672 deletions(-)

diff --git a/pages.json b/pages.json
index 81aa4e5..240f5bd 100644
--- a/pages.json
+++ b/pages.json
@@ -133,7 +133,8 @@
 						"van-action-sheet": "/wxcomponents/vant/action-sheet/index"
 					},
 					"componentPlaceholder": {
-						"u-modal": "view"
+						"u-modal": "view",
+						"uni-easyinput": "view"
 					}
 				}
 			}
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index 4c5c763..4bafc16 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="view-container">
-    <view class="box">
+    <view class="box wd-flex wd-flex-col" style="gap: 12px">
       <view
         class="wd-flex"
         style="justify-content: space-between; align-items: center"
@@ -14,8 +14,30 @@
       <uni-easyinput
         type="textarea"
         v-model="form.advice"
-        placeholder="请输入内容"
+        placeholder="请输入..."
+        :maxlength="500"
+        :autoHeight="true"
+        :styles="{
+          backgroundColor: '#F9F9F9',
+          borderColor: '#F1F1F4'
+        }"
       ></uni-easyinput>
+      <view
+        class="wd-flex"
+        style="justify-content: space-between; align-items: center"
+      >
+        <view style="font-weight: bold">
+          <text style="color: #f8285a; margin-right: 4px">*</text>
+          上传证明
+        </view>
+      </view>
+      <u-upload
+        :fileList="fileList1"
+        @afterRead="afterRead"
+        @delete="deletePic"
+        multiple
+        :maxCount="10"
+      ></u-upload>
     </view>
 
     <cs-bottom-wrapper>
@@ -81,4 +103,7 @@ export default {
     }
   }
 }
+::v-deep .uni-easyinput__content-textarea {
+  min-height: 400rpx;
+}
 </style>
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index 93506d6..5ed421c 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -1,676 +1,800 @@
 <template>
-	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
-		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
-			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="22"></uni-icons>
-			<slot name="left">
-			</slot>
-			<!-- #ifdef MP-ALIPAY -->
-			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
-			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
-			<!-- #endif -->
-			<!-- #ifndef MP-ALIPAY -->
-			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
-			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
-			<!-- #endif -->
-
-			<template v-if="type === 'password' && passwordIcon">
-				<!-- 开启密码时显示小眼睛 -->
-				<uni-icons v-if="isVal" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" :type="showPassword ? 'eye-slash-filled' : 'eye-filled'" :size="22" :color="focusShow ? primaryColor : '#c0c4cc'" @click="onEyes"></uni-icons>
-			</template>
-			<template v-if="suffixIcon">
-				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')" size="22"></uni-icons>
-			</template>
-			<template v-else>
-				<uni-icons v-if="clearable && isVal && !disabled && type !== 'textarea'" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" type="clear" :size="clearSize" :color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'" @click="onClear"></uni-icons>
-			</template>
-			<slot name="right"></slot>
-		</view>
-	</view>
+  <view
+    class="uni-easyinput"
+    :class="{ 'uni-easyinput-error': msg }"
+    :style="boxStyle"
+  >
+    <view
+      class="uni-easyinput__content"
+      :class="inputContentClass"
+      :style="inputContentStyle"
+    >
+      <uni-icons
+        v-if="prefixIcon"
+        class="content-clear-icon"
+        :type="prefixIcon"
+        color="#c0c4cc"
+        @click="onClickIcon('prefix')"
+        size="22"
+      ></uni-icons>
+      <slot name="left"></slot>
+      <!-- #ifdef MP-ALIPAY -->
+      <textarea
+        :enableNative="enableNative"
+        v-if="type === 'textarea'"
+        class="uni-easyinput__content-textarea"
+        :class="{ 'input-padding': inputBorder }"
+        :name="name"
+        :value="val"
+        :placeholder="placeholder"
+        :placeholderStyle="placeholderStyle"
+        :disabled="disabled"
+        placeholder-class="uni-easyinput__placeholder-class"
+        :maxlength="inputMaxlength"
+        :focus="focused"
+        :autoHeight="autoHeight"
+        :cursor-spacing="cursorSpacing"
+        :adjust-position="adjustPosition"
+        @input="onInput"
+        @blur="_Blur"
+        @focus="_Focus"
+        @confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+      ></textarea>
+      <input
+        :enableNative="enableNative"
+        v-else
+        :type="type === 'password' ? 'text' : type"
+        class="uni-easyinput__content-input"
+        :style="inputStyle"
+        :name="name"
+        :value="val"
+        :password="!showPassword && type === 'password'"
+        :placeholder="placeholder"
+        :placeholderStyle="placeholderStyle"
+        placeholder-class="uni-easyinput__placeholder-class"
+        :disabled="disabled"
+        :maxlength="inputMaxlength"
+        :focus="focused"
+        :confirmType="confirmType"
+        :cursor-spacing="cursorSpacing"
+        :adjust-position="adjustPosition"
+        @focus="_Focus"
+        @blur="_Blur"
+        @input="onInput"
+        @confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+      />
+      <!-- #endif -->
+      <!-- #ifndef MP-ALIPAY -->
+      <textarea
+        v-if="type === 'textarea'"
+        class="uni-easyinput__content-textarea"
+        :class="{ 'input-padding': inputBorder }"
+        :name="name"
+        :value="val"
+        :placeholder="placeholder"
+        :placeholderStyle="placeholderStyle"
+        :disabled="disabled"
+        placeholder-class="uni-easyinput__placeholder-class"
+        :maxlength="inputMaxlength"
+        :focus="focused"
+        :autoHeight="autoHeight"
+        :cursor-spacing="cursorSpacing"
+        :adjust-position="adjustPosition"
+        @input="onInput"
+        @blur="_Blur"
+        @focus="_Focus"
+        @confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+      ></textarea>
+      <input
+        v-else
+        :type="type === 'password' ? 'text' : type"
+        class="uni-easyinput__content-input"
+        :style="inputStyle"
+        :name="name"
+        :value="val"
+        :password="!showPassword && type === 'password'"
+        :placeholder="placeholder"
+        :placeholderStyle="placeholderStyle"
+        placeholder-class="uni-easyinput__placeholder-class"
+        :disabled="disabled"
+        :maxlength="inputMaxlength"
+        :focus="focused"
+        :confirmType="confirmType"
+        :cursor-spacing="cursorSpacing"
+        :adjust-position="adjustPosition"
+        @focus="_Focus"
+        @blur="_Blur"
+        @input="onInput"
+        @confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+      />
+      <!-- #endif -->
+
+      <template v-if="type === 'password' && passwordIcon">
+        <!-- 开启密码时显示小眼睛 -->
+        <uni-icons
+          v-if="isVal"
+          class="content-clear-icon"
+          :class="{ 'is-textarea-icon': type === 'textarea' }"
+          :type="showPassword ? 'eye-slash-filled' : 'eye-filled'"
+          :size="22"
+          :color="focusShow ? primaryColor : '#c0c4cc'"
+          @click="onEyes"
+        ></uni-icons>
+      </template>
+      <template v-if="suffixIcon">
+        <uni-icons
+          v-if="suffixIcon"
+          class="content-clear-icon"
+          :type="suffixIcon"
+          color="#c0c4cc"
+          @click="onClickIcon('suffix')"
+          size="22"
+        ></uni-icons>
+      </template>
+      <template v-else>
+        <uni-icons
+          v-if="clearable && isVal && !disabled && type !== 'textarea'"
+          class="content-clear-icon"
+          :class="{ 'is-textarea-icon': type === 'textarea' }"
+          type="clear"
+          :size="clearSize"
+          :color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'"
+          @click="onClear"
+        ></uni-icons>
+      </template>
+      <slot name="right"></slot>
+    </view>
+  </view>
 </template>
 
 <script>
-	/**
-	 * Easyinput 输入框
-	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
-	 * @property {String}	value	输入内容
-	 * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
-	 * 	@value text			文本输入键盘
-	 * 	@value textarea	多行文本输入键盘
-	 * 	@value password	密码输入键盘
-	 * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
-	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
-	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
-	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
-	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
-	 * @property {String }	placeholder	输入框的提示文字
-	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
-	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
-	 * @property {Boolean}	disabled	是否禁用（默认false）
-	 * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
-	 * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
-	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
-	 * @property {String}	prefixIcon	输入框头部图标
-	 * @property {String}	suffixIcon	输入框尾部图标
-	 * @property {String}	primaryColor	设置主题色（默认#2979ff）
-	 * @property {Boolean}	trim	是否自动去除两端的空格
-	 * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
-	 * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
-	 * @value both	去除两端空格
-	 * @value left	去除左侧空格
-	 * @value right	去除右侧空格
-	 * @value start	去除左侧空格
-	 * @value end		去除右侧空格
-	 * @value all		去除全部空格
-	 * @value none	不去除空格
-	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
-	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
-	 * @property {Object}	styles	自定义颜色
-	 * @event {Function}	input	输入框内容发生变化时触发
-	 * @event {Function}	focus	输入框获得焦点时触发
-	 * @event {Function}	blur	输入框失去焦点时触发
-	 * @event {Function}	confirm	点击完成按钮时触发
-	 * @event {Function}	iconClick	点击图标时触发
-	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
-	 */
-	function obj2strClass(obj) {
-		let classess = '';
-		for (let key in obj) {
-			const val = obj[key];
-			if (val) {
-				classess += `${key} `;
-			}
-		}
-		return classess;
-	}
-
-	function obj2strStyle(obj) {
-		let style = '';
-		for (let key in obj) {
-			const val = obj[key];
-			style += `${key}:${val};`;
-		}
-		return style;
-	}
-	export default {
-		name: 'uni-easyinput',
-		emits: [
-			'click',
-			'iconClick',
-			'update:modelValue',
-			'input',
-			'focus',
-			'blur',
-			'confirm',
-			'clear',
-			'eyes',
-			'change',
-			'keyboardheightchange'
-		],
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
-		options: {
-			// #ifdef MP-TOUTIAO
-			virtualHost: false,
-			// #endif
-			// #ifndef MP-TOUTIAO
-			virtualHost: true
-			// #endif
-		},
-		inject: {
-			form: {
-				from: 'uniForm',
-				default: null
-			},
-			formItem: {
-				from: 'uniFormItem',
-				default: null
-			}
-		},
-		props: {
-			name: String,
-			value: [Number, String],
-			modelValue: [Number, String],
-			type: {
-				type: String,
-				default: 'text'
-			},
-			clearable: {
-				type: Boolean,
-				default: true
-			},
-			autoHeight: {
-				type: Boolean,
-				default: false
-			},
-			placeholder: {
-				type: String,
-				default: ' '
-			},
-			placeholderStyle: String,
-			focus: {
-				type: Boolean,
-				default: false
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			maxlength: {
-				type: [Number, String],
-				default: 140
-			},
-			confirmType: {
-				type: String,
-				default: 'done'
-			},
-			clearSize: {
-				type: [Number, String],
-				default: 24
-			},
-			inputBorder: {
-				type: Boolean,
-				default: true
-			},
-			prefixIcon: {
-				type: String,
-				default: ''
-			},
-			suffixIcon: {
-				type: String,
-				default: ''
-			},
-			trim: {
-				type: [Boolean, String],
-				default: false
-			},
-			cursorSpacing: {
-				type: Number,
-				default: 0
-			},
-			passwordIcon: {
-				type: Boolean,
-				default: true
-			},
-			adjustPosition: {
-				type: Boolean,
-				default: true
-			},
-			primaryColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {
-						color: '#333',
-						backgroundColor: '#fff',
-						disableColor: '#F7F6F6',
-						borderColor: '#e5e5e5'
-					};
-				}
-			},
-			errorMessage: {
-				type: [String, Boolean],
-				default: ''
-			},
-			// #ifdef MP-ALIPAY
-			enableNative: {
-				type: Boolean,
-				default: false
-			}
-			// #endif
-		},
-		data() {
-			return {
-				focused: false,
-				val: '',
-				showMsg: '',
-				border: false,
-				isFirstBorder: false,
-				showClearIcon: false,
-				showPassword: false,
-				focusShow: false,
-				localMsg: '',
-				isEnter: false // 用于判断当前是否是使用回车操作
-			};
-		},
-		computed: {
-			// 输入框内是否有值
-			isVal() {
-				const val = this.val;
-				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
-				if (val || val === 0) {
-					return true;
-				}
-				return false;
-			},
-
-			msg() {
-				// console.log('computed', this.form, this.formItem);
-				// if (this.form) {
-				// 	return this.errorMessage || this.formItem.errMsg;
-				// }
-				// TODO 处理头条 formItem 中 errMsg 不更新的问题
-				return this.localMsg || this.errorMessage;
-			},
-			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
-			inputMaxlength() {
-				return Number(this.maxlength);
-			},
-
-			// 处理外层样式的style
-			boxStyle() {
-				return `color:${
-					this.inputBorder && this.msg ? '#e43d33' : this.styles.color
-				};`;
-			},
-			// input 内容的类和样式处理
-			inputContentClass() {
-				return obj2strClass({
-					'is-input-border': this.inputBorder,
-					'is-input-error-border': this.inputBorder && this.msg,
-					'is-textarea': this.type === 'textarea',
-					'is-disabled': this.disabled,
-					'is-focused': this.focusShow
-				});
-			},
-			inputContentStyle() {
-				const focusColor = this.focusShow ?
-					this.primaryColor :
-					this.styles.borderColor;
-				const borderColor =
-					this.inputBorder && this.msg ? '#dd524d' : focusColor;
-				return obj2strStyle({
-					'border-color': borderColor || '#e5e5e5',
-					'background-color': this.disabled ?
-						this.styles.disableColor : this.styles.backgroundColor
-				});
-			},
-			// input右侧样式
-			inputStyle() {
-				const paddingRight =
-					this.type === 'password' || this.clearable || this.prefixIcon ?
-					'' :
-					'10px';
-				return obj2strStyle({
-					'padding-right': paddingRight,
-					'padding-left': this.prefixIcon ? '' : '10px'
-				});
-			}
-		},
-		watch: {
-			value(newVal) {
-				// fix by mehaotian 解决 值为null的情况下，input报错的bug
-				if (newVal === null) {
-					this.val = '';
-					return
-				}
-				this.val = newVal;
-			},
-			modelValue(newVal) {
-				if (newVal === null) {
-					this.val = '';
-					return
-				}
-				this.val = newVal;
-			},
-			focus(newVal) {
-				this.$nextTick(() => {
-					this.focused = this.focus;
-					this.focusShow = this.focus;
-				});
-			}
-		},
-		created() {
-			this.init();
-			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
-			if (this.form && this.formItem) {
-				this.$watch('formItem.errMsg', newVal => {
-					this.localMsg = newVal;
-				});
-			}
-		},
-		mounted() {
-			this.$nextTick(() => {
-				this.focused = this.focus;
-				this.focusShow = this.focus;
-			});
-		},
-		methods: {
-			/**
-			 * 初始化变量值
-			 */
-			init() {
-				if (this.value || this.value === 0) {
-					this.val = this.value;
-				} else if (
-					this.modelValue ||
-					this.modelValue === 0 ||
-					this.modelValue === ''
-				) {
-					this.val = this.modelValue; 
-				} else {
-					// fix by ht 如果初始值为null，则input报错，待框架修复
-					this.val = '';
-				}
-			},
-
-			/**
-			 * 点击图标时触发
-			 * @param {Object} type
-			 */
-			onClickIcon(type) {
-				this.$emit('iconClick', type);
-			},
-
-			/**
-			 * 显示隐藏内容，密码框时生效
-			 */
-			onEyes() {
-				this.showPassword = !this.showPassword;
-				this.$emit('eyes', this.showPassword);
-			},
-
-			/**
-			 * 输入时触发
-			 * @param {Object} event
-			 */
-			onInput(event) {
-				let value = event.detail.value;
-				// 判断是否去除空格
-				if (this.trim) {
-					if (typeof this.trim === 'boolean' && this.trim) {
-						value = this.trimStr(value);
-					}
-					if (typeof this.trim === 'string') {
-						value = this.trimStr(value, this.trim);
-					}
-				}
-				if (this.errMsg) this.errMsg = '';
-				this.val = value;
-				// TODO 兼容 vue2
-				this.$emit('input', value);
-				// TODO　兼容　vue3
-				this.$emit('update:modelValue', value);
-			},
-
-			/**
-			 * 外部调用方法
-			 * 获取焦点时触发
-			 * @param {Object} event
-			 */
-			onFocus() {
-				this.$nextTick(() => {
-					this.focused = true;
-				});
-				this.$emit('focus', null);
-			},
-
-			_Focus(event) {
-				this.focusShow = true;
-				this.$emit('focus', event);
-			},
-
-			/**
-			 * 外部调用方法
-			 * 失去焦点时触发
-			 * @param {Object} event
-			 */
-			onBlur() {
-				this.focused = false;
-				this.$emit('blur', null);
-			},
-			_Blur(event) {
-				let value = event.detail.value;
-				this.focusShow = false;
-				this.$emit('blur', event);
-				// 根据类型返回值，在event中获取的值理论上讲都是string
-				if (this.isEnter === false) {
-					this.$emit('change', this.val);
-				}
-				// 失去焦点时参与表单校验
-				if (this.form && this.formItem) {
-					const { validateTrigger } = this.form;
-					if (validateTrigger === 'blur') {
-						this.formItem.onFieldChange();
-					}
-				}
-			},
-
-			/**
-			 * 按下键盘的发送键
-			 * @param {Object} e
-			 */
-			onConfirm(e) {
-				this.$emit('confirm', this.val);
-				this.isEnter = true;
-				this.$emit('change', this.val);
-				this.$nextTick(() => {
-					this.isEnter = false;
-				});
-			},
-
-			/**
-			 * 清理内容
-			 * @param {Object} event
-			 */
-			onClear(event) {
-				this.val = '';
-				// TODO 兼容 vue2
-				this.$emit('input', '');
-				// TODO 兼容 vue2
-				// TODO　兼容　vue3
-				this.$emit('update:modelValue', '');
-				// 点击叉号触发
-				this.$emit('clear');
-			},
-
-			/**
-			 * 键盘高度发生变化的时候触发此事件
-			 * 兼容性：微信小程序2.7.0+、App 3.1.0+
-			 * @param {Object} event
-			 */
-			onkeyboardheightchange(event) {
-				this.$emit('keyboardheightchange', event);
-			},
-
-			/**
-			 * 去除空格
-			 */
-			trimStr(str, pos = 'both') {
-				if (pos === 'both') {
-					return str.trim();
-				} else if (pos === 'left') {
-					return str.trimLeft();
-				} else if (pos === 'right') {
-					return str.trimRight();
-				} else if (pos === 'start') {
-					return str.trimStart();
-				} else if (pos === 'end') {
-					return str.trimEnd();
-				} else if (pos === 'all') {
-					return str.replace(/\s+/g, '');
-				} else if (pos === 'none') {
-					return str;
-				}
-				return str;
-			}
-		}
-	};
+/**
+ * Easyinput 输入框
+ * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+ * @property {String}	value	输入内容
+ * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+ * 	@value text			文本输入键盘
+ * 	@value textarea	多行文本输入键盘
+ * 	@value password	密码输入键盘
+ * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+ * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+ * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+ * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+ * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+ * @property {String }	placeholder	输入框的提示文字
+ * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean}	focus	是否自动获得焦点（默认false）
+ * @property {Boolean}	disabled	是否禁用（默认false）
+ * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+ * @property {String}	prefixIcon	输入框头部图标
+ * @property {String}	suffixIcon	输入框尾部图标
+ * @property {String}	primaryColor	设置主题色（默认#2979ff）
+ * @property {Boolean}	trim	是否自动去除两端的空格
+ * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
+ * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
+ * @value both	去除两端空格
+ * @value left	去除左侧空格
+ * @value right	去除右侧空格
+ * @value start	去除左侧空格
+ * @value end		去除右侧空格
+ * @value all		去除全部空格
+ * @value none	不去除空格
+ * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+ * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+ * @property {Object}	styles	自定义颜色
+ * @event {Function}	input	输入框内容发生变化时触发
+ * @event {Function}	focus	输入框获得焦点时触发
+ * @event {Function}	blur	输入框失去焦点时触发
+ * @event {Function}	confirm	点击完成按钮时触发
+ * @event {Function}	iconClick	点击图标时触发
+ * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+ */
+function obj2strClass(obj) {
+  let classess = ''
+  for (let key in obj) {
+    const val = obj[key]
+    if (val) {
+      classess += `${key} `
+    }
+  }
+  return classess
+}
+
+function obj2strStyle(obj) {
+  let style = ''
+  for (let key in obj) {
+    const val = obj[key]
+    style += `${key}:${val};`
+  }
+  return style
+}
+export default {
+  name: 'uni-easyinput',
+  emits: [
+    'click',
+    'iconClick',
+    'update:modelValue',
+    'input',
+    'focus',
+    'blur',
+    'confirm',
+    'clear',
+    'eyes',
+    'change',
+    'keyboardheightchange'
+  ],
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue'
+  },
+  options: {
+    // #ifdef MP-TOUTIAO
+    virtualHost: false,
+    // #endif
+    // #ifndef MP-TOUTIAO
+    virtualHost: true
+    // #endif
+  },
+  inject: {
+    form: {
+      from: 'uniForm',
+      default: null
+    },
+    formItem: {
+      from: 'uniFormItem',
+      default: null
+    }
+  },
+  props: {
+    name: String,
+    value: [Number, String],
+    modelValue: [Number, String],
+    type: {
+      type: String,
+      default: 'text'
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    autoHeight: {
+      type: Boolean,
+      default: false
+    },
+    placeholder: {
+      type: String,
+      default: ' '
+    },
+    placeholderStyle: String,
+    focus: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, String],
+      default: 140
+    },
+    confirmType: {
+      type: String,
+      default: 'done'
+    },
+    clearSize: {
+      type: [Number, String],
+      default: 24
+    },
+    inputBorder: {
+      type: Boolean,
+      default: true
+    },
+    prefixIcon: {
+      type: String,
+      default: ''
+    },
+    suffixIcon: {
+      type: String,
+      default: ''
+    },
+    trim: {
+      type: [Boolean, String],
+      default: false
+    },
+    cursorSpacing: {
+      type: Number,
+      default: 0
+    },
+    passwordIcon: {
+      type: Boolean,
+      default: true
+    },
+    adjustPosition: {
+      type: Boolean,
+      default: true
+    },
+    primaryColor: {
+      type: String,
+      default: '#2979ff'
+    },
+    styles: {
+      type: Object,
+      default() {
+        return {
+          color: '#333',
+          backgroundColor: '#fff',
+          disableColor: '#F7F6F6',
+          borderColor: '#e5e5e5'
+        }
+      }
+    },
+    errorMessage: {
+      type: [String, Boolean],
+      default: ''
+    },
+    // #ifdef MP-ALIPAY
+    enableNative: {
+      type: Boolean,
+      default: false
+    }
+    // #endif
+  },
+  data() {
+    return {
+      focused: false,
+      val: '',
+      showMsg: '',
+      border: false,
+      isFirstBorder: false,
+      showClearIcon: false,
+      showPassword: false,
+      focusShow: false,
+      localMsg: '',
+      isEnter: false // 用于判断当前是否是使用回车操作
+    }
+  },
+  computed: {
+    // 输入框内是否有值
+    isVal() {
+      const val = this.val
+      // fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+      if (val || val === 0) {
+        return true
+      }
+      return false
+    },
+
+    msg() {
+      // console.log('computed', this.form, this.formItem);
+      // if (this.form) {
+      // 	return this.errorMessage || this.formItem.errMsg;
+      // }
+      // TODO 处理头条 formItem 中 errMsg 不更新的问题
+      return this.localMsg || this.errorMessage
+    },
+    // 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+    inputMaxlength() {
+      return Number(this.maxlength)
+    },
+
+    // 处理外层样式的style
+    boxStyle() {
+      return `color:${
+        this.inputBorder && this.msg ? '#e43d33' : this.styles.color
+      };`
+    },
+    // input 内容的类和样式处理
+    inputContentClass() {
+      return obj2strClass({
+        'is-input-border': this.inputBorder,
+        'is-input-error-border': this.inputBorder && this.msg,
+        'is-textarea': this.type === 'textarea',
+        'is-disabled': this.disabled,
+        'is-focused': this.focusShow
+      })
+    },
+    inputContentStyle() {
+      const focusColor = this.focusShow
+        ? this.primaryColor
+        : this.styles.borderColor
+      const borderColor =
+        this.inputBorder && this.msg ? '#dd524d' : focusColor
+      return obj2strStyle({
+        'border-color': borderColor || '#e5e5e5',
+        'background-color': this.disabled
+          ? this.styles.disableColor
+          : this.styles.backgroundColor
+      })
+    },
+    // input右侧样式
+    inputStyle() {
+      const paddingRight =
+        this.type === 'password' || this.clearable || this.prefixIcon
+          ? ''
+          : '10px'
+      return obj2strStyle({
+        'padding-right': paddingRight,
+        'padding-left': this.prefixIcon ? '' : '10px'
+      })
+    }
+  },
+  watch: {
+    value(newVal) {
+      // fix by mehaotian 解决 值为null的情况下，input报错的bug
+      if (newVal === null) {
+        this.val = ''
+        return
+      }
+      this.val = newVal
+    },
+    modelValue(newVal) {
+      if (newVal === null) {
+        this.val = ''
+        return
+      }
+      this.val = newVal
+    },
+    focus(newVal) {
+      this.$nextTick(() => {
+        this.focused = this.focus
+        this.focusShow = this.focus
+      })
+    }
+  },
+  created() {
+    this.init()
+    // TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
+    if (this.form && this.formItem) {
+      this.$watch('formItem.errMsg', newVal => {
+        this.localMsg = newVal
+      })
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.focused = this.focus
+      this.focusShow = this.focus
+    })
+  },
+  methods: {
+    /**
+     * 初始化变量值
+     */
+    init() {
+      if (this.value || this.value === 0) {
+        this.val = this.value
+      } else if (
+        this.modelValue ||
+        this.modelValue === 0 ||
+        this.modelValue === ''
+      ) {
+        this.val = this.modelValue
+      } else {
+        // fix by ht 如果初始值为null，则input报错，待框架修复
+        this.val = ''
+      }
+    },
+
+    /**
+     * 点击图标时触发
+     * @param {Object} type
+     */
+    onClickIcon(type) {
+      this.$emit('iconClick', type)
+    },
+
+    /**
+     * 显示隐藏内容，密码框时生效
+     */
+    onEyes() {
+      this.showPassword = !this.showPassword
+      this.$emit('eyes', this.showPassword)
+    },
+
+    /**
+     * 输入时触发
+     * @param {Object} event
+     */
+    onInput(event) {
+      let value = event.detail.value
+      // 判断是否去除空格
+      if (this.trim) {
+        if (typeof this.trim === 'boolean' && this.trim) {
+          value = this.trimStr(value)
+        }
+        if (typeof this.trim === 'string') {
+          value = this.trimStr(value, this.trim)
+        }
+      }
+      if (this.errMsg) this.errMsg = ''
+      this.val = value
+      // TODO 兼容 vue2
+      this.$emit('input', value)
+      // TODO　兼容　vue3
+      this.$emit('update:modelValue', value)
+    },
+
+    /**
+     * 外部调用方法
+     * 获取焦点时触发
+     * @param {Object} event
+     */
+    onFocus() {
+      this.$nextTick(() => {
+        this.focused = true
+      })
+      this.$emit('focus', null)
+    },
+
+    _Focus(event) {
+      this.focusShow = true
+      this.$emit('focus', event)
+    },
+
+    /**
+     * 外部调用方法
+     * 失去焦点时触发
+     * @param {Object} event
+     */
+    onBlur() {
+      this.focused = false
+      this.$emit('blur', null)
+    },
+    _Blur(event) {
+      let value = event.detail.value
+      this.focusShow = false
+      this.$emit('blur', event)
+      // 根据类型返回值，在event中获取的值理论上讲都是string
+      if (this.isEnter === false) {
+        this.$emit('change', this.val)
+      }
+      // 失去焦点时参与表单校验
+      if (this.form && this.formItem) {
+        const { validateTrigger } = this.form
+        if (validateTrigger === 'blur') {
+          this.formItem.onFieldChange()
+        }
+      }
+    },
+
+    /**
+     * 按下键盘的发送键
+     * @param {Object} e
+     */
+    onConfirm(e) {
+      this.$emit('confirm', this.val)
+      this.isEnter = true
+      this.$emit('change', this.val)
+      this.$nextTick(() => {
+        this.isEnter = false
+      })
+    },
+
+    /**
+     * 清理内容
+     * @param {Object} event
+     */
+    onClear(event) {
+      this.val = ''
+      // TODO 兼容 vue2
+      this.$emit('input', '')
+      // TODO 兼容 vue2
+      // TODO　兼容　vue3
+      this.$emit('update:modelValue', '')
+      // 点击叉号触发
+      this.$emit('clear')
+    },
+
+    /**
+     * 键盘高度发生变化的时候触发此事件
+     * 兼容性：微信小程序2.7.0+、App 3.1.0+
+     * @param {Object} event
+     */
+    onkeyboardheightchange(event) {
+      this.$emit('keyboardheightchange', event)
+    },
+
+    /**
+     * 去除空格
+     */
+    trimStr(str, pos = 'both') {
+      if (pos === 'both') {
+        return str.trim()
+      } else if (pos === 'left') {
+        return str.trimLeft()
+      } else if (pos === 'right') {
+        return str.trimRight()
+      } else if (pos === 'start') {
+        return str.trimStart()
+      } else if (pos === 'end') {
+        return str.trimEnd()
+      } else if (pos === 'all') {
+        return str.replace(/\s+/g, '')
+      } else if (pos === 'none') {
+        return str
+      }
+      return str
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	$uni-error: #e43d33;
-	$uni-border-1: #dcdfe6 !default;
-
-	.uni-easyinput {
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		/* #endif */
-		flex: 1;
-		position: relative;
-		text-align: left;
-		color: #333;
-		font-size: 14px;
-	}
-
-	.uni-easyinput__content {
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		display: flex;
-		box-sizing: border-box;
-		// min-height: 36px;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		// 处理border动画刚开始显示黑色的问题
-		border-color: #fff;
-		transition-property: border-color;
-		transition-duration: 0.3s;
-	}
-
-	.uni-easyinput__content-input {
-		/* #ifndef APP-NVUE */
-		width: auto;
-		/* #endif */
-		position: relative;
-		overflow: hidden;
-		flex: 1;
-		line-height: 1;
-		font-size: 14px;
-		height: 35px;
-		// min-height: 36px;
-
-		/*ifdef H5*/
-		& ::-ms-reveal {
-			display: none;
-		}
-
-		& ::-ms-clear {
-			display: none;
-		}
-
-		& ::-o-clear {
-			display: none;
-		}
-
-		/*endif*/
-	}
-
-	.uni-easyinput__placeholder-class {
-		color: #999;
-		font-size: 12px;
-		// font-weight: 200;
-	}
-
-	.is-textarea {
-		align-items: flex-start;
-	}
-
-	.is-textarea-icon {
-		margin-top: 5px;
-	}
-
-	.uni-easyinput__content-textarea {
-		position: relative;
-		overflow: hidden;
-		flex: 1;
-		line-height: 1.5;
-		font-size: 14px;
-		margin: 6px;
-		margin-left: 0;
-		height: 80px;
-		min-height: 80px;
-		/* #ifndef APP-NVUE */
-		min-height: 80px;
-		width: auto;
-		/* #endif */
-	}
-
-	.input-padding {
-		padding-left: 10px;
-	}
-
-	.content-clear-icon {
-		padding: 0 5px;
-	}
-
-	.label-icon {
-		margin-right: 5px;
-		margin-top: -1px;
-	}
-
-	// 显示边框
-	.is-input-border {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		border: 1px solid $uni-border-1;
-		border-radius: 4px;
-		/* #ifdef MP-ALIPAY */
-		overflow: hidden;
-		/* #endif */
-	}
-
-	.uni-error-message {
-		position: absolute;
-		bottom: -17px;
-		left: 0;
-		line-height: 12px;
-		color: $uni-error;
-		font-size: 12px;
-		text-align: left;
-	}
-
-	.uni-error-msg--boeder {
-		position: relative;
-		bottom: 0;
-		line-height: 22px;
-	}
-
-	.is-input-error-border {
-		border-color: $uni-error;
-
-		.uni-easyinput__placeholder-class {
-			color: mix(#fff, $uni-error, 50%);
-		}
-	}
-
-	.uni-easyinput--border {
-		margin-bottom: 0;
-		padding: 10px 15px;
-		// padding-bottom: 0;
-		border-top: 1px #eee solid;
-	}
-
-	.uni-easyinput-error {
-		padding-bottom: 0;
-	}
-
-	.is-first-border {
-		/* #ifndef APP-NVUE */
-		border: none;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		border-width: 0;
-		/* #endif */
-	}
-
-	.is-disabled {
-		background-color: #f7f6f6;
-		color: #d5d5d5;
-
-		.uni-easyinput__placeholder-class {
-			color: #d5d5d5;
-			font-size: 12px;
-		}
-	}
-</style>
\ No newline at end of file
+$uni-error: #e43d33;
+$uni-border-1: #dcdfe6 !default;
+
+.uni-easyinput {
+  /* #ifndef APP-NVUE */
+  width: 100%;
+  /* #endif */
+  flex: 1;
+  position: relative;
+  text-align: left;
+  color: #333;
+  font-size: 14px;
+}
+
+.uni-easyinput__content {
+  flex: 1;
+  /* #ifndef APP-NVUE */
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+  // min-height: 36px;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  // 处理border动画刚开始显示黑色的问题
+  border-color: #fff;
+  transition-property: border-color;
+  transition-duration: 0.3s;
+}
+
+.uni-easyinput__content-input {
+  /* #ifndef APP-NVUE */
+  width: auto;
+  /* #endif */
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1;
+  font-size: 14px;
+  height: 35px;
+  // min-height: 36px;
+
+  /*ifdef H5*/
+  & ::-ms-reveal {
+    display: none;
+  }
+
+  & ::-ms-clear {
+    display: none;
+  }
+
+  & ::-o-clear {
+    display: none;
+  }
+
+  /*endif*/
+}
+
+.uni-easyinput__placeholder-class {
+  color: #999;
+  font-size: 12px;
+  // font-weight: 200;
+}
+
+.is-textarea {
+  align-items: flex-start;
+}
+
+.is-textarea-icon {
+  margin-top: 5px;
+}
+
+.uni-easyinput__content-textarea {
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1.5;
+  font-size: 14px;
+  margin: 6px;
+  margin-left: 0;
+  height: 80px;
+  min-height: 80px;
+  /* #ifndef APP-NVUE */
+  min-height: 80px;
+  width: auto;
+  /* #endif */
+}
+
+.input-padding {
+  padding-left: 10px;
+}
+
+.content-clear-icon {
+  padding: 0 5px;
+}
+
+.label-icon {
+  margin-right: 5px;
+  margin-top: -1px;
+}
+
+// 显示边框
+.is-input-border {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  box-sizing: border-box;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  border: 1px solid $uni-border-1;
+  border-radius: 4px;
+  /* #ifdef MP-ALIPAY */
+  overflow: hidden;
+  /* #endif */
+}
+
+.uni-error-message {
+  position: absolute;
+  bottom: -17px;
+  left: 0;
+  line-height: 12px;
+  color: $uni-error;
+  font-size: 12px;
+  text-align: left;
+}
+
+.uni-error-msg--boeder {
+  position: relative;
+  bottom: 0;
+  line-height: 22px;
+}
+
+.is-input-error-border {
+  border-color: $uni-error;
+
+  .uni-easyinput__placeholder-class {
+    color: mix(#fff, $uni-error, 50%);
+  }
+}
+
+.uni-easyinput--border {
+  margin-bottom: 0;
+  padding: 10px 15px;
+  // padding-bottom: 0;
+  border-top: 1px #eee solid;
+}
+
+.uni-easyinput-error {
+  padding-bottom: 0;
+}
+
+.is-first-border {
+  /* #ifndef APP-NVUE */
+  border: none;
+  /* #endif */
+  /* #ifdef APP-NVUE */
+  border-width: 0;
+  /* #endif */
+}
+
+.is-disabled {
+  background-color: #f7f6f6;
+  color: #d5d5d5;
+
+  .uni-easyinput__placeholder-class {
+    color: #d5d5d5;
+    font-size: 12px;
+  }
+}
+</style>

From 94e812385a32d7fcbd0cf54b4cbaa9f8de4f9432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Sun, 16 Feb 2025 17:17:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/enterprise/index.js                |  11 +
 api/inspections/index.js               |  29 ++-
 components/cs-bottom-wrapper/index.vue |   2 +-
 components/cs-dict-tag/index.vue       |   4 +
 pages.json                             |  11 +-
 pages/enterprise.vue                   |  33 ++-
 static/scss/global.scss                |   1 +
 sub/enterprise/detail.vue              | 323 ++++++++++++++++---------
 sub/task/detail.vue                    |   8 +-
 sub/task/enforce.vue                   | 184 +++++++++++++-
 sub/task/locate.vue                    |  34 ++-
 sub/task/log.vue                       | 113 +++++++++
 sub/task/record.vue                    | 100 ++++++--
 utils/dict.js                          |  13 +-
 utils/ruoyi.js                         |  11 +-
 15 files changed, 697 insertions(+), 180 deletions(-)
 create mode 100644 sub/task/log.vue

diff --git a/api/enterprise/index.js b/api/enterprise/index.js
index d7bb773..66915c6 100644
--- a/api/enterprise/index.js
+++ b/api/enterprise/index.js
@@ -33,4 +33,15 @@ export function getEnterPrise(id) {
 		url: `/system/enterprise/get?id=${id}`,
 		method: 'GET',
 	})
+}
+
+/**
+ * 审核企业
+ * @param {Object} id 
+ */
+export function checkEnterprise(id) {
+	return request({
+		url: `/system/enterprise/audit?id=${id}`,
+		method: 'PUT',
+	})
 }
\ No newline at end of file
diff --git a/api/inspections/index.js b/api/inspections/index.js
index 5139de7..5648bba 100644
--- a/api/inspections/index.js
+++ b/api/inspections/index.js
@@ -12,15 +12,7 @@ export const InspectionsApi = {
 			params
 		})
 	},
-	/**
-	 * 获取详情
-	 */
-	getDetail: (id) => {
-		return request({
-			url: `/system/enterprise-inspections/appGet?id=${id}`,
-			method: 'GET',
-		})
-	},
+
 	/**
 	 * 获取反馈结果
 	 */
@@ -68,5 +60,24 @@ export const InspectionsApi = {
 			method: 'PUT',
 			data
 		})
+	},
+	/**
+	 * 执法反馈
+	 */
+	feeback: data => {
+		return request({
+			url: `/system/inspections-log/inspectionsAudit`,
+			method: 'POST',
+			data
+		})
+	},
+	/**
+	 * 反馈详情
+	 */
+	feedBackDetail: id => {
+		return request({
+			url: `/system/inspections-log/get?id=${id}`,
+			method: 'GET',
+		})
 	}
 }
\ No newline at end of file
diff --git a/components/cs-bottom-wrapper/index.vue b/components/cs-bottom-wrapper/index.vue
index f2a8c39..7461156 100644
--- a/components/cs-bottom-wrapper/index.vue
+++ b/components/cs-bottom-wrapper/index.vue
@@ -21,7 +21,7 @@ export default {
 
 <style lang="scss" scoped>
 .view {
-  position: absolute;
+  position: fixed;
   bottom: 0;
   left: 0;
   width: 100%;
diff --git a/components/cs-dict-tag/index.vue b/components/cs-dict-tag/index.vue
index 0ced52f..519a4f8 100644
--- a/components/cs-dict-tag/index.vue
+++ b/components/cs-dict-tag/index.vue
@@ -88,6 +88,10 @@ export default {
   color: #f8285a;
   background-color: #ffeef3;
 }
+.danger {
+  color: #f8285a;
+  background-color: #ffeef3;
+}
 .info {
   background-color: #f1f1f4;
   color: #99a1b7;
diff --git a/pages.json b/pages.json
index 240f5bd..0ee071b 100644
--- a/pages.json
+++ b/pages.json
@@ -83,7 +83,10 @@
 			}, {
 				"path": "enterprise/detail",
 				"style": {
-					"navigationBarTitleText": "企业详情"
+					"navigationBarTitleText": "企业详情",
+					"componentPlaceholder": {
+						"u-modal": "view"
+					}
 				}
 			}, {
 				"path": "chat/index",
@@ -137,6 +140,12 @@
 						"uni-easyinput": "view"
 					}
 				}
+			},
+			{
+				"path": "task/log",
+				"style": {
+					"navigationBarTitleText": "结果反馈"
+				}
 			}
 		]
 	}],
diff --git a/pages/enterprise.vue b/pages/enterprise.vue
index fe4cb6f..8ec0002 100644
--- a/pages/enterprise.vue
+++ b/pages/enterprise.vue
@@ -78,6 +78,22 @@
               </text>
             </view>
             <view class="tagList">
+              <view class="tag">
+                {{
+                  $dict.echoDicValue(
+                    dictMap.enterprises_type,
+                    enterprise.type
+                  )
+                }}
+              </view>
+              <view class="tag">
+                {{
+                  $dict.echoDicValue(
+                    dictMap.enterprises_area,
+                    enterprise.region
+                  )
+                }}
+              </view>
               <view
                 class="tag"
                 v-for="(tag, index) in enterprise.tagList"
@@ -89,15 +105,10 @@
           </view>
           <view
             class="audit"
-            v-if="enterprise.audit != 2"
-            :style="{
-              color: enterprise.audit == 1 ? '#F6B100' : '#ea000c',
-              backgroundColor: '#FFF8DD'
-            }"
+            v-if="!isAudit"
+            style="color: #f6b100; background-color: #fff8dd"
           >
-            {{
-              $dict.echoDicValue(dictMap.user_audit_type, enterprise.audit)
-            }}
+            待审核
           </view>
         </view>
         <u-loadmore :status="load" marginTop="12" marginBottom="12" />
@@ -177,7 +188,11 @@ export default {
     async getDict() {
       const tags = await getTagData(['qy', ' hy', 'st', 'wr'].join(','))
       const dict = await getDictBatchByType({
-        type: ['user_audit_type'].join(',')
+        type: [
+          'user_audit_type',
+          'enterprises_type',
+          'enterprises_area'
+        ].join(',')
       })
       let tagMap = {}
       tags.data.forEach(t => {
diff --git a/static/scss/global.scss b/static/scss/global.scss
index fec1318..68a9905 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -1,6 +1,7 @@
 page {
   background-color: #f9f9f9;
   position: relative;
+  color: #071437;
 }
 
 button {
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index cfbdbf6..959b646 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -1,115 +1,154 @@
 <template>
-  <cs-page isCustom>
-    <template #header>
-      <view
-        class="wd-flex wd-flex-row wd-flex-center"
-        style="position: relative"
-        @click="goBack"
-      >
-        <view class="icon-box">
-          <u-icon name="arrow-left" size="12"></u-icon>
-        </view>
-        <view class="wd-font-800 wd-text-16">企业档案</view>
+  <scroll-view class="detail-container" scroll-y>
+    <view class="box detail">
+      <view>
+        <text class="wd-font-800 wd-text-16" style="margin-bottom: 4px">
+          {{ detail.enterprisesName }}
+        </text>
       </view>
-    </template>
-    <view class="detail-container">
-      <view class="box detail">
-        <view>
-          <text class="wd-font-800 wd-text-16" style="margin-bottom: 4px">
-            {{ detail.enterprisesName }}
-          </text>
-        </view>
-        <view class="address">
-          <u-icon name="map" size="14" color="#17C653"></u-icon>
-          <text style="text-decoration: underline">
-            {{ detail.address }}
-          </text>
+      <view class="address" @click="goView(detail)">
+        <u-icon name="map" size="14" color="#17C653"></u-icon>
+        <text style="text-decoration: underline">
+          {{ detail.address }}
+        </text>
+      </view>
+      <view class="tagList">
+        <view class="tag">
+          {{ $dict.echoDicValue(dictMap.enterprises_type, detail.type) }}
         </view>
-        <view class="wd-flex" style="align-items: center">
-          <text class="address" style="margin-right: 8px">环保负责人</text>
-          <text style="margin-right: 16px">
-            {{ detail.enterprisesName }}
-          </text>
-          <text class="address" style="margin-right: 8px">联系方式</text>
-          <text style="text-decoration: underline">
-            {{ detail.environmentalContactPhone }}
-          </text>
+        <view class="tag">
+          {{ $dict.echoDicValue(dictMap.enterprises_area, detail.region) }}
         </view>
-        <view class="images-box">
-          <image
-            v-for="(src, index) in detail.files"
-            :key="index"
-            :src="src.url"
-            mode="widthFix"
-            class="image"
-          ></image>
+        <view
+          class="tag"
+          v-for="(tag, index) in detail.tagList"
+          :key="index"
+        >
+          {{ tag }}
         </view>
-        <text class="address">{{ detail.introduction }}</text>
       </view>
+      <view class="wd-flex" style="align-items: center">
+        <text class="address" style="margin-right: 8px">环保负责人</text>
+        <text style="margin-right: 16px">
+          {{ detail.enterprisesName }}
+        </text>
+        <text class="address" style="margin-right: 8px">联系方式</text>
+        <text style="text-decoration: underline">
+          {{ detail.environmentalContactPhone }}
+        </text>
+      </view>
+      <view class="images-box">
+        <image
+          v-for="(src, index) in detail.files"
+          :key="index"
+          :src="src.url"
+          mode="widthFix"
+          class="image"
+        ></image>
+      </view>
+      <text class="address">{{ detail.introduction }}</text>
+      <view class="status">
+        <cs-dict-tag
+          :dict="dictMap.enterprises_status"
+          :value="detail.enterprisesStatus"
+        ></cs-dict-tag>
+      </view>
+    </view>
 
-      <view
-        class="box wd-text-12"
-        v-for="prove in detail.qualificationList"
-        :key="prove.id"
-      >
-        <view class="wd-flex" style="gap: 8px">
-          <image
-            src="@/static/images/enterprise/zz.png"
-            style="width: 90px; height: 70px"
-            mode="widthFix"
-          ></image>
-          <view
-            style="flex: 1; justify-content: space-between"
-            class="wd-flex wd-flex-col"
-          >
-            <view class="wd-flex" style="gap: 8px; align-items: center">
-              <text class="label">资质名称</text>
-              <view>
-                {{
-                  $dict.echoDicValue(
-                    dictMap.enterprise_qua,
-                    prove.qualificationName.toString()
-                  )
-                }}
-              </view>
+    <view
+      class="box wd-text-12 prove"
+      v-for="prove in detail.qualificationList"
+      :key="prove.id"
+    >
+      <view class="wd-flex" style="gap: 8px; position: relative">
+        <image
+          src="@/static/images/enterprise/zz.png"
+          style="width: 90px; height: 70px"
+          mode="widthFix"
+        ></image>
+        <view
+          style="flex: 1; justify-content: space-between"
+          class="wd-flex wd-flex-col"
+        >
+          <view class="wd-flex" style="gap: 8px; align-items: center">
+            <text class="label">资质名称</text>
+            <view>
+              {{
+                $dict.echoDicValue(
+                  dictMap.enterprise_qua,
+                  prove.qualificationName.toString()
+                )
+              }}
             </view>
-            <view class="wd-flex" style="gap: 8px; align-items: center">
-              <text class="label">资质编号</text>
-              <view>
-                {{ prove.enterpriseAuth }}
-              </view>
+          </view>
+          <view class="wd-flex" style="gap: 8px; align-items: center">
+            <text class="label">资质编号</text>
+            <view>
+              {{ prove.enterpriseAuth }}
             </view>
-            <view class="wd-flex" style="gap: 8px; align-items: center">
-              <text class="label">资质时限</text>
-              <view>
-                {{ $util.formatDate(prove.handleDate, 'YYYY/M/D') }}~
-                {{ $util.formatDate(prove.expiryDate, 'YYYY/M/D') }}
-              </view>
+          </view>
+          <view class="wd-flex" style="gap: 8px; align-items: center">
+            <text class="label">资质时限</text>
+            <view>
+              {{ $util.formatDate(prove.handleDate, 'YYYY/M/D') }} ~
+              {{ $util.formatDate(prove.expiryDate, 'YYYY/M/D') }}
             </view>
           </view>
         </view>
       </view>
+      <view class="status">
+        <cs-dict-tag
+          :dict="dictMap.enterprise_qualification_status"
+          :value="prove.status"
+        ></cs-dict-tag>
+      </view>
+    </view>
 
-      <view class="box">
-        <view class="wd-font-800">执法记录</view>
+    <cs-bottom-wrapper>
+      <view class="operation">
+        <view
+          class="btn green"
+          @tap="showModel = true"
+          v-if="!detail.isAudit"
+        >
+          确认审核
+        </view>
+        <view :class="['btn', 'grey']">执法记录</view>
       </view>
+    </cs-bottom-wrapper>
 
-      <view class="button-box">
-        <view class="button">确认审核</view>
+    <u-modal
+      :show="showModel"
+      confirmText="返回"
+      showCancelButton
+      cancel-text="确认"
+      cancel-color="#17C653"
+      confirm-color="#071437"
+      @confirm="showModel = false"
+      @cancel="postApi"
+    >
+      <view class="wd-flex wd-flex-col wd-flex-center" style="gap: 10px">
+        <view style="font-size: 18px; color: #071437; font-weight: 800">
+          是否审核?
+        </view>
+        <view class="">请确保企业信息真实性</view>
       </view>
-    </view>
-  </cs-page>
+    </u-modal>
+  </scroll-view>
 </template>
 
 <script>
-import { getEnterPrise } from '@/api/enterprise/index.js'
+import { getEnterPrise, checkEnterprise } from '@/api/enterprise/index.js'
 import { getDictBatchByType } from '@/api/system/dict.js'
 export default {
   data() {
     return {
       detail: {
-        id: ''
+        id: '',
+        type: '',
+        region: ''
       },
+      showModel: false,
       dictMap: {}
     }
   },
@@ -126,7 +165,12 @@ export default {
      */
     async getDict() {
       const dict = await getDictBatchByType({
-        type: ['enterprises_type', 'enterprise_qua'].join(',')
+        type: [
+          'enterprises_type',
+          'enterprises_area',
+          'enterprises_status',
+          'enterprise_qualification_status'
+        ].join(',')
       })
       this.dictMap = {
         ...dict.data
@@ -140,6 +184,30 @@ export default {
       uni.switchTab({
         url: '/pages/enterprise'
       })
+    },
+    goView(enterprise) {
+      if (!enterprise.gpsLocation) {
+        uni.showToast({
+          icon: 'none',
+          title: '暂无gps信息'
+        })
+        return
+      }
+      const position = enterprise.gpsLocation.split(',')
+      this.$util.viewPosition({
+        lat: position[0],
+        lng: position[1],
+        name: enterprise.enterprisesName
+      })
+    },
+    postApi() {
+      checkEnterprise(this.detail.id).then(() => {
+        uni.showToast({
+          icon: 'none',
+          title: '操作成功'
+        })
+        this.showModel = false
+      })
     }
   }
 }
@@ -165,8 +233,46 @@ export default {
       gap: 5px;
       color: $uni-text-color-grey;
     }
+    .tagList {
+      display: flex;
+      gap: 4px;
+      color: $uni-text-color-grey;
+      display: flex;
+      .tag {
+        font-size: 12px;
+        display: flex;
+        padding: 2px 6px;
+        justify-content: center;
+        align-items: center;
+        border-radius: 2px;
+        background: #f9f9f9;
+      }
+    }
+    .status {
+      position: absolute;
+      right: -19px;
+      top: 6px;
+      transform: rotateZ(45deg) translateX(20px) translateY(-20px);
+      transform-origin: 50% 50%;
+      padding: 4px 20px;
+      font-size: 12px;
+      text-align: center;
+    }
+  }
+  .prove {
+    position: relative;
+    overflow: hidden;
+    .status {
+      position: absolute;
+      right: -19px;
+      top: 6px;
+      transform: rotateZ(45deg) translateX(20px) translateY(-20px);
+      transform-origin: 50% 50%;
+      padding: 4px 20px;
+      font-size: 12px;
+      text-align: center;
+    }
   }
-
   .images-box {
     display: flex;
     flex-flow: row nowrap;
@@ -178,6 +284,7 @@ export default {
     }
   }
 }
+
 .label {
   color: $uni-text-color-grey;
 }
@@ -185,33 +292,27 @@ export default {
   position: absolute;
   left: 0;
 }
-.button-box {
-  width: 100%;
-  bottom: 0;
-  position: fixed;
-  background-color: #fff;
+.operation {
+  padding: 12px;
   display: flex;
-  left: 0;
-  padding: var(--Number-12px, 12px);
-  padding-bottom: 25px;
   align-items: center;
-  gap: var(--Number-12px, 12px);
-  .button {
+  justify-content: center;
+  gap: 12px;
+  .btn {
+    flex: 1;
+    border-radius: 8px;
     display: flex;
-    padding: var(--Number-12px, 12px) 0px;
-    justify-content: center;
+    padding: 12px 0;
     align-items: center;
-    gap: var(--Number-12px, 12px);
-    flex: 1 0 0;
-    background: #17c653;
-    border-radius: var(--Number-4px, 4px);
-    background: var(--LightMode-Success-Success-Light, #eafff1);
-    color: var(--LightMode-Success-Success, #17c653);
-    text-align: center;
-    font-size: 16px;
-    font-style: normal;
-    font-weight: 500;
-    line-height: normal;
+    justify-content: center;
+  }
+  .green {
+    background-color: $cs-color-main;
+    color: #fff;
+  }
+  .grey {
+    background: #f1f1f4;
+    color: #99a1b7;
   }
 }
 </style>
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index a7cc418..340d664 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -137,7 +137,7 @@
             isSelect: isSelect.includes(record.id)
           }"
           @tap.native.stop="select(record.id)"
-          v-if="[3, null].includes(record.inspectionStatus)"
+          v-if="['3', null].includes(record.inspectionStatus)"
         >
           <u-icon name="checkbox-mark" size="16px" color="#fff"></u-icon>
         </view>
@@ -684,6 +684,12 @@ export default {
     box-shadow: none;
     --dropdown-menu-title-font-size: 13px;
     --dropdown-menu-title-text-color: #071437;
+    .van-dropdown-menu__item {
+      flex: 0;
+      .van-dropdown-menu__title {
+        width: 80px;
+      }
+    }
   }
 }
 .isTop {
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index 4bafc16..847b05c 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -32,38 +32,180 @@
         </view>
       </view>
       <u-upload
-        :fileList="fileList1"
-        @afterRead="afterRead"
-        @delete="deletePic"
+        :fileList="form.photo"
+        @afterRead="addPhoto"
+        @delete="delPhoto"
         multiple
-        :maxCount="10"
+        :maxCount="3"
+        width="96px"
+        height="96px"
       ></u-upload>
     </view>
 
+    <view class="box" v-if="form.state == 3">
+      <view
+        class="wd-flex"
+        style="justify-content: space-between; align-items: center"
+        @tap="showCalender"
+      >
+        <view style="font-weight: bold">
+          <text style="color: #f8285a; margin-right: 4px">*</text>
+          截止日期
+        </view>
+        <view class="wd-flex" style="gap: 4px; align-items: center">
+          <text style="color: #f8285a">
+            {{ $util.formatDate(form.date, 'YYYY年M月D日') }}
+          </text>
+          <u-icon name="arrow-right"></u-icon>
+        </view>
+      </view>
+    </view>
+
     <cs-bottom-wrapper>
       <view class="operation">
-        <view :class="['btn', form.state == 2 ? 'green' : 'red']">
+        <view
+          :class="['btn', form.state == 2 ? 'green' : 'red']"
+          @tap="submit"
+        >
           {{ form.state == 2 ? '审批通过' : '整改处理' }}
         </view>
       </view>
     </cs-bottom-wrapper>
+    <uni-calendar
+      ref="calendarRef"
+      :insert="false"
+      @confirm="confirmCalendar"
+    />
+    <u-modal
+      :show="showModel"
+      confirmText="返回"
+      showCancelButton
+      :cancel-text="form.state == 2 ? '通过' : '整改'"
+      :cancel-color="form.state == 2 ? '#17C653' : '#F8285A'"
+      confirm-color="#071437"
+      @confirm="showModel = false"
+      @cancel="postApi"
+    >
+      <view class="wd-flex wd-flex-col wd-flex-center" style="gap: 10px">
+        <view style="font-size: 18px; color: #071437; font-weight: 800">
+          {{ form.state == 2 ? '是否通过？' : '是否整改？' }}
+        </view>
+        <view class="">确认后不可再次修改</view>
+      </view>
+    </u-modal>
   </view>
 </template>
 
 <script>
+import { uploadFile } from '@/api/system/file.js'
+import { InspectionsApi } from '@/api/inspections/index.js'
 export default {
   data() {
     return {
       form: {
         state: undefined,
         inspectionsId: undefined,
-        advice: undefined
-      }
+        advice: undefined,
+        photo: undefined,
+        date: ''
+      },
+      showModel: false
     }
   },
   onLoad(res) {
     this.form.state = res.state
-    this.inspectionsId = res.inspectionsId
+    this.form.inspectionsId = res.inspectionsId
+  },
+  methods: {
+    /**
+     * 选择图片并上传
+     * @param {Object} e
+     */
+    async addPhoto(e) {
+      this.form.photo = e.file.map(p => {
+        return {
+          ...p,
+          status: 'uploading',
+          message: '上传中'
+        }
+      })
+      // 使用promise.all()方法上传到后端做统一接收
+      await Promise.all(
+        this.form.photo.map(async (p, i) => {
+          const res = await uploadFile({ name: `file`, filePath: p.url })
+          return {
+            ...res.data,
+            status: 'success',
+            message: ''
+          }
+        })
+      ).then(res => {
+        this.form.photo = res
+      })
+    },
+    /**
+     * 删除图片
+     * @param {Object} e
+     */
+    delPhoto(e) {
+      this.form.photo.splice(e.index, 1)
+    },
+    confirmCalendar(e) {
+      this.form.date = e.fulldate
+    },
+    showCalender() {
+      this.$refs.calendarRef.open()
+    },
+    postApi() {
+      const data = {
+        ...this.form,
+        status: this.form.state,
+        feedBack: this.form.advice,
+        fileIds: this.form.photo.map(i => i.file_id),
+        correctionTime: new Date(this.form.date).getTime()
+      }
+      InspectionsApi.feeback(data).then(res => {
+        uni.showToast({
+          icon: 'none',
+          title: '操作成功'
+        })
+        uni.navigateBack()
+      })
+    },
+    async submit() {
+      const validate = await this.validate()
+      if (validate.msg) {
+        uni.showToast({
+          icon: 'error',
+          title: validate.msg
+        })
+        return
+      }
+      this.showModel = true
+    },
+    validate() {
+      return new Promise(resolve => {
+        if (!this.form.advice) {
+          resolve({
+            state: false,
+            msg: '请填写处理意见'
+          })
+        }
+        if (!this.form.photo) {
+          resolve({
+            state: false,
+            msg: '请上传证明'
+          })
+        }
+        if (!this.form.date && this.form.state == 3) {
+          resolve({
+            state: false,
+            msg: '请选择日期'
+          })
+        }
+        resolve(true)
+      })
+    }
   }
 }
 </script>
@@ -78,6 +220,7 @@ export default {
     border: 1px solid #f9f9f9;
     border-radius: 12px;
     background-color: #fff;
+    margin-bottom: 12px;
   }
   .operation {
     padding: 12px;
@@ -106,4 +249,29 @@ export default {
 ::v-deep .uni-easyinput__content-textarea {
   min-height: 400rpx;
 }
+::v-deep .u-upload__button {
+  border-radius: 8px !important;
+  border: 1px solid #f1f1f4;
+  background-color: #f9f9f9 !important;
+}
+
+::v-deep .u-upload__wrap {
+  .u-upload__wrap__preview {
+    width: 192rpx;
+    height: 192rpx;
+    border-radius: 8px !important;
+    overflow: visible !important;
+    .u-upload__wrap__preview__image {
+      border-radius: 8px !important;
+    }
+    .u-upload__deletable {
+      border-radius: 100% !important;
+      background-color: #f8285a !important;
+      transform: translateX(50%) translateY(-50%);
+      .u-upload__deletable__icon {
+        position: relative;
+      }
+    }
+  }
+}
 </style>
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index 01aae23..89cf402 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -211,6 +211,17 @@ export default {
     this.timer && clearInterval(this.timer)
     return false
   },
+  watch: {
+    list: {
+      handler: function (val) {
+        if (val.length >= 2) {
+          this.timer && clearInterval(this.timer)
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   methods: {
     async init() {
       const miniCode = await getMiniCode({
@@ -331,18 +342,19 @@ export default {
     },
     echoQueset() {
       const timeout = 3 * 60 * 1000
+      // const timeout = 10 * 1000
       this.timer && clearInterval(this.timer)
-      // this.timer = setInterval(() => {
-      //   this.getLocateList()
-      //   this.time += 5000
-      //   if (this.time > timeout) {
-      //     console.log('timeout')
-      //     clearInterval(this.timer)
-      //     uni.navigateBack({
-      //       delta: 1
-      //     })
-      //   }
-      // }, 5 * 1000)
+      this.timer = setInterval(() => {
+        this.getLocateList()
+        this.time += 5000
+        if (this.time > timeout) {
+          console.log('timeout')
+          clearInterval(this.timer)
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      }, 5 * 1000)
     },
     goNext() {
       InspectionsApi.beginEnforce({
diff --git a/sub/task/log.vue b/sub/task/log.vue
new file mode 100644
index 0000000..0644d0a
--- /dev/null
+++ b/sub/task/log.vue
@@ -0,0 +1,113 @@
+<template>
+  <view class="view-container">
+    <view class="box">
+      <view
+        class="wd-flex"
+        style="justify-content: space-between; align-items: center"
+      >
+        <view style="font-weight: bold">
+          <text style="color: #f8285a; margin-right: 4px">*</text>
+          处理意见
+        </view>
+      </view>
+      <view style="color: #071437">{{ detail.feedBack }}</view>
+      <view
+        class="wd-flex"
+        style="justify-content: space-between; align-items: center"
+      >
+        <view style="font-weight: bold">
+          <text style="color: #f8285a; margin-right: 4px">*</text>
+          上传证明
+        </view>
+      </view>
+      <view class="imageList">
+        <image
+          :src="photo.url"
+          v-for="photo in detail.fileList"
+          :key="photo.id"
+          mode="aspectFill"
+          class="image"
+        ></image>
+      </view>
+    </view>
+
+    <view class="box" v-if="detail.status == 3">
+      <view
+        class="wd-flex"
+        style="justify-content: space-between; align-items: center"
+      >
+        <view style="font-weight: bold">
+          <text style="color: #f8285a; margin-right: 4px">*</text>
+          截止日期
+        </view>
+        <view class="wd-flex" style="gap: 4px; align-items: center">
+          <text style="color: #f8285a">
+            {{ $util.formatDate(detail.correctionTime, 'YYYY年M月D日') }}
+          </text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getDictBatchByType } from '@/api/system/dict.js'
+import { InspectionsApi } from '@/api/inspections/index.js'
+export default {
+  data() {
+    return { detail: {}, dictMap: {} }
+  },
+  async onLoad(res) {
+    this.detail.id = res.id
+    await this.getDict()
+  },
+  onShow() {
+    this.getDetail()
+  },
+  methods: {
+    getDetail() {
+      InspectionsApi.feedBackDetail(this.detail.id).then(res => {
+        this.detail = res.data
+      })
+    },
+    /**
+     * 获取字典
+     */
+    async getDict() {
+      const dict = await getDictBatchByType({
+        type: ['inspections_mark'].join(',')
+      })
+      this.dictMap = {
+        ...dict.data
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.view-container {
+  padding: 12px;
+  display: flex;
+  gap: 12px;
+  flex-direction: column;
+  .box {
+    padding: 12px;
+    border-radius: 8px;
+    background-color: #fff;
+    display: flex;
+    flex-flow: column nowrap;
+    gap: 12px;
+
+    .imageList {
+      display: flex;
+      gap: 12px;
+      .image {
+        width: 192rpx;
+        height: 192rpx;
+        border-radius: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/sub/task/record.vue b/sub/task/record.vue
index a1067db..3c0a555 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -1,10 +1,13 @@
 <template>
-  <view class="view-container">
-    <view class="box detail">
+  <scroll-view class="view-container" scroll-y>
+    <view class="box detail" style="margin-bottom: 12px">
       <text class="wd-font-800 wd-text-16" style="margin-bottom: 4px">
         {{ detail.title }}
       </text>
       <view class="tagList">
+        <view class="tag" v-if="detail.priority">
+          {{ $dict.echoDicValue(dictMap.task_priority, detail.priority) }}
+        </view>
         <view
           v-for="(tag, index) in detail.tagList"
           :key="index"
@@ -83,6 +86,22 @@
             </text>
           </view>
           <view class="tagList">
+            <view class="tag" v-if="detail.enterprise.region">
+              {{
+                $dict.echoDicValue(
+                  dictMap.enterprises_area,
+                  detail.enterprise.region
+                )
+              }}
+            </view>
+            <view class="tag" v-if="detail.enterprise.type">
+              {{
+                $dict.echoDicValue(
+                  dictMap.enterprises_type,
+                  detail.enterprise.type
+                )
+              }}
+            </view>
             <view
               class="tag"
               v-for="(tag, index) in detail.enterprise.tagList"
@@ -102,19 +121,25 @@
     </view>
 
     <view class="box record">
-      <view class="wd-text-14 wd-font-800 wd-pb-12">结果反馈</view>
-      <view class="row" v-for="item in list" :key="item.id">
+      <view class="wd-text-14 wd-font-800">结果反馈</view>
+      <view
+        class="row log"
+        v-for="item in list"
+        :key="item.id"
+        @tap="goLog(item)"
+      >
         <view style="margin-bottom: 12px">
           <text
             :style="{
               marginRight: '10px',
               fontWeight: 'bold',
-              color: setColor(item.status)
+              color: $dict.echoDictOption(
+                dictMap.inspections_mark,
+                item.status
+              ).remark
             }"
           >
-            {{
-              $dict.echoDicValue(dictMap.Inspections_status, item.status)
-            }}
+            {{ $dict.echoDicValue(dictMap.inspections_mark, item.status) }}
           </text>
           <text>
             {{ $util.formatDate(item.createTime, 'YYYY/M/D h:m') }}
@@ -158,7 +183,10 @@
     </view>
 
     <cs-bottom-wrapper>
-      <view class="" v-if="[null, 3].includes(inspectionsState)">
+      <view
+        class="operation"
+        v-if="[null, 0, 3].includes(inspectionsState)"
+      >
         <view class="btn green" @tap="locate">执法签到</view>
       </view>
       <view class="operation" v-else-if="inspectionsState == 1">
@@ -169,7 +197,7 @@
         <view class="btn grey">任务完成</view>
       </view>
     </cs-bottom-wrapper>
-  </view>
+  </scroll-view>
 </template>
 
 <script>
@@ -184,7 +212,12 @@ export default {
       // 任务详情
       detail: {
         id: '',
-        description: ''
+        description: '',
+        priority: '',
+        enterprise: {
+          region: '',
+          type: ''
+        }
       },
       // 是否展开文本
       isShowAllText: false,
@@ -214,7 +247,14 @@ export default {
      */
     async getDict() {
       const dict = await getDictBatchByType({
-        type: ['Inspections_status', 'task_state'].join(',')
+        type: [
+          'Inspections_status',
+          'task_state',
+          'inspections_mark',
+          'enterprises_type',
+          'enterprises_area',
+          'task_priority'
+        ].join(',')
       })
       const dept = await getDeptTree()
       this.dictMap = {
@@ -232,9 +272,8 @@ export default {
       const feedBack = await InspectionsApi.getFeedBack(
         this.queryParams.recordId
       )
-
-      this.list = feedBack.data.list
-      this.inspectionsState = this.list[0].status
+      this.list = feedBack.data
+      this.inspectionsState = this.list[this.list.length - 1].status
     },
     goEnterprise(enterprise) {
       uni.navigateTo({
@@ -257,13 +296,24 @@ export default {
       })
     },
     setColor(status) {
-      if (status == 1) return '#F6B100'
-      if (status == 3) return '#F8285A'
+      const colorMap = {
+        1: '#F6B100',
+        2: '#17C653',
+        3: '#F8285A'
+      }
+      return colorMap[status]
     },
     tackle(state) {
       uni.navigateTo({
         url: `/sub/task/enforce?state=${state}&inspectionsId=${this.queryParams.recordId}`
       })
+    },
+    goLog(record) {
+      if ([2, 3].includes(record.status)) {
+        uni.navigateTo({
+          url: `/sub/task/log?id=${record.id}`
+        })
+      }
     }
   }
 }
@@ -272,15 +322,14 @@ export default {
 <style lang="scss" scoped>
 .view-container {
   height: 100vh;
-  padding: 12px;
-  display: flex;
-  flex-flow: column nowrap;
-  gap: 12px;
+  padding: 0 12px;
   position: relative;
+  padding-bottom: 100px;
   .box {
     background-color: #fff;
     border-radius: $cs-border-radius;
     padding: 16px;
+    margin-top: 12px;
   }
   .row {
     border-radius: $cs-border-radius;
@@ -367,6 +416,9 @@ export default {
   .record {
     position: relative;
     overflow: hidden;
+    display: flex;
+    flex-flow: column nowrap;
+    gap: 12px;
     .emty {
       display: flex;
       flex-direction: column;
@@ -389,7 +441,11 @@ export default {
       transform-origin: 50% 50%;
     }
   }
-
+  .log {
+    &:active {
+      background-color: $cs-color-touch;
+    }
+  }
   .operation {
     padding: 12px;
     display: flex;
diff --git a/utils/dict.js b/utils/dict.js
index d07e46a..04557b1 100644
--- a/utils/dict.js
+++ b/utils/dict.js
@@ -4,11 +4,20 @@
  * @param {Object} value
  */
 export function echoDicValue(dict, value) {
-	if (!dict) return ''
-	if (!value) return ''
+	if (!dict || !value) return ''
 	return dict.find(d => d.value == value).label || ''
 }
 
+/**
+ * 回显字典项
+ * @param {Object} dict
+ * @param {Object} value
+ */
+export function echoDictOption(dict, value) {
+	if (!dict || !value) return ''
+	return dict.find(d => d.value == value) || {}
+}
+
 /**
  * 构造树型结构数据
  *
diff --git a/utils/ruoyi.js b/utils/ruoyi.js
index 95fe768..dd6ca6f 100644
--- a/utils/ruoyi.js
+++ b/utils/ruoyi.js
@@ -83,10 +83,11 @@ export function viewPosition({
 	name = ''
 }) {
 	uni.openLocation({
-		latitude: lat,
-		longitude: lng,
-		address: lat,
-		lng,
-		name
+		latitude: Number(lat),
+		longitude: Number(lng),
+		name,
+		fail: (err) => {
+			console.log(err);
+		}
 	})
 }
\ No newline at end of file