Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-electric

App.vue

@@ -38,11 +38,10 @@
 		padding: 0 24rpx;
 		display: flex;
 		align-items: center;
-		position: fixed;
+		position: sticky;
 		left: 0;
 		right: 0;
 		top: 0;
-		
 		z-index: 99999;
 		.back{
 			.img{

pages.json

@@ -220,6 +220,14 @@
         		"navigationBarTitleText" : "",
         		"enablePullDownRefresh" : false
         	}
+        },
+        {
+        	"path" : "pages/mine/feedback",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "",
+        		"enablePullDownRefresh" : false
+        	}
         }
        
     ],

pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -266,7 +266,7 @@
 
 	.main {
 		background-color: #fff;
-		margin-top: 80rpx;
+		
 
 		.item {
 			border-bottom: 1px solid rgba(245, 245, 245, 1);

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -560,7 +560,6 @@
 	.background {
 		background-color: rgba(22, 119, 255, 1);
 		padding-bottom: 100rpx;
-        padding-top: 88rpx;
 
 
 		/deep/.u-border-bottom:after {

pages/mine/cancelAccount.vue

@@ -5,7 +5,7 @@
 			<view class="main">
 				<view class="top">
 					<view class="img-box">
-						<image class="img" src="@/assets/img/vessel.svg" mode=""></image>
+						<image class="img" src="@/assets/img/vessel2.png" mode=""></image>
 					</view>
 				</view>
 				<view class="content">
@@ -62,6 +62,8 @@
 			background-color: #fff;
 			border-radius: 8px;
 			overflow: hidden;
+			font-size: 32rpx;
+			line-height: 46rpx;
 
 			.top {
 				background: linear-gradient(180deg, rgba(255, 100, 106, 1) 0%, rgba(255, 161, 164, 1) 98%);
@@ -75,8 +77,8 @@
 					.img {
 						width: 144rpx;
 						height: 144rpx;
-
-						// box-shadow: 0px 6px 10px 0px rgba(255,0,9,1);
+       
+						 
 
 
 					}

pages/mine/contactService.vue

@@ -39,9 +39,9 @@
 				list: [{
 					name: '软件使用'
 				}, {
-					name: '支付及退款'
+					name: '设备状态及参数'
 				}, {
-					name: '发票相关问题',
+					name: '工单相关',
 					
 				}],
 				itemList: [{
@@ -81,9 +81,13 @@
 			}
 			// 标签
 			.tabs{
-				width: 524rpx;
 				border-top: 1px solid rgba(232,232,232,1);
 				margin-top: 28rpx;
+				width: 522rpx;
+				/deep/.u-tab-item{
+					
+					font-size: 24rpx !important;
+				}
 			}
 			.problems{
 				margin-top: 8rpx;

pages/mine/feedback.vue

@@ -0,0 +1,128 @@
+<template>
+	<view>
+		<u-navbar title="意见反馈" title-color="#101010"></u-navbar>
+		<view class="main">
+			<view class="title">
+				<text>*</text>请选择反馈问题类型：
+			</view>
+			<!-- 类型 -->
+			<view class="classify">
+				<view class="classify-item item-checked">
+					功能异常
+				</view>
+				<view class="classify-item">
+					产品建议
+				</view>
+				<view class="classify-item">
+					安全问题
+				</view>
+				<view class="classify-item">
+					其他问题
+				</view>
+			</view>
+		</view>
+		<!-- 问题描述 -->
+		  <view class="main">
+		  	<view class="title">
+		  		问题描述（必填）
+		  	</view>
+			<view class="textarea">
+				<textarea placeholder="请填写15字以上描述，以便我们更好地为您提供帮助~" ></textarea>
+			</view>
+		  </view>
+		  <!-- 上传照片 -->
+		  <view class="main">
+		  	<view class="title">
+		  		上传图片（最多3张）
+		  	</view>
+			<view class="upload">
+					<u-upload  width="144" height="144" :action="action" :file-list="fileList" max-count="3" ></u-upload>
+			</view>
+		  </view>
+		  <!-- 底部 -->
+		  <view class="bottom">
+		  	<button class="submit">提交反馈</button>
+		  </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main{
+		background-color: #fff;
+		padding: 32rpx;
+		margin-bottom: 24rpx;
+		.title{
+			color: rgb(16,16,16);
+			font-size: 32rpx;
+			font-weight: bold;
+			text{
+				color: rgba(255,0,9,1);
+			}
+		}
+		// 类型
+		.classify{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-top: 24rpx;
+			.classify-item{
+				width: 160rpx;
+				line-height: 66rpx;
+				border-radius: 4px;
+				background-color: rgba(255,255,255,1);
+				color: rgba(16, 16, 16, 1);
+				text-align: center;
+				border: 1px solid rgba(216,223,232,1);
+			}
+			.item-checked{
+				background-color: rgba(22,119,255,1);
+				color: rgba(255,255,255,1);
+			}
+		}
+		.textarea{
+			margin-top: 24rpx;
+			uni-textarea{
+				width: 100%;
+				height: 200rpx;
+			}
+			/deep/.uni-textarea-placeholder{
+				color: #b2b2b2;
+				font-size: 32rpx;
+			}
+		}
+		.upload{
+			margin-top: 24rpx;
+		}
+	}
+	// 底部
+	.bottom{
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+		padding: 20rpx 32rpx;
+		.submit{
+			
+			line-height: 80rpx;
+			border-radius: 4px;
+			background-color: rgba(22,119,255,1);
+			color: rgba(255,255,255,1);
+			font-size: 32rpx;
+		}
+	}
+
+</style>

pages/mine/feedbackRecord.vue

@@ -71,6 +71,7 @@
 			}
 		}
 	}
+	// 底部
 	.bottom{
 		position: fixed;
 		left: 0;

pages/workOrderManagement/workOrderManagement.vue

@@ -6,7 +6,7 @@
 				<image class="img" src="@/assets/img/riLine-road-map-line.svg" mode=""></image>
 			</view>
 			<view class="title">
-				工单管理-
+				工单管理
 			</view>
 			<view class="right" >
 				故障上报
@@ -394,7 +394,7 @@
 
 // 我的工单
 .my-work-order{
-	margin-top: 88rpx;
+	
 	.title{
 		display: flex;
 		align-items: center;

pages/workOrderManagement/workOrderStatistics.vue

@@ -180,8 +180,8 @@
 				justify-content: space-between;
 				margin-top: 24rpx;
 				.state-item{
-					width: 72px;
-					height: 72px;
+					width: 144rpx;
+					height: 144rpx;
 					border-radius: 8px;
 					color: rgba(255,255,255,1);
 					text-align: center;