BJ_web_developers / jy_parkingOS

Commit 23fa4babfbcdcc98cc25e24631c34fda662af899

Authored by 刘淇
2 parents 1e8bca1e 0b55ba4d

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

Inline Side-by-side
Showing 3 changed files with 20 additions and 10 deletions
pages.json
  View file @23fa4ba
... ... @@ -23,7 +23,7 @@
23 23 {
24 24 "path": "pages/rechargeDetail/rechargeDetail",
25 25 "style": {
26   - "navigationBarTitleText": "充值明细",
  26 + "navigationBarTitleText": "余额明细",
27 27 "enablePullDownRefresh": true
28 28 }
29 29  
... ...
pages/moneyRecharge/moneyRecharge.vue
  View file @23fa4ba
... ... @@ -145,7 +145,7 @@
145 145 rechargeType: '2',
146 146 acctType: '1',
147 147 paySrcType: '204',
148   - payType:'4',
  148 + payType:'2',
149 149 realPayMoney: payMoney,
150 150 rechargeFee: payMoney,
151 151 };
... ...
pages/rechargeDetail/rechargeDetail.vue
  View file @23fa4ba
1 1 <template>
2 2 <view>
3   - <view class="statistics yellow-bg uni-list-cell-pd" style="color: #fff">{{detailText | tranNull}}</view>
  3 + <!-- scrollable speed="50" 滚动 -->
  4 + <uni-notice-bar backgroundColor="#f0ad4e" color="#fff" single :text="detailText | tranNull"></uni-notice-bar>
  5 +
4 6 <view class="uni-list">
5 7 <view class="uni-list-cell">
6 8 <view class="uni-list-cell-left">
... ... @@ -58,15 +60,21 @@
58 60  
59 61 <view class="" v-if="orderList.length > 0">
60 62  
61   - <uni-list class="rechargeWrap" v-for="(item, index) in orderList" :key="index">
  63 + <uni-list class="rechargeWrap pos-rel" v-for="(item, index) in orderList" :key="index">
62 64 <view class="recordCon uni-list-cell-pd">
63 65 <text class="color-black">{{item.changeFeeDetail}}</text>
64 66 <text>{{item.payStateDesc}}</text>
65 67 </view>
66 68 <view class="recordCon uni-list-cell-pd">
67   - <text class="color-green">{{item.typeName}}</text>
  69 + <text v-if="item.typeName == '购买卡券'" class="color-green">{{item.typeName}}</text>
  70 + <text v-if="item.typeName == '微信充值'" class="color-green">{{item.typeName}}</text>
  71 + <text v-if="item.typeName == '支付停车费'" class="color-red">{{item.typeName}}</text>
  72 + <text v-if="item.typeName == '支付宝充值'" class="color-blue">{{item.typeName}}</text>
  73 + <text v-if="item.typeName == '平台现金充值'" class="color-red">{{item.typeName}}</text>
68 74 <text>{{item.opTime}}</text>
69 75 </view>
  76 + <view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
  77 + </view>
70 78 </uni-list>
71 79 <uni-load-more :status="status" />
72 80  
... ... @@ -244,13 +252,9 @@
244 252 })
245 253  
246 254 },
247   -
248 255 fetchData() {
249   -
250   -
251 256 let that = this
252 257 that.status = 'loading'
253   -
254 258 let paramsData = {
255 259 pageNum: that.page,
256 260 pageSize: that.pageSize,
... ... @@ -259,7 +263,7 @@
259 263 beginDate: new Date(that.beginDate + " 00:00:00"),
260 264 endDate: new Date(that.overDate + " 23:59:59")
261 265 }
262   - // 首页信息获取 接口
  266 +
263 267 that.$myRequest({
264 268 url: that.$common.walletDetailsPage,
265 269 method: 'POST',
... ... @@ -305,4 +309,10 @@
305 309 display: flex;
306 310 justify-content: space-between;
307 311 }
  312 + .icon-arrowright {
  313 + color: #bbb;
  314 + font-size: 20px;
  315 + right: 2upx;
  316 + top: 60upx;
  317 + }
308 318 </style>
... ...