jufubao-base 1.0.162-beta4 → 1.0.162-beta6

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCard/JfbBaseCard.vue +4 -0
  3. package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue +24 -6
  4. package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue +21 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.162-beta4",
3
+ "version": "1.0.162-beta6",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCard/JfbBaseCard.vue CHANGED
@@ -268,6 +268,8 @@ export default {
268
268
  jfbAuthorize: (state) => state.jfbAuthorize,
269
269
  }),
270
270
 
271
+
272
+
271
273
  //布局2特殊样式，布局1在行内样式
272
274
  loginStyle(){
273
275
  let style = { backgroundColor: '#FFFFFF'};
@@ -275,6 +277,7 @@ export default {
275
277
  if(this.login_text_color) style['color'] = this.login_text_color;
276
278
  if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
277
279
  if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
280
+ if(this.cardLayout === '2') return style;
278
281
  return this.styleObjectToString(style);
279
282
  },
280
283
 
@@ -284,6 +287,7 @@ export default {
284
287
  if(this.look_text_color) style['color'] = this.look_text_color;
285
288
  if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
286
289
  if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx';
290
+ if(this.cardLayout === '2') return style;
287
291
  return this.styleObjectToString(style);
288
292
  }
289
293
  },
package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue CHANGED
@@ -19,27 +19,31 @@
19
19
  <view class="jfb-base-card-info__body" style="position: relative">
20
20
  <view v-if="!qrcode && showForm">
21
21
  <view>
22
- <view class="jfb-base-card-info__body-form">
22
+ <view class="jfb-base-card-info__body-form" @click="handleLabel('card_number')">
23
23
  <view class="jfb-base-card-info__body-form-label">票券号码</view>
24
24
  <input
25
+ placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
25
26
  type="number"
27
+ :focus="card_number_focus"
26
28
  max="32"
27
29
  v-model="card_number"
28
30
  :placeholder="card_num_placeholder"
29
31
  />
30
32
  </view>
31
- <view class="jfb-base-card-info__body-form">
33
+ <view class="jfb-base-card-info__body-form" @click="handleLabel('card_password')">
32
34
  <view class="jfb-base-card-info__body-form-label">票券密码</view>
33
35
  <input
34
36
  class="mp"
37
+ placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
35
38
  max="18"
36
39
  :password="isPassword"
40
+ :focus="card_password_focus"
37
41
  v-model="card_password"
38
42
  :placeholder="card_pwd_placeholder"
39
43
  />
40
44
  <!--#ifdef H5-->
41
45
  <xd-font-icon
42
- @click="handleIcon()"
46
+ @click.stop="handleIcon()"
43
47
  :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
44
48
  ></xd-font-icon>
45
49
  <!--#endif-->
@@ -47,7 +51,7 @@
47
51
  <xd-font-icon
48
52
  :width="72"
49
53
  :height="72"
50
- @click="handleIcon()"
54
+ @click.stop="handleIcon()"
51
55
  :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
52
56
  ></xd-font-icon>
53
57
  <!--#endif-->
@@ -160,6 +164,10 @@ export default {
160
164
  my_card_url: "", //我的票券跳转地址
161
165
 
162
166
  inCallbackUrlOrg:'',//是否带有回调地址
167
+
168
+ card_password_focus: false,
169
+ card_number_focus: false,
170
+
163
171
  };
164
172
  },
165
173
  computed: {
@@ -178,6 +186,8 @@ export default {
178
186
  }
179
187
  return this.valueKey;
180
188
  },
