jufubao-base 1.0.67-beta221 → 1.0.67-beta223

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.67-beta221",
3
+ "version": "1.0.67-beta223",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
@@ -42,69 +42,138 @@
42
42
  </view>
43
43
  </view>
44
44
  <view class="jfb-base-con-list__body-content-list">
45
- <view
46
- v-for="(item, index) in couponList"
47
- :key="index"
48
- class="jfb-base-con-list__body-content-list-item"
49
- :style="{
50
- backgroundColor:
51
- item.remain_card_count == 0 ? '#f3f3f3' : contentBackground,
52
- }"
53
- >
54
- <view class="jfb-base-con-list__body-content-list-item-left">
55
- <view
56
- :style="item.couponBackground"
57
- class="jfb-base-con-list__body-content-list-item-left-info"
58
- >
45
+ <view v-for="(item, index) in couponList" :key="index">
46
+ <view
47
+ class="jfb-base-con-list__body-content-list-item"
48
+ :style="{
49
+ backgroundColor: contentBackground,
50
+ }"
51
+ v-if="item.can_take === 'N'"
52
+ >
53
+ <view class="jfb-base-con-list__body-content-list-item-left">
59
54
  <view
60
- :style="{
61
- color: item.remain_card_count == 0 ? '#D6D6D6' : mainColor,
62
- textAlign: 'center'
63
- }"
64
- >{{ item.prize_type }}</view
55
+ :style="item.couponBackground"
56
+ class="jfb-base-con-list__body-content-list-item-left-info"
57
+ >
58
+ <view
59
+ :style="{
60
+ color: mainColor,
61
+ textAlign: 'center',
62
+ }"
63
+ >{{ item.prize_type }}</view
64
+ >
65
+ <view
66
+ :style="{
67
+ color: '#fff',
68
+ }"
69
+ >{{ item.prize_name }}</view
70
+ >
71
+ </view>
72
+ </view>
73
+ <view class="jfb-base-con-list__body-content-list-item-right">
74
+ <view
75
+ class="jfb-base-con-list__body-content-list-item-right-name"
65
76
  >
77
+ <view>{{ item.prize_name }}</view>
78
+ <xd-font-icon
79
+ size="100"
80
+ :style="{
81
+ color: '#D6D6D6',
82
+ position: 'absolute',
83
+ right: '-30rpx',
84
+ top: '-60rpx',
85
+ }"
86
+ icon="iconyilingqu"
87
+ ></xd-font-icon>
88
+ </view>
66
89
  <view
90
+ class="jfb-base-con-list__body-content-list-item-right-num"
91
+ >
92
+ <!-- <view
67
93
  :style="{
68
- color: item.remain_card_count == 0 ? '#D6D6D6' : '#fff',
94
+ color: mainColor,
95
+ display: 'flex',
96
+ alignItems: 'center',
97
+ fontSize: '28rpx',
69
98
  }"
70
- >{{ item.prize_name }}</view
71
99
  >
100
+ <xd-font-icon
101
+ style="margin-right: 10rpx"
102
+ size="22"
103
+ icon="icondanchuangguanbi_xian"
104
+ ></xd-font-icon>
105
+ {{ item.prize_num }}
106
+ </view> -->
107
+ <view></view>
108
+
109
+ <xd-button
110
+ v-if="item.can_take === 'Y'"
111
+ size="small"
112
+ :disabled="item.remain_card_count == 0"
113
+ @click="getCoupont(item)"
114
+ type="primary"
115
+ :style="item.btn"
116
+ :color="item.remain_card_count == 0 ? '#AAA' : '#fff'"
117
+ >领取</xd-button
118
+ >
119
+ </view>
72
120
  </view>
73
121
  </view>
74
- <view class="jfb-base-con-list__body-content-list-item-right">
75
- <view
76
- class="jfb-base-con-list__body-content-list-item-right-name"
77
- >
78
- <view>{{ item.prize_name }}</view>
79
- <xd-font-icon
80
- v-if="item.remain_card_count > 0"
81
- size="100"
82
- :style="{
83
- color: item.can_take === 'N' ? '#D6D6D6' : iconColor,
84
- position: 'absolute',
85
- right: '-30rpx',
86
- top: '-30rpx',
87
- }"
88
- :icon="
89
- item.can_take === 'N' ? 'iconyilingqu' : 'icondailingqu'
90
- "
91
- ></xd-font-icon>
92
- <xd-font-icon
93
- v-else
94
- size="100"
95
- :style="{
96
- color: '#D6D6D6',
97
- position: 'absolute',
98
- right: '-30rpx',
99
- top: '-58rpx',
100
- }"
101
- icon="iconyifawan"
102
- ></xd-font-icon>
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>
103
150
  </view>
104
- <view
105
- class="jfb-base-con-list__body-content-list-item-right-num"
106
- >
107
- <!-- <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
108
177
  :style="{
109
178
  color: mainColor,
110
179
  display: 'flex',
@@ -119,18 +188,23 @@
119
188
  ></xd-font-icon>
120
189
  {{ item.prize_num }}
121
190
  </view> -->
122
- <view></view>
191
+ <view></view>
123
192
 
124
- <xd-button
125
- v-if="item.can_take === 'Y'"
126
- size="small"
127
- :disabled="item.remain_card_count ==0"
128
- @click="getCoupont(item)"
129
- type="primary"
130
- :style="item.btn"
131
- :color="item.remain_card_count ==0 ? '#AAA' : '#fff'"
132
- >领取</xd-button
133
- >
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'"
205
+ >领取</xd-button
206
+ >
207
+ </view>
134
208
  </view>
135
209
  </view>
136
210
  </view>
@@ -259,23 +333,24 @@ export default {
259
333
  margin: "0",
260
334
  };
261
335
  item.couponBackground = {
262
- backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
336
+ backgroundImage:
337
+ item.remain_card_count > 0
338
+ ? `url(${getServiceUrl(res.app_coupon_url)})`
339
+ : `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
263
340
  backgroundSize: "100%",
264
341
  backgroundRepeat: "no-repeat",
265
342
  };
266
343
  } else {
267
344
  item.btn = { background: "#D6D6D6", margin: "0" };
268
345
  item.couponBackground = {
269
- backgroundImage: `url(${getServiceUrl(
270
- res.app_coupon_invalid_url
271
- )})`,
346
+ backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
272
347
  backgroundSize: "100%",
273
348
  backgroundRepeat: "no-repeat",
274
349
  };
275
350
  }
276
351
  return item;
277
352
  });
278
- console.log("couponList", this.couponList);
353
+ console.log("couponList", this.couponList);
279
354
  this.message = res.message;
280
355
  this.done = true;
281
356
  })
@@ -295,6 +370,17 @@ export default {
295
370
  },
296
371
  })
297
372
  .then((res) => {
373
+ if (res.code == 400) {
374
+ this.$xdHideLoading();
375
+ this.$xdAlert({
376
+ content: res.message,
377
+ zIndex: 3200,
378
+ time: 2000,
379
+ isClose: false,
380
+ });
381
+ this.getList();
382
+ return;
383
+ }
298
384
  this.order_num = res.tmp_order_number;
299
385
  this.getResult();
300
386
  })
@@ -333,7 +419,7 @@ export default {
333
419
  time: 2000,
334
420
  isClose: false,
335
421
  });
336
- if(res.code==400) {
422
+ if (res.code == 400) {
337
423
  this.getList();
338
424
  }
339
425
  if (this.timeer) {