From ba8f17f2e7c850c810e10b6075bd640ecbff06ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 27 Jul 2020 16:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8A=95=E8=AF=89=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/complaint/complaint.js                    | 25 +++++
 pages.json                                    |  4 +-
 pages/complaintDispatch/complaintDispatch.vue | 22 -----
 pages/complaintFinish/complaintFinish.vue     | 95 +++++++++++++++++++
 pages/my/my.vue                               | 12 +++
 5 files changed, 134 insertions(+), 24 deletions(-)
 delete mode 100644 pages/complaintDispatch/complaintDispatch.vue
 create mode 100644 pages/complaintFinish/complaintFinish.vue

diff --git a/api/complaint/complaint.js b/api/complaint/complaint.js
index 90ed400..8a65443 100644
--- a/api/complaint/complaint.js
+++ b/api/complaint/complaint.js
@@ -46,4 +46,29 @@ export function auditComplaint(_that,_data){
 			}
 		})
 	});
+}
+
+
+/**
+ * 查询投诉待办
+ * @param {Object} _that 上下文对象
+ * @param {Object} _data 请求报文
+ */
+export function loadCompaintFinish(_that,_data){
+	return new Promise(function(reslove,reject){
+		_that.context.get({
+			url: url.listAuditHistoryComplaints,
+			data:_data,
+			success: function(res) {
+				reslove(res);
+			},
+			fail: function(e) {
+				wx.showToast({
+					title: "服务器异常了",
+					icon: 'none',
+					duration: 2000
+				})
+			}
+		})
+	});
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3d4ae33..4991e5d 100644
--- a/pages.json
+++ b/pages.json
@@ -208,9 +208,9 @@
 			}
         }
         ,{
-            "path" : "pages/complaintDispatch/complaintDispatch",
+            "path" : "pages/complaintFinish/complaintFinish",
             "style" : {
-				"navigationBarTitleText": "投诉待办单"
+				"navigationBarTitleText": "投诉已办单"
 			}
         }
         ,{
diff --git a/pages/complaintDispatch/complaintDispatch.vue b/pages/complaintDispatch/complaintDispatch.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/complaintDispatch/complaintDispatch.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/pages/complaintFinish/complaintFinish.vue b/pages/complaintFinish/complaintFinish.vue
new file mode 100644
index 0000000..c2679b7
--- /dev/null
+++ b/pages/complaintFinish/complaintFinish.vue
@@ -0,0 +1,95 @@
+<template>
+	<view>
+		<view v-for="(item,index) in orders" :key="index" class="bg-white margin-top margin-right-xs radius margin-left-xs padding">
+			<view class="flex padding-bottom-xs solid-bottom justify-between">
+				<view>{{item.complaintId}}</view>
+				<view class="text-gray">{{item.tel}}</view>
+			</view>
+			<view class="flex margin-top justify-between">
+				<view class="text-gray">投诉类型</view>
+				<view class="text-gray">{{item.typeCdName}}</view>
+			</view>
+			<view class="flex margin-top-xs justify-between">
+				<view class="text-gray">投诉人</view>
+				<view class="text-gray">{{item.complaintName}}</view>
+			</view>
+			<view class="flex margin-top-xs justify-between">
+				<view class="text-gray">房间</view>
+				<view class="text-gray">{{item.floorNum}}栋{{item.unitNum}}单元{{item.roomNum}}室</view>
+			</view>
+			<view class="flex margin-top-xs justify-between">
+				<view class="text-gray">投诉时间</view>
+				<view class="text-gray">{{item.createTime }}</view>
+			</view>
+			<view class="flex margin-top-xs justify-between">
+				<view class="text-gray">投诉内容</view>
+				<view class="text-gray">{{item.context}}</view>
+			</view>
+			<view class="solid-top flex justify-end margin-top padding-top-sm ">
+				<button class="cu-btn sm line-gray" @click="_complaintDetail(item)">详情</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {loadCompaintFinish} from '../../api/complaint/complaint.js'
+	
+	export default {
+		data() {
+			return {
+				state: '10001',
+				orderImg:this.java110Constant.url.baseUrl + 'img/order.png',
+				orders:[]
+			}
+		},
+		onLoad() {
+			this._loadComplaintOrder();
+		},
+		methods: {
+			_loadComplaintOrder:function(){
+				//
+				let _that = this;
+				let _userInfo = this.java110Context.getUserInfo();
+				let storeId = _userInfo.storeId;
+				let _objData = {
+					page: 1,
+					row: 15,
+					storeId: storeId,
+					userId: _userInfo.userId,
+					communityId:_that.java110Context.getCurrentCommunity().communityId
+				};
+				
+				loadCompaintFinish(this,_objData)
+				.then(function(res){
+					if (res.statusCode != 200) {
+						uni.showToast({
+							icon:'none',
+							title:res.data
+						});
+						return;
+					}
+					let _data = res.data;
+					_that.orders = _data.complaints;
+					_that.orders.forEach(function(item){
+						let dateStr = item.createTime;
+						let _startTime = dateStr.replace(/\-/g, "/")
+						let _date=new Date(_startTime);
+						item.createTime = (_date.getMonth()+1) +'-'+_date.getDate();
+					});
+				})
+			},
+			_complaintDetail:function(_item){
+				console.log('_item',_item);
+				uni.setStorageSync("_complaintOrderDetail_"+_item.complaintId, _item);
+				uni.navigateTo({
+					url:"/pages/complaintOrderDetail/complaintOrderDetail?complaintId="+_item.complaintId
+				});		
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 9e200db..caf6e4d 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -30,6 +30,12 @@
 						<text class="text-grey">维修已办</text>
 					</view>
 				</view>
+				<view class="cu-item arrow" @tap="_complaintFinish()">
+					<view class="content">
+						<text class="lg text-gray cuIcon-favor"></text>
+						<text class="text-grey">投诉已办</text>
+					</view>
+				</view>
 				<view class="cu-item arrow" @tap="_changePwd()">
 					<view class="content">
 						<text class="lg text-gray cuIcon-lock"></text>
@@ -124,6 +130,12 @@
 					url:"/pages/repairDispatchFinish/repairDispatchFinish"
 				})
 			},
+			//投诉已办
+			_complaintFinish:function(){
+				this.context.navigateTo({
+					url:'/pages/complaintFinish/complaintFinish'
+				})
+			},
 			//修改密码
 			_changePwd:function(){
 				uni.navigateTo({