jufubao-base 1.0.307-beta1 → 1.0.308
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 +1 -1
- package/src/components/JfbBaseCodeOpenVip/Api.js +4 -15
- package/src/components/JfbBaseCodeOpenVip/Attr.js +229 -299
- package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue +182 -695
- package/src/components/JfbBaseCodeOpenVip/Mock.js +1 -3
- package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +4 -24
- package/src/components/JfbBaseConsumpCode/cusAttr/advanced.js +1 -1
- package/src/components/JfbBaseConsumpCode/cusAttr/style.js +1 -43
- package/src/components/JfbBaseNotice/JfbBaseNotice.vue +25 -14
- package/src/components/JfbBaseOpenVip/Attr.js +2 -52
- package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue +24 -70
- package/src/components/JfbBaseOpenVip/Mock.js +1 -1
- package/src/components/JfbBaseOpenVip/XdVipList.vue +19 -85
- package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue +41 -57
|
@@ -5,60 +5,29 @@
|
|
|
5
5
|
v-for="item in uiList" :key="item.vip_card_id"
|
|
6
6
|
@click="handleChoseVip(item.vip_card_id)"
|
|
7
7
|
>
|
|
8
|
-
<view>
|
|
9
|
-
|
|
10
|
-
<view class="vip_price"><text>￥</text>{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100) }}</view>
|
|
11
|
-
</view>
|
|
8
|
+
<view class="vip_name">{{ item.product_name}}</view>
|
|
9
|
+
<view class="vip_price">￥{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100) }}</view>
|
|
12
10
|
</view>
|
|
13
11
|
</view>
|
|
14
12
|
<view class="vip_pay">
|
|
15
|
-
<view class="pay_btn" @click="toVipDetail
|
|
13
|
+
<view class="pay_btn" @click="toVipDetail">
|
|
16
14
|
<template v-if="vip_card_id===-1">0元开通</template>
|
|
17
15
|
<template v-else>
|
|
18
|
-
￥{{ $xdUniHelper.divisionFloatNumber(curVipCard.sale_price, 100) }}
|
|
16
|
+
立即支付 ￥{{ $xdUniHelper.divisionFloatNumber(curVipCard.sale_price, 100) }}
|
|
19
17
|
</template>
|
|
20
18
|
</view>
|
|
21
|
-
<view class="vip_tip">
|
|
22
|
-
<checkbox-group @change="checkboxChange">
|
|
23
|
-
<label>
|
|
24
|
-
<view>
|
|
25
|
-
<checkbox
|
|
26
|
-
:color="mainColor"
|
|
27
|
-
style="transform:scale(0.6)"
|
|
28
|
-
:value="1"/>
|
|
29
|
-
</view>
|
|
30
|
-
</label>
|
|
31
|
-
</checkbox-group>
|
|
32
|
-
勾选同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text>
|
|
33
|
-
</view>
|
|
19
|
+
<view class="vip_tip">开通视为同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
|
|
34
20
|
</view>
|
|
35
|
-
<XdDailog
|
|
36
|
-
class="confirm-dialog"
|
|
37
|
-
title="开通确认"
|
|
38
|
-
:showClose="false"
|
|
39
|
-
:maskAutoClose="true"
|
|
40
|
-
:show.sync="showConfirm">
|
|
41
|
-
<view style="color:#999999;font-size: 28rpx;">
|
|
42
|
-
我已阅读并同意<text @click.stop="handlePrivacy('privacy_service')">《PLUS会员服务协议》</text>
|
|
43
|
-
</view>
|
|
44
|
-
<template slot="btn">
|
|
45
|
-
<view class="confirm-dialog__btn" @click="showConfirm=false">
|
|
46
|
-
<XdButton @click="toVipDetail(1)" type="primary" size="small" width="500rpx">继续开通</XdButton>
|
|
47
|
-
</view>
|
|
48
|
-
</template>
|
|
49
|
-
</XdDailog>
|
|
50
21
|
</view>
|
|
51
22
|
</template>
|
|
52
23
|
|
|
53
24
|
<script>
|
|
54
25
|
import XdButton from "@/components/XdButton/XdButton.vue"
|
|
55
26
|
import XdUnit from "@/components/XdUnit/XdUnit.vue"
|
|
56
|
-
import XdDailog from "@/components/XdDailog/XdDailog.vue"
|
|
57
27
|
export default {
|
|
58
28
|
components: {
|
|
59
29
|
XdButton,
|
|
60
|
-
XdUnit
|
|
61
|
-
XdDailog
|
|
30
|
+
XdUnit
|
|
62
31
|
},
|
|
63
32
|
props: {
|
|
64
33
|
list: {
|
|
@@ -66,10 +35,6 @@
|
|
|
66
35
|
default(){
|
|
67
36
|
return []
|
|
68
37
|
}
|
|
69
|
-
},
|
|
70
|
-
mainColor: {
|
|
71
|
-
type: String,
|
|
72
|
-
default: ''
|
|
73
38
|
}
|
|
74
39
|
},
|
|
75
40
|
watch: {
|
|
@@ -86,9 +51,7 @@
|
|
|
86
51
|
data(){
|
|
87
52
|
return {
|
|
88
53
|
uiList: [],
|
|
89
|
-
vip_card_id: ''
|
|
90
|
-
isAgree: [],
|
|
91
|
-
showConfirm: false
|
|
54
|
+
vip_card_id: ''
|
|
92
55
|
}
|
|
93
56
|
},
|
|
94
57
|
methods: {
|
|
@@ -98,17 +61,7 @@
|
|
|
98
61
|
handleChoseVip(vip_card_id){
|
|
99
62
|
this.vip_card_id = vip_card_id
|
|
100
63
|
},
|
|
101
|
-
|
|
102
|
-
this.isAgree = e.detail.value;
|
|
103
|
-
},
|
|
104
|
-
toVipDetail(isAgree) {
|
|
105
|
-
if (isAgree) {
|
|
106
|
-
this.isAgree= [isAgree]
|
|
107
|
-
}
|
|
108
|
-
if (this.isAgree.length === 0) {
|
|
109
|
-
this.showConfirm = true
|
|
110
|
-
return
|
|
111
|
-
}
|
|
64
|
+
toVipDetail(){
|
|
112
65
|
if(this.vip_card_id){
|
|
113
66
|
this.$emit('toVipDetail', this.vip_card_id)
|
|
114
67
|
}
|
|
@@ -124,20 +77,18 @@
|
|
|
124
77
|
width: 100%;
|
|
125
78
|
overflow: auto;
|
|
126
79
|
white-space: nowrap;
|
|
127
|
-
padding: 32rpx
|
|
80
|
+
padding: 32rpx 16rpx;
|
|
128
81
|
.vip_item{
|
|
129
|
-
display: inline-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
height: 266rpx;
|
|
134
|
-
border-radius: 32rpx;
|
|
82
|
+
display: inline-block;
|
|
83
|
+
width: 160rpx;
|
|
84
|
+
height: 112rpx;
|
|
85
|
+
border-radius: 24rpx;
|
|
135
86
|
text-align: center;
|
|
136
87
|
color: #999999;
|
|
137
88
|
border: 4rpx solid #EEEEEE;
|
|
138
89
|
background-color: #EEEEEE;
|
|
139
90
|
box-sizing: border-box;
|
|
140
|
-
margin
|
|
91
|
+
margin: 0 16rpx;
|
|
141
92
|
padding: 20rpx 0;
|
|
142
93
|
line-height: 1;
|
|
143
94
|
font-weight: 500;
|
|
@@ -147,22 +98,16 @@
|
|
|
147
98
|
color: #AB6900;
|
|
148
99
|
}
|
|
149
100
|
.vip_name{
|
|
150
|
-
font-size:
|
|
151
|
-
margin-bottom:
|
|
101
|
+
font-size: 24rpx;
|
|
102
|
+
margin-bottom: 12rpx;
|
|
152
103
|
}
|
|
153
104
|
.vip_price{
|
|
154
|
-
font-size:
|
|
155
|
-
&>text{
|
|
156
|
-
font-size: 24rpx;
|
|
157
|
-
}
|
|
105
|
+
font-size: 36rpx;
|
|
158
106
|
}
|
|
159
107
|
}
|
|
160
|
-
.vip_item:first-child{
|
|
161
|
-
margin-left: 0;
|
|
162
|
-
}
|
|
163
108
|
}
|
|
164
109
|
.vip_pay{
|
|
165
|
-
padding:
|
|
110
|
+
padding: 24rpx 0 50rpx;
|
|
166
111
|
.pay_btn{
|
|
167
112
|
width: 600rpx;
|
|
168
113
|
display: flex;
|
|
@@ -173,24 +118,13 @@
|
|
|
173
118
|
color: #FFFFFF;
|
|
174
119
|
margin: 0 auto;
|
|
175
120
|
border-radius: 80rpx;
|
|
176
|
-
font-size: 32rpx;
|
|
177
121
|
}
|
|
178
122
|
}
|
|
179
123
|
.vip_tip{
|
|
124
|
+
text-align: center;
|
|
180
125
|
font-size: 22rpx;
|
|
181
126
|
color: #999999;
|
|
182
127
|
margin-top: 24rpx;
|
|
183
|
-
display: flex;
|
|
184
|
-
align-items: center;
|
|
185
|
-
justify-content: center;
|
|
186
128
|
}
|
|
187
|
-
.confirm-dialog ::v-deep .xd-dailog__body-title{
|
|
188
|
-
font-size: 32rpx;
|
|
189
|
-
color: #333;
|
|
190
|
-
}
|
|
191
|
-
.confirm-dialog__btn{
|
|
192
|
-
border-top: 2rpx dashed #E5E5E5;
|
|
193
|
-
padding-top: 28rpx;
|
|
194
|
-
}
|
|
195
129
|
}
|
|
196
130
|
</style>
|
|
@@ -58,25 +58,19 @@
|
|
|
58
58
|
</view>
|
|
59
59
|
<view v-if="productList.length>0">
|
|
60
60
|
<view v-for="(item,index) in productList" :key="index" class="jfb-base-saving-detail__body-product-item">
|
|
61
|
-
<
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
<view class="jfb-base-saving-detail__body-product-item-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
</view>
|
|
73
|
-
<!-- <view class="jfb-base-saving-detail__body-product-item-info-price">
|
|
74
|
-
<view>合计节省</view>
|
|
75
|
-
<view :style="{color:mainColor}">{{getAmout(item.saving_amount)}}</view>
|
|
76
|
-
</view> -->
|
|
61
|
+
<image :src="item.product_image">
|
|
62
|
+
</image>
|
|
63
|
+
<view class="jfb-base-saving-detail__body-product-item-info">
|
|
64
|
+
<view class="jfb-base-saving-detail__body-product-item-info-name">{{item.product_name}}</view>
|
|
65
|
+
<view class="jfb-base-saving-detail__body-product-item-info-time">
|
|
66
|
+
<view>{{item.order_time}}</view>
|
|
67
|
+
<view>{{item.product_num}}件</view>
|
|
68
|
+
</view>
|
|
69
|
+
<view class="jfb-base-saving-detail__body-product-item-info-price">
|
|
70
|
+
<view>合计节省</view>
|
|
71
|
+
<view :style="{color:mainColor}">{{getAmout(item.saving_amount)}}</view>
|
|
77
72
|
</view>
|
|
78
73
|
</view>
|
|
79
|
-
<view class="jfb-base-saving-detail__body-product-item-bottom">{{ item.saving_desc_text }}</view>
|
|
80
74
|
</view>
|
|
81
75
|
</view>
|
|
82
76
|
<XdNoData v-else></XdNoData>
|
|
@@ -676,7 +670,7 @@
|
|
|
676
670
|
align-items: center;
|
|
677
671
|
justify-content: space-between;
|
|
678
672
|
padding: 24rpx;
|
|
679
|
-
border-bottom: 2rpx solid #
|
|
673
|
+
border-bottom: 2rpx solid #eee;
|
|
680
674
|
|
|
681
675
|
&>view:first-child {
|
|
682
676
|
color: #333;
|
|
@@ -690,57 +684,47 @@
|
|
|
690
684
|
}
|
|
691
685
|
|
|
692
686
|
&-item {
|
|
687
|
+
display: flex;
|
|
693
688
|
padding: 26rpx;
|
|
694
|
-
border-bottom: 2rpx solid #
|
|
695
|
-
&-top{
|
|
696
|
-
display: flex;
|
|
697
|
-
&>image {
|
|
698
|
-
width: 140rpx;
|
|
699
|
-
height: 140rpx;
|
|
700
|
-
margin-right: 32rpx;
|
|
701
|
-
flex-shrink: 0;
|
|
689
|
+
border-bottom: 2rpx solid #eee;
|
|
702
690
|
|
|
691
|
+
&>image {
|
|
692
|
+
width: 200rpx;
|
|
693
|
+
height: 200rpx;
|
|
694
|
+
margin-right: 32rpx;
|
|
695
|
+
flex-shrink: 0;
|
|
696
|
+
|
|
697
|
+
}
|
|
698
|
+
|
|
699
|
+
&-info {
|
|
700
|
+
flex: 1;
|
|
701
|
+
|
|
702
|
+
&-name {
|
|
703
|
+
font-size: 28rpx;
|
|
704
|
+
color: #333333;
|
|
705
|
+
.uni-max-cut(2, 80);
|
|
703
706
|
}
|
|
704
707
|
|
|
705
|
-
&-
|
|
706
|
-
flex: 1;
|
|
708
|
+
&-time {
|
|
707
709
|
display: flex;
|
|
708
|
-
|
|
710
|
+
align-items: center;
|
|
709
711
|
justify-content: space-between;
|
|
712
|
+
font-size: 24rpx;
|
|
713
|
+
color: #999999;
|
|
714
|
+
margin: 40rpx 0 12rpx 0;
|
|
715
|
+
}
|
|
710
716
|
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
.uni-max-cut(2, 80);
|
|
717
|
-
}
|
|
718
|
-
|
|
719
|
-
&-time {
|
|
720
|
-
display: flex;
|
|
721
|
-
align-items: center;
|
|
722
|
-
// justify-content: space-between;
|
|
723
|
-
font-size: 24rpx;
|
|
724
|
-
color: #999999;
|
|
725
|
-
margin: 40rpx 0 12rpx 0;
|
|
726
|
-
& > view:first-child{
|
|
727
|
-
margin-right: 24rpx;
|
|
728
|
-
}
|
|
729
|
-
}
|
|
717
|
+
&-price {
|
|
718
|
+
display: flex;
|
|
719
|
+
align-items: center;
|
|
720
|
+
justify-content: space-between;
|
|
721
|
+
font-size: 24rpx;
|
|
730
722
|
|
|
731
|
-
|
|
732
|
-
font-size: 28rpx;
|
|
723
|
+
&>view:nth-child(2) {
|
|
733
724
|
font-weight: 500;
|
|
734
|
-
color:#FF5A39;
|
|
735
|
-
flex-shrink: 0;
|
|
736
725
|
}
|
|
737
726
|
}
|
|
738
727
|
}
|
|
739
|
-
&-bottom {
|
|
740
|
-
color: #666666;
|
|
741
|
-
font-size: 18rpx;
|
|
742
|
-
margin-top: 24rpx;
|
|
743
|
-
}
|
|
744
728
|
}
|
|
745
729
|
}
|
|
746
730
|
|