jufubao-base 1.0.70 → 1.0.71-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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseConList/JfbBaseConList.vue +33 -105
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.70",
3
+ "version": "1.0.71-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseConList/JfbBaseConList.vue CHANGED
@@ -46,9 +46,8 @@
46
46
  <view
47
47
  class="jfb-base-con-list__body-content-list-item"
48
48
  :style="{
49
- backgroundColor: contentBackground,
49
+ backgroundColor: item.can_take_num==='Y'||item.can_take_num==='P'? contentBackground:'#F3F3F3',
50
50
  }"
51
- v-if="item.can_take === 'N'"
52
51
  >
53
52
  <view class="jfb-base-con-list__body-content-list-item-left">
54
53
  <view
@@ -57,14 +56,14 @@
57
56
  >
58
57
  <view
59
58
  :style="{
60
- color: mainColor,
59
+ color: item.nameColor,
61
60
  textAlign: 'center',
62
61
  }"
63
62
  >{{ item.prize_type }}</view
64
63
  >
65
64
  <view
66
65
  :style="{
67
- color: '#fff',
66
+ color: item.infoColor,
68
67
  }"
69
68
  >{{ item.prize_name }}</view
70
69
  >
@@ -78,12 +77,12 @@
78
77
  <xd-font-icon
79
78
  size="100"
80
79
  :style="{
81
- color: '#D6D6D6',
80
+ color: item.iconColor,
82
81
  position: 'absolute',
83
- right: '-30rpx',
84
- top: '-60rpx',
82
+ right: '0rpx',
83
+ top: '0rpx',
85
84
  }"
86
- icon="iconyilingqu"
85
+ :icon="item.icon"
87
86
  ></xd-font-icon>
88
87
  </view>
89
88
  <view
@@ -107,101 +106,13 @@
107
106
  <view></view>
108
107
 
109
108
  <xd-button
110
- v-if="item.can_take === 'Y'"
109
+ v-if="item.can_take_num !== 'Y'"
111
110
  size="small"
112
111
  :disabled="item.remain_card_count == 0"
113
112
  @click="getCoupont(item)"
114
113
  type="primary"
115
114
  :style="item.btn"
116
- :color="item.remain_card_count == 0 ? '#AAA' : '#fff'"
117
- >领取</xd-button
118
- >
119
- </view>
120
- </view>
121
- </view>
122
- <view
123
- class="jfb-base-con-list__body-content-list-item"
124
- :style="{
125
- backgroundColor:
126
- item.remain_card_count == 0 ? '#f3f3f3' : contentBackground,
127
- }"
128
- v-else
129
- >
130
- <view class="jfb-base-con-list__body-content-list-item-left">
131
- <view
132
- :style="item.couponBackground"
133
- class="jfb-base-con-list__body-content-list-item-left-info"
134
- >
135
- <view
136
- :style="{
137
- color:
138
- item.remain_card_count == 0 ? '#D6D6D6' : mainColor,
139
- textAlign: 'center',
140
- }"
141
- >{{ item.prize_type }}</view
142
- >
143
- <view
144
- :style="{
145
- color: item.remain_card_count == 0 ? '#D6D6D6' : '#fff',
146
- }"
147
- >{{ item.prize_name }}</view
148
- >
149
- </view>
150
- </view>
151
- <view class="jfb-base-con-list__body-content-list-item-right">
152
- <view
153
- class="jfb-base-con-list__body-content-list-item-right-name"
154
- >
155
- <view>{{ item.prize_name }}</view>
156
- <xd-font-icon
157
- size="100"
158
- :style="{
159
- color:
160
- item.remain_card_count == 0 ? '#D6D6D6' : iconColor,
161
- position: 'absolute',
162
- right: '-30rpx',
163
- top: '-30rpx',
164
- }"
165
- :icon="
166
- item.remain_card_count == 0
167
- ? 'iconyifawan'
168
- : 'icondailingqu'
169
- "
170
- >
171
- </xd-font-icon>
172
- </view>
173
- <view
174
- class="jfb-base-con-list__body-content-list-item-right-num"
175
- >
176
- <!-- <view
177
- :style="{
178
- color: mainColor,
179
- display: 'flex',
180
- alignItems: 'center',
181
- fontSize: '28rpx',
182
- }"
183
- >
184
- <xd-font-icon
185
- style="margin-right: 10rpx"
186
- size="22"
187
- icon="icondanchuangguanbi_xian"
188
- ></xd-font-icon>
189
- {{ item.prize_num }}
190
- </view> -->
191
- <view></view>
192
-
193
- <xd-button
194
- v-if="item.can_take === 'Y'"
195
- size="small"
196
- :disabled="item.remain_card_count == 0"
197
- @click="getCoupont(item)"
198
- type="primary"
199
- :style="
200
- item.remain_card_count == 0
201
- ? { background: '#DDDDDD', margin: 0 }
202
- : item.btn
203
- "
204
- :color="item.remain_card_count == 0 ? '#AAA' : '#fff'"
115
+ :color="item.infoColor"
205
116
  >领取</xd-button
