diff --git a/pagesA/detail/detail.vue b/pagesA/detail/detail.vue
index d3d694d..93c7f0a 100644
--- a/pagesA/detail/detail.vue
+++ b/pagesA/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="pad-zy20 fon24">
+		<view class="pad-zy20 fon24" v-if="loading">
 			<view class="disjbac fon30 bbot pad-sx30">
 				<view class="colb bold flexs">序号</view>
 				<view class="col9">{{detail.coding}}</view>
@@ -30,6 +30,7 @@
 				<view class="disac width100 fe" v-if="detail.images">
 					<image :src="item" v-for="(item,index) in detail.images.split(',')" :key="index" @tap="preVedio(index,0)" mode="aspectFill" class="width155 radius30 mar-z20"></image>
 				</view>
+				<view class="disac col9 width100 fe" v-else>未上传</view>
 			</view>
 			<view class="dis fon30 bbot pad-sx30">
 				<view class="colb bold flexs">视频</view>
@@ -38,22 +39,24 @@
 						<video :src="item" :controls="false" class="width155 radius30"></video>
 					</view>
 				</view>
+				<view class="disac col9 width100 fe" v-else>未上传</view>
 			</view>
 			<view class="disjb bbot pad-sx20">
 				<view class="fon30 colb bold flexs">描述文案</view>
-				<view class="col9 tright line-h40" style="max-width: 60%;">我想问下我们村的机耕道什么 时候可以弄好？当前以及严重 影响我们出行了！</view>
+				<view class="col9 tright line-h40" style="max-width: 60%;">{{detail.description}}</view>
 			</view>
 			<view class="dis fon30 bbot pad-sx30">
 				<view class="colb bold flexs">语音</view>
-				<view class="disac col9 width100 fe">
-					<view @tap="playVoice" class="col9 radius30 disjcac fc posir mar-y20 item-box width155" style="border: 1px solid #d9d9d9;">
+				<view class="disac col9 width100 fe" v-if="detail.audios" @tap="playVoice">
+					<view class="col9 radius30 disjcac fc posir mar-y20 item-box width155" style="border: 1px solid #d9d9d9;">
 						<image src="/static/icon/icon-audio.png" mode="aspectFill" style="width: 74rpx;height: 85rpx;"></image>
 					</view>
 				</view>
+				<view class="disac col9 width100 fe" v-else>未上传</view>
 			</view>
 			<view class="disjbac fon30 bbot pad-sx30">
 				<view class="colb bold flexs">类别</view>
-				<view class="col9">测试村</view>
+				<view class="col9">{{detail.type_text}}</view>
 			</view>
 			<view class="" style="margin: 0 -20rpx;" v-if="ifManager!=2">
 				<view class="disac pad-zy20 pad-x30 pad-s40">
