样式修改

user_ui/news/components/box/list.vue

@@ -18,8 +18,73 @@
 				</view>
 			</view>
 		</block>
-		<!-- 投诉建议 -->
+		<!-- 新版投诉建议  @click="getDetail(ite.suggestionId)"-->
 		<block v-if="type=='complaint'">
+			<!-- @click.stop="getDetail(ite.repairId)" -->
+			<view class="bxlists" v-for="(ite,idx) in datainfo" :key="ite.suggestionId">
+				<view class="bxtop">
+					<swiper v-if="ite.images"  class="swiper" circular :indicator-color="incolorh" :indicator-active-color="activecolorh" :indicator-dots="indicatorDotsh" :autoplay="autoplay">
+						<!-- datainfo.images -->
+						<swiper-item v-for="(aite,aidx) in ite.images" :key="aidx">
+							<image :src="baseUrl+aite" @click="getPreviewImage(ite.images,aidx)"></image>
+						</swiper-item>
+					</swiper>
+					<view class="toptit mb10">{{ite.content}}</view>
+					<view class="walist"><view class="tit">提交时间</view>：{{ite.createTime}}</view>
+					<view class="btns">
+						<view class="btn btna" v-if="checkPermi(['wuYe:suggestion:remove'])"  @click.stop="getDelFn(ite.suggestionId)">删除</view>
+						<!-- <view class="btn btnb" v-if="checkPermi(['wuYe:suggestion:edit'])&&ite.status==1">回复</view> -->
+					</view>
+				</view>
+				<view class="bxsteps">
+					<uni-collapse ref="collapse" v-model="value">
+						<uni-collapse-item title-border="none">
+								<template v-slot:title>
+									<view class="chtop flexc" >
+										<view class="line"></view>
+										<view>交流记录</view>
+										<view class="flex1"></view>
+									</view>
+								</template>
+								<view class="hfstep">
+									<view class="hfslist flex" v-if="ite.status==2">
+										<view class="limg flexccc">
+											<image :src="cira" class="imga"></image>
+										</view>
+										<view class="flex1">
+											<view class="hfstit co01">已回复 <text>回复时间</text></view>
+											<view class="hfstxt">{{ite.replyContent}}</view>
+											<!-- 附件 -->
+											<block v-if="ite.suggestionFjList">
+												<view class="fjlists"  v-for="(fite,fidx) in ite.suggestionFjList" :key='fidx'>
+													<view class="flext" @click="getDownloader(fite.url)">
+														<view class="imgl"><image :src="filico" ></image></view>
+														<view class="tit">{{fite.name}}</view>
+													</view>
+												</view>
+											</block>
+											<!-- <view class="hfimgs flexcw">
+												<image :src="cira"></image>
+											</view> -->
+										</view>
+									</view>
+									<view class="hfslist flex" >
+										<view class="limg flexccc">
+											<image :src="cira" class="imga" v-if="ite.status==1"></image>
+											<image :src="cirb" class="imgb" v-else></image>
+										</view>
+										<view class="flex1">
+											<view class="hfstit">已提交 <text>{{ite.createTime}}</text></view>
+											<view class="hfstxt">您的投诉建议已提交，请耐心等待</view>
+										</view>
+									</view>
+								</view>
+							</uni-collapse-item>
+						</uni-collapse>
+				</view>
+			</view>
+		</block>
+		<block v-if="type=='bylcomplaint'">
 			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.suggestionId)"
 				:data-idx="idx"
 				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
@@ -63,17 +128,22 @@
 			<view class="pllist flex" v-for="(ite,idx) in datainfo" :key="`yj${idx}`">
 				<image :src="ite.commentUser.avatar?baseUrl+ite.commentUser.avatar:head" class="head"></image>
 				<view class="flex1 overh">
-					<view class="flexat mb14 ">
+					<view class="flexat mb9 ">
 						<view class="plname flex1 over">{{ite.commentUser.nickName}}</view>
 						<view class="plrbtn flexc flex0" @click="getDzFn(ite.id,'2',ite.content,idx)">
 							<image :src="nicond" v-if="ite.isLike=='Y'"></image>
-							<image :src="niconb" class="imga" v-else></image>
-							<view>点赞</view>
+							<image :src="niconb" class="imga" v-else></image>2
+							<!-- <view>点赞</view> -->
 						</view>
 						<view class="plrbtn flexc flex0" @touchend.prevent="getHfFn('yjhf',ite,ite.id)">