206
117
  >
207
118
  </view>
@@ -318,7 +229,8 @@ export default {
318
229
  res.list &&
319
230
  res.list.length > 0 &&
320
231
  res.list.map((item) => {
321
- if (item.can_take === "Y") {
232
+ if (item.can_take_num === "Y" || item.can_take_num === "P") {
233
+ //按钮样式
322
234
  item.btn = res.app_coupon_button_bg_url
323
235
  ? {
324
236
  backgroundImage: `url(${getServiceUrl(
@@ -332,21 +244,37 @@ export default {
332
244
  backgroundColor: this.mainColor,
333
245
  margin: "0",
334
246
  };
247
+ //整块背景
335
248
  item.couponBackground = {
336
- backgroundImage:
337
- item.remain_card_count > 0
338
- ? `url(${getServiceUrl(res.app_coupon_url)})`
339
- : `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
249
+ backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
340
250
  backgroundSize: "100%",
341
251
  backgroundRepeat: "no-repeat",
342
252
  };
253
+ //icon
254
+ item.icon=item.can_take_num === "Y"?'iconyilingqu':'icondailingqu'
255
+ //icon颜色
256
+ item.iconColor = item.can_take_num === "Y"?'#D6D6D6':this.iconColor
257
+ //券名称颜色
258
+ item.nameColor = '#FB5B3F'
259
+ //其他文字颜色
260
+ item.infoColor = '#fff'
343
261
  } else {
262
+ //按钮样式
344
263
  item.btn = { background: "#D6D6D6", margin: "0" };
264
+ //整块背景
345
265
  item.couponBackground = {
346
- backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
266
+ backgroundImage: `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
347
267
  backgroundSize: "100%",
348
268
  backgroundRepeat: "no-repeat",
349
269
  };
270
+ //icon
271
+ item.icon='iconyifawan'
272
+ //icon颜色
273
+ item.iconColor = '#D6D6D6'
274
+ //券名称颜色
275
+ item.nameColor = '#BBBBBB'
276
+ //其他文字颜色
277
+ item.infoColor = '#BBBBBB'
350
278
  }
351
279
  return item;
352
280
  });
@@ -562,6 +490,7 @@ export default {
562
490
  padding: unit(20, rpx) unit(30, rpx);
563
491
  border-radius: unit(12, rpx);
564
492
  margin: unit(20, rpx) auto 0 auto;
493
+ position: relative;
565
494
  &-left {
566
495
  display: flex;
567
496
  &-info {
@@ -581,7 +510,6 @@ export default {
581
510
  margin-left: unit(24, rpx);
582
511
  flex: 1;
583
512
  &-name {
584
- position: relative;
585
513
  font-size: unit(40, rpx);
586
514
  color: #000;
587
515
  display: flex;