wangchao %!s(int64=2) %!d(string=hai) anos
pai
achega
16e0e36f72

+ 3 - 1
common/helper.js

@@ -3,6 +3,7 @@ const selectContractNo = {}
 const detailData = {}
 const erpWarehouse = {}
 let rolesList = []
+const gjList = []
 const now = Date.now || function() {
 	return new Date().getTime();
 };
@@ -255,7 +256,7 @@ const filterArea = (q) => {
 	}
 	return q
 }
-
+const fUN_AmapLocation = uni.requireNativePlugin('FUN-AmapLocation');
 
 export default {
 	detailData,
@@ -270,4 +271,5 @@ export default {
 	convertCurrency,
 	filterUrban,
 	filterArea,
+	gjList
 }

+ 1 - 1
pages/fuelfilling/apply_for_reimbursement.vue

@@ -93,7 +93,7 @@
 		data() {
 			return {
 				detailData: {
-					carNo: '',
+					carNo: '辽A11111',
 					destinationProvince: "",
 					destinationCity: "",
 					destinationArea: "",

+ 95 - 36
pages/fuelfilling/the_fuel_filling.vue

@@ -4,6 +4,7 @@
 			<view class="content1-top">
 				<view class="top2">
 					<view class="left">
+						<view @click='tabcarchange(0)' class='line' :class='searchType==0?"active":""'>全部</view>
 						<view @click='tabcarchange(1)' class='line' :class='searchType==1?"active":""'>未完成</view>
 						<view @click='tabcarchange(3)' class='line' :class='searchType==3?"active":""'>已完成</view>
 					</view>
@@ -16,34 +17,45 @@
 		<view v-for="(item,index) in fuelFilling" :key="index" @click="getInfo(item)">
 			<view class="good-list">
 				<view style="padding: 0 35rpx 20rpx 35rpx;position: relative;">
-					<view class="flex align-center">
-						<view class="item1">
-							<view class="ssx">{{$helper.getProvinceAbbreviation(item.originProvince)}}</view>
-							<view class="level2-title" style="font-size: 14px;">{{$helper.filterUrban(item.originCity)}}
-								{{$helper.filterArea(item.originArea)}}
+					<view class="flex top">
+						<view class="flex left">
+							<view class="item1">
+								<view class="ssx">{{$helper.getProvinceAbbreviation(item.originProvince)}}</view>
+								<view class="level2-title" style="font-size: 14px;">
+									{{$helper.filterUrban(item.originCity)}}
+									{{$helper.filterArea(item.originArea)}}
+								</view>
 							</view>
-						</view>
-						<image class="jt-icon item2" src="@/static/images/fuel/jt.png" mode='widthFix'>
-						</image>
-						<view class="item3">
-							<view class="ssx">{{$helper.getProvinceAbbreviation(item.destinationProvince)}}</view>
-							<view class="level2-title">{{$helper.filterUrban(item.destinationCity)}}
-								{{$helper.filterArea(item.destinationArea)}}
+							<image class="jt-icon item2" src="@/static/images/fuel/jt.png" mode='widthFix'>
+							</image>
+							<view class="item3">
+								<view class="ssx">{{$helper.getProvinceAbbreviation(item.destinationProvince)}}</view>
+								<view class="level2-title">{{$helper.filterUrban(item.destinationCity)}}
+									{{$helper.filterArea(item.destinationArea)}}
+								</view>
 							</view>
 						</view>
+						<view class="flex">
+							<view class="audit1" v-if="item.travelStatus == '已开始'">已开始</view>
+							<view class="audit2" v-if="item.travelStatus == '已结束'">已结束</view>
+							<view class="audit3" v-if="item.travelStatus == '已报销'">已报销</view>
+						</view>
 					</view>
-					<view class="flex flex-space-between yf-style">
-						<view class="left">
-							<view class="flex">
-								<view style="padding: 10px 0px 5px 20px;">车牌号 : {{item.carNo}}</view>
-								<view class="wenzi audit1" v-if="item.travelStatus == '已开始'">已开始</view>
-								<view class="wenzi audit2" v-if="item.travelStatus == '已结束'">已结束</view>
-								<view class="wenzi audit3" v-if="item.travelStatus == '已报销'">已报销</view>
+					<view class="car-info">
+						<view class="car-num">车牌号 : {{item.carNo}}</view>
+						<view class="car-date">{{item.createDate.split(" ")[0]}}</view>
+					</view>
+					<view class="car-yh">
+						<view class="row">
+							总油耗
+							<view class="text">
+								{{item.tfc}}L
 							</view>
-							<view class="u-flex-wrap flex row ">
-								<view style="width: 125px;padding: 10px 0px 5px 20px;">总油耗 : {{item.tfc}}L</view>
-								<view style="width: 100px;padding-top: 10px;">总价 : {{item.totalCost}}元</view>
-								<view style="padding: 13px 0px 5px 24px;">{{item.createDate.split(" ")[0]}}</view>
+						</view>
+						<view class="row">
+							总价
+							<view class="text">
+								{{item.totalCost}}元
 							</view>
 						</view>
 					</view>
@@ -57,26 +69,28 @@
 	export default {
 		data() {
 			return {
-				searchType: 1,
+				searchType: 0,
 				pageSize: 10,
 				currentPage: 1,
 				fuelFilling: [{
-					destinationProvince: "",
-					destinationCity: "",
-					destinationArea: "",
-					carNo: "",
-					originProvince: "",
-					originCity: "",
-					originArea: "",
-					createDate: "",
-					travelStatus: "",
-					totalCost: "",
-					tfc: ""
+					destinationProvince: "辽宁省",
+					destinationCity: "营口市",
+					destinationArea: "鲅鱼圈区",
+					destinationAddress: '鲅鱼圈5号门',
+					carNo: "辽H11111",
+					originProvince: "辽宁省",
+					originCity: "营口",
+					originArea: "鲅鱼圈区",
+					originAddress: '中天昊元',
+					createDate: "2022-01-01 15:30:20",
+					travelStatus: "已开始",
+					totalCost: "233.20",
+					tfc: "60L"
 				}],
 			}
 		},
 		onShow() {
-			this.getList()
+			// this.getList()
 		},
 		methods: {
 			tabcarchange(searchType) {
@@ -98,6 +112,7 @@
 					compId: uni.getStorageSync('pcUserInfo').compId,
 					commonId: uni.getStorageSync('pcUserInfo').userId,
 				}).then(res => {
+					debugger
 					if (res.data.code == 200) {
 						this.fuelFilling = res.data.data.records
 
@@ -305,4 +320,48 @@
 	.audit3 {
 		color: #AFB3BF;
 	}
+
+	.top {
+		justify-content: space-between;
+		align-items: center;
+
+		.left {
+			align-items: center;
+		}
+	}
+
+	.car-info {
+		background: #F9F9FA;
+		padding: 20rpx;
+		display: flex;
+		border-radius: 20rpx;
+		flex-direction: column;
+
+		.car-num {
+			font-size: 26rpx;
+			font-weight: 700;
+		}
+
+		.car-date {
+			margin-top: 10rpx;
+			color: #878C9C;
+		}
+	}
+
+	.car-yh {
+		display: flex;
+		justify-content: flex-end;
+		margin-top: 20rpx;
+
+		.row {
+			display: flex;
+			align-items: center;
+
+			.text {
+				font-weight: 700;
+				margin: 0 20rpx;
+			}
+		}
+
+	}
 </style>

+ 309 - 91
pages/fuelfilling/track_addition.vue

@@ -1,22 +1,25 @@
 <template>
 	<view>
-		<view>
-			<view class='wrap'>
-				<view class="c-row">
-					<view class="title">车牌号</view>
-					<view class="con-list">
-						<input v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input>
-					</view>
+		<map :latitude="detailData.originLatitude" :longitude="detailData.originLongitude" :markers="covers"
+			class="map"></map>
+		<view class='wrap'>
+			<view class="c-row">
+				<view class="title">车牌号</view>
+				<view class="con-list">
+					<input v-model='detailData.carNo' placeholder="请输入车牌号" maxlength="7"></input>
 				</view>
 			</view>
 			<view @click='startTrack' class="button" v-if='titleBtn=="开始轨迹"'>{{titleBtn}}</view>
-			<view @click='startTrack' class="button1" v-if='titleBtn=="结束轨迹"'>{{titleBtn}}</view>
-			<view @click='startTrack' class="button2" v-if='titleBtn=="申请报销"'>{{titleBtn}}</view>
+			<view @click='endTrack' class="button1" v-if='titleBtn=="结束轨迹"'>{{titleBtn}}</view>
+			<view @click='reimbursement' class="button2" v-if='titleBtn=="申请报销"'>{{titleBtn}}</view>
 		</view>
+
+
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
@@ -40,11 +43,16 @@
 					fillingNo: '',
 					strokeType: '1',
 				},
+				covers: [],
 				titleBtn: "开始轨迹",
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
+			// #ifdef APP-PLUS
+			this.getLngLat();
+			// #endif
+			that = this
 		},
 		onShow() {
 			var that = this
@@ -53,6 +61,131 @@
 			}
 		},
 		methods: {
+			getLngLat() {
+				this.checkOpenGPSServiceByAndroidIOS()
+				var that = this
+				uni.showLoading({
+					title: '获取定位中',
+					mask: true
+				})
+				uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					success: res => {
+						if (res.latitude) {
+							console.log(res)
+							that.detailData.originLongitude = res.longitude;
+							that.detailData.originLatitude = res.latitude;
+							that.detailData.destinationCity = that.$helper.filterUrban(res.address.city)
+							that.detailData.originArea = that.$helper.filterUrban(res.address.district)
+							this.covers = [{
+								id: 0,
+								latitude: res.latitude,
+								longitude: res.longitude,
+								iconPath: '../../../static/img/location.png',
+							}]
+							that.$forceUpdate()
+							uni.hideLoading()
+						} else {
+							if (uni.getSystemInfoSync().platform == 'android') {
+								var context = plus.android.importClass("android.content.Context");
+								var locationManager = plus.android.importClass(
+									"android.location.LocationManager");
+								var main = plus.android.runtimeMainActivity();
+								var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+								that.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
+							}
+							if (that.bool === false) {
+								uni.showModal({
+									title: '提示',
+									content: '请打开定位服务',
+									success: ({
+										confirm,
+										cancel
+									}) => {
+										if (confirm) {
+											if (uni.getSystemInfoSync().platform == 'android') {
+												var Intent = plus.android.importClass(
+													'android.content.Intent');
+												var Settings = plus.android.importClass(
+													'android.provider.Settings');
+												var intent = new Intent(Settings
+													.ACTION_LOCATION_SOURCE_SETTINGS);
+												var main = plus.android.runtimeMainActivity();
+												main.startActivity(intent); // 打开系统设置GPS服务页面
+											}
+										}
+									}
+								});
+								uni.hideLoading()
+							}
+						}
+					},
+					fail: res => {
+						console.log('定位失败')
+						console.log(res)
+						uni.hideLoading()
+					}
+				});
+			},
+			checkOpenGPSServiceByAndroidIOS() {
+				let system = uni.getSystemInfoSync(); // 获取系统信息
+				if (system.platform === 'android') { // 判断平台
+					var context = plus.android.importClass("android.content.Context");
+					var locationManager = plus.android.importClass("android.location.LocationManager");
+					var main = plus.android.runtimeMainActivity();
+					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+					if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+						uni.showModal({
+							title: '提示',
+							content: '请打开定位服务功能',
+							// showCancel: false, // 不显示取消按钮
+							success(res) {
+								if (res.confirm) {
+									if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+										var Intent = plus.android.importClass('android.content.Intent');
+										var Settings = plus.android.importClass('android.provider.Settings');
+										var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+										main.startActivity(intent); // 打开系统设置GPS服务页面
+									}
+								}
+							}
+						});
+					}
+				} else if (system.platform === 'ios') {
+					// console.log("苹果");
+					var cllocationManger = plus.ios.import("CLLocationManager");
+					var enable = cllocationManger.locationServicesEnabled();
+					var status = cllocationManger.authorizationStatus();
+					plus.ios.deleteObject(cllocationManger);
+					if (enable && status != 2) {
+						console.log("手机系统的定位已经打开");
+					} else {
+						console.log("手机系统的定位没有打开");
+						uni.showModal({
+							title: '提示',
+							content: '请前往设置-隐私-定位服务打开定位服务功能',
+							// showCancel: false, // 不显示取消按钮
+							success(res) {
+								if (res.confirm) {
+									var UIApplication = plus.ios.import("UIApplication");
+									var application2 = UIApplication.sharedApplication();
+									var NSURL2 = plus.ios.import("NSURL");
+									// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("app-settings");
+									var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION_SERVICES");
+									application2.openURL(setting2);
+									plus.ios.deleteObject(setting2);
+									plus.ios.deleteObject(NSURL2);
+									plus.ios.deleteObject(application2);
+								}
+							}
+						});
+					}
+				}
+			},
 			seeInfo() {
 				this.$api.doRequest('get', '/fuelFillingInfo/getFilling', {
 					id: this.id
@@ -67,76 +200,160 @@
 					}
 				})
 			},
+			// 申请报销
+			reimbursement() {
+				uni.navigateTo({
+					url: '/pages/fuelfilling/apply_for_reimbursement?id=' + this.id
+				})
+			},
+			// 结束轨迹
+			endTrack() {
+				if (that.$helper.fUN_AmapLocation) {
+					that.$helper.fUN_AmapLocation.stop({}, result => {
+						console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+						// 更新轨迹结束地点
+
+						this.titleBtn = "申请报销"
+					});
+				}
+			},
+			//开始轨迹
 			startTrack() {
-				if (this.titleBtn == "开始轨迹") {
-					var that = this
-					uni.showModal({
-						content: "确定开始轨迹?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
-								that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
-								that.detailData.driverName = uni.getStorageSync('userInfo').userName
-								that.detailData.trackFlag = "0"
-								that.detailData.fillingNo = "202207040001"
-								that.detailData.originProvince = "辽宁省"
-								that.detailData.originCity = "营口市"
-								that.detailData.originArea = "鲅鱼圈区"
-								that.detailData.originLongitude = "122.21"
-								that.detailData.originLatitude = "40.664"
-								that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling',
-										that.detailData
-									)
-									.then(res => {
-										that.id = res.data.data
-										if (res.data.code == 200) {
-											that.$api.msg('提交成功')
-											that.titleBtn = "结束轨迹"
-										} else {
-											that.$api.msg('提交失败')
-										}
-									})
-							}
-						}
-					})
-				} else if (this.titleBtn == "结束轨迹") {
-					var that = this
-					uni.showModal({
-						content: "确定结束轨迹?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
-								that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
-								that.detailData.driverName = uni.getStorageSync('userInfo').userName
-								that.detailData.trackFlag = "1"
-								that.detailData.destinationProvince = "江苏省"
-								that.detailData.destinationCity = "宿迁市"
-								that.detailData.destinationArea = "宿城区"
-								that.detailData.destinationLongitude = "118.291"
-								that.detailData.destinationLatitude = "33.942"
-								that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling',
-										that.detailData
-									)
-									.then(res => {
-										if (res.data.code == 200) {
-											that.$api.msg('提交成功')
-											that.titleBtn = "申请报销"
-										} else {
-											that.$api.msg('提交失败')
-										}
-									})
-							}
+				that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
+				that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
+				that.detailData.driverName = uni.getStorageSync('userInfo').userName
+				that.detailData.trackFlag = "1"
+				that.detailData.destinationProvince = ""
+				that.detailData.destinationCity = ""
+				that.detailData.destinationArea = ""
+				that.detailData.destinationLongitude = ""
+				that.detailData.destinationLatitude = ""
+				that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling', that.detailData).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							that.$helper.fUN_AmapLocation.start({
+									intervalTime: 5000,
+									isReport: false
+								},
+								res => {
+									let _data = {
+										orderId: that.id,
+										longitude: res.longitude,
+										latitude: res.latitude,
+										province: res.province,
+										city: res.city,
+										area: res.district
+									}
+									// if (this.shippingNoteInfos && this.shippingNoteInfos.length > 0) { //更新持续定位经纬度
+									// 	for (let i = 0; i < this.shippingNoteInfos.length; i++) {
+									// 		this.shippingNoteInfos[i].startLatitude = _data.latitude //纬度
+									// 		this.shippingNoteInfos[i].startLocationText = _data.city //起点
+									// 		this.shippingNoteInfos[i].startLongitude = _data.longitude //经度
+									// 	}
+									// }
+									this.$helper.gjList.push(_data)
+									uni.setStorageSync('mapGJ', this.$helper.gjList);
+									// console.log('this.$helper.gjList')
+									// console.log(this.$helper.gjList)
+									// console.log("条数", uni.getStorageSync('mapGJ').length)
+									if (uni.getStorageSync('mapGJ').length > 100) {
+										//存储轨迹经纬度list
+										this.$request.baseRequest('post', 'xx', {
+												orderId: that.id,
+												longitudeLatitude: JSON.stringify(uni.getStorageSync('mapGJ'))
+											}).then(res => {
+												uni.removeStorageSync('mapGJ');
+												this.$helper.gjList = []
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+									}
+								}
+							);
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "轨迹持续监控中!",
+								complete() {
+									this.titleBtn = '结束轨迹'
+								}
+							})
 						}
 					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/fuelfilling/apply_for_reimbursement?id=' + this.id
