jufubao-base 1.0.237-beta14 → 1.0.237-beta16

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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +3 -2
  3. package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue +2 -0
  4. package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue +2 -2
  5. package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue +2 -6
  6. package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue +2 -0
  7. package/src/components/JfbBaseWithdraw/JfbBaseWithdraw.vue +9 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.237-beta14",
3
+ "version": "1.0.237-beta16",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue CHANGED
@@ -37,8 +37,8 @@
37
37
  <view :style="{color:mainColor}" class="tip">*提货点数请咨询店员，提货成功后无法退换</view>
38
38
  </view>
39
39
  </view>
40
- <XdButton v-if="btnDisabled" style="margin-top: 200rpx" width="260rpx" type="primary" disabled>下一步</XdButton>
41
- <XdButton v-else style="margin-top: 200rpx" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
40
+ <XdButton v-if="btnDisabled" style="margin-top: 200rpx;display:block" width="260rpx" type="primary" disabled>下一步</XdButton>
41
+ <XdButton v-else style="margin-top: 200rpx;display:block" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
42
42
  <view v-if="plusDiscount">
43
43
  <view class="vip" v-if="is_vip==='N'">
44
44
  <view class="vip-title">
@@ -730,6 +730,7 @@
730
730
  },
731
731
  onJfbShow(options) {
732
732
  console.log('event.onJfbShow', options)
733
+ this.onJfbLoad(options);
733
734
  },
734
735
  onJfbHide(options) {
735
736
  console.log('event.onJfbHide', options)
package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue CHANGED
@@ -185,6 +185,8 @@
185
185
  color: #999999;
186
186
  font-size: 28rpx;
187
187
  text-align: right;
188
+ display: flex;
189
+ align-items: center;
188
190
  }
189
191
 
190
192
  .profile {
package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue CHANGED
@@ -8,7 +8,7 @@
8
8
  <view class="jfb-base-poster-group__body" :style="[bodyStyleComp]">
9
9
  <view class="jfb-base-poster-group__body-header">
10
10
  <view class="jfb-base-poster-group__body-header-title">
11
- <XdContentXss v-html="title"></XdContentXss>
11
+ <XdContentXss :html="title"></XdContentXss>
12
12
  <view @click="handleToMore" v-if="is_show_more==='Y'" class="jfb-base-poster-group__body-header-title-more">
13
13
  更多
14
14
  <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
@@ -20,7 +20,7 @@
20
20
  </view>
21
21
  <view class="jfb-base-poster-group__body-content">
22
22
  <view class="jfb-base-poster-group__body-content-tabs">
23
- <view @click="handleChangeTab(item)" :style="tab===item.random?[activeStyleComp]:[normalStyleComp]"
23
+ <view @click="handleChangeTab(item)" :style="[tab===item.random?activeStyleComp:normalStyleComp]"
24
24
  class="jfb-base-poster-group__body-content-tabs-item" v-for="(item, index) in posterGroup.group"
25
25
  :key="index">
26
26
  {{item.title}}
package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue CHANGED
@@ -311,14 +311,12 @@
311
311
  let max = this.getAmout(res.total_amount);
312
312
  // 数量
313
313
  let value = this.getAmout(res.save_amount);
314
- // 计算
315
- let rate = this.getAmout(Math.round((value * 1000) / max));
316
314
  this.option = {
317
315
  backgroundColor: '#fff', // 设置图表区域的背景颜色
318
316
  borderRadius: 10, // 设置图表区域的圆角
319
317
  title: [
320
318
  {
321
- text: '{a|周期已省}\n{b|' + rate + '}', // 显示标题
319
+ text: '{a|周期已省}\n{b|' + value + '}', // 显示标题
322
320
  show: true, // 是否显示
323
321
  x: 'center', // x轴位置
324
322
  y: 'center', // y轴位置
@@ -405,14 +403,12 @@
405
403
  let max = this.getAmout(res.total_amount);
406
404
  // 数量
407
405
  let value = this.getAmout(res.save_amount);
408
- // 计算
409
- let rate = this.getAmout(Math.round((value * 1000) / max));
410
406
  this.option = {
411
407
  backgroundColor: '#fff', // 设置图表区域的背景颜色
412
408
  borderRadius: 10, // 设置图表区域的圆角
413
409
  title: [
414
410
  {
415
- text: '{a|周期已省}\n{b|' + rate + '}', // 显示标题
411
+ text: '{a|周期已省}\n{b|' + value + '}', // 显示标题
416
412
  show: true, // 是否显示
417
413
  x: 'center', // x轴位置
418
414
  y: 'center', // y轴位置
package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue CHANGED
@@ -107,7 +107,9 @@
107
107
  onJfbLoad(options) {
108
108
  this.order_id = options.order_id;
109
109
  this.getOrderDetail()
110
+ // #ifdef H5
110
111
  this.p_getH5WxAuthorize()
112
+ // #endif
111
113
  },
112
114
  p_getH5WxAuthorize() {
113
115
  jfbRootExec("getH5WxAuthorize", {
package/src/components/JfbBaseWithdraw/JfbBaseWithdraw.vue CHANGED
@@ -154,7 +154,13 @@
154
154
  wallet_type: this.wallet_type,
155
155
  total_amount: this.amount * 100,
156
156
  login_providers: this.projectAttr.login_providers.join(),
157
- pay_channel_providers: this.projectAttr.pay_channels.join()
157
+ pay_channel_providers: this.projectAttr.pay_channels.join(),
158
+ //#ifdef MP-WEIXIN
159
+ 'x-jfb-platform': 'MP-WEIXIN',
160
+ //#endif
161
+ //#ifdef H5
162
+ 'x-jfb-platform': 'H5'
163
+ //#endif
158
164
  },
159
165
  }).then(res => {
160
166
  this.$xdUniHelper.navigateTo({ url: `${this.withDrawPath}?order_id=${res.order_id}` })
@@ -233,6 +239,8 @@
233
239
  &-amount {
234
240
  color: #333;
235
241
  font-size: 64rpx;
242
+ line-height: 64rpx;
243
+ height: 70rpx;
236
244
  font-weight: 500;
237
245
  margin: 20rpx 0;
238
246
  border-bottom: 0.5px solid #EEEEEE;