jufubao-third 1.0.10-beta7 → 1.0.11-beta2
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
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
</view>
|
|
16
16
|
</view>
|
|
17
17
|
<!-- #endif -->
|
|
18
|
-
<view class="jfb-third-pay__body">
|
|
18
|
+
<view class="jfb-third-pay__body" :style="[bodyWrapStyle]">
|
|
19
19
|
<view class="column-group">
|
|
20
20
|
<view class="pay_section">
|
|
21
21
|
<view style="padding: 20rpx 0 0;">
|
|
@@ -416,6 +416,12 @@
|
|
|
416
416
|
brandInfo: state => state.brandInfo,
|
|
417
417
|
siteInfo: state => state.siteInfo,
|
|
418
418
|
}),
|
|
419
|
+
bodyWrapStyle(){
|
|
420
|
+
return {
|
|
421
|
+
background: 'rgb(249, 249, 249)',
|
|
422
|
+
minHeight: this.layoutInfo.bodyMinHeightRpx + 'rpx'
|
|
423
|
+
}
|
|
424
|
+
},
|
|
419
425
|
isShowIcon() {
|
|
420
426
|
if(this.$configProject['isPreview']) return true;
|
|
421
427
|
return this.siteInfo.mapping.is_show_coin_icon==='Y'
|
|
@@ -909,7 +915,7 @@
|
|
|
909
915
|
|
|
910
916
|
.jfb-third-pay {
|
|
911
917
|
&__body{
|
|
912
|
-
padding-bottom: 150rpx;
|
|
918
|
+
// padding-bottom: 150rpx;
|
|
913
919
|
// background: #FFFFFF;
|
|
914
920
|
|
|
915
921
|
.pay_section{
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { jfbRootExec } from "@/utils/xd.event";
|
|
2
|
-
|
|
3
|
-
import cookie from "@/common/cookie";
|
|
4
|
-
//#endif
|
|
2
|
+
import {mapState} from "vuex";
|
|
5
3
|
import {Base64} from "js-base64";
|
|
6
4
|
|
|
7
5
|
export default {
|
|
@@ -20,6 +18,7 @@ export default {
|
|
|
20
18
|
}
|
|
21
19
|
},
|
|
22
20
|
computed: {
|
|
21
|
+
...mapState(['jfbAuthorize','brandInfo']),
|
|
23
22
|
payWallet(){
|
|
24
23
|
return this.otherPayMethod.find(item => item.method === 'wallet')
|
|
25
24
|
},
|
|
@@ -231,7 +230,7 @@ export default {
|
|
|
231
230
|
let payPath = '';
|
|
232
231
|
let isMp = false;
|
|
233
232
|
// #ifdef H5
|
|
234
|
-
payPath =
|
|
233
|
+
payPath = this.jfbAuthorize.getMpKey('paySetting');
|
|
235
234
|
if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
|
|
236
235
|
//#endif
|
|
237
236
|
if(payPath && isMp) {
|