-					})
-				}
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+
+
+				// if (this.titleBtn == "开始轨迹") {
+				// 	var that = this
+				// 	uni.showModal({
+				// 		content: "确定开始轨迹?",
+				// 		showCancel: true,
+				// 		confirmText: '确定',
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
+				// 				that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
+				// 				that.detailData.driverName = uni.getStorageSync('userInfo').userName
+				// 				that.detailData.trackFlag = "0"
+				// 				that.detailData.fillingNo = "202207040001"
+				// 				that.detailData.originProvince = "辽宁省"
+				// 				that.detailData.originCity = "营口市"
+				// 				that.detailData.originArea = "鲅鱼圈区"
+				// 				that.detailData.originLongitude = "122.21"
+				// 				that.detailData.originLatitude = "40.664"
+				// 				that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling',
+				// 						that.detailData
+				// 					)
+				// 					.then(res => {
+				// 						that.id = res.data.data
+				// 						if (res.data.code == 200) {
+				// 							that.$api.msg('提交成功')
+				// 							that.titleBtn = "结束轨迹"
+				// 						} else {
+				// 							that.$api.msg('提交失败')
+				// 						}
+				// 					})
+				// 			}
+				// 		}
+				// 	})
+				// } else if (this.titleBtn == "结束轨迹") {
+				// 	var that = this
+				// 	uni.showModal({
+				// 		content: "确定结束轨迹?",
+				// 		showCancel: true,
+				// 		confirmText: '确定',
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
+				// 				that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
+				// 				that.detailData.driverName = uni.getStorageSync('userInfo').userName
+				// 				that.detailData.trackFlag = "1"
+				// 				that.detailData.destinationProvince = "江苏省"
+				// 				that.detailData.destinationCity = "宿迁市"
+				// 				that.detailData.destinationArea = "宿城区"
+				// 				that.detailData.destinationLongitude = "118.291"
+				// 				that.detailData.destinationLatitude = "33.942"
+				// 				that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling',
+				// 						that.detailData
+				// 					)
+				// 					.then(res => {
+				// 						if (res.data.code == 200) {
+				// 							that.$api.msg('提交成功')
+				// 							that.titleBtn = "申请报销"
+				// 						} else {
+				// 							that.$api.msg('提交失败')
+				// 						}
+				// 					})
+				// 			}
+				// 		}
+				// 	})
+				// } else {
+				// 	uni.navigateTo({
+				// 		url: '/pages/fuelfilling/apply_for_reimbursement?id=' + this.id
+				// 	})
+				// }
 			},
 		}
 	}
