auto commit

pages.json

@@ -60,6 +60,13 @@
 				"navigationStyle":"custom",// 隐藏系统导航栏
 				"navigationBarTitleText": "考勤"
 			}
+		},
+		{
+			"path": "pages/setting/setting",
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "设置"
+			}
 		}
 	],
 	"globalStyle": {

pages/attence/attence.vue

@@ -124,7 +124,7 @@
 		},
 		methods:{
 			getLocation(){
-				ALog.info({msg:'请求定位'});
+				ALog?.info({msg:'请求定位'});
 				uni.showLoading({ title: '定位中'});
 				let that = this;
 				uni.getLocation({
@@ -133,7 +133,7 @@
 						uni.hideLoading();
 						console.log("定位返回信息:", res)
 						// alert(res.longitude + "," + res.latitude )
-						ALog.info({msg:res})
+						ALog?.info({msg:res})
 						that.payeeinfo.longitude = res.longitude;
 						that.payeeinfo.latitude = res.latitude;
 						var dst = `${that.payeeinfo.longitude},${that.payeeinfo.latitude}`;
@@ -141,7 +141,7 @@
 						var locRet = location?.distance?.(src, dst);
 						that.positionInfo = true;
 						// console.log('locRet',locRet);
-						ALog.info({msg:locRet.distance})
+						ALog?.info({msg:locRet.distance})
 						if(locRet<=that.payeeinfo.workDistance){//在打卡范围内
 							that.outPosition = false;
 							console.log('that.workType',that.workType);
@@ -191,7 +191,7 @@
 					fail: function(res){
 						uni.hideLoading();
 						console.log('getLocation err',res)					
-						ALog.info({msg:'请求错误',err:res})
+						ALog?.info({msg:'请求错误',err:res})
 					}
 				})
 			},

pages/index/index.vue

@@ -35,20 +35,20 @@
 			<view class="feature-list u-flex u-flex-wrap u-row-between">
 				<view class="feature-item" @click="openPage('pages/attence/attence')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-01.png"></u-image>
-					<view class="feature-item-text">签到</view>
+					<view class="feature-item-text">签到打卡</view>
 				</view>
-				<view class="feature-item" @click="speaks('贵AF113Z')">
+				<!-- <view class="feature-item" @click="speaks('贵AF113Z')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-02.png"></u-image>
 					<view class="feature-item-text">拍照取证</view>
-				</view>
-				<view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
+				</view> -->
+				<!-- <view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-03.png"></u-image>
 					<view class="feature-item-text">缴费</view>
-				</view>
-				<view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
+				</view> -->
+				<!-- <view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-04.png"></u-image>
 					<view class="feature-item-text">车位管理</view>
-				</view>
+				</view> -->
 				<view class="feature-item" @click="openPage('pages/parking/parking')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-05.png"></u-image>
 					<view class="feature-item-text">车辆入场</view>
@@ -57,18 +57,26 @@
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-06.png"></u-image>
 					<view class="feature-item-text">车辆出场</view>
 				</view>
-				<view class="feature-item" @click="openPage('pages/modifypwd/modifypwd')">
+				<!-- <view class="feature-item" @click="openPage('pages/modifypwd/modifypwd')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-07.png"></u-image>
 					<view class="feature-item-text">密码修改</view>
-				</view>
+				</view> -->
+				<view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
+					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-10.png"></u-image>
+					<view class="feature-item-text">车主查询</view>
+				</view>	
 				<view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
+					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-11.png"></u-image>
+					<view class="feature-item-text">我的业绩</view>
+				</view>	
+				<view class="feature-item" @click="openPage('pages/setting/setting')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-08.png"></u-image>
 					<view class="feature-item-text">设置</view>
 				</view>
-				<view class="feature-item" @click="logout">
+				<!-- <view class="feature-item" @click="logout">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-09.png"></u-image>
 					<view class="feature-item-text">退出登录</view>
-				</view>				
+				</view>	 -->			
 			</view>
 			<u-bottom color="#949494"></u-bottom>
 		</view>

pages/login/login.vue

@@ -69,8 +69,8 @@
 			// 	}
 			// },
 			handleLogin(){
-				// this.form.deviceNo = '1122334455';
-				this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
+				this.form.deviceNo = '1122334455';
+				// this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
 				this.$u.api.login(this.form)
 				.then(res=>{
 					this.$refs.uToast.show({

pages/setting/setting.vue

@@ -0,0 +1,40 @@
+<template>
+	<view>
+		<u-navbar 
+		title="设置" 
+		title-color="#fff" 
+		:custom-back="customBack" 
+		:border-bottom="false" 
+		back-icon-color="#CCE8FF" 
+		:background="{background: '#008CFF' }"></u-navbar>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		onLoad(){
+			
+		},
+		onShow(){
+			
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+					// type:'switchTab',
+					url: 'pages/index/index'
+				});
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import  './setting.scss'
+</style>