jufubao-base 1.0.182-beta1 → 1.0.184-beta1

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 (46) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseAddress/Attr.js +1 -50
  3. package/src/components/JfbBaseAddress/JfbBaseAddress.vue +68 -120
  4. package/src/components/JfbBaseCardDelay/Api.js +19 -30
  5. package/src/components/JfbBaseCardDelay/Attr.js +237 -35
  6. package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue +279 -78
  7. package/src/components/JfbBaseCardDetailEntry/Attr.js +12 -0
  8. package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +14 -0
  9. package/src/components/JfbBaseCardDetailEntry/Mock.js +1 -1
  10. package/src/components/JfbBaseCardEntry/Attr.js +121 -0
  11. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +206 -29
  12. package/src/components/JfbBaseCardGive/Api.js +18 -34
  13. package/src/components/JfbBaseCardGive/Attr.js +40 -32
  14. package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue +502 -79
  15. package/src/components/JfbBaseCardGive/Mock.js +2 -9
  16. package/src/components/JfbBaseCardReceive/Api.js +10 -36
  17. package/src/components/JfbBaseCardReceive/Attr.js +9 -39
  18. package/src/components/JfbBaseCardReceive/JfbBaseCardReceive.vue +403 -80
  19. package/src/components/JfbBaseCardReceive/Mock.js +1 -7
  20. package/src/components/JfbBaseCardReceiveCover/Api.js +5 -43
  21. package/src/components/JfbBaseCardReceiveCover/Attr.js +119 -30
  22. package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue +189 -82
  23. package/src/components/JfbBaseCardReceiveCover/Mock.js +1 -9
  24. package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +1 -1
  25. package/src/components/JfbBaseOrderDetail/Attr.js +42 -10
  26. package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +137 -23
  27. package/src/components/JfbBaseOrderDetail/Mock.js +5 -0
  28. package/src/components/JfbBaseOrderList/Attr.js +0 -23
  29. package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +86 -117
  30. package/src/components/JfbBasePay/Attr.js +12 -0
  31. package/src/components/JfbBasePay/JfbBasePay.vue +18 -12
  32. package/src/components/JfbBasePhoneCollect/Attr.js +945 -411
  33. package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue +307 -27
  34. package/src/components/JfbBasePhoneLogin/Attr.js +893 -405
  35. package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue +609 -253
  36. package/src/components/JfbBasePosterType/JfbBasePosterType.vue +0 -1
  37. package/src/components/JfbBaseRechargeOrder/Api.js +11 -0
  38. package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +46 -27
  39. package/src/components/JfbBaseRechargeOrderDetail/Api.js +11 -0
  40. package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue +142 -13
  41. package/src/components/JfbBaseRechargeSuccess/Api.js +11 -0
  42. package/src/components/JfbBaseRechargeSuccess/Attr.js +1 -1
  43. package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue +6 -3
  44. package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue +0 -1
  45. package/src/components/JfbBaseAddress/XdTfkItem.vue +0 -117
  46. package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue +0 -246
package/src/components/JfbBasePay/JfbBasePay.vue CHANGED
@@ -100,7 +100,7 @@
100
100
  <view class="remain_pay" v-if="payInfo.channel_amount > 0">
101
101
  <view style="border-bottom: 2rpx solid #eee;" class="column-group">
102
102
  <view class="column-item" style="padding: 30rpx 60rpx">
103
- <view class="column_label">仍需支付<text class="label_sub">（可使用多张票券支付）</text></view>
103
+ <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
104
104
  <view class="column_value text-primary">
105
105
  <xd-unit
106
106
  :price="payInfo.channel_amount"
@@ -112,9 +112,9 @@
112
112
  </view>
113
113
  </view>
114
114
  <view class="remain_header">
115
- <view>选择以下支付方式</view>
115
+ <view>选择以下补差方式</view>
116
116
  <view class="flex align-center text-primary">
117
- <view class="margin-right">继续支付</view>
117
+ <view class="margin-right">继续补差</view>
118
118
  <xd-unit
119
119
  :price="payInfo.channel_amount"
120
120
  :is-show-icon="false"
@@ -150,7 +150,7 @@
150
150
  type="primary"
151
151
  radius="50rpx"
152
152
  @click="doThirdPay"
153
- >确认支付</xd-button>
153
+ >确认</xd-button>
154
154
  </view>
155
155
  </view>
156
156
  </view>
@@ -222,12 +222,12 @@ export default {
222
222
  },
223
223
  },
224
224
  computed: {
225
- prod_bottom() {
225
+ prod_bottom() {
226
226
  return this.fixedStyle({ height: 0, zIndex: 111 });
227
227
  },
228
228
  getSuccessUrl(){
229
229
  let url = this.paySuccessPath;
230
- if(this.type === 'recharge') {
230
+ if(this.type === 'recharge'||this.type==='delay') {
231
231
  url = this.rechargeSuccessPath || url;
232
232
  }
233
233
  return url
@@ -252,8 +252,8 @@ export default {
252
252
  this.p_getPayOrderDetail();
253
253
  this.p_getListUserPayChannel();
254
254
 
255
- //充值不进行检查订单状态
256
- if(this.type !== 'recharge') {
255
+ //充值延期不进行检查订单状态
256
+ if((this.type !== 'recharge'&&this.type!=='delay')) {
257
257
  this.p_getBaseOrderDetail();
258
258
  }
259
259
  },
@@ -361,7 +361,7 @@ export default {
361
361
  async doThirdPay() {
362
362
  if (this.$configProject.isPreview) return;
363
363
 
364
- if(this.type !== 'recharge') {
364
+ if((this.type !== 'recharge'&&this.type!=='delay')) {
365
365
  await this.p_getBaseOrderDetail();
366
366
  }
367
367
  const {channel_provider_id, order_id, payInfo} = this;
@@ -416,9 +416,15 @@ export default {
416
416
  },
417
417
  })
418
418
  .then((res) => {
419
- this.$xdUniHelper.redirectTo({
420
- url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
421
- });
419
+ if(this.type) {
420
+ this.$xdUniHelper.redirectTo({
421
+ url: this.getSuccessUrl + `?order_id=${this.main_order_id}&type=${this.type}`
422
+ });
423
+ } else {
424
+ this.$xdUniHelper.redirectTo({
425
+ url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
426
+ });
427
+ }
422
428
  })
423
429
  .catch(error=>{
424
430
  this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});