jufubao-base 1.0.216-beta1 → 1.0.216

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 (12) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCard/JfbBaseCard.vue +5 -30
  3. package/src/components/JfbBaseCard/Mock.js +4 -9
  4. package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +5 -26
  5. package/src/components/JfbBaseCardDisabled/Mock.js +2 -4
  6. package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue +1 -19
  7. package/src/components/JfbBaseCardDisabledEntry/Mock.js +0 -2
  8. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +117 -131
  9. package/src/components/JfbBaseCardEntry/Mock.js +1 -22
  10. package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue +13 -1
  11. package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +1 -26
  12. package/src/components/JfbBaseCardV2/Mock.js +6 -12
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.216-beta1",
3
+ "version": "1.0.216",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCard/JfbBaseCard.vue CHANGED
@@ -166,16 +166,14 @@
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 :class="{card_name:item.is_gift === 'Y'}">
170
- <view :style="{backgroundColor: mainColor}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
169
+ <view>
171
170
  <xd-font-icon
172
- v-else
173
171
  icon="iconkaquan"
174
172
  size="38"
175
173
  :style="{marginRight: '18rpx'}"
176
174
  :color="mainColor"
177
175
  ></xd-font-icon>
178
- <view class="card_name_text">{{ item.card_type_name }}</view>
176
+ <view>{{ item.card_type_name }}</view>
179
177
  </view>
180
178
  <view>
181
179
  <view>{{ item.card_number }}{{showIndex?(':' + index):''}}</view>
@@ -213,7 +211,9 @@
213
211
  </template>
214
212
  </view>
215
213
  </template>
216
- <view v-if="showDisabled==='Y'" @click="handleToDisabled" class="jfb-base-card__body-disabled">已失效票券>>></view>
214
+ <view v-if="showDisabled==='Y'" @click="handleToDisabled" class="jfb-base-card__body-disabled">
215
+ 已失效票券>>>
216
+ </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,29 +698,6 @@ 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
-
724
701
  &-dialog {
725
702
  position: fixed;
726
703
  top: 0;
@@ -922,8 +899,6 @@ export default {
922
899
  color: #b8b7be;
923
900
  margin-bottom: unit(30, rpx);
924
901
  }
925
-
926
-
927
902
  }
928
903
  }
929
904
  </style>
