xiaoxin vor 1 Jahr
Ursprung
Commit
980188b3ce

+ 81 - 77
components/c-img/index.vue

@@ -1,93 +1,97 @@
 <template>
 	<view>
 		<view class="img_box">
-				<u-upload @on-list-change="change" upload-text="上传图片" width="139" height="139"
-					:max-size="10 * 1024 * 1024" max-count="6" ref="uUpload" :action="action" :auto-upload="false">
-				</u-upload>
+			<u-upload
+				@on-list-change="change"
+				upload-text="上传图片"
+				width="139"
+				height="139"
+				:max-size="10 * 1024 * 1024"
+				max-count="6"
+				ref="uUpload"
+				:action="action"
+				:auto-upload="false"
+			></u-upload>
 		</view>
 		<u-toast ref="uToast" />
 	</view>
-
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				uploadlist:[],//上传图片数组
-				value: '', //提交图片数组
-				action: 'https://www.jxydyw.cn/patrol-app/v1/file/upload' //没用到的
-			}
-		},
-		created() {},
-		methods: {
-			change() {
-				this.uploadlist = []
-				this.value = ''
-				this.$nextTick(() => {
-					let lists =  this.$refs.uUpload.lists;
-					lists.forEach(val => {
-						this.upload(val.url)
-					})
+export default {
+	data() {
+		return {
+			uploadlist: [], //上传图片数组
+			value: '', //提交图片数组
+			action: 'https://www.jxydyw.cn/patrol-app/v1/file/upload' //没用到的
+		}
+	},
+	created() {},
+	methods: {
+		change() {
+			this.uploadlist = []
+			this.value = ''
+			this.$nextTick(() => {
+				let lists = this.$refs.uUpload.lists
+				lists.forEach((val) => {
+					this.upload(val.url)
 				})
-			},
-			//上传图片
-			upload(item){
-				uni.uploadFile({
-					url: 'https://www.jxydyw.cn/patrol-app/v1/file/upload', //仅为示例,非真实的接口地址
-					filePath: item,
-					name: 'file',
-					success: (uploadFileRes) => {
-						let data= JSON.parse(uploadFileRes.data)
-					    let showUrl=data.data
-						this.uploadlist.push(showUrl)
-						this.$nextTick(() => {
-							let value = '';
-							let len = this.uploadlist.length
-							if( len > 0 ) {
-								if (len > 1) {
-									value = this.uploadlist[0];
-									for (let i = 1; i < len; i++) {
-										value = value + "," + this.uploadlist[i];
-									}
-								} else {
-									value = this.uploadlist[0];
+			})
+		},
+		//上传图片
+		upload(item) {
+			uni.uploadFile({
+				url: 'https://xj.chuanghai-tech.com/patrol-app/v1/file/upload', //仅为示例,非真实的接口地址
+				filePath: item,
+				name: 'file',
+				success: (uploadFileRes) => {
+					let data = JSON.parse(uploadFileRes.data)
+					let showUrl = data.data
+					this.uploadlist.push(showUrl)
+					this.$nextTick(() => {
+						let value = ''
+						let len = this.uploadlist.length
+						if (len > 0) {
+							if (len > 1) {
+								value = this.uploadlist[0]
+								for (let i = 1; i < len; i++) {
+									value = value + ',' + this.uploadlist[i]
 								}
-								this.value = value
-								this.$nextTick(() => {
-									this.$emit('changeImg',this.value)
-								})
+							} else {
+								value = this.uploadlist[0]
 							}
-						})
-					},
-					fail(data) {
-						this.$refs.uToast.show({
-							title: data.message,
-							type: 'warning',
-						})
-					}
-				});
-				
-			},
-			//提交
-			submit() {
-					let newarr = JSON.parse(JSON.stringify(this.value))
-					let item = {
-						id: this.scan_id,
-						value: JSON.stringify(newarr)
-					} //提交数据
-					this.$store.state.user.items.push(item)
-			},
-			reset() {
-				this.$nextTick(() => {
-					let len = this.$refs.uUpload.lists.length
-					this.$refs.uUpload.lists.splice(0,len)
-				})
-			}
+							this.value = value
+							this.$nextTick(() => {
+								this.$emit('changeImg', this.value)
+							})
+						}
+					})
+				},
+				fail(data) {
+					this.$refs.uToast.show({
+						title: data.message,
+						type: 'warning'
+					})
+				}
+			})
+		},
+		//提交
+		submit() {
+			let newarr = JSON.parse(JSON.stringify(this.value))
+			let item = {
+				id: this.scan_id,
+				value: JSON.stringify(newarr)
+			} //提交数据
+			this.$store.state.user.items.push(item)
+		},
+		reset() {
+			this.$nextTick(() => {
+				let len = this.$refs.uUpload.lists.length
+				this.$refs.uUpload.lists.splice(0, len)
+			})
 		}
 	}
+}
 </script>
 
-<style>
-
-</style>
+<style></style>

+ 172 - 179
scan_pages/patrol/patrol.vue

@@ -1,43 +1,45 @@
 <template>
 	<!-- 巡检进度页 -->
-	<view class="m-w partol ">
-		<view class="logo-back">
-		</view>
-		<view class="title-font m-w  u-p-l-30 u-p-r-30">
-			<view class=" m-w u-m-t-10">
-				<view class="u-f-32 f-w-b">{{parobj.name}}</view>
+	<view class="m-w partol">
+		<view class="logo-back"></view>
+		<view class="title-font m-w u-p-l-30 u-p-r-30">
+			<view class="m-w u-m-t-10">
+				<view class="u-f-32 f-w-b">{{ parobj.name }}</view>
 				<view class="u-m-t-16 u-flex">
-					<view class="u-m-r-14">开始时间:{{beginTime.slice(0,-3)}}</view>
+					<view class="u-m-r-14">开始时间:{{ beginTime.slice(0, -3) }}</view>
 					<view class="u-m-r-14">
 						<u-tag :text="status[statusType].text" :color="status[statusType].color" />
 					</view>
 				</view>
-				<view class="u-m-t-16">截至时间:{{endTime.slice(0,-3)}}</view>
-				<view class="u-m-t-20">今日巡查:{{parobj.completed}}/{{parobj.total}}</view>
-				<view class="u-m-t-20 u-flex">
+				<view class="u-m-t-16">截至时间:{{ endTime.slice(0, -3) }}</view>
+				<view class="u-m-t-20" v-if="parobj.total">今日巡查:{{ parobj.completed }}/{{ parobj.total }}</view>
+				<view class="u-m-t-20 u-flex" v-if="parobj.total">
 					<view>完成进度:</view>
-					<view style="width: 255rpx; height: 30rpx;">
-						<u-line-progress :show-percent="false" active-color="#ffffff" :round="true"
-							inactive-color="rgba(255, 255, 255, .3)" :percent="Math.round((parobj.completed/parobj.total)*100)">
-						</u-line-progress>
+					<view style="width: 255rpx; height: 30rpx">
+						<u-line-progress
+							:show-percent="false"
+							active-color="#ffffff"
+							:round="true"
+							inactive-color="rgba(255, 255, 255, .3)"
+							:percent="Math.round((parobj.completed / parobj.total) * 100)"
+						></u-line-progress>
 					</view>
-					<view class="u-m-l-20">{{Math.round((parobj.completed/parobj.total)*100)}}%</view>
+					<view class="u-m-l-20">{{ Math.round((parobj.completed / parobj.total) * 100) }}%</view>
 				</view>
 			</view>
-			<scroll-view :scroll-y="true" class="cell-item u-m-t-40 u-p-l-20 u-p-r-20 ">
-				<view @click="checkdeatal(index,parobj.id)" class="u-flex menu-list" v-for="(index,key) in parobj.rooms"
-					:key="key">
-					<view class="item-left-title">{{key+1}}</view>
+			<scroll-view :scroll-y="true" class="cell-item u-m-t-40 u-p-l-20 u-p-r-20">
+				<view @click="checkdeatal(index, parobj.id)" class="u-flex menu-list" v-for="(index, key) in parobj.rooms" :key="key">
+					<view class="item-left-title">{{ key + 1 }}</view>
 					<block v-if="!index.completed">
 						<u-image :src="imgstatus[3]" width="80" height="80"></u-image>
 					</block>
 					<block v-else>
-						<u-image :src="imgstatus[index.qualified==true?1:2]" width="80" height="80"></u-image>
+						<u-image :src="imgstatus[index.qualified == true ? 1 : 2]" width="80" height="80"></u-image>
 					</block>
 
 					<view class="item-right-font">
-						<view>点编号:{{index.name}}</view>
-						<view class="u-m-t-20">设备名称:{{index.number}}</view>
+						<view>点编号:{{ index.name }}</view>
+						<view class="u-m-t-20">设备名称:{{ index.number }}</view>
 					</view>
 					<view class="uicon">
 						<u-icon name="arrow-right" size="30" color="rgba(153, 153, 153, 1)"></u-icon>
@@ -50,186 +52,177 @@
 </template>
 
 <script>
-	import dayjs from "dayjs";
-	import backtitle from '@/static/img/partrol/back.png'
-	import hege from '@/static/img/hege.png'
-	import bhg from '@/static/img/bhg.png'
-	import wks from '@/static/img/wks.png'
-	import {
-		patrolTaskinfo,
-		pointDetailForMobile,
-		getPointInfoOfScanaa
-	} from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				backtitle,
-				imgstatus: ["", hege, bhg, wks],
-				parobj: "",
-				status: ["", {
-					text: "暂未巡检",
-					color: "#002AC5"
-				}, {
-					text: "进行中",
-					color: "#CF6100"
-				}, {
-					text: "已结束",
-					color: "#009C33"
-				}, {
-					text: "超时漏检",
-					color: "red"
-				},{
-					text: "超时完成",
-					color: "yellow"
-				}],
-				taskId: -1,
-				statusType: ''
-			}
-		},
-		onLoad({
-			taskId,
-			status
-		}) {
-			this.taskId = taskId
-			this.statusType = status
-			this.init(taskId)
-		},
-		methods: {
-			saoma(id) {
-				if(id==1){
-					this.$store.dispatch("user/gettasklist"); 
-					return false
-				}else{
-					return true
+import dayjs from 'dayjs'
+import backtitle from '@/static/img/partrol/back.png'
+import hege from '@/static/img/hege.png'
+import bhg from '@/static/img/bhg.png'
+import wks from '@/static/img/wks.png'
+import { patrolTaskinfo, pointDetailForMobile, getPointInfoOfScanaa } from '@/api/index.js'
+export default {
+	data() {
+		return {
+			backtitle,
+			imgstatus: ['', hege, bhg, wks],
+			parobj: '',
+			status: [
+				'',
+				{
+					text: '暂未巡检',
+					color: '#002AC5'
+				},
+				{
+					text: '进行中',
+					color: '#CF6100'
+				},
+				{
+					text: '已结束',
+					color: '#009C33'
+				},
+				{
+					text: '超时漏检',
+					color: 'red'
+				},
+				{
+					text: '超时完成',
+					color: 'yellow'
 				}
-			},
-			checkdeatal(row, renwuid) {
-				const {
-					completed,
-					id,
-					qualified
-				} = row
-				if (completed) {
-					uni.navigateTo({
-						url: `../patroldetail/patroldetail?roomId=${id}&taskId=${renwuid}`
-					})
-				} else  {
-					uni.navigateTo({
-						url: `../checkdetail/checkdetail?roomId=${id}&taskId=${renwuid}`
-					})
-				}
-			},
-			async init(id) {
-				let {
-					data
-				} = await patrolTaskinfo(id)
-				this.parobj = data
+			],
+			taskId: -1,
+			statusType: ''
+		}
+	},
+	onLoad({ taskId, status }) {
+		this.taskId = taskId
+		this.statusType = status
+		this.init(taskId)
+	},
+	methods: {
+		saoma(id) {
+			if (id == 1) {
+				this.$store.dispatch('user/gettasklist')
+				return false
+			} else {
+				return true
 			}
 		},
-		computed: {
-			beginTime() {
-				return dayjs(this.parobj.beginTime).format("YYYY-MM-DD HH:mm:ss")
-			},
-			endTime() {
-				return dayjs(this.parobj.endTime).format("YYYY-MM-DD HH:mm:ss")
+		checkdeatal(row, renwuid) {
+			const { completed, id, qualified } = row
+			if (completed) {
+				uni.navigateTo({
+					url: `../patroldetail/patroldetail?roomId=${id}&taskId=${renwuid}`
+				})
+			} else {
+				uni.navigateTo({
+					url: `../checkdetail/checkdetail?roomId=${id}&taskId=${renwuid}`
+				})
 			}
+		},
+		async init(id) {
+			let { data } = await patrolTaskinfo(id)
+			this.parobj = data
+		}
+	},
+	computed: {
+		beginTime() {
+			return dayjs(this.parobj.beginTime).format('YYYY-MM-DD HH:mm:ss')
+		},
+		endTime() {
+			return dayjs(this.parobj.endTime).format('YYYY-MM-DD HH:mm:ss')
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.partol {
-		height: 100vh;
-		background: #f0f2f5;
+.partol {
+	height: 100vh;
+	background: #f0f2f5;
+
+	.logo-back {
+		width: 751rpx;
+		height: 350rpx;
+		position: relative;
 
-		.logo-back {
-			width: 751rpx;
+		&::after {
+			content: '';
+			width: 140%;
 			height: 350rpx;
-			position: relative;
+			position: absolute;
+			left: -20%;
+			top: 0;
 
-			&::after {
-				content: '';
-				width: 140%;
-				height: 350rpx;
-				position: absolute;
-				left: -20%;
-				top: 0;
+			border-radius: 0 0 45% 45%;
+			background: #4a8bff !important;
+		}
+	}
 
-				border-radius: 0 0 45% 45%;
-				background: #4a8bff !important;
-			}
+	.title-font {
+		height: 100rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #ffffff;
+		position: absolute;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
 
+		.cell-item {
+			width: 690rpx;
+			height: calc(100vh - 347rpx);
+			background: #ffffff;
+			border-radius: 20rpx 20rpx 0px 0px;
+			padding: 1rpx;
+			box-sizing: border-box;
 		}
 
-		.title-font {
-			height: 100rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-			position: absolute;
-			top: 0;
-			display: flex;
-			flex-direction: column;
+		.menu-list {
+			margin-top: 28rpx;
 			align-items: center;
-
-			.cell-item {
-				width: 690rpx;
-				height: calc(100vh - 347rpx);
-				background: #FFFFFF;
-				border-radius: 20rpx 20rpx 0px 0px;
-				padding: 1rpx;
-				box-sizing: border-box;
+			padding-bottom: 30rpx;
+			border-bottom: 1rpx solid #e6e6e6;
+			.item-left-title {
+				width: 40rpx;
+				height: 40rpx;
+				background: #4a8bff;
+				border-radius: 50%;
+				text-align: center;
+				line-height: 40rpx;
+				margin-right: 40rpx;
 			}
 
-			.menu-list {
-				margin-top: 28rpx;
-				align-items: center;
-				padding-bottom: 30rpx;
-				border-bottom: 1rpx solid #E6E6E6;
-				;
-
-				.item-left-title {
-					width: 40rpx;
-					height: 40rpx;
-					background: #4A8BFF;
-					border-radius: 50%;
-					text-align: center;
-					line-height: 40rpx;
-					margin-right: 40rpx;
-				}
-
-				.item-right-font {
-					margin-left: 21rpx;
-					font-size: 28rpx;
-					font-family: Microsoft YaHei-3970(82674968);
-					font-weight: 400;
-					color: #333333;
-				}
+			.item-right-font {
+				margin-left: 21rpx;
+				font-size: 28rpx;
+				font-family: Microsoft YaHei-3970(82674968);
+				font-weight: 400;
+				color: #333333;
+			}
 
-				.uicon {
-					position: absolute;
-					right: 23rpx;
-				}
+			.uicon {
+				position: absolute;
+				right: 23rpx;
 			}
 		}
+	}
 
-		view {
-			line-height: 1;
-		}
+	view {
+		line-height: 1;
+	}
 
-		.sumit {
-			position: fixed;
-			bottom: 20rpx;
-			width: 600rpx;
-			height: 88rpx;
-			margin-top: 98rpx;
-			color: white;
-			background-color: #2a82e4;
-			border-radius: 5px;
-			font-size: 16px;
-			line-height: 88rpx;
-			text-align: center;
-			left: 75rpx;
-		}
+	.sumit {
+		position: fixed;
+		bottom: 20rpx;
+		width: 600rpx;
+		height: 88rpx;
+		margin-top: 98rpx;
+		color: white;
+		background-color: #2a82e4;
+		border-radius: 5px;
+		font-size: 16px;
+		line-height: 88rpx;
+		text-align: center;
+		left: 75rpx;
 	}
+}
 </style>

+ 159 - 170
task_pages/taskarrment/feebacklist/feebacklist.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="u-flex f-d-c ">
+	<view class="u-flex f-d-c">
 		<scroll-view @scrolltolower="init(id)" :scroll-y="true" class="cs-heig">
 			<view class="comment" v-for="(res, index) in list" :key="res.id">
 				<view class="left">
@@ -10,227 +10,216 @@
 						<view class="name">{{ res.userId }}</view>
 					</view>
 					<view class="content">{{ res.content }}</view>
-					<view class="u-flex">
-						<view class="u-m-r-10" :key="key" v-for="(index,key) in res.imagear">
-							<u-image @click="previewImage(index)" :src="index " width="150" height="150"></u-image>
+					<view class="u-flex" v-if="res.images">
+						<view class="u-m-r-10" :key="key" v-for="(index, key) in res.imagear">
+							<u-image @click="previewImage(index)" :src="index" width="150" height="150"></u-image>
 						</view>
 					</view>
 					<view class="bottom">
-						{{res.createTime}}
+						{{ res.createTime }}
 					</view>
 				</view>
 			</view>
 		</scroll-view>
-		<navigator hover-class="none" :url="`../taskfeeback/taskfeeback?id=${id}&title=${title}`" class="feebtn">我要反馈
-		</navigator>
+		<navigator hover-class="none" :url="`../taskfeeback/taskfeeback?id=${id}&title=${title}`" class="feebtn">我要反馈</navigator>
 		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
-	import {
-		taskfeedback
-	} from '@/api/index.js'
-	import dayjs from "dayjs";
-	export default {
-		data() {
-			return {
-				commentList: [],
-				title: "",
-				id: "",
-				list: [],
-				totalCount: -1,
-				curPage: 1,
-				totalPage: 0 //总页数
-			};
-		},
-		onLoad(option) {
-			this.title = option.title
-			this.id = option.id
-		},
-		onShow() {
-			this.totalCount = -1
-			this.curPage = -1
-			this.$nextTick(() => {
-				this.init(this.id)
+import { taskfeedback } from '@/api/index.js'
+import dayjs from 'dayjs'
+export default {
+	data() {
+		return {
+			commentList: [],
+			title: '',
+			id: '',
+			list: [],
+			totalCount: -1,
+			curPage: 1,
+			totalPage: 0 //总页数
+		}
+	},
+	onLoad(option) {
+		this.title = option.title
+		this.id = option.id
+	},
+	onShow() {
+		this.totalCount = -1
+		this.curPage = -1
+		this.$nextTick(() => {
+			this.init(this.id)
+		})
+	},
+	methods: {
+		// 点击图片事件
+		previewImage(index) {
+			console.log(index)
+			uni.previewImage({
+				current: index, //预览图片的下标
+				urls: [index] //预览图片的地址,必须要数组形式,如果不是数组形式就转换成数组形式就可以
 			})
 		},
-		methods: {
-			// 点击图片事件
-			previewImage(index) {
-				uni.previewImage({
-					current: index, //预览图片的下标
-					urls: [index] //预览图片的地址,必须要数组形式,如果不是数组形式就转换成数组形式就可以
+		// createimg(arr) {
+		// 	arr.map((index) => {
+		// 		index.imagear = index.images.split(",")
+		// 		return index
+		// 	})
+		// },
+
+		// 处理图片数据格式
+		spliteimage(datastring) {
+			let ar = datastring.split(',')
+			return ar
+		},
+		// 获取页面数据
+		async init(id) {
+			if (this.totalCount == -1) {
+				let data = await taskfeedback({
+					taskId: id
+				})
+				let { list, total } = data.data
+				list = list.map((index) => {
+					index.createTime = dayjs(index.createTime).format('YYYY-MM-DD HH:mm:ss')
+					index.imagear = this.spliteimage(index.images)
+					return index
 				})
-			},
-			// createimg(arr) {
-			// 	arr.map((index) => {
-			// 		index.imagear = index.images.split(",")
-			// 		return index
-			// 	})
-			// },
-			
-			// 处理图片数据格式
-			spliteimage(datastring) {
-				let ar = datastring.split(',')
-				return ar
-			},
-			// 获取页面数据
-			async init(id) {
-				if (this.totalCount == -1) {
+				this.list = list //列表
+			} else {
+				if (this.curPage <= this.totalPage) {
 					let data = await taskfeedback({
-						taskId: id,
+						taskId: id
+						// page: this.curPage
 					})
-					let {
-						list,
-						total,
-					} = data.data
+					let list = JSON.parse(JSON.stringify(this.list))
 					list = list.map((index) => {
-						index.createTime = dayjs(index.createTime).format("YYYY-MM-DD HH:mm:ss")
 						index.imagear = this.spliteimage(index.images)
 						return index
 					})
-					this.list = list //列表
+					this.list = [...list, ...data.data.list]
+					this.curPage = this.curPage + 1
 				} else {
-					if (this.curPage <= this.totalPage) {
-						let data = await taskfeedback({
-							taskId: id,
-							// page: this.curPage
-						})
-						let list = JSON.parse(JSON.stringify(this.list))
-						list = list.map((index) => {
-							index.imagear = this.spliteimage(index.images)
-							return index
-						})
-						this.list = [
-							...list, ...data.data.list
-						]
-						this.curPage = this.curPage + 1
-					} else {
-						this.$refs.uToast.show({
-							title: '没有更多了',
-
-						})
-					}
+					this.$refs.uToast.show({
+						title: '没有更多了'
+					})
 				}
-
-			},
-
+			}
 		}
-	};
+	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.comment {
-		display: flex;
-		padding: 30rpx;
-
-		.left {
-			image {
-				width: 64rpx;
-				height: 64rpx;
-				border-radius: 50%;
-				background-color: #f2f2f2;
-			}
+.comment {
+	display: flex;
+	padding: 30rpx;
+
+	.left {
+		image {
+			width: 64rpx;
+			height: 64rpx;
+			border-radius: 50%;
+			background-color: #f2f2f2;
 		}
+	}
 
-		.right {
-			flex: 1;
-			padding-left: 20rpx;
-			font-size: 30rpx;
+	.right {
+		flex: 1;
+		padding-left: 20rpx;
+		font-size: 30rpx;
 
-			.top {
+		.top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 10rpx;
+
+			.name {
+				color: #5677fc;
+			}
+
+			.like {
 				display: flex;
-				justify-content: space-between;
 				align-items: center;
-				margin-bottom: 10rpx;
-
-				.name {
-					color: #5677fc;
-				}
+				color: #9a9a9a;
+				font-size: 26rpx;
 
-				.like {
-					display: flex;
-					align-items: center;
+				.num {
+					margin-right: 4rpx;
 					color: #9a9a9a;
-					font-size: 26rpx;
-
-					.num {
-						margin-right: 4rpx;
-						color: #9a9a9a;
-					}
 				}
+			}
 
-				.highlight {
-					color: #5677fc;
+			.highlight {
+				color: #5677fc;
 
-					.num {
-						color: #5677fc;
-					}
+				.num {
+					color: #5677fc;
 				}
 			}
+		}
 
-			.content {
-				margin-bottom: 10rpx;
-			}
-
-			.reply-box {
-				background-color: rgb(242, 242, 242);
-				border-radius: 12rpx;
-
-				.item {
-					padding: 20rpx;
-					border-bottom: solid 2rpx $u-border-color;
+		.content {
+			margin-bottom: 10rpx;
+		}
 
-					.username {
-						font-size: 24rpx;
-						color: #999999;
-					}
-				}
+		.reply-box {
+			background-color: rgb(242, 242, 242);
+			border-radius: 12rpx;
 
-				.all-reply {
-					padding: 20rpx;
-					display: flex;
-					color: #5677fc;
-					align-items: center;
+			.item {
+				padding: 20rpx;
+				border-bottom: solid 2rpx $u-border-color;
 
-					.more {
-						margin-left: 6rpx;
-					}
+				.username {
+					font-size: 24rpx;
+					color: #999999;
 				}
 			}
 
-			.bottom {
-				margin-top: 20rpx;
+			.all-reply {
+				padding: 20rpx;
 				display: flex;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #999999;
+				color: #5677fc;
+				align-items: center;
 
-				.reply {
-					color: #5677fc;
-					margin-left: 10rpx;
+				.more {
+					margin-left: 6rpx;
 				}
 			}
 		}
-	}
 
-	.feebtn {
-		width: 690rpx;
-		height: 90rpx;
-		background: #4A8BFF;
-		border-radius: 4rpx;
-		font-size: 28rpx;
-		text-align: center;
-		line-height: 90rpx;
-		font-family: Microsoft YaHei-3970(82674968);
-		font-weight: bold;
-		color: #FFFFFF;
-		margin-top: 20rpx;
-	}
-
-	.cs-heig {
-		height: calc(100vh - 140rpx);
+		.bottom {
+			margin-top: 20rpx;
+			display: flex;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #999999;
 
+			.reply {
+				color: #5677fc;
+				margin-left: 10rpx;
+			}
+		}
 	}
+}
+
+.feebtn {
+	width: 690rpx;
+	height: 90rpx;
+	background: #4a8bff;
+	border-radius: 4rpx;
+	font-size: 28rpx;
+	text-align: center;
+	line-height: 90rpx;
+	font-family: Microsoft YaHei-3970(82674968);
+	font-weight: bold;
+	color: #ffffff;
+	margin-top: 20rpx;
+}
+
+.cs-heig {
+	height: calc(100vh - 140rpx);
+}
 </style>

+ 68 - 77
task_pages/taskarrment/taskfeeback/taskfeeback.vue

@@ -1,8 +1,8 @@
 <template>
-	<view class="u-p-30 backconfig  ">
-		<view class="u-f-28 u-p-b-28" style="font-weight: 400;color: #333333">任务标题:{{taskdetail.title}}</view>
+	<view class="u-p-30 backconfig">
+		<view class="u-f-28 u-p-b-28" style="font-weight: 400; color: #333333">任务标题:{{ taskdetail.title }}</view>
 		<view class="text-span">
-			<textarea style="width: 100%;height: 180rpx;" v-model="form.content" placeholder="请输入你反馈的内容"></textarea>
+			<textarea style="width: 100%; height: 180rpx" v-model="form.content" placeholder="请输入你反馈的内容"></textarea>
 			<view class="m-w u-flex">
 				<!-- <block>
 					<view class="u-m-l-6" v-for="(item,index) in uploadlist4" :key="index">
@@ -16,91 +16,82 @@
 			<u-toast ref="uToast" />
 		</view>
 	</view>
-
 </template>
 
 <script>
-	import cImg from '@/components/c-img/index.vue'
-	import {
-		taskfeedbacksave
-	} from "@/api/index.js"
-	export default {
-		components: {
-			cImg,
-		},
-		data() {
-			return {
-				taskdetail: "", //任务详情
-				//反馈提交表单
-				form: {
-					content: "",
-					images:''
-				},
-				
+import cImg from '@/components/c-img/index.vue'
+import { taskfeedbacksave } from '@/api/index.js'
+export default {
+	components: {
+		cImg
+	},
+	data() {
+		return {
+			taskdetail: '', //任务详情
+			//反馈提交表单
+			form: {
+				content: '',
+				images: ''
 			}
+		}
+	},
+	onLoad() {
+		this.taskdetail = this.$store.state.user.taskdetail
+	},
+	methods: {
+		changeImg(img) {
+			this.form.images = img
 		},
-		onLoad() {
-			this.taskdetail = this.$store.state.user.taskdetail
-		},
-		methods: {
-			changeImg(img){
-				this.form.images = img;
-			},
-			// 提交反馈请求
-			submit() {
-				const id = this.taskdetail.id
-				
-				taskfeedbacksave({
-						taskId: id,
-						...this.form
-					})
-					.then(({
-						code,
-						message
-					}) => {
-						this.$refs.uToast.show({
-							title: code == 200 ? "提交成功" : message,
-							type: code == 200 ? 'success' : 'info',
-							callback() {
-								if (code == 200) {
-									uni.navigateBack(1)
-								}
-							}
-						})
-					})
+		// 提交反馈请求
+		submit() {
+			const id = this.taskdetail.id
 
-			}
+			taskfeedbacksave({
+				taskId: id,
+				...this.form
+			}).then(({ code, message }) => {
+				this.$refs.uToast.show({
+					title: code == 200 ? '提交成功' : message,
+					type: code == 200 ? 'success' : 'info',
+					callback() {
+						if (code == 200) {
+							uni.navigateBack(1)
+						}
+					}
+				})
+			})
 		}
 	}
+}
 </script>
 
 <style scoped>
-	.backconfig {
-		height: 100vh;
-		position: relative;
-	}
+.backconfig {
+	height: 100vh;
+	position: relative;
+}
 
-	.text-span {
-		width: 690rpx;
-		height: 400rpx;
-		background: #F2F2F2;
-		border-radius: 10rpx;
-		margin-top: 28rpx;
-		padding: 21rpx;
-	}
+.text-span {
+	width: 690rpx;
+	height: 400rpx;
+	background: #f2f2f2;
+	border-radius: 10rpx;
+	margin-top: 28rpx;
+	padding: 21rpx;
+}
 
-	.task-btn {
-		width: 690rpx;
-		height: 90rpx;
-		background: #4A8BFF;
-		border-radius: 4rpx;
-		position: absolute;
-		bottom: 30rpx;
-		font-size: 28rpx;
-		font-family: Microsoft YaHei-3970(82674968);
-		font-weight: bold;
-		text-align: center;
-		line-height: 90rpx;
-		color: #FFFFFF;
-	}
+.task-btn {
+	width: 690rpx;
+	height: 90rpx;
+	background: #4a8bff;
+	border-radius: 4rpx;
+	position: absolute;
+	bottom: 30rpx;
+	font-size: 28rpx;
+	font-family: Microsoft YaHei-3970(82674968);
+	font-weight: bold;
+	text-align: center;
+	line-height: 90rpx;
+	color: #ffffff;
+}
 </style>