jufubao-base 1.0.215-beta1 → 1.0.216-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 (11) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCard/JfbBaseCard.vue +30 -5
  3. package/src/components/JfbBaseCard/Mock.js +9 -4
  4. package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +26 -5
  5. package/src/components/JfbBaseCardDisabled/Mock.js +4 -2
  6. package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue +19 -1
  7. package/src/components/JfbBaseCardDisabledEntry/Mock.js +2 -0
  8. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +131 -117
  9. package/src/components/JfbBaseCardEntry/Mock.js +22 -1
  10. package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +26 -1
  11. package/src/components/JfbBaseCardV2/Mock.js +12 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.215-beta1",
3
+ "version": "1.0.216-beta1",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCard/JfbBaseCard.vue CHANGED
@@ -166,14 +166,16 @@
166
166
  class="jfb-base-card__body-card-item-right-top"
167
167
  :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
168
168
  >
169
- <view>
169
+ <view :class="{card_name:item.is_gift === 'Y'}">
170
+ <view :style="{backgroundColor: mainColor}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
170
171
  <xd-font-icon
172
+ v-else
171
173
  icon="iconkaquan"
172
174
  size="38"
173
175
  :style="{marginRight: '18rpx'}"
174
176
  :color="mainColor"
175
177
  ></xd-font-icon>
176
- <view>{{ item.card_type_name }}</view>
178
+ <view class="card_name_text">{{ item.card_type_name }}</view>
177
179
  </view>
178
180
  <view>
179
181
  <view>{{ item.card_number }}{{showIndex?(':' + index):''}}</view>
@@ -211,9 +213,7 @@
211
213
  </template>
212
214
  </view>
213
215
  </template>
214
- <view v-if="showDisabled==='Y'" @click="handleToDisabled" class="jfb-base-card__body-disabled">
215
- 已失效票券>>>
216
- </view>
216
+ <view v-if="showDisabled==='Y'" @click="handleToDisabled" class="jfb-base-card__body-disabled">已失效票券>>></view>
217
217
  </view>
218
218
  <view class="jfb-base-card__body-dialog" v-if="dialogEvent">
219
219
  <view class="jfb-base-card__body-dialog-content">
@@ -698,6 +698,29 @@ export default {
698
698
  padding: unit(55, rpx) unit(35, rpx);
699
699
  color: #333;
700
700
 
701
+ & .card_name {
702
+ display: flex;
703
+ justify-content: flex-start;
704
+ align-items: flex-start;
705
+
706
+ & .is-gift {
707
+ margin-top: 5rpx;
708
+ font-size: 18rpx;
709
+ padding: 2rpx 10rpx;
710
+ border-radius: 8rpx;
711
+ line-height:26rpx;
712
+ height: 26rpx;
713
+ color: #fff;
714
+ margin-right: 18rpx;
715
+ }
716
+
717
+ & .card_name_text {
718
+ //line-height: 36rpx;
719
+ }
720
+ }
721
+
722
+
723
+
701
724
  &-dialog {
702
725
  position: fixed;
703
726
  top: 0;
@@ -899,6 +922,8 @@ export default {
899
922
  color: #b8b7be;
900
923
  margin-bottom: unit(30, rpx);
901
924
  }
925
+
926
+
902
927
  }
903
928
  }
904
929
  </style>
