tianhui il y a 3 ans
Parent
commit
f37d679b72
5 fichiers modifiés avec 26 ajouts et 22 suppressions
  1. 2 2
      common/config.js
  2. 19 15
      pages/getin/getin.vue
  3. 2 2
      pages/getout/getout.scss
  4. 1 1
      pages/getout/getout.vue
  5. 2 2
      pages/parking/parking.scss

+ 2 - 2
common/config.js

@@ -1,5 +1,5 @@
-// const host = 'http://wx.hw.hongweisoft.com/parking';//本地
-const host = 'http://parking.pdzhtc.com';//正式
+const host = 'http://wx.hw.hongweisoft.com/parking';//本地
+// const host = 'http://parking.pdzhtc.com';//正式
 // const host = 'http://172.16.90.64:7000';
 const config = {
 	wxAppid:'wxbe90cc7c5233dd84',// wxAppid 

+ 19 - 15
pages/getin/getin.vue

@@ -55,6 +55,7 @@
 			:show-progress="false" 
 			max-count="4"
 			@on-oversize
+			:source-type="sourceType"
 			upload-text="拍照取证" ></u-upload>
 		</view>
 		
@@ -125,6 +126,7 @@
 		},
 		data() {
 			return {
+				sourceType:['camera'],
 				time: '12:01',
 				visible:false,
 				carImg:'',
@@ -297,17 +299,17 @@
 			timesubmit(){
 				this.time = this.confirmTime;
 				console.log(this.time)
-				let files = [];
-				let that = this;
-				// 通过filter,筛选出上传进度为100的文件(因为某些上传失败的文件,进度值不为100,这个是可选的操作)
-				files = this.$refs.uUpload.lists.filter(val => {
-					return val.progress == 100;
-				});
-				// 如果不需要进行太多的处理,直接如下即可
-				// files = this.$refs.uUpload.lists;
-				files.forEach(function(element) {
-				  that.images.push(element.response.data.url);
-				});
+				// let files = [];
+				// let that = this;
+				// // 通过filter,筛选出上传进度为100的文件(因为某些上传失败的文件,进度值不为100,这个是可选的操作)
+				// files = this.$refs.uUpload.lists.filter(val => {
+				// 	return val.progress == 100;
+				// });
+				// // 如果不需要进行太多的处理,直接如下即可
+				// // files = this.$refs.uUpload.lists;
+				// files.forEach(function(element) {
+				//   that.images.push(element.response.data.url);
+				// });
 				let param ={
 					spaceId:this.spaceId,
 					vehicleNo:this.vehicleNo,
@@ -322,10 +324,12 @@
 				if(this.placeStatus==1&&(this.currentVehicleNo == null || this.currentVehicleNo=='')){
 					this.$u.api.parkInConfirm(param)//有车但是车牌为空
 					.then(res=>{
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'success'
-						});
+						// this.$refs.uToast.show({
+						// 	title: res.msg,
+						// 	type: 'success',
+							
+						// });
+						plus.nativeUI.toast(res.msg);
 						uni.redirectTo({
 						    url: '/pages/getout/getout'
 						});

+ 2 - 2
pages/getout/getout.scss

@@ -83,7 +83,7 @@
 	letter-spacing: 1px
 }
 .search{
-	margin: 10rpx 28rpx;
+	margin: 26rpx 30rpx 0 30rpx;
 }
 .bt1{
 	float: left;
@@ -108,7 +108,7 @@
 }
 .pagesInput{
 	display: flex;
-	width: 120rpx;
+	width: 145rpx;
 	margin: auto 30rpx;
 	.pagesInput-left{
 		margin-top: 20rpx;

+ 1 - 1
pages/getout/getout.vue

@@ -7,8 +7,8 @@
 		 :border-bottom="false" 
 		 back-icon-color="#CCE8FF" 
 		 :background="{background: 'linear-gradient(145deg, #41AFF9 0%, #2D8CFB 100%)' }"></u-navbar>
-		<u-empty class="u-m-t-80" text="暂无停车" mode="data" v-if="roadspaceList.length == 0"></u-empty>
 		<view class="search"><u-search placeholder="请输入车位名称"  v-model="roadspaceList.spaceName" shape="round" @search="spaceSearch()" @custom="spaceSearch()"></u-search></view>
+		<u-empty class="u-m-t-80" text="暂无停车" mode="data" v-if="roadspaceList.length == 0"></u-empty>
 		<view class="roadspace-list wrap">
 			<view class="roadspace-list-item" :class="{used:item.placeStatus==1}" v-if="item.placeStatus==1&&item.vehicleNo != 0" @click="roadspaceClick(item)" v-for="item in roadspaceList" :key="item.id">
 				<view class="block"  >

+ 2 - 2
pages/parking/parking.scss

@@ -96,11 +96,11 @@
 }
 
 .search{
-	margin: 10rpx 28rpx;
+	margin: 26rpx 30rpx 0 30rpx;
 }
 .pagesInput{
 	display: flex;
-	width: 120rpx;
+	width: 145rpx;
 	margin: auto 30rpx;
 	.pagesInput-left{
 		margin-top: 20rpx;