package/src/components/JfbBaseCard/Mock.js CHANGED
@@ -13,8 +13,7 @@ module.exports = {
13
13
  "is_login":'Y',
14
14
  "main_product_name": "",
15
15
  "other_card_point": 0,
16
- "is_exchange": "N",
17
- "is_gift":"Y"
16
+ "is_exchange": "N"
18
17
  }, {
19
18
  "card_number": "101001000005193",
20
19
  "card_point": 99963600,
@@ -24,8 +23,7 @@ module.exports = {
24
23
  "is_valid": "Y",
25
24
  "main_product_name": "",
26
25
  "other_card_point": 0,
27
- "is_exchange": "N",
28
- "is_gift":"N"
26
+ "is_exchange": "N"
29
27
  }, {
30
28
  "card_number": "101001000005184",
31
29
  "card_point": 100000000,
@@ -35,8 +33,7 @@ module.exports = {
35
33
  "is_valid": "Y",
36
34
  "main_product_name": "",
37
35
  "other_card_point": 0,
38
- "is_exchange": "N",
39
- "is_gift":"Y"
36
+ "is_exchange": "N"
40
37
  }, {
41
38
  "card_number": "101001000005185",
42
39
  "card_point": 99631000,
@@ -66,7 +63,6 @@ module.exports = {
66
63
  "is_valid": "Y",
67
64
  "main_product_name": "",
68
65
  "other_card_point": 0,
69
- "is_gift":"Y",
70
66
  "is_exchange": "Y"
71
67
  }, {
72
68
  "card_number": "101001000006989",
@@ -87,8 +83,7 @@ module.exports = {
87
83
  "is_valid": "Y",
88
84
  "main_product_name": "",
89
85
  "other_card_point": 0,
90
- "is_exchange": "Y",
91
- "is_gift":"Y"
86
+ "is_exchange": "Y"
92
87
  }, {
93
88
  "card_number": "101001000005479",
94
89
  "card_point": 10000000,
package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue CHANGED
@@ -10,7 +10,9 @@
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">删除</view>
13
+ <view class="jfb-base-card-disabled__edit-icon" @click="delEdit"
14
+ >删除</view
15
+ >
14
16
  </view>
15
17
  <!-- #endif -->
16
18
  <view class="jfb-base-card-disabled__body">
@@ -54,16 +56,14 @@
54
56
  </view>
55
57
  <view class="jfb-base-card-disabled__body-card-item-right">
56
58
  <view class="jfb-base-card-disabled__body-card-item-right-top">
57
- <view :class="{card_name:item.is_gift === 'Y'}">
58
- <view :style="{backgroundColor: '#b8b7be'}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
59
+ <view>
59
60
  <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 class="card_name_text" style="color: #b8b7be">{{ item.card_type_name }}</view>
66
+ <view style="color: #b8b7be">{{ item.card_type_name }}</view>
67
67
  </view>
68
68
  <view>
69
69
  <view>{{ item.card_number }}</view>
@@ -211,27 +211,6 @@ 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
-
235
214
  &-card {
236
215
  border: 1px dashed rgba(0, 0, 0, 0);
237
216
  box-sizing: border-box;
package/src/components/JfbBaseCardDisabled/Mock.js CHANGED
@@ -100,8 +100,7 @@ module.exports = {
100
100
  "main_business_code_name": "",
101
101
  "other_card_point": 0,
102
102
  "is_exchange": "N",
103
- "card_point_type": 1,
104
- "is_gift": 'Y',
103
+ "card_point_type": 1
105
104
  }, {
106
105
  "card_number": "261001000002643",
107
106
  "card_point": 0,
@@ -112,8 +111,7 @@ module.exports = {
112
111
  "main_business_code_name": "",
113
112
  "other_card_point": 0,
114
113
  "is_exchange": "N",
115
- "card_point_type": 1,
116
- "is_gift": 'Y',
114
+ "card_point_type": 1
117
115
  }, {
118
116
  "card_number": "261001000002641",
119
117
  "card_point": 0,
package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue CHANGED
@@ -34,10 +34,7 @@
34
34
  >
35
35
  <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
36
36
  <view class="card-list__title">
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>
37
+ <view>{{item['card_type_name']}}</view>
41
38
  </view>
42
39
  <div class="card-list__content">
43
40
  <view>
@@ -441,9 +438,6 @@ export default {
441
438
  align-items: center;
442
439
 
443
440
  & > view {
444
- display: flex;
445
- justify-content: flex-start;
446
- align-items: center;
447
441
  padding: 0 unit(80, rpx);
448
442
  font-size: unit(24, rpx);
449
443
  line-height: unit(56, rpx);
@@ -452,18 +446,6 @@ export default {
452
446
  border-radius: 0 0 unit(16, rpx) 0;
453
447
  }
454
448
 
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
-
467
449
  }
468
450
 
469
451
  &__content {
package/src/components/JfbBaseCardDisabledEntry/Mock.js CHANGED
@@ -25,7 +25,6 @@ module.exports = {
25
25
  "is_valid": "N",
26
26
  "main_business_code_name": "",
27
27
  "other_card_point": 0,
28
- "is_gift":'Y',
29
28
  "is_exchange": "N",
30
29
  "card_point_type": 1,
31
30
  "business_codes": ["health"]
@@ -41,7 +40,6 @@ module.exports = {
41
40
  "other_card_point": 0,
42
41
  "is_exchange": "N",
43
42
  "card_point_type": 1,
44
- "is_gift":'Y',
45
43
  "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
46
44
  }, {
47
45
  "card_number": "101001000008421",
package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue CHANGED
@@ -137,7 +137,6 @@
137
137
  v-if="subTabIndex === 2&&tabIndex === 1"
138
138
  >* 目前仅支持电影票兑换券进行转换</view>
139
139
  <view class="card-content">
140
- <!--loading-->
141
140
  <view v-if="loadingCardList" class="jfb-base-card-entry__body-card skeleton-card">
142
141
  <view v-for="i in 3" class="card-list" :key="i">
143
142
  <view class="card-list-warp">
@@ -165,124 +164,126 @@
165
164
  </view>
166
165
  </view>
167
166
  </view>
168
- <!--loading-->
169
- <!--content-->
167
+
170
168
  <template v-else>
171
- <!--content card-->
172
- <view v-if="tabIndex === 1 && (cardList && cardList.length > 0)" class="jfb-base-card-entry__body-card">
169
+ <view
170
+ v-if="tabIndex === 1 && (cardList && cardList.length > 0)"
171
+ class="jfb-base-card-entry__body-card"
172
+ >
173
173
  <template v-if="cardType==='default'">
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="{
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="{
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 :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>
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>
196
194
  </view>
197
- <view class="card-list__content">
195
+ </view>
196
+ <view class="card-list__content">
197
+ <view>
198
+ <text>券号：</text>
199
+ <text>{{item.card_number}}{{showIndex?(':' + index):''}}</text>
200
+ </view>
201
+ <view @click.stop="toDetail(item)" v-if="subTabIndex !== 3&&isShowCode === 'Y'&&!force">
198
202
  <view>
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>
203
+ <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
207
204
  </view>
205
+ <view>点击查看</view>
208
206
  </view>
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="{
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="{
225
224
  background: '#fff',
226
225
  color: item['theme']['color']}"
227
- >登录</view>
228
- </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>
226
+ >
227
+ 登录
234
228
  </view>
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>
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
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>
244
+ </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>
258
258
  </view>
259
259
  </view>
260
- </scroll-view>
261
- </view>
260
+ </view>
261
+ </scroll-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>
269
263
  </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
- 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="{
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="{
279
280
  height: item.height + 'px',
280
281
  backgroundImage: 'url('+ (tabIndex===2 || item.entries.length <= 1 ? cardItem: cardItemEntry) +')'
281
282
  }"
282
- ></view>
283
- </template>
283
+ ></view>
284
284
  </template>
285
285
  <template v-if="cardType==='style2'">
286
+
286
287
  <view v-for="(item,index) in cardList" :key="item.card_number">
287
288
  <xd-card-new
288
289
  :item="item"
@@ -296,29 +297,27 @@
296
297
  </view>
297
298
  </template>
298
299
  </view>
299
- <!--content card-->
300
- <!--content coupon-->
301
300
  <view v-if="tabIndex===2&&(couponList&&couponList.length)">
302
301
  <view v-if="couponList.length" class="coupon_list">
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>
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>
319
320
  </view>
320
- <!--content coupon-->
321
- <!--no data-->
322
321
  <view v-else-if="cardList !== null && cardList.length === 0">
323
322
  <view class="jfb-base-card-entry__body-empty">
324
323
  <view class="jfb-base-card-entry__body-empty-wrap">
@@ -327,17 +326,14 @@
327
326
  </view>
328
327
  </view>
329
328
  </view>
330
- <!--no data-->
331
329
  </template>
332
- <!--content-->
333
- <!--disabled-->
330
+
334
331
  <view
335
332
  v-if="showDisabled==='Y'"
336
333
  @click="handleToDisabled"
337
334
  class="jfb-base-card-entry__body-disabled"
338
335
  >已失效票券>>></view>
339
336
  </view>
340
- <!--disabled-->
341
337
  <view class="jfb-base-card-entry__body-dialog" v-if="dialogEvent">
342
338
  <view class="jfb-base-card-entry__body-dialog-content">
343
339
  <image
@@ -1194,11 +1190,11 @@ export default {
1194
1190
  justify-content: center;
1195
1191
  align-items: center;
1196
1192
 
1197
- .skeleton-card & {
1193
+ .skeleton-card &{
1198
1194
  .skeleton-item(120rpx, 50rpx, 0 0 16rpx 0, #EEEEEE);
1199
1195
  }
1200
1196
 
1201
- & > view.logined {
1197
+ & > view:nth-child(2) {
1202
1198
  height: 36rpx;
1203
1199
  line-height: 36rpx;
1204
1200
  background-color: rgb(41, 203, 151);
@@ -1222,18 +1218,8 @@ export default {
1222
1218
  }
1223
1219
  }
1224
1220
 
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
- }
1235
-
1236
1221
  }
1222
+
1237
1223
  }
1238
1224
 
1239
1225
  &__content {
package/src/components/JfbBaseCardEntry/Mock.js CHANGED
@@ -17,7 +17,6 @@ module.exports = {
17
17
  "is_transfering":"Y",
18
18
  "card_point_type": 1,
19
19
  "is_login":'Y',
20
- "is_gift":"Y",
21
20
  "business_codes": ["health"]
22
21
  }, {
23
22
  "card_number": "121000100000028",
@@ -32,7 +31,6 @@ module.exports = {
32
31
  "is_exchange": "N",
33
32
  "is_transfering":"Y",
34
33
  "card_point_type": 1,
35
- "is_gift":"N",
36
34
  "business_codes": ["health"]
37
35
  }, {
38
36
  "card_number": "101001000005192",
@@ -47,7 +45,6 @@ module.exports = {
47
45
  "is_exchange": "N",
48
46
  "is_transfering":"Y",
49
47
  "card_point_type": 1,
50
- "is_gift":"N",
51
48
  "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
52
49
  }, {
53
50
  "card_number": "101001000008421",
@@ -62,7 +59,6 @@ module.exports = {
62
59
  "is_exchange": "N",
63
60
  "is_transfering":"N",
64
61
  "is_login":'Y',
65
- "is_gift":'Y',
66
62
  "card_point_type": 1,
67
63
  "business_codes": ["cake"]
68
64
  }, {
@@ -77,26 +73,9 @@ module.exports = {
77
73
  "other_card_point": 0,
78
74
  "is_exchange": "Y",
79
75
  "is_transfering":"N",
80
- "is_gift":'Y',
81
76
  "card_point_type": 1,
82
77
  "business_codes": ["movie", "market", "cake"]
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
- },{
78
+ }, {
100
79
  "card_number": "101001000007175",
101
80
  "card_point": 9998700,
102
81
  "card_type": "27",
package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue CHANGED
@@ -63,7 +63,7 @@
63
63
  </xd-form-item>
64
64
  </xd-form>
65
65
  <view class="jfb-base-card-merge__body-btn">
66
- <xd-button @click="handleToSubmit" width="90%" type="primary" >提交</xd-button>
66
+ <xd-button @click="handleToSubmit" width="90%" type="primary" >提交</xd-button>
67
67
  </view>
68
68
  </view>
69
69
  <view class="xd-notice" :style="{ color: warningColor }" v-if="content">
@@ -201,6 +201,18 @@ export default {
201
201
  this.$set(this.mergeForm, "valid_token", valid_token);
202
202
  },
203
203
  handleToSubmit() {
204
+ if(!this.mergeForm.from_card_number){
205
+ this.$xdAlert({
206
+ content: '请选择转出卡号！'
207
+ })
208
+ return
209
+ }
210
+ if(!this.mergeForm.to_card_number){
211
+ this.$xdAlert({
212
+ content: '请选择转入卡号！'
213
+ })
214
+ return
215
+ }
204
216
  this.$xdConfirm({
205
217
  title: "是否确认合并卡",
206
218
  isHtml: true,
package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue CHANGED
@@ -76,10 +76,8 @@
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 :class="{card_name:item.is_gift === 'Y'}">
80
- <view :style="{backgroundColor: mainColor}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
79
+ <view>
81
80
  <xd-font-icon
82
- v-else
83
81
  icon="iconkaquan"
84
82
  size="30"
85
83
  :style="{marginRight: '10rpx'}"
@@ -328,32 +326,9 @@
328
326
  /* #endif */
329
327
  }
330
328
  }
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
- }
352
329
  }
353
330
  }
354
331
  .jfb-base-card__body{
355
-
356
-
357
332
  &-card {
358
333
  &-item {
359
334
  display: flex;
package/src/components/JfbBaseCardV2/Mock.js CHANGED
@@ -13,8 +13,7 @@ module.exports = {
13
13
  "main_product_name": "",
14
14
  "other_card_point": 0,
15
15
  "is_exchange": "N",
16
- "is_login":"Y",
17
- "is_gift":"Y"
16
+ "is_login":"Y"
18
17
  }, {
19
18
  "card_number": "101001000005193",
20
19
  "card_point": 99963600,
@@ -24,8 +23,7 @@ module.exports = {
24
23
  "is_valid": "Y",
25
24
  "main_product_name": "",
26
25
  "other_card_point": 0,
27
- "is_exchange": "N",
28
- "is_gift":"N"
26
+ "is_exchange": "N"
29
27
  }, {
30
28
  "card_number": "101001000005184",
31
29
  "card_point": 100000000,
@@ -35,8 +33,7 @@ module.exports = {
35
33
  "is_valid": "Y",
36
34
  "main_product_name": "",
37
35
  "other_card_point": 0,
38
- "is_exchange": "N",
39
- "is_gift":"Y"
36
+ "is_exchange": "N"
40
37
  }, {
41
38
  "card_number": "101001000005185",
42
39
  "card_point": 99631000,
@@ -46,8 +43,7 @@ module.exports = {
46
43
  "is_valid": "Y",
47
44
  "main_product_name": "",
48
45
  "other_card_point": 0,
49
- "is_exchange": "N",
50
- "is_gift":"Y"
46
+ "is_exchange": "N"
51
47
  }, {
52
48
  "card_number": "101001000006990",
53
49
  "card_point": 1400,
@@ -67,8 +63,7 @@ module.exports = {
67
63
  "is_valid": "Y",
68
64
  "main_product_name": "",
69
65
  "other_card_point": 0,
70
- "is_exchange": "Y",
71
- "is_gift":"Y"
66
+ "is_exchange": "Y"
72
67
  }, {
73
68
  "card_number": "101001000006989",
74
69
  "card_point": 3600,
@@ -88,8 +83,7 @@ module.exports = {
88
83
  "is_valid": "Y",
89
84
  "main_product_name": "",
90
85
  "other_card_point": 0,
91
- "is_exchange": "Y",
92
- "is_gift":"Y"
86
+ "is_exchange": "Y"
93
87
  }, {
94
88
  "card_number": "101001000005479",
95
89
  "card_point": 10000000,