jufubao-third 1.0.11-beta5 → 1.0.11-beta7

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbThirdPay/Attr.js +62 -60
  3. package/src/components/JfbThirdPay/WalletMix.js +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-third",
3
- "version": "1.0.11-beta5",
3
+ "version": "1.0.11-beta7",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件第三方购物平台包",
6
6
  "main": "index.js",
package/src/components/JfbThirdPay/Attr.js CHANGED
@@ -3,68 +3,70 @@
3
3
  export default {
4
4
  style: [],
5
5
  advanced: [],
6
- content: [
7
- {
8
- label: "支付时是否跳过补差提示:",
9
- ele: 'xd-radio',
10
- valueKey: "skipTip",
11
- value: data['skipTip'] || 'N',
12
- groupKey:'content',
13
- list: [
14
- {label: '是', value: 'Y'},
15
- {label: '否', value: 'N'},
16
- ],
17
- },
18
- {
19
- label: "选择业务线",
20
- ele: "xd-choose-namespace",
21
- valueKey: "xnamespace",
22
- value: "",
23
- groupKey: "advanced",
24
- handleCustom: (cb) => {
25
- XdBus.getParentApi('getOptionsNamespaces')()
26
- .then(res => {
27
- cb(res.list)
28
- })
29
- .catch();
30
- }
31
- },
32
- {
33
- label: '支付成功路径:', //label
34
- ele: 'xd-select-pages-path', //package 名称
35
- valueKey: 'orderSuccessPath', //form[valueKey]
36
- placeholder: '请选择核销成功路径',
37
- value: null,
38
- groupKey: "advanced",
39
- setting: {
40
- router: XdBus.getParentApi('getPagesTree'),
6
+ content:(data)=>{
7
+ return [
8
+ {
9
+ label: "支付时是否跳过补差提示:",
10
+ ele: 'xd-radio',
11
+ valueKey: "skipTip",
12
+ value: data['skipTip'] || 'N',
13
+ groupKey:'content',
14
+ list: [
15
+ {label: '是', value: 'Y'},
16
+ {label: '否', value: 'N'},
17
+ ],
18
+ },
19
+ {
20
+ label: "选择业务线",
21
+ ele: "xd-choose-namespace",
22
+ valueKey: "xnamespace",
23
+ value: data['xnamespace'] || null,
24
+ groupKey: "advanced",
25
+ handleCustom: (cb) => {
26
+ XdBus.getParentApi('getOptionsNamespaces')()
27
+ .then(res => {
28
+ cb(res.list)
29
+ })
30
+ .catch();
31
+ }
32
+ },
33
+ {
34
+ label: '支付成功路径:', //label
35
+ ele: 'xd-select-pages-path', //package 名称
36
+ valueKey: 'orderSuccessPath', //form[valueKey]
37
+ placeholder: '请选择核销成功路径',
38
+ value: data['orderSuccessPath'] || null,
39
+ groupKey: "advanced",
40
+ setting: {
41
+ router: XdBus.getParentApi('getPagesTree'),
41
42
 
43
+ },
44
+ inline: false,
42
45
  },
43
- inline: false,
44
- },
45
- {
46
- label: '三方支付补差路径:', //label
47
- ele: 'xd-select-pages-path', //package 名称
48
- valueKey: 'thirdPayPath', //form[valueKey]
49
- placeholder: '请选择支付路径',
50
- value: null,
51
- groupKey: "advanced",
52
- setting: {
53
- router: XdBus.getParentApi('getPagesTree'),
46
+ {
47
+ label: '三方支付补差路径:', //label
48
+ ele: 'xd-select-pages-path', //package 名称
49
+ valueKey: 'thirdPayPath', //form[valueKey]
50
+ placeholder: '请选择支付路径',
51
+ value: data['thirdPayPath'] || null,
52
+ groupKey: "advanced",
53
+ setting: {
54
+ router: XdBus.getParentApi('getPagesTree'),
54
55
 
56
+ },
57
+ inline: false,
58
+ },
59
+ {
60
+ label: "是否可以使用新票券",
61
+ ele: "xd-radio",
62
+ valueKey: 'bindCard',
63
+ value: data['thirdPayPath'] || '1',
64
+ groupKey: 'content',
65
+ list: [
66
+ {label: "是", value: "1"},
67
+ {label: "否", value: "2"},
68
+ ]
55
69
  },
56
- inline: false,
57
- },
58
- {
59
- label: "是否可以使用新票券",
60
- ele: "xd-radio",
61
- valueKey: 'bindCard',
62
- value: "",
63
- groupKey: 'content',
64
- list: [
65
- {label: "是", value: "1"},
66
- {label: "否", value: "2"},
67
- ]
68
- },
69
- ],
70
+ ]
71
+ },
70
72
  }
package/src/components/JfbThirdPay/WalletMix.js CHANGED
@@ -192,7 +192,9 @@ export default {
192
192
  }else{
193
193
  //支持补差, 提示是否使用补差
194
194
  if(this.payThird){
195
- await this.handleConfirmAllWxPay();
195
+ if(this.skipTip === 'N'){
196
+ await this.handleConfirmAllWxPay();
197
+ }
196
198
  }else{
197
199
  //不支持补差，仅提示
198
200
  return this.$xdAlert({content: "请选择兑换方式"})