+							<!-- <image :src="niconf" class="imgd"></image> -->
+							<image :src="niconb" class="imge"></image>2
+							<!-- <view>回复</view> -->
+						</view>
+						<!-- <view class="plrbtn flexc flex0" @touchend.prevent="getHfFn('yjhf',ite,ite.id)">
 							<image :src="nicone" class="imgb"></image>
 							<view>回复</view>
-						</view>
+						</view> -->
 						<view class="plrbtn flexc flex0" @click="getDelFn(ite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&ite.isMyself=='Y'">
 							<image :src="del" class="imgc"></image>
 							<view class="cof4">删除</view>
@@ -81,10 +151,31 @@
 					</view>
 					<view class="infotxt">
 						<rich-text v-if="ite.content" :nodes="analyzeEmoji(ite.content)"></rich-text>
-					<view class="infotime">{{ite.createDate}}</view></view>
-				
+						<view class="flexc mt10">
+							<view class="inforeply"  @touchend.prevent="getHfFn('yjhf',ite,ite.id)">回复</view>
+							<view class="infotime">5分钟前</view></view>
+						</view>
+						
+					<!-- <view class="infotime">{{ite.createDate}}</view></view> -->
+					<!-- 新二级回复 -->
+					<view class="pllista" v-if="ite.childrenList&&ite.childrenList.length">
+						<view class="flexat ptb3" v-for="(aite,aidx) in ite.childrenList" :key="`ej${aidx}`">
+							<view class="plnamea flexcw flex1" @touchend.prevent="getHfFn('ejhf',aite,ite.id)">
+								<view class="over namea">{{aite.commentUser.nickName}}</view>
+								<block v-if="aite.toRoot=='Y'">
+									<view class="plrep">回复</view>
+									<view class="over namea">{{aite.targetUser.nickName}}</view>
+								</block>：
+								<rich-text v-if="aite.content" :nodes="analyzeEmoji(aite.content)"></rich-text>
+							</view>
+							<view class="plrbtn flexc flex0" @click="getDelFn(aite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&aite.isMyself=='Y'">
+								<image :src="del" class="imgc"></image>
+								<view class="cof4">删除</view>
+							</view>
+						</view>
+					</view>
 					<!-- 二级回复 -->
-					<view class="pllist flex" v-for="(aite,aidx) in ite.childrenList" :key="`ej${aidx}`">
+					<!-- <view class="pllist flex" v-for="(aite,aidx) in ite.childrenList" :key="`ej${aidx}`">
 						<image :src="aite.commentUser.avatar?baseUrl+aite.commentUser.avatar:head" class="head"></image>
 						<view class="flex1 overh">
 							<view class="flexat mb14 ">
@@ -94,8 +185,6 @@
 										<image :src="rimg" class="rimg"></image>
 										<view class="over">{{aite.targetUser.nickName}}</view>
 									</block>
-									<!-- 判断是不是二级回复的回复 加字段-->
-									<!-- <block v-if="ite."></block> -->
 								</view>
 								<view class="plrbtn flexc flex0" @click="getDzFn(aite.id,'2',aite.content,idx,aidx,'ejdz')">
 									<image :src="nicond" v-if="aite.isLike=='Y'"></image>
@@ -115,14 +204,14 @@
 								<rich-text v-if="aite.content" :nodes="analyzeEmoji(aite.content)"></rich-text>
 								<view class="infotime">{{aite.createDate}}</view></view>
 						</view>
-					</view>
+					</view> -->
 					<view class="flexc" v-if="ite.childrenListCount>0">
-						<view class="zhanbox flexc" v-if="ite.reachflag" @click="getZhanFn(ite,idx)">
+						<view class="zhanbox flexc" v-if="ite.reachflag" @click.stop="getZhanFn(ite,idx)">
 							<block v-if="ite.childrenList&&ite.childrenList.length">展开更多</block>
 							<block v-else>展开{{ite.childrenListCount}}条回复</block>
 							<image :src="upimg" class="zhan"></image>
 						</view>
-						<view v-if="ite.childrenList&&ite.childrenList.length" class="zhanbox flexc ml10" @click="getShouFn(idx)">收起<image :src="upimg"></view>
+						<view v-if="ite.childrenList&&ite.childrenList.length" class="zhanbox flexc ml10" @click.stop="getShouFn(idx)">收起<image :src="upimg"></view>
 					</view>
 					<!-- <view style="height: 16rpx;" v-else></view>	 -->
 				</view>
