Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -228,6 +228,9 @@ body {
 	.mui-content .vongi-photo {
 		height: 240px
 	}
+	.mui-content .vongi-meform-pho .mui-table-view-cell a{
+		padding:3px 5px
+	}
 }
 
 .bindfyy-btn button {
@@ -1959,11 +1962,13 @@ h3 {
 	margin-bottom: 10px
 }
 .vongi-meform-pho .mui-table-view-radio .mui-table-view-cell>a:not(.mui-btn){
-	margin:0;
-	
+	margin:0;	
+}
+.vongi-meform-pho .mui-table-view-radio {
+	flex-wrap: wrap;
 }
 .vongi-meform-pho .mui-table-view-cell a{
-	padding: 6px 15px;
+	padding: 3px 10px;
     border-radius: 20px;
     border: 1px solid #A9A9A9;
     color:#888888
@@ -1974,7 +1979,8 @@ h3 {
 	background:0
 }
 .mui-table-view-radio .mui-table-view-cell{
-	padding:0
+	padding:0;
+	margin: 5px 0;
 }
 .vongi-xzyljg .mui-table-view-cell:after {
 	left: 0

src/projects/business/views/Master/Property/Complaint/Form.vue

@@ -3,14 +3,62 @@
 		<common ref="common" @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content">
+		<div class="mui-content margin60">
+			<div class="vongi-yqsb flew-items">
+				<i class="iconfont icon-shouye2 color4fc5f7"></i>赵刚  1-1-2201
+			</div>
+			<div class="vongi-meform-pho">
+				<h5>投诉类型</h5>
+				<ul class="mui-table-view mui-table-view-radio flew-sp">
+					<li class="mui-table-view-cell mui-selected">
+						<a >
+							管理服务
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a >
+							工程投诉
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a >
+							收费投诉
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a >
+							其他投诉
+						</a>
+					</li>
+				</ul>
+			</div>
+			<div class="vongi-meform-pho">
+				<h5>投诉内容</h5>
+				<div class="mui-input-row">
+					<textarea id="textarea" rows="5" placeholder="请描述您投诉的内容"></textarea>
+				</div>
+			</div>
+			<div class="vongi-wordcard vongi-meform-pho">
+				<h5>上传图片<span class="color999">（选填,提供问题截图）</span></h5>
+				<div class="fyy-upphoto">
+					<div class="mui-col-xs-3 fyy-upphoto-close">
+						<img src="~$project/assets/img/zhaop.jpg" />
+						<a class="mui-icon mui-icon-closeempty" href=""></a>
+					</div>
+					<div class="mui-col-xs-3">
+						<a><span class="mui-icon mui-icon-camera"></span></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- <div class="mui-content">
 			<div class="mui-content-padded">
 				<h5>请输入您的投诉内容或者建议</h5>
 				<div class="mui-input-row">
 					<textarea v-model="subForm.content" rows="5" placeholder="请输入"></textarea>
 				</div>
 			</div>
-		</div>
+		</div> -->
 		<div class="fyy-footer">
 			<div class="bindfyy-btn"><button @click="submit" type="submit" class="mui-btn mui-btn-primary ">提交</button></div>
 		</div>
@@ -76,12 +124,7 @@
 
 			},
 		},
-		mounted() {
-			//document.body.style.backgroundColor = '#fff';
-		},
-		destroyed() {
-			//document.body.style.backgroundColor = '';
-		},
+		
 		computed: {
 			...mapGetters({
 				openId: 'wx_openid',

src/projects/business/views/Master/Property/Complaint/Info.vue

@@ -4,6 +4,70 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>投诉人</label>
+						<span>1111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>房号</label>
+						<span>1-1-2201</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded  vongi-qingjiadt vongi-hdsq">
+				<form class="mui-input-group vongi-wybx">
+					<div class="mui-input-row padd10">
+						<label>投诉内容</label>
+						<span class="vongi-span vongi-meform-pho">您的投诉建议服务，已上]处理完毕。如未能解决您的问题，可与我们物业联系。</span>
+						<span class="vongi-span vongi-wordcard vongi-meform-pho">
+							<div class="fyy-upphoto flew">
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop.jpg" />
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop.jpg" />
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop.jpg" />
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop.jpg" />
+								</div>
+							</div>
+						</span>
+					</div>
+					
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>投诉时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+					<div class="mui-input-row">
+						<label>投诉状态</label>
+						<span class="color4fc5f7">处理中</span>
+					</div>
+					<div class="mui-input-row">
+						<label>投诉内容</label>
+						<span class="vongi-span">您的投诉建议服务，已上]处理完毕。如未能解决您的问题，可与我们物业联系。</span>
+						
+					</div>
+					<div class="mui-input-row">
+						<label>回复时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+					<div class="mui-input-row">
+						<label>关闭时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+				</form>
+			</div>
+		</div>
+		<!-- <div class="mui-content">
 			<div class="mui-content-padded fyy-detail">
 				<h4 style="margin:30px 0 15px" v-text="detail.createTime"></h4>
 				<p v-text="detail.content"></p>
@@ -13,7 +77,7 @@
 				<p v-text="detail.returnContent"></p>
 				<div class="mui-h6 mui-pull-right" v-text="detail.returnTime"></div>
 			</div>
-		</div>
+		</div> -->
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -65,14 +129,7 @@
 
 			},
 		},
