jufubao-base 1.0.119-beta16 → 1.0.119-beta17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.119-beta16",
3
+ "version": "1.0.119-beta17",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
@@ -79,7 +79,7 @@
79
79
  @change="bindDateChange"
80
80
  >
81
81
  <view class="jfb-base-wallet-index__body-filter-condition">
82
- <text>全部月份</text>
82
+ <text>{{date?date:'全部月份'}}</text>
83
83
  <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
84
84
  </view>
85
85
  </picker>
@@ -91,7 +91,7 @@
91
91
  @change="bindOperateChange"
92
92
  >
93
93
  <view class="jfb-base-wallet-index__body-filter-condition">
94
- <text>全部收支</text>
94
+ <text>{{operate_type?operate_type==='R'?"全部支出":"全部收入":'全部收支'}}</text>
95
95
  <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
96
96
  </view>
97
97
  </picker>
@@ -110,7 +110,7 @@
110
110
  item.operate_type === 'A' ? 'iconshouru' : 'iconzhichu'
111
111
  "
112
112
  ></XdFontIcon>
113
- <text style="margin-left:10rpx">消费{{ item.operate_type_name }}</text>
113
+ <text style="margin-left:10rpx">{{ item.trade_type_name }}</text>
114
114
  </view>
115
115
  <view>
116
116
  <view
@@ -154,9 +154,9 @@
154
154
  <view class="jfb-base-wallet-index__body-pay">
155
155
  <view class="jfb-base-wallet-index__body-pay-type">
156
156
  <view>付款方式</view>
157
- <view>
157
+ <view @click="handleChangePayType">
158
158
  <view> {{ qrcodeInfo.wallet_name }} </view>
159
- <XdFontIcon size="20" icon="iconxia_down"></XdFontIcon>
159
+ <XdFontIcon v-if="typeList.length" size="20" icon="iconxia_down"></XdFontIcon>
160
160
  </view>
161
161
  </view>
162
162
  <view class="jfb-base-wallet-index__body-pay-id"
@@ -318,6 +318,11 @@ export default {
318
318
  await this.getList();
319
319
  this.status = true;
320
320
  },
321
+ handleChangePayType() {
322
+ this.showQrcode = false;
323
+ this.handleClose();
324
+ this.handleShowQrcode()
325
+ },
321
326
  getList() {
322
327
  console.log(this.data, this.operate_type, "operate_typeoperate_type");
323
328
  jfbRootExec("getWalletRecordList", {
@@ -487,7 +492,6 @@ export default {
487
492
  clearInterval(this.timeer);
488
493
  this.timeer = null;
489
494
  }
490
- this.wallet_type = null;
491
495
  this.timeStr = "00分00秒";
492
496
  },
493
497
  handleDrawerClose() {
@@ -70,7 +70,7 @@
70
70
  @change="bindDateChange"
71
71
  >
72
72
  <view class="jfb-base-wallet-item__body-filter-condition">
73
- <text>全部月份</text>
73
+ <text>{{date?date:'全部月份'}}</text>
74
74
  <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
75
75
  </view>
76
76
  </picker>
@@ -82,7 +82,7 @@
82
82
  @change="bindOperateChange"
83
83
  >
84
84
  <view class="jfb-base-wallet-item__body-filter-condition">
85
- <text>全部收支</text>
85
+ <text>{{operate_type?operate_type==='R'?"全部支出":"全部收入":'全部收支'}}</text>
86
86
  <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
87
87
  </view>
88
88
  </picker>
@@ -102,7 +102,7 @@
102
102
  "
103
103
  ></XdFontIcon>
104
104
  <text style="margin-left: 10rpx"
105
- >消费{{ item.operate_type_name }}</text
105
+ >{{ item.trade_type_name }}</text
106
106
  >
107
107
  </view>
108
108
  <view>
@@ -225,6 +225,7 @@ export default {
225
225
  page_size: this.page_size,
226
226
  page_token: this.page_token,
227
227
  operate_type: this.operate_type,
228
+ wallet_type: this.wallet_type,
228
229
  },
229
230
  })
230
231
  .then((res) => {