@@ -183,12 +272,21 @@
 				niconc:require('@/news/static/news/niconc.png'),
 				nicond:require('@/news/static/news/nicond.png'),
 				nicone:require('@/news/static/news/nicone.png'),
+				niconf:require('@/news/static/news/niconf.png'),
+				cira:require('@/news/static/complaint/cira.png'),
+				cirb:require('@/news/static/complaint/cirb.png'),
 				del:require('@/news/static/news/delb.png'),
 				head:require('@/news/static/news/head.png'),
 				upimg:require('@/mine/static/house/up.png'),
+				filico:require('@/news/static/complaint/filico.png'),
 				baseUrl:config.baseUrl,
 				delBtnWidth:66,//左滑默认宽度
 				userId:this.$store.state.user.userId,
+				value:[],
+				autoplay:false,
+				incolorh:'#C0C3C3',
+				activecolorh:'#FFFFFF',
+				indicatorDotsh: true,
 				OwOlist: [
 				        //表情包和表情路径
 				        { title: "微笑", url: "weixiao.gif" },
@@ -353,6 +451,56 @@
 					}
 				});
 			},
+			getPreviewImage(arr,idx){
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {
+						
+					},
+					fail: function(err) {
+						
+					}
+				});
+			},
+			getDownloader(e){
+				uni.showLoading({
+					title: '加载中'
+				});
+				var url=this.baseUrl+e;
+				let index1 = e.lastIndexOf("."); // 得到一个索引值
+				let index2 = e.length;
+				let type = e.substring(index1, index2);
+				if ((type.indexOf('jpg') > -1 || type.indexOf('jpeg') > -1 || type.indexOf('png') > -1)) {
+					uni.previewImage({
+						current: 0,
+						urls: [url],
+						// background: '#ffffff'
+					});
+					uni.hideLoading();
+				} else {
+				uni.downloadFile({
+					url: url,//文件的下载路径
+					success(result) {
+							uni.hideLoading()
+						var filePath = result.tempFilePath;
+						   uni.openDocument({
+						     filePath: filePath,
+						     showMenu: true,
+						     success: function (res) {
+						       // console.log('打开文档成功');
+						     }
+						   });
+					},
+					fail(res) {uni.hideLoading()}
+				})
+				}
+			},
 			//开始触摸滑动
 			drawStart(e) {
 				// console.log("开始触发");
@@ -439,32 +587,95 @@
 	}
 }
 //评论
