gjy 2 anni fa
parent
commit
e4a32d8271

+ 1 - 1
config/index.js

@@ -11,7 +11,7 @@ const dev = {
 	// 上传图片的
 	// baseUrlNew1: 'http://192.168.110.82:9527/',
 	baseUrlNew1: 'https://api2.eliangeyun.com/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 1 - 1
pages/fuelfilling/the_fuel_filling.vue

@@ -48,7 +48,7 @@
 							<view class="car-num">车牌号 : {{item.carNo}}</view>
 							<view class="car-date">{{item.createDate.split(" ")[0]}}</view>
 						</view>
-						<view class="car-yh">
+						<view v-if='item.tfc&&item.totalCost' class="car-yh">
 							<view class="row">
 								总油耗
 								<view class="text">

+ 7 - 1
pages/fuelfilling/track_addition.vue

@@ -257,6 +257,7 @@
 			},
 			//开始轨迹
 			startTrack() {
+				var that=this
 				console.log('车牌号')
 				console.log(this.detailData.carNo)
 				if (!this.detailData.carNo) {
@@ -267,6 +268,10 @@
 
 					return
 				}
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 				that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
 				that.detailData.driverName = uni.getStorageSync('userInfo').userName
@@ -277,7 +282,7 @@
 						console.log(res1)
 						if (res1.data.code == 200) {
 							console.log(222)
-							uni.hideLoading()
+							
 							that.$helper.fUN_AmapLocation.start({
 									intervalTime: 5000,
 									isReport: false
@@ -324,6 +329,7 @@
 													longitude: _data.longitude
 												});
 												console.log('上传经纬度list', res)
+												uni.hideLoading()
 												uni.removeStorageSync('mapGJ');
 												this.$helper.gjList = []
 											})

BIN
static/img/oa_office/oaOffice.png