@@ -161,7 +378,10 @@
 		-webkit-box-align: center;
 		-webkit-align-items: center;
 		align-items: center;
-		padding: 20rpx 30rpx;
+		/* 	padding: 20rpx 30rpx;
+		margin: 20rpx 0; */
+
+
 	}
 
 	.con-list {
@@ -182,24 +402,16 @@
 	}
 
 	.wrap {
-		font-size: 14px;
 		background: #fff;
-		margin: 10px;
-		border-radius: 15px 10px;
-
-		input {
-			font-size: 14px;
-		}
-
-		>.title {
-			padding: 10px 16px;
-		}
+		padding: 40rpx 20rpx;
+		box-sizing: border-box;
+		height: 20vh;
 	}
 
 	.button {
 		background: #22C572;
 		width: 90%;
-		margin: 250px auto;
+		margin: 40rpx auto;
 		padding: 10px;
 		color: #fff;
 		text-align: center;
@@ -209,7 +421,7 @@
 	.button1 {
 		background: #ff0000;
 		width: 90%;
-		margin: 250px auto;
+		margin: 0 auto;
 		padding: 10px;
 		color: #fff;
 		text-align: center;
@@ -219,7 +431,7 @@
 	.button2 {
 		background: #4089ff;
 		width: 90%;
-		margin: 250px auto;
+		margin: 0 auto;
 		padding: 10px;
 		color: #fff;
 		text-align: center;
@@ -253,4 +465,10 @@
 		background: #F9F9FA;
 		border: 1px solid #EEEEEE;
 	}
+
+	.map {
+		width: 100vw;
+		height: 80vh;
+
+	}
 </style>

+ 52 - 51
pages/user/user.vue

@@ -313,7 +313,7 @@
 						show: true
 					},
 					{
-						num:8,
+						num: 8,
 						name: 'OA办公',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/oa_office/oaOffice.png',
@@ -321,42 +321,42 @@
 						url: `/pages/oa_office/the_oaOffice`,
 						show: true
 					},
-					// {
-					// 	num: 9,
-					// 	name: '打卡',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/sign/kdsg.png',
-					// 	tips: 0,
-					// 	url: `/pages/clock/the_clock`,
-					// 	show: true
-					// },
-					// {
-					// 	num: 10,
-					// 	name: '请假',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/sign/kdsg.png',
-					// 	tips: 0,
-					// 	url: `/pages/leave/the_leave`,
-					// 	show: true
-					// },
-					// {
-					// 	num: 11,
-					// 	name: '加油',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/sign/kdsg.png',
-					// 	tips: 0,
-					// 	url: `/pages/fuelfilling/the_fuel_filling`,
-					// 	show: true
-					// },
-					// {
-					// 	num: 10,
-					// 	name: '短途记录',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/sign/kdsg.png',
-					// 	tips: 0,
-					// 	url: `/pages/shortDistance/short_distance_record`,
-					// 	show: true
-					// }
+					{
+						num: 9,
+						name: '打卡',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/daka.png',
+						tips: 0,
+						url: `/pages/clock/the_clock`,
+						show: true
+					},
+					{
+						num: 10,
+						name: '请假',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/qingjia.png',
+						tips: 0,
+						url: `/pages/leave/the_leave`,
+						show: true
+					},
+					{
+						num: 11,
+						name: '加油',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/jiayou.png',
+						tips: 0,
+						url: `/pages/fuelfilling/the_fuel_filling`,
+						show: true
+					},
+					{
+						num: 10,
+						name: '短途记录',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/dt.png',
+						tips: 0,
+						url: `/pages/shortDistance/short_distance_record`,
+						show: true
+					}
 				],
 				showTran: true,
 				companyId: 1,