@@ -100,10 +103,10 @@
 	export default {
 		data() {
 			return {
-				audioText:'',
 				detail:'', //工单详情
 				ifManager:0, // 是否是管理员
 				id:0, //工单id
+				loading:false
 			}
 		},
 		onLoad(op) {
@@ -135,16 +138,17 @@
 			},
 			// 播放录音
 			playVoice() {
-				if (this.audioText) {
-					innerAudioContext.src = this.audioText;
-					innerAudioContext.play();
-				}
+				innerAudioContext.src = this.detail.audios;
+				innerAudioContext.play();
 			},
 			// 查询工单详情
 			getDetailEv(id){
+				this.$toolAll.tools.showToast('加载中...');
 				this.$requst.post('user/opinionInfo',{id}).then(res => {
 					if(res.code==0){
 						this.detail = res.data.opinion;
+						this.loading = true;
+						uni.hideToast();
 					} else {
 						this.$toolAll.tools.showToast(res.msg);
 					}
diff --git a/pagesA/feedback/feedback.vue b/pagesA/feedback/feedback.vue
index 8ee4f58..a96052a 100644
--- a/pagesA/feedback/feedback.vue
+++ b/pagesA/feedback/feedback.vue
@@ -1,29 +1,31 @@
 <template>
-	<view class="pad-x50">
+	<view class="pad-x50" v-if="loading">
 		<view class="disac pad-zy20 pad-sx30">
 			<view class="cricle-box"></view>
 			<view class="fon36 mar-z20">处理反馈</view>
 		</view>
 		<view class="pad-zy20 fon30" style="background-color: #f5f5f5;">
-			<view class="col9 pad-sx30">2021年7月19日 21：30</view>
+			<view class="col9 pad-sx30">{{detail.opinion_operate.operated_at || ''}}</view>
 			<view class="disjb bbot pad-x30">
 				<view class="">调查情况</view>
-				<view class="col9 tright" style="max-width: 50%;">情况属实，马上安排人员 处理，请耐心等待</view>
+				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_desc || ''}}</view>
 			</view>
 			<view class="disjb bbot pad-sx30">
 				<view class="">处理结果</view>
-				<view class="col9 tright" style="max-width: 50%;">情况属实，马上安排人员 处理，请耐心等待</view>
+				<view class="col9 tright" style="max-width: 50%;">{{detail.opinion_operate.operate_result || ''}}</view>
 			</view>
 		</view>
 		<view class="disac pad-zy20 pad-sx30">
 			<view class="cricle-box"></view>
 			<view class="fon36 mar-z20">历史反馈</view>
 		</view>
-		<view class="pad-zy20 fon30" style="background-color: #f5f5f5;">
-			<view class="col9 pad-sx30">2021年7月19日 21：30</view>
-			<view class="disjb pad-x30">
-				<view class="">反馈意见（不满意）</view>
-				<view class="col9 tright" style="max-width: 50%;">等了好久了还没有上门 处理！</view>
+		<view class="" v-if="detail.opinion_feedback">
+			<view class="pad-zy20 fon30" style="background-color: #f5f5f5;" v-for="(item,index) in detail.opinion_feedback.list" :key="index">
+				<view class="col9 pad-sx30">{{item.create_time}}</view>
+				<view class="disjb pad-x30">
+					<view class="">反馈意见（{{['不满意','满意'][item.satisfied]}}）</view>
+					<view class="col9 tright" style="max-width: 50%;">{{item.content}}</view>
+				</view>
 			</view>
 		</view>
 		<view class="disac pad-zy20 pad-sx30">
@@ -42,7 +44,7 @@
 			</view>
 		</view>
 		<view class="disjcac mar-s70">
-			<view class="disjcac enter-btn" style="margin: 0;" @tap="submitEv">提交反馈</view>
+			<view class="disjcac enter-btn" style="margin: 0;" @tap="setFeedBack">提交反馈</view>
 		</view>
 	</view>
 </template>
@@ -53,10 +55,33 @@
 			return {
 				typeList:['满意','不满意'],
 				typeText:'满意',
-				content:''
+				content:'',
+				id:'',
+				detail:'',
+				loading:false,
+				flag:true
 			}
 		},
+		onLoad(op) {
+			this.id = op.id;
+			this.getDetailEv(op.id);
+		},
 		methods: {
+			// 查询工单详情
+			getDetailEv(id){
+				this.$toolAll.tools.showToast('加载中...');
+				this.$requst.post('user/feedback-load',{id}).then(res => {
+					if(res.code==0){
+						this.detail = res.data;
+						this.loading = true;
+						uni.hideToast();
+					} else {
+						this.$toolAll.tools.showToast(res.msg);
+					}
+					uni.hideLoading();
+					this.isLoading = true;
+				})
+			},
 			// 选择类型
 			chooseType(){
 				uni.showActionSheet({
@@ -68,15 +93,28 @@
 			},
 			// 反馈提交
 			setFeedBack(){
-				let params = {
-					satisfied:this.typeText=="满意"?1:0,
-					content:this.content
-				}
-				this.$requst.post('user/create-feedback').then(res=>{
-					if(res.code==0){
-						
+				if(this.flag){
+					this.flag = false;
+					let params = {
+						satisfied:this.typeText=="满意"?1:0,
+						content:this.content,
+						id:this.id
 					}
-				})
+					this.$toolAll.tools.showToast('正在提交...');
+					this.$requst.post('user/create-feedback',params).then(res=>{
+						if(res.code==0){
+							this.$toolAll.tools.showToast('提交成功');
+							setTimeout(()=>{
+								uni.navigateBack({
+									delta:1
+								})
+							},500)
+						}
+						this.flag = true;
+					})
+				} else {
+					this.$toolAll.tools.showToast('请勿重复提交');
+				}
 			}
 		}
 	}