-		mounted() {
-			//获取详情
-			this.getDetail();
-			document.body.style.backgroundColor = '#fff';
-		},
-		destroyed() {
-			document.body.style.backgroundColor = '';
-		},
+		
 		computed: {
 			...mapGetters({
 				openId: 'wx_openid',

src/projects/business/views/Master/Property/Complaint/List.vue

@@ -3,7 +3,154 @@
 		<common ref="common" @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content">
+		<div class="mui-content vongi-hdsq margin60">
+			<div id="slider" class="mui-slider mui-fullscreen ">
+				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+					<div class="mui-scroll">
+						<a class="mui-control-item mui-active" href="#item1mobile">
+							<span class="fyy-badge">待处理<span class="mui-badge">5</span></span>
+						</a>
+						<a class="mui-control-item" href="#item2mobile">
+							已处理
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group vongi-wybx">
+					<div id="item1mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">空调外挂机隔间下水堵住了，导致墙面漏…</div>
+												<div class="mui-col-xs-3 color4fc5f7">处理中</div>
+											</div>
+											<div class="fyy-upphoto flew">
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<span class="mui-badge">5</span>
+											</div>
+											<p class="flew-items flew-sp">
+												管理投诉
+												<span class='mui-ellipsis'>10-21 19:00</span>
+											</p>
+										</a>
+										<div class="vongi-btn-x">
+											<button type="button" class="mui-btn mui-btn-primary">撤销</button>
+										</div>
+									</li>
+									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">空调外挂机隔间下水堵住了，导致墙面漏…</div>
+												<div class="mui-col-xs-3 color4fc5f7">处理中</div>
+											</div>
+											<div class="fyy-upphoto flew">
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<span class="mui-badge">5</span>
+											</div>
+											<p class="flew-items flew-sp">
+												管理投诉
+												<span class='mui-ellipsis'>10-21 19:00</span>
+											</p>
+										</a>
+										<div class="vongi-btn-x">
+											<button type="button" class="mui-btn mui-btn-primary">撤销</button>
+										</div>
+									</li>
+								</ul>
+								<!--空状态-->
+								<!--<div class="vongi-kong">
+									<img src="~$project/assets/img/no.png" />
+									<p>暂无报修记录</p>
+								</div>-->
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">空调外挂机隔间下水堵住了，导致墙面漏…</div>
+												<div class="mui-col-xs-3 color55f868">已解决</div>
+											</div>
+											<div class="fyy-upphoto flew">
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<span class="mui-badge">5</span>
+											</div>
+											<p class="flew-items flew-sp">
+												管理投诉
+												<span class='mui-ellipsis'>10-21 19:00</span>
+											</p>
+										</a>
+										<div class="vongi-btn-x">
+											<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">查看回复</button>
+										</div>
+									</li>
+									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">空调外挂机隔间下水堵住了，导致墙面漏…</div>
+												<div class="mui-col-xs-3 color999">已关闭</div>
+											</div>
+											<div class="fyy-upphoto flew">
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<div class="mui-col-xs-3">
+													<img src="~$project/assets/img/zhaop.jpg" />
+												</div>
+												<span class="mui-badge">5</span>
+											</div>
+											<p class="flew-items flew-sp">
+												收费投诉
+												<span class='mui-ellipsis'>10-21 19:00</span>
+											</p>
+										</a>
+										<div class="vongi-btn-x">
+											<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">查看回复</button>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+
+		</div>
+		<!-- <div class="mui-content">
 			<div class="mui-content-padded">
 				<ul class="mui-table-view openfyy-list">
 					<li v-for="(item,index) in recordList" class="mui-table-view-cell mui-media">
@@ -16,7 +163,7 @@
 					</li>
 				</ul>
 			</div>
-		</div>
+		</div> -->
 
 		<div class="fyy-footer">
 			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="goToForm()">填写投诉建议</button></div>

src/projects/business/views/Master/Property/Repair/Form.vue

@@ -3,7 +3,7 @@
 		<common ref="common" @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content">
+		<div class="mui-content margin60">
 			<div class="vongi-yqsb flew-items">
 				<i class="iconfont icon-shouye2 color4fc5f7"></i> {{person_popedom.personName}} {{person_popedom.structureName}}
 			</div>

src/projects/business/views/Master/Property/Repair/List.vue

@@ -3,7 +3,7 @@
 		<common ref="common" @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content vongi-hdsq">
+		<div class="mui-content vongi-hdsq margin60">
 			<div id="slider" class="mui-slider mui-fullscreen ">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">