auto commit

common/config.js

@@ -1,9 +1,9 @@
 const config = {
-	// wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
-	wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
+	wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
+	// wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
 	
-	// baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
-	baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
+	baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
+	// baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
 }
 export {
 	config

pages/center/order/order.vue

@@ -175,10 +175,10 @@ export default {
       // 完成:   orderStatu = 4-完成
       this.$u.api.getOrderList(param)
         .then(res => {
-          for (const item of res.data.rows) {
+          for (const item of res.data.pageInfo.rows) {
             this.orderList[orderType.index].push(item)
           }
-          this.list[this.current].total = res.data.total
+          this.list[this.current].total = res.data.pageInfo.total
           this.list[orderType.index].pageNum++
           if (this.orderList[this.current].length >= this.list[this.current].total) {
             this.loadStatus.splice(this.list[orderType.index].index, 1, 'nomore')

pages/index/index.vue

@@ -76,7 +76,18 @@
 				</view>
       </view>
     </u-card>
-
+	
+	<u-card  
+		:show-head="false"
+		:show-foot="false"
+		border-radius="16"
+		margin="20rpx 40rpx"
+		padding="30">
+		<view slot="body" class="">
+			<view>已缴费{{totalCount}}笔，合计{{totalActualAmount}}元</view>
+			<view>当前欠费{{totalPayCount}}笔，合计{{totalPayAmount}}元</view>
+		</view>
+	</u-card>
 		<!-- ===================================== 无停车信息 ===================================== -->
     <view class="empty-data-box" v-if="!orderList || orderList.length < 1">
       <u-empty text="暂无停车信息" mode="list"></u-empty>
@@ -307,7 +318,11 @@ export default {
 					imageUrl: '../../static/img/index-content-nav-04.png',
 					title: '我的停车'
 				}
-			]
+			],
+		totalActualAmount: '',  //缴费总额
+		totalPayAmount: '',  //应支付总额
+		totalCount: '',   //缴费总笔数 
+		totalPayCount: '' //应支付总笔数
     }
   },
   onShow () {
@@ -473,6 +488,10 @@ export default {
                 enableFeepay.push(0)
               }
             })
+			this.totalActualAmount = res.data.payedInfo.totalActualAmount
+			this.totalCount = res.data.payedInfo.totalCount
+			this.totalPayAmount = res.data.payingInfo.totalPayAmount
+			this.totalPayCount = res.data.payingInfo.totalCount
             this.recordList = enableFeepay
             this.orderNav = enableFeepay[0]
             this.contractStatus = enableFeepay[2]

pages/payLists/payLists.vue

@@ -138,13 +138,13 @@
 				this.$u.api.getOrderList({pageSize:pageSize ,pageNum: pageNum, paying: true})
 				.then(res=>{
 					// 接口返回的当前页数据列表 (数组)
-					let curPageData = res.data.rows;
+					let curPageData = res.data.pageInfo.rows;
 					// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
 					let curPageLen = curPageData.length; 
 					// 接口返回的总页数 (如列表有26个数据,每页10条,共3页; 则totalPage=3)
-					let totalPage = res.data.pages; 
+					let totalPage = res.data.pageInfo.pages; 
 					// 接口返回的总数据量(如列表有26个数据,每页10条,共3页; 则totalSize=26)
-					let totalSize = res.data.total; 
+					let totalSize = res.data.pageInfo.total; 
 					// 接口返回的是否有下一页 (true/false)
 					// let hasNext = data.pages;