package/src/components/JfbBaseCard/Mock.js CHANGED
@@ -13,7 +13,8 @@ module.exports = {
13
13
  "is_login":'Y',
14
14
  "main_product_name": "",
15
15
  "other_card_point": 0,
16
- "is_exchange": "N"
16
+ "is_exchange": "N",
17
+ "is_gift":"Y"
17
18
  }, {
18
19
  "card_number": "101001000005193",
19
20
  "card_point": 99963600,
@@ -23,7 +24,8 @@ module.exports = {
23
24
  "is_valid": "Y",
24
25
  "main_product_name": "",
25
26
  "other_card_point": 0,
26
- "is_exchange": "N"
27
+ "is_exchange": "N",
28
+ "is_gift":"N"
27
29
  }, {
28
30
  "card_number": "101001000005184",
29
31
  "card_point": 100000000,
@@ -33,7 +35,8 @@ module.exports = {
33
35
  "is_valid": "Y",
34
36
  "main_product_name": "",
35
37
  "other_card_point": 0,
36
- "is_exchange": "N"
38
+ "is_exchange": "N",
39
+ "is_gift":"Y"
37
40
  }, {
38
41
  "card_number": "101001000005185",
39
42
  "card_point": 99631000,
@@ -63,6 +66,7 @@ module.exports = {
63
66
  "is_valid": "Y",
64
67
  "main_product_name": "",
65
68
  "other_card_point": 0,
69
+ "is_gift":"Y",
66
70
  "is_exchange": "Y"
67
71
  }, {
68
72
  "card_number": "101001000006989",
@@ -83,7 +87,8 @@ module.exports = {
83
87
  "is_valid": "Y",
84
88
  "main_product_name": "",
85
89
  "other_card_point": 0,
86
- "is_exchange": "Y"
90
+ "is_exchange": "Y",
91
+ "is_gift":"Y"
87
92
  }, {
88
93
  "card_number": "101001000005479",
89
94
  "card_point": 10000000,
package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue CHANGED
@@ -10,9 +10,7 @@
10
10
  :class="{ editx: isEditx && active }"
11
11
  v-if="isEditx && active"
12
12
  >
13
- <view class="jfb-base-card-disabled__edit-icon" @click="delEdit"
14
- >删除</view
15
- >
13
+ <view class="jfb-base-card-disabled__edit-icon" @click="delEdit">删除</view>
16
14
  </view>
17
15
  <!-- #endif -->
18
16
  <view class="jfb-base-card-disabled__body">
@@ -56,14 +54,16 @@
56
54
  </view>
57
55
  <view class="jfb-base-card-disabled__body-card-item-right">
58
56
  <view class="jfb-base-card-disabled__body-card-item-right-top">
59
- <view>
57
+ <view :class="{card_name:item.is_gift === 'Y'}">
58
+ <view :style="{backgroundColor: '#b8b7be'}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
60
59
  <xd-font-icon
60
+ v-else
61
61
  icon="iconkaquan"
62
62
  size="38"
63
63
  :style="{marginRight: '18rpx'}"
64
64
  color="#B8B7BE"
65
65
  ></xd-font-icon>
66
- <view style="color: #b8b7be">{{ item.card_type_name }}</view>
66
+ <view class="card_name_text" style="color: #b8b7be">{{ item.card_type_name }}</view>
67
67
  </view>
68
68
  <view>
69
69
  <view>{{ item.card_number }}</view>
@@ -211,6 +211,27 @@ export default {
211
211
  padding: unit(55, rpx) unit(35, rpx);
212
212
  color: #333;
213
213
 
214
+ & .card_name {
215
+ display: flex;
216
+ justify-content: flex-start;
217
+ align-items: flex-start;
218
+
219
+ & .is-gift {
220
+ margin-top: 5rpx;
221
+ font-size: 18rpx;
222
+ padding: 2rpx 10rpx;
223
+ border-radius: 8rpx;
224
+ line-height:26rpx;
225
+ height: 26rpx;
226
+ color: #fff;
227
+ margin-right: 18rpx;
228
+ }
229
+
230
+ & .card_name_text {
231
+ //line-height: 36rpx;
232
+ }
233
+ }
234
+
214
235
  &-card {
215
236
  border: 1px dashed rgba(0, 0, 0, 0);
216
237
  box-sizing: border-box;
package/src/components/JfbBaseCardDisabled/Mock.js CHANGED
@@ -100,7 +100,8 @@ module.exports = {
100
100
  "main_business_code_name": "",
101
101
  "other_card_point": 0,
102
102
  "is_exchange": "N",
103
- "card_point_type": 1
103
+ "card_point_type": 1,
104
+ "is_gift": 'Y',
104
105
  }, {
105
106
  "card_number": "261001000002643",
106
107
  "card_point": 0,
@@ -111,7 +112,8 @@ module.exports = {
111
112
  "main_business_code_name": "",
112
113
  "other_card_point": 0,
113
114
  "is_exchange": "N",
114
- "card_point_type": 1
115
+ "card_point_type": 1,
116
+ "is_gift": 'Y',
115
117
  }, {
116
118
  "card_number": "261001000002641",
117
119
  "card_point": 0,
package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue CHANGED
@@ -34,7 +34,10 @@
34
34
  >
35
35
  <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
36
36
  <view class="card-list__title">
37
- <view>{{item['card_type_name']}}</view>
37
+ <view>
38
+ <view :style="{backgroundColor: '#b8b7be'}" class="gifted" v-if="item['is_gift'] === 'Y'">赠</view>
39
+ <view class="__title-name">{{item['card_type_name']}}</view>
40
+ </view>
38
41
  </view>
39
42
  <div class="card-list__content">
40
43
  <view>
@@ -438,6 +441,9 @@ export default {
438
441
  align-items: center;
439
442
 
440
443
  & > view {
444
+ display: flex;
445
+ justify-content: flex-start;
446
+ align-items: center;
441
447
  padding: 0 unit(80, rpx);
442
448
  font-size: unit(24, rpx);
443
449
  line-height: unit(56, rpx);
@@ -446,6 +452,18 @@ export default {
446
452
  border-radius: 0 0 unit(16, rpx) 0;
447
453
  }
448
454
 
455
+
456
+ & view.gifted {
457
+ margin-top: -2rpx;
458
+ font-size: 18rpx;
459
+ padding: 2rpx 10rpx;
460
+ border-radius: 8rpx;
461
+ line-height:26rpx;
462
+ height: 26rpx;
463
+ color: #fff;
464
+ margin-right: 18rpx;
465
+ }
466
+
449
467
  }
450
468
 
451
469
  &__content {
package/src/components/JfbBaseCardDisabledEntry/Mock.js CHANGED
@@ -25,6 +25,7 @@ module.exports = {
25
25
  "is_valid": "N",
26
26
  "main_business_code_name": "",
27
27
  "other_card_point": 0,
28
+ "is_gift":'Y',
28
29
  "is_exchange": "N",
29
30
  "card_point_type": 1,
30
31
  "business_codes": ["health"]
@@ -40,6 +41,7 @@ module.exports = {
40
41
  "other_card_point": 0,
41
42
  "is_exchange": "N",
42
43
  "card_point_type": 1,
44
+ "is_gift":'Y',
43
45
  "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
44
46
  }, {
45
47
  "card_number": "101001000008421",
package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue CHANGED
@@ -137,6 +137,7 @@
137
137
  v-if="subTabIndex === 2&&tabIndex === 1"
138
138
  >* 目前仅支持电影票兑换券进行转换</view>
139
139
  <view class="card-content">
140
+ <!--loading-->
140
141
  <view v-if="loadingCardList" class="jfb-base-card-entry__body-card skeleton-card">
141
142
  <view v-for="i in 3" class="card-list" :key="i">
142
143
  <view class="card-list-warp">
@@ -164,126 +165,124 @@
164
165
  </view>
165
166
  </view>
166
167
  </view>
167
-
168
+ <!--loading-->
169
+ <!--content-->
168
170
  <template v-else>
169
- <view
170
- v-if="tabIndex === 1 && (cardList && cardList.length > 0)"
171
- class="jfb-base-card-entry__body-card"
172
- >
171
+ <!--content card-->
172
+ <view v-if="tabIndex === 1 && (cardList && cardList.length > 0)" class="jfb-base-card-entry__body-card">
173
173
  <template v-if="cardType==='default'">
174
- <view
175
- v-for="(item,index) in cardList"
176
- :data-index="item.card_number"
177
- :data-idx="index"
178
- :data-top="item.top"
179
- class="card-list"
180
- :key="item.card_number"
181
- @click="toDetail(item)"
182
- v-if="setCardItemShow(item,index)"
183
- :style="{
174
+ <template v-for="(item,index) in cardList">
175
+ <view
176
+ :data-index="item.card_number"
177
+ :data-idx="index"
178
+ :data-top="item.top"
179
+ class="card-list"
180
+ :key="item.card_number"
181
+ @click="toDetail(item)"
182
+ v-if="setCardItemShow(item,index)"
183
+ :style="{
184
184
  background: item['theme']['color'],
185
185
  backgroundSize: '100%',
186
186
  height: subTabIndex !== 3 ? item.height + 'px' : '300rpx'
187
187
  }"
188
- >
189
- <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
190
- <view class="card-list__title">
191
- <view>
192
- <view>{{item['card_type_name']}}</view>
193
- <view v-if="item['is_login'] === 'Y'"><text></text><text>已登录</text></view>
194
- </view>
195
- </view>
196
- <view class="card-list__content">
197
- <view>
198
- <text>券号：</text>
199
- <text>{{item.card_number}}{{showIndex?(':' + index):''}}</text>
188
+ >
189
+ <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
190
+ <view class="card-list__title">
191
+ <view>
192
+ <view :style="{backgroundColor: mainColor}" class="gifted" v-if="item['is_gift'] === 'Y'">赠</view>
193
+ <view>{{item['card_type_name']}}</view>
194
+ <view class="logined" v-if="item['is_login'] === 'Y'"><text></text><text>已登录</text></view>
195
+ </view>
200
196
  </view>
201
- <view @click.stop="toDetail(item)" v-if="subTabIndex !== 3&&isShowCode === 'Y'&&!force">
197
+ <view class="card-list__content">
202
198
  <view>
203
- <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
199
+ <text>券号：</text>
200
+ <text>{{item.card_number}}{{showIndex?(':' + index):''}}</text>
201
+ </view>
202
+ <view @click.stop="toDetail(item)" v-if="subTabIndex !== 3&&isShowCode === 'Y'&&!force">
203
+ <view>
204
+ <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
205
+ </view>
206
+ <view>点击查看</view>
204
207
  </view>
205
- <view>点击查看</view>
206
208
  </view>
207
- </view>
208
- <view class="card-list__date">
209
- <text>有效期：</text>
210
- <text>{{item.end_time}}</text>
211
- </view>
212
- <view class="card-list__yue">
213
- <text>余额：</text>
214
- <text>{{item.card_point}} {{ item.unit }}</text>
215
- </view>
216
- <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
217
- <view><text>购买其他物品可抵：</text><text>{{item.other_card_point}} {{ item.unit }}</text></view>
218
- </view>
219
- <template v-if="subTabIndex === 1">
220
- <view class="card-list__entry" v-if="item.is_login==='N'&&force">
221
- <view
222
- @click.stop="handleBindLogin(item,item['entries'][0])"
223
- :style="{
209
+ <view class="card-list__date">
210
+ <text>有效期：</text>
211
+ <text>{{item.end_time}}</text>
212
+ </view>
213
+ <view class="card-list__yue">
214
+ <text>余额：</text>
215
+ <text>{{item.card_point}} {{ item.unit }}</text>
216
+ </view>
217
+ <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
218
+ <view><text>购买其他物品可抵：</text><text>{{item.other_card_point}} {{ item.unit }}</text></view>
219
+ </view>
220
+ <template v-if="subTabIndex === 1">
221
+ <view class="card-list__entry" v-if="item.is_login==='N'&&force">
222
+ <view
223
+ @click.stop="handleBindLogin(item,item['entries'][0])"
224
+ :style="{
224
225
  background: '#fff',
225
226
  color: item['theme']['color']}"
226
- >
227
- 登录
227
+ >登录</view>
228
228
  </view>
229
- </view>
230
- <view class="card-list__entry" v-if="item.entries.length === 1&&!force">
231
- <view
232
- @click.stop="handleBindLogin(item,item['entries'][0])"
233
- :style="{color: item['theme']['color']}"
234
- >进入{{item['entries'][0]['entry_name']}}</view>
235
- </view>
236
- <view class="card-list__nodata" v-if="item.entries.length === 0&&!force">暂无支持服务列表</view>
237
- <view class="card-list__entrys" v-if="item.entries.length > 1&&!force" @click.stop>
238
- <view class="card-list__entrys-title">
239
- <view>可兑换权益</view>
240
- <view @click.stop="toDetail(item, false)">
241
- <text>查看详情</text>
242
- <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
243
- </view>
229
+ <view class="card-list__entry" v-if="item.entries.length === 1&&!force">
230
+ <view
231
+ @click.stop="handleBindLogin(item,item['entries'][0])"
232
+ :style="{color: item['theme']['color']}"
233
+ >进入{{item['entries'][0]['entry_name']}}</view>
244
234
  </view>
245
- <view class="card-list__entrys-list">
246
- <scroll-view scroll-x class="card-list__entrys-scroll">
247
- <view class="card-list__entrys-item">
248
- <view
249
- v-for="(entry,idx) in item.entries"
250
- :key="idx"
251
- @click.stop="handleBindLogin(item, entry)"
252
- >
253
- <view><image :src="entry.image_url"></image></view>
254
- <view>{{entry|cutstr}}</view>
255
- <view>
256
- <text>去兑换</text>
257
- <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
235
+ <view class="card-list__nodata" v-if="item.entries.length === 0&&!force">暂无支持服务列表</view>
236
+ <view class="card-list__entrys" v-if="item.entries.length > 1&&!force" @click.stop>
237
+ <view class="card-list__entrys-title">
238
+ <view>可兑换权益</view>
239
+ <view @click.stop="toDetail(item, false)">
240
+ <text>查看详情</text>
241
+ <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
242
+ </view>
243
+ </view>
244
+ <view class="card-list__entrys-list">
245
+ <scroll-view scroll-x class="card-list__entrys-scroll">
246
+ <view class="card-list__entrys-item">
247
+ <view
248
+ v-for="(entry,idx) in item.entries"
249
+ :key="idx"
250
+ @click.stop="handleBindLogin(item, entry)"
251
+ >
252
+ <view><image :src="entry.image_url"></image></view>
253
+ <view>{{entry|cutstr}}</view>
254
+ <view>
255
+ <text>去兑换</text>
256
+ <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
257
+ </view>
258
258
  </view>
259
259
  </view>
260
- </view>
261
- </scroll-view>
260
+ </scroll-view>
261
+ </view>
262
262
  </view>
263
+ </template>
264
+ <view class="card-list__entry" v-else-if="subTabIndex===2">
265
+ <view
266
+ @click.stop="handleBindLogin(item,item['entries'][0])"
267
+ :style="{color: item['theme']['color']}"
268
+ >票券转换</view>
263
269
  </view>
264
- </template>
265
- <view class="card-list__entry" v-else-if="subTabIndex===2">
266
- <view
267
- @click.stop="handleBindLogin(item,item['entries'][0])"
268
- :style="{color: item['theme']['color']}"
269
- >票券转换</view>
270
270
  </view>
271
271
  </view>
272
- </view>
273
- <view
274
- class="card-content-empty card-list"
275
- :data-index="item.card_number"
276
- :data-idx="index"
277
- :data-top="item.top"
278
- v-else
279
- :style="{
272
+ <view
273
+ class="card-content-empty card-list"
274
+ :data-index="item.card_number"
275
+ :data-idx="index"
276
+ :data-top="item.top"
277
+ v-else
278
+ :style="{
280
279
  height: item.height + 'px',
281
280
  backgroundImage: 'url('+ (tabIndex===2 || item.entries.length <= 1 ? cardItem: cardItemEntry) +')'
282
281
  }"
283
- ></view>
282
+ ></view>
283
+ </template>
284
284
  </template>
285
285
  <template v-if="cardType==='style2'">
286
-
287
286
  <view v-for="(item,index) in cardList" :key="item.card_number">
288
287
  <xd-card-new
289
288
  :item="item"
@@ -297,27 +296,29 @@
297
296
  </view>
298
297
  </template>
299
298
  </view>
299
+ <!--content card-->
300
+ <!--content coupon-->
300
301
  <view v-if="tabIndex===2&&(couponList&&couponList.length)">
301
302
  <view v-if="couponList.length" class="coupon_list">
302
- <CusCouponItem v-for="(item, i) in couponList" :key="i"
303
- style="margin-bottom:20rpx"
304
- :couponRadius="couponRadius"
305
- :couponImageUrl="couponImageUrl"
306
- :couponTitleBgColor="couponTitleBgColor"
307
- :couponUseBtnPadding="couponUseBtnPadding"
308
- :couponBtnRadius="couponBtnRadius"
309
- :couponBtnTextStyle="couponBtnTextStyle"
310
- :couponLeftBgColor="couponLeftBgColor"
311
- :item="item"
312
- :mainColor="mainColor"
313
- @useCoupon="handleBindLogin(item,item['entries'][0])"
314
- @toDetail="toDetail(item)"
315
- ></CusCouponItem>
316
- </view>
317
- <view v-else>
318
- 暂无数据
319
- </view>
303
+ <CusCouponItem v-for="(item, i) in couponList" :key="i"
304
+ style="margin-bottom:20rpx"
305
+ :couponRadius="couponRadius"
306
+ :couponImageUrl="couponImageUrl"
307
+ :couponTitleBgColor="couponTitleBgColor"
308
+ :couponUseBtnPadding="couponUseBtnPadding"
309
+ :couponBtnRadius="couponBtnRadius"
310
+ :couponBtnTextStyle="couponBtnTextStyle"
311
+ :couponLeftBgColor="couponLeftBgColor"
312
+ :item="item"
313
+ :mainColor="mainColor"
314
+ @useCoupon="handleBindLogin(item,item['entries'][0])"
315
+ @toDetail="toDetail(item)"
316
+ ></CusCouponItem>
317
+ </view>
318
+ <view v-else>暂无数据</view>
320
319
  </view>
320
+ <!--content coupon-->
321
+ <!--no data-->
321
322
  <view v-else-if="cardList !== null && cardList.length === 0">
322
323
  <view class="jfb-base-card-entry__body-empty">
323
324
  <view class="jfb-base-card-entry__body-empty-wrap">
@@ -326,14 +327,17 @@
326
327
  </view>
327
328
  </view>
328
329
  </view>
330
+ <!--no data-->
329
331
  </template>
330
-
332
+ <!--content-->
333
+ <!--disabled-->
331
334
  <view
332
335
  v-if="showDisabled==='Y'"
333
336
  @click="handleToDisabled"
334
337
  class="jfb-base-card-entry__body-disabled"
335
338
  >已失效票券>>></view>
336
339
  </view>
340
+ <!--disabled-->
337
341
  <view class="jfb-base-card-entry__body-dialog" v-if="dialogEvent">
338
342
  <view class="jfb-base-card-entry__body-dialog-content">
339
343
  <image
@@ -1190,11 +1194,11 @@ export default {
1190
1194
  justify-content: center;
1191
1195
  align-items: center;
1192
1196
 
1193
- .skeleton-card &{
1197
+ .skeleton-card & {
1194
1198
  .skeleton-item(120rpx, 50rpx, 0 0 16rpx 0, #EEEEEE);
1195
1199
  }
1196
1200
 
1197
- & > view:nth-child(2) {
1201
+ & > view.logined {
1198
1202
  height: 36rpx;
1199
1203
  line-height: 36rpx;
1200
1204
  background-color: rgb(41, 203, 151);
@@ -1218,8 +1222,18 @@ export default {
1218
1222
  }
1219
1223
  }
1220
1224
 
1221
- }
1225
+ & > view.gifted {
1226
+ margin-top: -2rpx;
1227
+ font-size: 18rpx;
1228
+ padding: 2rpx 10rpx;
1229
+ border-radius: 8rpx;
1230
+ line-height:26rpx;
1231
+ height: 26rpx;
1232
+ color: #fff;
1233
+ margin-right: 18rpx;
1234
+ }
1222
1235
 
1236
+ }
1223
1237
  }
1224
1238
 
1225
1239
  &__content {
package/src/components/JfbBaseCardEntry/Mock.js CHANGED
@@ -17,6 +17,7 @@ module.exports = {
17
17
  "is_transfering":"Y",
18
18
  "card_point_type": 1,
19
19
  "is_login":'Y',
20
+ "is_gift":"Y",
20
21
  "business_codes": ["health"]
21
22
  }, {
22
23
  "card_number": "121000100000028",
@@ -31,6 +32,7 @@ module.exports = {
31
32
  "is_exchange": "N",
32
33
  "is_transfering":"Y",
33
34
  "card_point_type": 1,
35
+ "is_gift":"N",
34
36
  "business_codes": ["health"]
35
37
  }, {
36
38
  "card_number": "101001000005192",
@@ -45,6 +47,7 @@ module.exports = {
45
47
  "is_exchange": "N",
46
48
  "is_transfering":"Y",
47
49
  "card_point_type": 1,
50
+ "is_gift":"N",
48
51
  "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
49
52
  }, {
50
53
  "card_number": "101001000008421",
@@ -59,6 +62,7 @@ module.exports = {
59
62
  "is_exchange": "N",
60
63
  "is_transfering":"N",
61
64
  "is_login":'Y',
65
+ "is_gift":'Y',
62
66
  "card_point_type": 1,
63
67
  "business_codes": ["cake"]
64
68
  }, {
@@ -73,9 +77,26 @@ module.exports = {
73
77
  "other_card_point": 0,
74
78
  "is_exchange": "Y",
75
79
  "is_transfering":"N",
80
+ "is_gift":'Y',
76
81
  "card_point_type": 1,
77
82
  "business_codes": ["movie", "market", "cake"]
78
- }, {
83
+ },
84
+ {
85
+ "card_number": "171003500000383",
86
+ "card_point": 100000,
87
+ "card_type": "39",
88
+ "card_type_name": "一对一次卡（无限制）",
89
+ "unit": "次",
90
+ "end_time": "2024-08-31",
91
+ "is_valid": "Y",
92
+ "main_business_code_name": "",
93
+ "other_card_point": 0,
94
+ "is_exchange": "Y",
95
+ "is_transfering":"N",
96
+ "is_gift":'N',
97
+ "card_point_type": 1,
98
+ "business_codes": ["movie", "market", "cake"]
99
+ },{
79
100
  "card_number": "101001000007175",
80
101
  "card_point": 9998700,
81
102
  "card_type": "27",
package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue CHANGED
@@ -76,8 +76,10 @@
76
76
  class="jfb-base-card__body-card-item-right-top"
77
77
  :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
78
78
  >
79
- <view>
79
+ <view :class="{card_name:item.is_gift === 'Y'}">
80
+ <view :style="{backgroundColor: mainColor}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
80
81
  <xd-font-icon
82
+ v-else
81
83
  icon="iconkaquan"
82
84
  size="30"
83
85
  :style="{marginRight: '10rpx'}"
@@ -326,9 +328,32 @@
326
328
  /* #endif */
327
329
  }
328
330
  }
331
+
332
+ & .card_name {
333
+ display: flex;
334
+ justify-content: flex-start;
335
+ align-items: flex-start;
336
+
337
+ & .is-gift {
338
+ margin-top: 6rpx;
339
+ font-size: 18rpx;
340
+ padding: 2rpx 10rpx;
341
+ border-radius: 8rpx;
342
+ line-height:26rpx;
343
+ height: 26rpx;
344
+ color: #fff;
345
+ margin-right: 18rpx;
346
+ }
347
+
348
+ & .card_name_text {
349
+ //line-height: 36rpx;
350
+ }
351
+ }
329
352
  }
330
353
  }
331
354
  .jfb-base-card__body{
355
+
356
+
332
357
  &-card {
333
358
  &-item {
334
359
  display: flex;
package/src/components/JfbBaseCardV2/Mock.js CHANGED
@@ -13,7 +13,8 @@ module.exports = {
13
13
  "main_product_name": "",
14
14
  "other_card_point": 0,
15
15
  "is_exchange": "N",
16
- "is_login":"Y"
16
+ "is_login":"Y",
17
+ "is_gift":"Y"
17
18
  }, {
18
19
  "card_number": "101001000005193",
19
20
  "card_point": 99963600,
@@ -23,7 +24,8 @@ module.exports = {
23
24
  "is_valid": "Y",
24
25
  "main_product_name": "",
25
26
  "other_card_point": 0,
26
- "is_exchange": "N"
27
+ "is_exchange": "N",
28
+ "is_gift":"N"
27
29
  }, {
28
30
  "card_number": "101001000005184",
29
31
  "card_point": 100000000,
@@ -33,7 +35,8 @@ module.exports = {
33
35
  "is_valid": "Y",
34
36
  "main_product_name": "",
35
37
  "other_card_point": 0,
36
- "is_exchange": "N"
38
+ "is_exchange": "N",
39
+ "is_gift":"Y"
37
40
  }, {
38
41
  "card_number": "101001000005185",
39
42
  "card_point": 99631000,
@@ -43,7 +46,8 @@ module.exports = {
43
46
  "is_valid": "Y",
44
47
  "main_product_name": "",
45
48
  "other_card_point": 0,
46
- "is_exchange": "N"
49
+ "is_exchange": "N",
50
+ "is_gift":"Y"
47
51
  }, {
48
52
  "card_number": "101001000006990",
49
53
  "card_point": 1400,
@@ -63,7 +67,8 @@ module.exports = {
63
67
  "is_valid": "Y",
64
68
  "main_product_name": "",
65
69
  "other_card_point": 0,
66
- "is_exchange": "Y"
70
+ "is_exchange": "Y",
71
+ "is_gift":"Y"
67
72
  }, {
68
73
  "card_number": "101001000006989",
69
74
  "card_point": 3600,
@@ -83,7 +88,8 @@ module.exports = {
83
88
  "is_valid": "Y",
84
89
  "main_product_name": "",
85
90
  "other_card_point": 0,
86
- "is_exchange": "Y"
91
+ "is_exchange": "Y",
92
+ "is_gift":"Y"
87
93
  }, {
88
94
  "card_number": "101001000005479",
89
95
  "card_point": 10000000,