gcz 4 anni fa
parent
commit
762f6d82b6

+ 3 - 0
common/apiurl.js

@@ -18,6 +18,9 @@ const apiurl = {
 	
 	//收费员密码修改
 	modifyPwdUrl:'/payee/payeeinfo/modifyPwd',
+	//我的业绩
+	// achievementUrl:'/payee/payeeinfo/achievement',
+	achievementUrl:'http://127.0.0.1:4523/mock/385524/payeeinfo/achievement',
 	
 	//收费员打卡路段信息
 	punchInfoUrl:'/payee/payeeinfo/punchInfo/',

+ 4 - 1
common/http.api.js

@@ -33,6 +33,8 @@ const install = (Vue, vm) => {
 	
 	let qiniuUpload = (params = {}) => vm.$u.post(apiurl.qiniuUploadUrl, params);
 	
+	let achievement = (params = {}) => vm.$u.post(apiurl.achievementUrl, params);
+	
 	// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
 	vm.$u.api = {
 		login,
@@ -48,7 +50,8 @@ const install = (Vue, vm) => {
 		punchIn,
 		parkInConfirm,
 		parkInInfo,
-		qiniuUpload
+		qiniuUpload,
+		achievement
 	};
 }
 

+ 4 - 4
pages/attence/attence.scss

@@ -11,17 +11,17 @@ page{
 	.payeeinfo-text{
 		margin-left: 19rpx;
 		.name{
-			font-size: 30rpx;
+			font-size: 36rpx;
 			font-weight: 500;
 			color: #5B5B5B;
-			line-height: 42rpx;
+			line-height: 50rpx;
 			letter-spacing: 1px;
 		}
 		.id{
-			font-size: 24rpx;
+			font-size: 30rpx;
 			font-weight: 400;
 			color: #5B5B5B;
-			line-height: 33rpx;
+			line-height: 42rpx;
 			letter-spacing: 1px;
 		}
 	}

+ 20 - 9
pages/index/index.scss

@@ -3,17 +3,28 @@
 	padding: 98rpx 20rpx 0 30rpx;
 	.payee-no{
 		margin-left: 23rpx;
-		font-size: 26rpx;
+		font-size: 30rpx;
 		font-weight: 400;
-		color: #FFFFFF;
-		line-height: 37rpx;
+		color: rgba(255,255,255,.7);
+		line-height: 42rpx;
 		letter-spacing: 1px;
 	}
+	.addr{
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 40rpx;
+		.u-icon{
+			margin-right: 18rpx;
+		}
+	}
 }
 .header{
-	height: 332rpx;
 	background-color: RGBA(47, 144, 250, 1);
 	color: #fff;
+	.header-total{
+		padding-bottom: 92rpx;
+	}
 }
 
 .notice{
@@ -26,17 +37,17 @@
 .feature-list{
 	margin-top: 50rpx;
 	.feature-item{
-		width: 30%;
-		margin-bottom: 34rpx;
+		width: 50%;
+		margin-bottom: 39rpx;
 		display: flex;
 		justify-content: center;
 		flex-wrap: wrap;
 		.feature-item-text{
-			margin-top: 8rpx;
+			margin-top: 17rpx;
 			width: 100%;
 			text-align: center;
-			font-size: 30rpx;
-			line-height: 42rpx;
+			font-size: 32rpx;
+			line-height: 45rpx;
 			color: #444;
 		}
 	}

+ 18 - 18
pages/index/index.vue

@@ -7,13 +7,13 @@
 				</view>
 				<view class="u-flex-1" @click="login($store.state.vuex_hasLogin)">
 					<view class="u-font-18 u-p-b-20"><b>智慧停车</b><span class="payee-no">工号:{{ userInfo.payeeNo || '请登录' }}</span></view>
-					<view class="u-font-14 u-flex">
-						<u-icon class="u-m-r-18" name="map-fill" color="#fff" size="38"></u-icon>
+					<view class="addr u-flex">
+						<u-icon name="map-fill" color="#fff" size="38"></u-icon>
 						{{ theRoad.roadName || '暂无' }}
 					</view>
 				</view>
 				<view class="u-m-l-10 u-p-10">
-					<u-icon name="arrow-right" color="#fff" size="28"></u-icon>
+					<u-icon name="arrow-right" color="rgba(255,255,255,.7)" size="28"></u-icon>
 				</view>
 			</view>	
 			<view class="header-total u-flex wrap">
@@ -32,49 +32,49 @@
 					<u-notice-bar mode="vertical" :list="noticeList" :more-icon="true" :volume-icon="false" bg-color="#fff" color="#373737"></u-notice-bar>
 				</view>
 			</view>
-			<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>
+			<view class="feature-list u-flex u-flex-wrap u-row-between">				
 				<!-- <view class="feature-item" @click="speaks('贵AF113Z')">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-02.png"></u-image>
+					<u-image width="160rpx" height="160rpx" 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: '建设中'})">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-03.png"></u-image>
+					<u-image width="160rpx" height="160rpx" 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: '建设中'})">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-04.png"></u-image>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-04.png"></u-image>
 					<view class="feature-item-text">车位管理</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>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-05.png"></u-image>
 					<view class="feature-item-text">车辆入场</view>
 				</view>
 				<view class="feature-item" @click="openPage('pages/getout/getout')">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-06.png"></u-image>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-06.png"></u-image>
 					<view class="feature-item-text">车辆出场</view>
 				</view>