189
+ },
190
+ watch:{
181
191
  container(value,oldValue) {
182
192
  if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
183
193
  if (this.$configProject['isPreview']) this.init(value)
@@ -187,6 +197,13 @@ export default {
187
197
  this.init(this.container)
188
198
  },
189
199
  methods: {
200
+ handleLabel(el){
201
+ this.card_password_focus = false;
202
+ this.card_number_focus = false;
203
+ setTimeout(()=>{
204
+ this[`${el}_focus`] = true;
205
+ },50)
206
+ },
190
207
  handleIcon(){
191
208
  this.isPassword = !this.isPassword
192
209
  },
@@ -406,7 +423,7 @@ export default {
406
423
  color: #a6a6a6;
407
424
  margin-right: unit(70, rpx);
408
425
  text-align: center;
409
-
426
+ font-size: unit(28, rpx);
410
427
  }
411
428
 
412
429
  & .mp {
@@ -417,7 +434,7 @@ export default {
417
434
  }
418
435
 
419
436
  input {
420
- font-size: unit(24, rpx);
437
+ font-size: unit(28, rpx);
421
438
  flex: 1;
422
439
  }
423
440
 
@@ -451,6 +468,7 @@ export default {
451
468
  color: #a6a6a6;
452
469
  margin-right: unit(70, rpx);
453
470
  text-align: center;
471
+
454
472
  }
455
473
 
456
474
  &-value {
package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue CHANGED
@@ -16,26 +16,30 @@
16
16
  <view class="jfb-base-card-info-entry__body" :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}">
17
17
  <view v-if="!qrcode && showForm">
18
18
  <view>
19
- <view class="jfb-base-card-info-entry__body-form">
19
+ <view class="jfb-base-card-info-entry__body-form" @click="handleLabel('card_number')">
20
20
  <view class="jfb-base-card-info-entry__body-form-label">票券号码</view>
21
21
  <input
22
+ placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
22
23
  type="number"
24
+ :focus="card_number_focus"
23
25
  max="32"
24
26
  v-model="card_number"
25
27
  :placeholder="card_num_placeholder"
26
28
  />
27
29
  </view>
28
- <view class="jfb-base-card-info-entry__body-form">
30
+ <view class="jfb-base-card-info-entry__body-form" @click="handleLabel('card_password')">
29
31
  <view class="jfb-base-card-info-entry__body-form-label">票券密码</view>
30
32
  <input
31
33
  max="18"
34
+ placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
32
35
  :password="isPassword"
36
+ :focus="card_password_focus"
33
37
  v-model="card_password"
34
38
  :placeholder="card_pwd_placeholder"
35
39
  />
36
40
  <!--#ifdef H5-->
37
41
  <xd-font-icon
38
- @click="handleIcon()"
42
+ @click.stop="handleIcon()"
39
43
  :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
40
44
  ></xd-font-icon>
41
45
  <!--#endif-->
@@ -43,7 +47,7 @@
43
47
  <xd-font-icon
44
48
  :width="72"
45
49
  :height="72"
46
- @click="handleIcon()"
50
+ @click.stop="handleIcon()"
47
51
  :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
48
52
  ></xd-font-icon>
49
53
  <!--#endif-->
@@ -165,6 +169,9 @@ export default {
165
169
  my_card_url: "", //我的票券跳转地址
166
170
  inCallbackUrlOrg:'',//是否带有回调地址
167
171
  is_show_balance: "N", //是否显示余额
172
+
173
+ card_password_focus: false,
174
+ card_number_focus: false,
168
175
  };
169
176
  },
170
177
  watch: {
@@ -190,6 +197,14 @@ export default {
190
197
  },
191
198
 
192
199
  methods: {
200
+ handleLabel(el){
201
+ this.card_password_focus = false;
202
+ this.card_number_focus = false;
203
+ setTimeout(()=>{
204
+ this[`${el}_focus`] = true;
205
+ },50)
206
+ },
207
+
193
208
  handleIcon(){
194
209
  this.isPassword = !this.isPassword
195
210
  },
@@ -449,6 +464,7 @@ export default {
449
464
  color: #a6a6a6;
450
465
  margin-right: unit(70, rpx);
451
466
  text-align: center;
467
+ font-size: unit(28, rpx);
452
468
  }
453
469
 
454
470
  & .mp {
@@ -460,7 +476,7 @@ export default {
460
476
  }
461
477
 
462
478
  input {
463
- font-size: unit(24, rpx);
479
+ font-size: unit(28, rpx);
464
480
  flex: 1;
465
481
  }
466
482