Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pages/homepage/homepage.vue

pages.json

@@ -9,7 +9,7 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
 				"enablePullDownRefresh": false,
@@ -414,6 +414,7 @@
 					"enablePullDownRefresh": false
 				}
 			},
+			
 			{
 				"path": "Filinginformation/Filinginformation",
 				"style": {

pages/homepage/homepage.vue

@@ -243,4 +243,4 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
+</style>

pagesC/ServiceAppointment/ServiceAppointment.scss

@@ -74,6 +74,9 @@
 			.servename {
 				padding: 0 50rpx 0 50rpx;
 				font-size: 28rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				   text-overflow: ellipsis;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #868585;
@@ -95,9 +98,12 @@
 			}
 
 			.big {
-				// padding: 35rpx 50rpx 30rpx 50rpx;
-				    padding: 27rpx 84rpx 29rpx 46rpx;
-				font-size: 32rpx;
+				padding: 35rpx 84rpx 24rpx 46rpx;
+				width: 80%;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 500;
 				color: #000000;

pagesC/ServiceAppointment/ServiceAppointment.vue

@@ -38,13 +38,13 @@
 					backgroundColor: '#26A888',
 				},
 				projectName: '',
-				identity: '372431196910127051',
+				identity: '',
 				region: '',
 				listinfo: [],
-				appointlist:[],
-				packageNo:'',
-				formName:'',
-				formNo:'',
+				appointlist: [],
+				packageNo: '',
+				formName: '',
+				formNo: '',
 
 			};
 		},
@@ -59,10 +59,9 @@
 		methods: {
 			getlist() {
 				this.userinfo = uni.getStorageSync('userinfo');
-				// this.identity=this.userinfo.cardNo
+				this.identity=this.userinfo.cardNo
 				this.region = this.userinfo.cityCode;
 				getForm(this.identity, this.region, this.projectName).then(res => {
-					// console.log(res, '555')
 					this.listinfo = res.data
 				})
 			},
@@ -72,13 +71,9 @@
 				})
 			},
 			goapponint(item) {
-
-			console.log(item,'56')
-						uni.navigateTo({
-							// url: '/pagesC/appointmenttime/appointmenttime',
-							url: `/pagesC/appointmenttime/appointmenttime?item=${JSON.stringify(item)}`
-						})
-					// }
+				uni.navigateTo({
+					url: `/pagesC/appointmenttime/appointmenttime?item=${JSON.stringify(item)}`
+				})
 
 
 
@@ -89,4 +84,4 @@
 
 <style lang="scss">
 	@import './ServiceAppointment.scss'
-</style>
+</style>

pagesC/appointmenttime/appointmenttime.vue

@@ -36,19 +36,10 @@
 			this.userinfo = uni.getStorageSync('userinfo');
 			// this.listitem.identity=this.userinfo.cardNo
 			this.appointlist = JSON.parse(e.item)
-			console.log(this.appointlist,'56')
-		
 			this.listitem = this.appointlist
-			
-			// this.single= new Date();
 		},
 		methods: {
-			maskClick(e) {
-				console.log(e, '55')
-			},
-
 			change(e) {
-				// console.log(e)
 				this.listitem.bookingTime = e.result
 			},
 			todayEndTime() {
@@ -59,12 +50,10 @@
 				return todayTime
 			},
 			submit() {
-				
-				
 				if (this.listitem.sourceType == '1') {
 					this.listitem.packageNo = this.appointlist.packageId
 					this.listitem.formNo = this.appointlist.projectId
-					this.listitem.identity='372431196910127051'
+					this.listitem.identity=this.userinfo.cardNo
 					this.listitem.applyStartTime = this.datetimerange[0]
 					this.listitem.applyEndTime = this.datetimerange[1]
 					this.listitem.formName = this.appointlist.projectName
@@ -72,7 +61,6 @@
 					this.$delete(this.listitem, 'projectName')
 					console.log(this.listitem, '55')
 					detail(this.listitem).then(res => {
-						// console.log(res)
 						if (res.code == 200) {
 							this.$refs.uToast.show({
 								title: '预约成功',
@@ -86,7 +74,7 @@
 						}
 					})
 				} else if (this.listitem.sourceType == '2') {
-					this.listitem.identity='372431196910127051'
+					this.listitem.identity=this.userinfo.cardNo
 					this.listitem.applyStartTime = this.datetimerange[0]
 					this.listitem.applyEndTime = this.datetimerange[1]
 					console.log(this.listitem, '555')
@@ -102,9 +90,6 @@
 								type: 'error'
 							})
 						}
-						// console.log(res, '9595')
-						// this.appointlistinfo = res.data
-
 					})
 				}
 			},