-.pllist{padding-top: 20rpx;margin-bottom: 16rpx;border-bottom: 2rpx solid #DADADA;
+.pllist{margin-bottom: 40rpx;
+	&:last-child{margin-bottom: 0;}
 	.head{width: 40rpx;height: 40rpx;margin-right: 18rpx;flex: 0 0 auto;border-radius: 50%;}
-	.plname{font-weight: bold;font-size: 30rpx;color: #161616;
-		view{max-width: 50%;}
+	.plname{font-size: 30rpx;color: #161616;font-weight: bold;
 	}
 	.plrbtn{margin-left: 36rpx;
 		image{width: 26rpx;height: 24rpx;margin-right: 16rpx;
 			&.imga{width: 26rpx;height: 26rpx;}
 			&.imgb{width: 26rpx;height: 22rpx;}
+			&.imgd{width: 26rpx;height: 24rpx;margin-right: 10rpx;}
+			&.imge{width: 26rpx;height: 26rpx;transform: rotate(180deg);}
 		}
 		view{font-weight: bold;font-size: 24rpx;color: #314081;}
 	}
-	.infotxt{font-weight: 500;font-size: 26rpx;color: #161616;line-height: 40rpx;margin-bottom: 30rpx;
+	// margin-bottom: 30rpx;
+	.infotxt{font-weight: 500;font-size: 26rpx;color: #161616;line-height: 40rpx;
 		&:before {content: "";float: right;width: 0;height: calc(100% - 16px);background: red;}
-		.infotime{font-weight: 500;font-size: 24rpx;color: #666666; float: right;clear: both;}	
+		.inforeply{min-width: 86rpx;height: 42rpx;background: #F8F8F8;border-radius: 20rpx; margin-right: 22rpx;font-weight: 500;
+font-size: 24rpx;text-align: center;padding: 0 8rpx;box-sizing: border-box;line-height: 42rpx;display: inline-block;
+color: #161616;}
+		.infotime{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		// .infotime{font-weight: 500;font-size: 24rpx;color: #666666; float: right;clear: both;}	
 		image{width: 44rpx;height: 44rpx;}
 	}
-	.pllist{
-		padding-top: 0;border-bottom: none;margin-bottom: 0;
+	.pllista{background: #F8F8F8;padding:12rpx 24rpx;border-radius: 10rpx;margin-top: 40rpx;
+		.plnamea{font-size: 26rpx;color: #161616;line-height: 40rpx;
+			.namea{font-weight: bold;max-width: 160rpx;}
+			.plrep{color: #AAAAAA;margin: 0 10rpx;}
+		}
 	}
-	.zhanbox{font-weight: 500;font-size: 24rpx;color: #AAAAAA;padding: 16rpx 0;
+	.zhanbox{font-weight: 500;font-size: 24rpx;color: #AAAAAA;padding-bottom: 16rpx;margin-top: 16rpx;
 		image{width: 20rpx;height: 12rpx;margin-left: 18rpx;transition: all 0.3s;
 			&.zhan{transform: rotate(-180deg);}
 		}
 	}
 }
+//投诉建议
+.bxlists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;position: relative;
+	.bxtop{padding: 30rpx 24rpx;position: relative;
+		.swiper{width: 100%;height: 280rpx;border-radius: 20rpx;box-sizing: border-box;margin-bottom: 28rpx;overflow: hidden;
+			image{width: 100%;height: 100%;}
+		}
+		.toptit{font-weight: bold;font-size: 28rpx;color: #161616;}
+		.walist{display: flex;font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 16rpx;
+			.tit{min-width: 100rpx;text-align-last: justify}
+		}
+		.btns{position: absolute;right: 26rpx;bottom: 20rpx;}
+		.btn{min-width: 120rpx;height: 54rpx;border-radius: 26rpx;font-weight: 500;font-size: 26rpx;text-align: center;line-height: 54rpx;padding: 0 10rpx;box-sizing: border-box; margin-bottom: 14rpx;
+			&.btna{border: 2rpx solid #FF6969;background: #FFF8F8;color: #FF6969;}
+			&.btnb{background: #0256FD;color: #FFFFFF;}
+		}
+	}
+	.bxsteps{border-top: 2rpx solid #E6E6E6;padding: 30rpx 0;
+		.chtop{padding-right: 48rpx;
+				.line{width: 14rpx;height: 48rpx;background: #0256FD;border-radius:0 12rpx 12rpx 0;margin-right: 18rpx;}
+				view{font-weight: bold;font-size: 28rpx;color: #272727;}
+				.upimg{width: 22rpx;height: 14rpx;flex: 0 0 auto;margin-left: 12rpx;transform: rotate(180deg);transition: all 0.3s;}
+		}
+		.fjlists {display: flex;align-items: flex-start;justify-content: space-between;margin-bottom: 20rpx;
+				&:last-child{margin-bottom: 0;}
+				.imgl{width: 40rpx;height: 40rpx;display: flex;align-items: center;flex: 0 0 auto;
+					image{width: 26rpx;height: 24rpx;}
+				}
+				.tit{font-size: 26rpx;color: #222327;font-weight: 500;margin-top: 4rpx;word-break: break-all;}
+			}
+		.hfstep{padding: 0 32rpx 30rpx 36rpx;margin-top: 24rpx;
+			.hfslist{padding-bottom: 20rpx;position: relative;
+				&:first-child{
+					.hfstit{color: #0156FE;}
+				}
+				&::before{content: '';position: absolute;left: 14rpx;top:14rpx;height: 100%;width: 2rpx;background: #E6E6E6;}
+				.limg{width: 30rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;margin-top:3rpx;
+					.imga{width: 30rpx;height: 30rpx;}
+					.imgb{width: 18rpx;height: 18rpx;}
+				}
+				.hfstit{font-weight: bold;font-size: 30rpx;color: #666666;line-height: 36rpx;margin-bottom: 20rpx;
+					text{font-size: 26rpx;margin-left: 12rpx;}
+				}
+				.hfstxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 20rpx;}
+				.hfimgs{padding-top: 2rpx;
+					image{width: 84rpx;height: 84rpx;border-radius: 20rpx;margin-right: 40rpx;margin-bottom: 10rpx;}
+				}
+			}
+		}
+	}
+}
+.bxlists /deep/ .uni-swiper-dots-horizontal{left: 26rpx;transform: translate(0);}
+.bxlists /deep/ .uni-swiper-dot{width: 10rpx;height: 10rpx;}
+.bxlists /deep/ .uni-swiper-dot-active{width: 24rpx;height: 10rpx;}
 // 无数据
 .nodata{display: flex;flex-direction: column;align-items: center;
 	image{width: 440rpx;height: 440rpx;}

user_ui/news/pages/complaint/index.vue

@@ -32,8 +32,8 @@
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
-				tabval:'-1',
-				tablist:[{tit:'全部',val:-1}],
+				tabval:'',
+				tablist:[],
 				tsjyList:[],
 				userId:this.$store.state.user.userId,
 			}
@@ -67,6 +67,7 @@
 								val: v.dictValue
 							}
 							this.tablist.push(obj)
+							this.tabval=res.data[0].dictValue
 							return {
 								dictLabel: v.dictLabel,
 								dictValue: v.dictValue
@@ -141,9 +142,14 @@
 							}
 						}
 						var newArr=JSON.parse(JSON.stringify(res.rows))
-						newArr.forEach(ite=>{
-							ite.right=0;
-						})
+						if(newArr&&newArr.length){
+							newArr.forEach(ite=>{
+								if(ite.images){
+									ite.images=ite.images.split(',')
+								}
+								// ite.right=0;
+							})
+						}
 						if (this.pageNum == 1) {
 							this.list = newArr;
 						} else {

user_ui/news/pages/news/detail.vue

@@ -11,35 +11,48 @@
 						<rich-text :nodes="communityContent" style="word-break: break-all;"></rich-text>
 					</view>
 				</view>
-				<view class="ndbfox flexc">
-					<view class="flexcc ndbflist" @touchend.prevent="getHfFna">
-						<image :src="nicona"></image>
-						<view>{{datainfo.userComment}}</view>
-					</view>
-					<view class="flexcc ndbflist" @click.stop="getDzFn('1')">
-						<image :src="nicond" v-if="datainfo.isLike=='Y'"></image>
-						<image :src="niconb" v-else></image>
-						<view>{{datainfo.userLikes}}</view>
-					</view>
-					<view class="flexcc ndbflist" @click.stop="getScFn('1')">
-						<image :src="starb" v-if="datainfo.isStar=='Y'"></image>
-						<image :src="niconc" v-else></image>
-						<view>{{datainfo.userStars}}</view>
-					</view>
-				</view>
 			</view>
 			<view class="ndbox mb12 plr15">
-				<view class="pltit">评论<text>({{commenttotal}})</text></view>
+				<view class="flext mb15">
+					<view class="pltit flex0">评论<text>({{commenttotal}})</text></view>
+					<view class="flex1"></view>
+					<view class="pltitnum"><text>17</text>赞<text class="line">|</text><text>21</text> 分享</view>
+
+				</view>
+				
 				<!-- 评论列表 -->
 				<box-list :datainfo="commentlist" type="comment" @getZhanFn="getZhanFn" @getShouFn="getShouFn" @getDzFn="getplDzFn" @getHfFn="getplHfFn" @getDelFn="getDelFn"></box-list>
 			</view>
 			<!-- 评论 -->
-			<view class="pjfbtn" @click.stop="btns" :style="{bottom: `${bottom}px`}">
-				<view class="flexc pjfbox">
-					<textarea :placeholder="placeholder"  :adjust-position="adjustpos" :focus="isfocus" v-model="text" :auto-height="autoHeight" :cursor-spacing='curspac' fixed="true" :show-confirm-bar="confirmBar" ></textarea>
-					<view class="btns" @click.stop="getPinLunFn">发送</view>
+				<view class="pjfbtn" @click.stop="btns" :style="{bottom: `${bottom}px`}">
+					<view class="mb10 plr20">
+						<view class="flexc pjfbox ">
+							<textarea :placeholder="placeholder"  :adjust-position="adjustpos" :focus="isfocus" v-model="text" :auto-height="autoHeight" :cursor-spacing='curspac' fixed="true" :show-confirm-bar="confirmBar" ></textarea>
+							<view class="btns" @click.stop="getPinLunFn">发送</view>
+						</view>
+					</view>
+					
+					<view class="ndbfox flexc">
+						<view class="flexcc ndbflist" @touchend.prevent="getHfFna">
+							<image :src="share"></image>
+							<view>0</view>
+						</view>
+						<view class="flexcc ndbflist" @touchend.prevent="getHfFna">
+							<image :src="nicona"></image>
+							<view>{{datainfo.userComment}}</view>
+						</view>
+						<view class="flexcc ndbflist" @click.stop="getDzFn('1')">
+							<image :src="nicond" v-if="datainfo.isLike=='Y'"></image>
+							<image :src="niconb" v-else></image>
+							<view>{{datainfo.userLikes}}</view>
+						</view>
+						<view class="flexcc ndbflist" @click.stop="getScFn('1')">
+							<image :src="starb" v-if="datainfo.isStar=='Y'"></image>
+							<image :src="niconc" v-else></image>
+							<view>{{datainfo.userStars}}</view>
+						</view>
+					</view>
 				</view>
-			</view>
 		</block>	
 		<loading></loading>	
 	</view>
@@ -61,6 +74,8 @@
 				niconc:require('@/news/static/news/niconc.png'),
 				nicond:require('@/news/static/news/nicond.png'),
 				nicone:require('@/news/static/news/nicone.png'),
+				niconf:require('@/news/static/news/niconf.png'),
+				share:require('@/news/static/news/share.png'),
 				starb:require('@/news/static/news/starb.png'),
 				head:require('@/news/static/news/head.png'),
 				upimg:require('@/mine/static/house/up.png'),
@@ -391,24 +406,23 @@
 <style lang="scss" scoped>
 .ndetail{
 	min-height: 100vh;padding: 20rpx 18rpx 100rpx;
-	.ndbox{background: #FFFFFF;border-radius: 20rpx;padding-top: 30rpx;
+	.ndbox{background: #FFFFFF;border-radius: 20rpx;padding-top: 30rpx;padding-bottom: 20rpx;
 		.tit{font-weight: bold;font-size: 32rpx;color: #272727;margin-bottom: 14rpx;text-align: center;padding-top: 4rpx;}
 		.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;text-align: center;}
-		.rich{border-top: 2rpx solid #E5E5E5;padding: 28rpx 0;}	
-		.ndbfox{
-			border-top: 2rpx solid #E5E5E5;
-			.ndbflist{width: 33.3%;min-height: 78rpx;padding: 16rpx 0;box-sizing: border-box;
-				image{width: 26rpx;height: 26rpx;margin-right: 26rpx;}
-				view{font-weight: 500;font-size: 26rpx;color: #666666;}
-			}
-		}
+		.rich{padding: 28rpx 0;}	
+		//border-top: 2rpx solid #E5E5E5;
+	}
+}
+.pltitnum{font-weight: 500;font-size: 26rpx;color: #AAAAAA;
+	text{display: inline-block;margin-right:10rpx;
+		&.line{margin: 0 12rpx;}
 	}
 }
 .pltit{font-weight: bold;font-size: 30rpx;color: #272727;
 	text{margin-left: 24rpx;font-size: 24rpx;color: #666666;}
 }
-
-.pjfbtn{background: #FFFFFF;position: fixed;bottom: 0;left: 0;right: 0;padding:20rpx 48rpx;box-shadow: 0px 0px 18rpx 0px rgba(159,159,159,0.47);
+.plr20{padding: 0 40rpx;}
+.pjfbtn{background: #FFFFFF;position: fixed;bottom: 0;left: 0;right: 0;padding:26rpx 0rpx 20rpx;box-shadow: 0px 0px 18rpx 0px rgba(159,159,159,0.47);
 	.pjfbox{background: #E6E6E6;border-radius: 10rpx;
 		textarea{flex: 1;font-size: 26rpx;color: #222327;min-height: 100rpx;font-size: 26rpx;margin: 0;background: #E6E6E6;box-sizing: border-box;padding: 10rpx 0 10rpx 36rpx;border-radius:10rpx 0 0 10rpx;}
 		.btns{nt-weight: bold;padding: 0 34rpx;height: 60rpx;line-height: 60rpx;flex: 0 0 auto;
@@ -417,7 +431,13 @@
 	
 color: #314081;}
 }
-
+.ndbfox{
+	// border-top: 2rpx solid #E5E5E5;
+		.ndbflist{width: 33.3%;padding: 20rpx 0;box-sizing: border-box;
+		image{width: 26rpx;height: 26rpx;margin-right: 26rpx;}
+		view{font-weight: 500;font-size: 26rpx;color: #666666;}
+	}
+}
 // .pjfbtn /deep/ .uni-easyinput{flex: 1;font-size: 26rpx;color: #222327;}
 // .pjfbtn /deep/ .uni-textarea-textarea{min-height: 40rpx;font-size: 26rpx;margin: 0;background: #E6E6E6;box-sizing: border-box;padding: 10rpx 0 10rpx 36rpx;border-radius:10rpx 0 0 10rpx;}
 </style>

user_ui/static/style.css

@@ -63,6 +63,7 @@ font-weight: bold;font-size: 26rpx;color: #0256FD;background: #FFFFFF;border-rad
 .plr5{padding: 0 10rpx;}
 .plr12{padding: 0 24rpx;}
 .plr15{padding: 0 30rpx;}
+.ptb3{padding: 6rpx 0;}
 .pr35{padding-right: 70rpx;}
 .pt10{padding-top: 20rpx;}
 .pt16{padding-top: 32rpx;}

user_ui/work/components/box/list.vue

@@ -5,14 +5,11 @@
 		<!-- 报修管理 步骤条-->
 		<block v-if="type=='warranty'">
 			<!-- @click.stop="getDetail(ite.repairId)" -->
-			<view class="bxlists" v-for="(ite,idx) in datainfo" :key="idx" >
+			<view class="bxlists" v-for="(ite,idx) in datainfo" :key="ite.repairId" >
 				<view class="bxtop">
-					<swiper  class="swiper" circular :indicator-color="incolorh" :indicator-active-color="activecolorh" :indicator-dots="indicatorDotsh" :autoplay="autoplay">
-						<swiper-item>
-							<image :src="noiconpimg"></image>
-						</swiper-item>
-						<swiper-item>
-							<image :src="noiconpimg"></image>
+					<swiper v-if="ite.repairImages"  class="swiper" circular :indicator-color="incolorh" :indicator-active-color="activecolorh" :indicator-dots="indicatorDotsh" :autoplay="autoplay">
+						<swiper-item v-for="(aite,aidx) in ite.repairImages" :key="aidx">
+							<image :src="baseUrl+aite" @click="getPreviewImage(ite.repairImages,aidx)"></image>
 						</swiper-item>
 					</swiper>
 					<view class="toptit mb10">{{ite.repairDetails}}</view>
@@ -263,7 +260,7 @@
 					}
 				});
 			},
-			getPreview(idx,arr) {
+			getPreviewImage(arr,idx){
 				var newArr=[];
 				arr.forEach(ite=>{
 					var ds=this.baseUrl+ite
@@ -272,8 +269,12 @@
 				uni.previewImage({
 					urls: newArr,
 					current:idx,
-					success: function(data) {},
-					fail: function(err) {}
+					success: function(data) {
+						
+					},
+					fail: function(err) {
+						
+					}
 				});
 			},
 			//开始触摸滑动
@@ -408,7 +409,7 @@ font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
 //报修步骤条
 .bxlists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;position: relative;
 	.bxtop{padding: 30rpx 24rpx;position: relative;
-		.swiper{width: 100%;height: 280rpx;border: 2rpx solid red;border-radius: 20rpx;box-sizing: border-box;margin-bottom: 28rpx;
+		.swiper{width: 100%;height: 280rpx;border-radius: 20rpx;box-sizing: border-box;margin-bottom: 28rpx;overflow: hidden;
 			image{width: 100%;height: 100%;}
 		}
 		.toptit{font-weight: bold;font-size: 28rpx;color: #161616;}

user_ui/work/pages/service/warranty.vue

@@ -178,9 +178,13 @@
 							}
 						}
 						var newArr=JSON.parse(JSON.stringify(res.rows))
-						// newArr.forEach(ite=>{
-						// 	ite.right=0;
-						// })
+						if(newArr&&newArr.length){
+							newArr.forEach(ite=>{
+								if(ite.repairImages){
+									ite.repairImages=ite.repairImages.split(',')
+								}
+							})
+						}
 						if (this.pageNum == 1) {
 							this.list = newArr;
 						} else {