+				<view class="feature-item" @click="openPage('pages/attence/attence')">
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-01.png"></u-image>
+					<view class="feature-item-text">签到打卡</view>
+				</view>
 				<!-- <view class="feature-item" @click="openPage('pages/modifypwd/modifypwd')">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-07.png"></u-image>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-07.png"></u-image>
 					<view class="feature-item-text">密码修改</view>
 				</view> -->
 				<view class="feature-item" @click="openPage('pages/ownersquery/ownersquery')">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-10.png"></u-image>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-10.png"></u-image>
 					<view class="feature-item-text">车主查询</view>
 				</view>	
 				<view class="feature-item" @click="openPage('pages/performance/performance')">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-11.png"></u-image>
+					<u-image width="160rpx" height="160rpx" 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>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-08.png"></u-image>
 					<view class="feature-item-text">设置</view>
 				</view>
 				<!-- <view class="feature-item" @click="logout">
-					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-09.png"></u-image>
+					<u-image width="160rpx" height="160rpx" src="/static/img/index-feature-09.png"></u-image>
 					<view class="feature-item-text">退出登录</view>
 				</view>	 -->			
 			</view>

+ 2 - 2
pages/login/login.vue

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

+ 19 - 0
pages/performance/performance.vue

@@ -43,6 +43,7 @@
 		</view>
 		
 		<u-picker v-model="pickerShow" mode="time" :params="pickerParams" @confirm="confirmTime"></u-picker>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -65,6 +66,7 @@
 				pickerYear:'',
 				pickerMonth:'',
 				pickerDay:'',
+				achievementData:'',
 				
 			}
 		},
@@ -74,6 +76,7 @@
 			this.pickerYear = this.$u.timeFormat(date, 'yyyy');
 			this.pickerMonth = this.$u.timeFormat(date, 'mm');
 			this.pickerDay = this.$u.timeFormat(date, 'dd');
+			this.handleAchievement();
 		},
 		onShow(){
 			
@@ -97,6 +100,22 @@
 				this.pickerYear = e.year;
 				this.pickerMonth = e.month;
 				this.pickerDay = e.day;
+			},
+			handleAchievement(){
+				this.$u.api.achievement()
+				.then(res=>{
+					this.$refs.uToast.show({
+						title: res.msg,
+						type: 'success',
+					});
+					console.log('achievement',res)
+				}).catch(err=>{
+					this.$refs.uToast.show({
+						title: err.msg,
+						type: 'error',
+					});
+					console.log('achievement ',err)
+				});
 			}
 			
 		},