Merge branch 'branch' of http://gitlab1.renniting.cn/web_developers/jy_parkingOS into branch

刘淇
2 parents 1e8bca1e 0b55ba4d
Showing 3 changed files with 20 additions and 10 deletions
pages.json
pages/moneyRecharge/moneyRecharge.vue
pages/rechargeDetail/rechargeDetail.vue
@@ -23,7 +23,7 @@
 		{
 			"path": "pages/rechargeDetail/rechargeDetail",
 			"style": {
-				"navigationBarTitleText": "充值明细",
+				"navigationBarTitleText": "余额明细",
 				"enablePullDownRefresh": true
 			}
@@ -145,7 +145,7 @@
 					rechargeType: '2',
 					acctType: '1',
 					paySrcType: '204',
-					payType:'4',
+					payType:'2',
 					realPayMoney: payMoney,
 					rechargeFee: payMoney,
 				};
 <template>
 	<view>
-		<view class="statistics yellow-bg uni-list-cell-pd" style="color: #fff">{{detailText | tranNull}}</view>
+		<!-- scrollable speed="50" 滚动 -->
+		<uni-notice-bar backgroundColor="#f0ad4e" color="#fff"  single :text="detailText | tranNull"></uni-notice-bar>
+
 		<view class="uni-list">
 			<view class="uni-list-cell">
 				<view class="uni-list-cell-left">
@@ -58,15 +60,21 @@
 		<view class="" v-if="orderList.length > 0">
-			<uni-list class="rechargeWrap" v-for="(item, index) in orderList" :key="index">
+			<uni-list class="rechargeWrap pos-rel" v-for="(item, index) in orderList" :key="index">
 				<view class="recordCon uni-list-cell-pd">
 					<text class="color-black">{{item.changeFeeDetail}}</text>
 					<text>{{item.payStateDesc}}</text>
 				</view>
 				<view class="recordCon uni-list-cell-pd">
-					<text class="color-green">{{item.typeName}}</text>
+					<text v-if="item.typeName == '购买卡券'" class="color-green">{{item.typeName}}</text>
+					<text v-if="item.typeName == '微信充值'" class="color-green">{{item.typeName}}</text>
+					<text v-if="item.typeName == '支付停车费'" class="color-red">{{item.typeName}}</text>
+					<text v-if="item.typeName == '支付宝充值'" class="color-blue">{{item.typeName}}</text>
+					<text v-if="item.typeName == '平台现金充值'" class="color-red">{{item.typeName}}</text>
 					<text>{{item.opTime}}</text>
 				</view>
+				<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
+				</view>
 			</uni-list>
 			<uni-load-more :status="status" />
@@ -244,13 +252,9 @@
 				})
 			},
-
 			fetchData() {
-
-
 				let that = this
 				that.status = 'loading'
-
 				let paramsData = {
 					pageNum: that.page,
 					pageSize: that.pageSize,
@@ -259,7 +263,7 @@
 					beginDate: new Date(that.beginDate + " 00:00:00"),
 					endDate: new Date(that.overDate + " 23:59:59")
 				}
-				// 首页信息获取 接口
+			
 				that.$myRequest({
 					url: that.$common.walletDetailsPage,
 					method: 'POST',
@@ -305,4 +309,10 @@
 		display: flex;
 		justify-content: space-between;
 	}
+	.icon-arrowright {
+		color: #bbb;
+		font-size: 20px;
+		right: 2upx;
+		top: 60upx;
+	}
 </style>