jufubao-base 1.0.116-beta11 → 1.0.116-beta12
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
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
</view>
|
|
17
17
|
<!-- #endif -->
|
|
18
18
|
<view class="jfb-base-card-detail-entry__body" v-if="info!==null">
|
|
19
|
-
<view class="card-list" :style="{
|
|
19
|
+
<!-- <view class="card-list" :style="{
|
|
20
20
|
background: headerBg['color'],
|
|
21
21
|
backgroundSize: '100%'
|
|
22
22
|
}">
|
|
@@ -40,23 +40,44 @@
|
|
|
40
40
|
<view><text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text></view>
|
|
41
41
|
</view>
|
|
42
42
|
</view>
|
|
43
|
-
</view>
|
|
44
|
-
<view class="
|
|
45
|
-
<view>
|
|
46
|
-
<view>
|
|
47
|
-
<
|
|
43
|
+
</view> -->
|
|
44
|
+
<view class="qrcode_card">
|
|
45
|
+
<view class="jfb-base-card-detail-entry__body-qrcode">
|
|
46
|
+
<view class="qrcode_card-title">
|
|
47
|
+
<xd-font-icon style="margin-right: 24rpx;" icon="iconsaoma-02" size="32"></xd-font-icon>
|
|
48
|
+
向商家付款
|
|
49
|
+
</view>
|
|
50
|
+
<view class="barcode_wrap">
|
|
51
|
+
<view>
|
|
52
|
+
<image mode="aspectFit" :src="info.barcode"></image>
|
|
53
|
+
</view>
|
|
54
|
+
</view>
|
|
55
|
+
<view class="qrcode_wrap" style="position: relative">
|
|
56
|
+
<image
|
|
57
|
+
:style="{width: '300rpx', height: '300rpx'}"
|
|
58
|
+
:src="info.card_qrcode"
|
|
59
|
+
></image>
|
|
60
|
+
<image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
|
|
61
|
+
</view>
|
|
62
|
+
<!-- <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view> -->
|
|
63
|
+
<view v-if="timeStr">{{ timeStr }}后自动刷新</view>
|
|
64
|
+
<view class="refresh_wrap" @click="handleRefresh">
|
|
65
|
+
<xd-font-icon icon="iconshuaxin"
|
|
66
|
+
style="margin-right: 24rpx;"
|
|
67
|
+
size="28"></xd-font-icon> 刷新二维码
|
|
48
68
|
</view>
|
|
49
69
|
</view>
|
|
50
|
-
<view
|
|
51
|
-
<
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
<
|
|
70
|
+
<view class="card_info">
|
|
71
|
+
<view class="card_type">{{ info['card_type_name'] }}</view>
|
|
72
|
+
<view class="card_sec">券号：{{ info.card_number }}</view>
|
|
73
|
+
<view class="card_sec">有效期：{{ info.end_time }}</view>
|
|
74
|
+
<view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
|
|
75
|
+
<view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
|
|
76
|
+
<text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
|
|
77
|
+
</view>
|
|
56
78
|
</view>
|
|
57
|
-
<view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view>
|
|
58
|
-
<view v-if="timeStr">距离刷新还有{{ timeStr }}</view>
|
|
59
79
|
</view>
|
|
80
|
+
|
|
60
81
|
<view
|
|
61
82
|
v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
|
|
62
83
|
class="jfb-base-card-detail-entry__body-business"
|
|
@@ -287,6 +308,11 @@ export default {
|
|
|
287
308
|
// this.$refs["pwPay"].clearPwd();
|
|
288
309
|
});
|
|
289
310
|
},
|
|
311
|
+
handleRefresh(){
|
|
312
|
+
clearInterval(this.timeer);
|
|
313
|
+
this.detail();
|
|
314
|
+
// this.refrush();
|
|
315
|
+
},
|
|
290
316
|
refrush() {
|
|
291
317
|
if (this.stopTimer) return;
|
|
292
318
|
if (this.time >= this.maxTime) {
|
|
@@ -558,6 +584,37 @@ export default {
|
|
|
558
584
|
.jfb-base-card-detail-entry {
|
|
559
585
|
&__body {
|
|
560
586
|
color: #333;
|
|
587
|
+
|
|
588
|
+
.qrcode_card{
|
|
589
|
+
background-color: #FF2121;
|
|
590
|
+
border-radius: 24rpx;
|
|
591
|
+
padding: 24rpx;
|
|
592
|
+
&-title{
|
|
593
|
+
display: flex;
|
|
594
|
+
font-size: 32rpx;
|
|
595
|
+
}
|
|
596
|
+
.card_info{
|
|
597
|
+
color: #FFFFFF;
|
|
598
|
+
font-size: 28rpx;
|
|
599
|
+
padding-left: 40rpx;
|
|
600
|
+
.card_type{
|
|
601
|
+
font-size: 40rpx;
|
|
602
|
+
font-weight: 600;
|
|
603
|
+
margin-top: 70rpx;
|
|
604
|
+
}
|
|
605
|
+
.card_sec{
|
|
606
|
+
margin: 12rpx 0;
|
|
607
|
+
}
|
|
608
|
+
.card_other{
|
|
609
|
+
background-color: rgba(255,255,255, 0.2);
|
|
610
|
+
border-radius: 8rpx;
|
|
611
|
+
padding: 8rpx 20rpx;
|
|
612
|
+
display: inline-block;
|
|
613
|
+
}
|
|
614
|
+
}
|
|
615
|
+
}
|
|
616
|
+
|
|
617
|
+
|
|
561
618
|
.logo-icon {
|
|
562
619
|
width: unit(100, rpx) !important;
|
|
563
620
|
height: unit(100, rpx) !important;
|
|
@@ -784,9 +841,20 @@ export default {
|
|
|
784
841
|
line-height: unit(36, rpx);
|
|
785
842
|
background: #fff;
|
|
786
843
|
border-radius: unit(16,rpx);
|
|
787
|
-
|
|
788
|
-
padding: unit(20,rpx) unit(70,rpx) unit(70,rpx) unit(70,rpx);
|
|
844
|
+
padding: unit(20,rpx) unit(70,rpx) 0 unit(70,rpx);
|
|
789
845
|
color: #000;
|
|
846
|
+
position: relative;
|
|
847
|
+
&::after{
|
|
848
|
+
content: " ";
|
|
849
|
+
position: absolute;
|
|
850
|
+
left: 0;
|
|
851
|
+
bottom: -40rpx;
|
|
852
|
+
width: 100%;
|
|
853
|
+
height: 100rpx;
|
|
854
|
+
background: #FFFFFF;
|
|
855
|
+
border-radius: 100%;
|
|
856
|
+
z-index: 1;
|
|
857
|
+
}
|
|
790
858
|
|
|
791
859
|
& > view {
|
|
792
860
|
// margin-bottom: unit(20, rpx);
|
|
@@ -795,8 +863,21 @@ export default {
|
|
|
795
863
|
margin-bottom: 0;
|
|
796
864
|
}
|
|
797
865
|
}
|
|
866
|
+
.refresh_wrap{
|
|
867
|
+
width: 300rpx;
|
|
868
|
+
height: 80rpx;
|
|
869
|
+
display: flex;
|
|
870
|
+
align-items: center;
|
|
871
|
+
border: 1px solid #999999;
|
|
872
|
+
color: #999999;
|
|
873
|
+
border-radius: 40rpx;
|
|
874
|
+
justify-content: center;
|
|
875
|
+
margin: 36rpx auto 0;
|
|
876
|
+
position: relative;
|
|
877
|
+
z-index: 10;
|
|
878
|
+
}
|
|
798
879
|
|
|
799
|
-
|
|
880
|
+
.barcode_wrap {
|
|
800
881
|
display: flex;
|
|
801
882
|
justify-content: center;
|
|
802
883
|
align-items: center;
|
|
@@ -819,7 +900,7 @@ export default {
|
|
|
819
900
|
}
|
|
820
901
|
}
|
|
821
902
|
|
|
822
|
-
|
|
903
|
+
.qrcode_wrap {
|
|
823
904
|
display: flex;
|
|
824
905
|
justify-content: center;
|
|
825
906
|
align-items: center;
|
|
@@ -17,8 +17,12 @@
|
|
|
17
17
|
minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'
|
|
18
18
|
}">
|
|
19
19
|
<view class="setting_list">
|
|
20
|
-
<xd-list-item label="已绑实体卡是否失效"
|
|
21
|
-
|
|
20
|
+
<xd-list-item label="已绑实体卡是否失效" :showRight="!showSwitch" listIcon="icongongxiang"
|
|
21
|
+
paddingLR="50rpx" paddingTB="32rpx"
|
|
22
|
+
@click="handleToShowSwitch"
|
|
23
|
+
>
|
|
24
|
+
<view v-if="!showSwitch">去配置</view>
|
|
25
|
+
<xd-switch v-else :checked="cardChecked" size="small" @change="handleCardChecked"></xd-switch>
|
|
22
26
|
</xd-list-item>
|
|
23
27
|
<xd-list-item :showRight="!phone_number" label="绑定手机号" listIcon="iconshouji01"
|
|
24
28
|
paddingLR="50rpx" paddingTB="32rpx"
|
|
@@ -64,6 +68,7 @@
|
|
|
64
68
|
return {
|
|
65
69
|
cardChecked: false,
|
|
66
70
|
phone_number: "",
|
|
71
|
+
showSwitch: true,
|
|
67
72
|
|
|
68
73
|
//面板
|
|
69
74
|
bind_phone_url: "", //绑定手机号跳转地址
|
|
@@ -98,6 +103,11 @@
|
|
|
98
103
|
});
|
|
99
104
|
}
|
|
100
105
|
},
|
|
106
|
+
handleToShowSwitch(){
|
|
107
|
+
if(!this.showSwitch){
|
|
108
|
+
this.showSwitch = true;
|
|
109
|
+
}
|
|
110
|
+
},
|
|
101
111
|
handleCardChecked(flag){
|
|
102
112
|
jfbRootExec("setCardUserSetting", {
|
|
103
113
|
vm: this,
|
|
@@ -126,11 +136,12 @@
|
|
|
126
136
|
getCardConfig(){
|
|
127
137
|
jfbRootExec("getCardUserSetting", {
|
|
128
138
|
vm: this,
|
|
129
|
-
data: {
|
|
130
|
-
|
|
131
|
-
}
|
|
139
|
+
data: {}
|
|
132
140
|
}).then(res => {
|
|
133
141
|
let is_entity_card_invalid = res.is_entity_card_invalid; //Y失效 N: 有效
|
|
142
|
+
if(is_entity_card_invalid === ""){
|
|
143
|
+
this.showSwitch = false;
|
|
144
|
+
}
|
|
134
145
|
this.cardChecked = is_entity_card_invalid === "Y";
|
|
135
146
|
})
|
|
136
147
|
},
|