@@ -416,8 +416,9 @@
 				} else {
 					this.headUrl = this.userInfo.avatarUrl
 				}
-				this.username = this.userInfo.userName?this.userInfo.userName:uni.getStorageSync("userInfo").data.userName
-				this.userphone = this.userInfo.phone?this.userInfo.phone:uni.getStorageSync("userInfo").data.phone
+				this.username = this.userInfo.userName ? this.userInfo.userName : uni.getStorageSync("userInfo").data
+					.userName
+				this.userphone = this.userInfo.phone ? this.userInfo.phone : uni.getStorageSync("userInfo").data.phone
 				var that = this
 				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					console.log("noticeNumber", res)
@@ -893,18 +894,18 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		    border: 1px solid #fff;
-		    background-color: #f43530;
-		    padding: 4px;
-		    position: absolute;
-		    font-size: 12px;
-		    font-weight: 700;
-		    width: 22px;
-		    height: 22px;
-		    right: 19px;
-		    top: -12px;
-		    z-index: 2;
-		    border-radius: 50%;
+		border: 1px solid #fff;
+		background-color: #f43530;
+		padding: 4px;
+		position: absolute;
+		font-size: 12px;
+		font-weight: 700;
+		width: 22px;
+		height: 22px;
+		right: 19px;
+		top: -12px;
+		z-index: 2;
+		border-radius: 50%;
 	}
 
 	@keyframes move_wave {

BIN=BIN
static/img/sign/daka.png


BIN=BIN
static/img/sign/daka@3x.png


BIN=BIN
static/img/sign/dt.png


BIN=BIN
static/img/sign/jiayou.png


BIN=BIN
static/img/sign/qingjia.png