gcz 3 سال پیش
والد
کامیت
9ae513a534
4فایلهای تغییر یافته به همراه20 افزوده شده و 12 حذف شده
  1. 5 2
      common/apiurl.js
  2. 2 0
      common/http.api.js
  3. 1 1
      pages/getin/getin.vue
  4. 12 9
      pages/performance/performance.vue

+ 5 - 2
common/apiurl.js

@@ -1,3 +1,4 @@
+const mockhost = 'http://127.0.0.1:4523/mock/385524';
 const apiurl = {
 	//登录
 	loginUrl:'/payee/auth/login',
@@ -21,8 +22,8 @@ const apiurl = {
 	//收费员密码修改
 	modifyPwdUrl:'/payee/payeeinfo/modifyPwd',
 	//我的业绩
-	achievementUrl:'/payee/payeeinfo/achievement',
-	// achievementUrl:'http://127.0.0.1:4523/mock/385524/payeeinfo/achievement',
+	// achievementUrl:'/payee/payeeinfo/achievement',
+	achievementUrl:`${mockhost}/payeeinfo/achievement`,
 	
 	//收费员切换路段
 	modifyRoadUrl:'/payee/payeeinfo/modifyRoad/',
@@ -49,6 +50,8 @@ const apiurl = {
 	
 	//七牛文件上传
 	qiniuUploadUrl:'/file/qiniu/upload',
+	//腾讯文件上传
+	tencentUploadUrl:'/file/tencent/upload',
 	
 	//设备注册
 	deviceReg: '/device/pda/accept',

+ 2 - 0
common/http.api.js

@@ -34,6 +34,7 @@ const install = (Vue, vm) => {
 	let parkInInfo = (params = {}) => vm.$u.get(apiurl.parkInInfoUrl,params);
 	
 	let qiniuUpload = (params = {}) => vm.$u.post(apiurl.qiniuUploadUrl, params);
+	let tencentUpload = (params = {}) => vm.$u.post(apiurl.tencentUploadUrl, params);
 	
 	let achievement = (params = {}) => vm.$u.post(apiurl.achievementUrl, params);
 	let printIn = (params = {}) => vm.$u.get(apiurl.printIn + params.orderId);
@@ -65,6 +66,7 @@ const install = (Vue, vm) => {
 		parkInConfirm,
 		parkInInfo,
 		qiniuUpload,
+		tencentUpload,
 		achievement,
 		printIn,
 		gzbankSwept,

+ 1 - 1
pages/getin/getin.vue

@@ -69,7 +69,7 @@
 		data() {
 			return {
 				carImg:'/static/img/default-car.png',
-				uploadAction:config.baseUrl+'/file/qiniu/upload',
+				uploadAction:config.baseUrl+'/file/tencent/upload',
 				spaceId:'',
 				spaceName:'',
 				carTypeShow:false,

+ 12 - 9
pages/performance/performance.vue

@@ -19,21 +19,21 @@
 		<view class="statistics">
 			<view class="statistics-title">实收数(聚合)</view>
 			<view class="statistics-total">
-				<span class="number">1380.30</span>
+				<span class="number">{{resdata.actualAmount||''}}</span>
 			</view>
 			<view class="statistics-item u-flex">
 				<view class="statistics-item-cell">
 					<view class="til">入场数</view>
-					<view class="con">26</view>
+					<view class="con">{{resdata.parkInNum||''}}</view>
 				</view>
 				<view class="statistics-item-cell">
 					<view class="til">出场数</view>
-					<view class="con">18</view>
+					<view class="con">{{resdata.parkLeaveNum||''}}</view>
 				</view>
 				<view class="statistics-item-cell">
 					<view class="til">应收数</view>
-					<view class="con">2215.00</view>
+					<view class="con">{{resdata.mustAmount||''}}</view>
 				</view>
 			</view>
 		</view>
@@ -67,6 +67,7 @@
 				pickerMonth:'',
 				pickerDay:'',
 				achievementData:'',
+				resdata:[]
 				
 			}
 		},
@@ -100,18 +101,20 @@
 				this.pickerYear = e.year;
 				this.pickerMonth = e.month;
 				this.pickerDay = e.day;
+				this.handleAchievement();
 			},
 			handleAchievement(){
 				this.$u.api.achievement({startDate:this.theTime,endDate:this.theTime})
 				.then(res=>{
-					this.$refs.uToast.show({
-						title: res.msg,
-						type: 'success',
-					});
+					// this.$refs.uToast.show({
+					// 	title: res.msg,
+					// 	type: 'success',
+					// });
+					this.resdata = res.data;
 					console.log('achievement',res)
 				}).catch(err=>{
 					this.$refs.uToast.show({
-						title: err.msg,
+						title: err,
 						type: 'error',
 					});
 					console.log('achievement ',err)