jufubao-base 1.0.302 → 1.0.304-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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +9 -9
  3. package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue +23 -4
  4. package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue +24 -20
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.302",
3
+ "version": "1.0.304-beta1",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue CHANGED
@@ -767,10 +767,10 @@
767
767
  </view>
768
768
  <!--旅游模块-->
769
769
  <view
770
- v-if="info.extras &&
771
- info.extras.travel_booking_info &&
772
- info.extras.travel_booking_info['travelers'] &&
773
- info.extras.travel_booking_info['travelers'].length > 0"
770
+ v-if="info.contacts_v2 &&
771
+ info.contacts_v2['title'] &&
772
+ info.contacts_v2['data'] &&
773
+ info.contacts_v2['data'].length > 0"
774
774
  :style="{
775
775
  background: backgroundColor,
776
776
  border: borderBox,
@@ -780,15 +780,15 @@
780
780
  }"
781
781
  class="jfb-base-order-detail__body-card jfb-base-order-detail__body-booking"
782
782
  >
783
- <view class="jfb-base-order-detail__body-delivery-bottom-title">预订信息</view>
783
+ <view class="jfb-base-order-detail__body-delivery-bottom-title">{{info.contacts_v2['title']}}</view>
784
784
  <view class="jfb-base-order-detail__body-line"></view>
785
785
  <view class="jfb-base-order-detail__body-booking-list">
786
- <view v-for="(item,index) in info.extras.travel_booking_info.travelers" :key="index" class="jfb-base-order-detail__body-booking-list-item">
787
- <view :style="{color:mainColor,background:bgColor}" class="jfb-base-order-detail__body-booking-list-item-num">游客{{index+1}}</view>
786
+ <view v-for="(item,index) in info.contacts_v2['data']" :key="index" class="jfb-base-order-detail__body-booking-list-item">
787
+ <view :style="{color:mainColor,background:bgColor}" class="jfb-base-order-detail__body-booking-list-item-num">{{biz_code==='travel'?'出行人':'观演人'}}{{index+1}}</view>
788
788
  <view class="jfb-base-order-detail__body-booking-list-item-info">
789
789
  <view class="jfb-base-order-detail__body-booking-list-item-info-name">{{item.name}}</view>
790
- <view v-if="item.id_card_no" class="jfb-base-order-detail__body-booking-list-item-info-item">身份证：{{item.id_card_no}}</view>
791
- <view v-if="item.mobile" class="jfb-base-order-detail__body-booking-list-item-info-item">手机号：{{item.mobile}}</view>
790
+ <view v-if="item.id_card" class="jfb-base-order-detail__body-booking-list-item-info-item">身份证：{{item.id_card}}</view>
791
+ <view v-if="item.phone" class="jfb-base-order-detail__body-booking-list-item-info-item">手机号：{{item.phone}}</view>
792
792
  </view>
793
793
  </view>
794
794
  </view>
package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue CHANGED
@@ -175,6 +175,8 @@ export default {
175
175
  callback_url: "",
176
176
  is_show_skip: "Y",
177
177
  isCollectUsername: false,
178
+ phonePlaceholder:'', //
179
+ codePlaceholder:'', //
178
180
 
179
181
  inputStyle: "linear", //输入框样式 linear:线性 face: 面性
180
182
  formBorderColor: "#F9F9F9", //
@@ -350,10 +352,27 @@ export default {
350
352
  this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
351
353
  this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
352
354
  this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
353
- this.labelFont = getContainerPropsValue(value, "content.labelFont", {});
354
- this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {});
355
- this.contentFont = getContainerPropsValue(value, "content.contentFont", {});
356
- this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {});
355
+ this.labelFont = getContainerPropsValue(value, "content.labelFont", {
356
+ color: "#333",
357
+ fontSize: "24rpx",
358
+ fontWeight: "normal",
359
+ });
360
+ this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {
361
+ color: "#d4d4d4",
362
+ fontSize: "24rpx",
363
+ fontWeight: "normal",
364
+ });
365
+ this.contentFont = getContainerPropsValue(value, "content.contentFont", {
366
+ color: "#333",
367
+ fontSize: "24rpx",
368
+ fontWeight: "normal",
369
+ });
370
+ this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {
371
+ color: "#ff5a39",
372
+ fontSize: "24rpx",
373
+ fontWeight: "normal",
374
+ });
375
+
357
376
  this.getCodeShowType = getContainerPropsValue(value, "content.getCodeShowType", 'text');
358
377
  this.btnMargin = getContainerPropsValue(value, "content.btnMargin", {});
359
378
  this.btnRadius = getContainerPropsValue(value, "content.btnRadius", '20');
package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue CHANGED
@@ -65,10 +65,7 @@
65
65
  label="手机号"
66
66
  content-align="left"
67
67
  >
68
- <xd-form-input
69
- v-model="accountForm.phone_number"
70
- :placeholder="phonePlaceholder"
71
- />
68
+ <xd-form-input v-model="accountForm.phone_number" :placeholder="phonePlaceholder"/>
72
69
  </xd-form-item>
73
70
  <xd-form-item
74
71
  class="form-item"
@@ -199,6 +196,8 @@ export default {
199
196
  isCollectUsername: false,
200
197
  showDialog: false,
201
198
  share_code: "",
199
+ phonePlaceholder:'', //
200
+ codePlaceholder:'', //
202
201
 
203
202
  inputStyle: "linear", //输入框样式 linear:线性 face: 面性
204
203
  formBorderColor: "#F9F9F9", //
@@ -432,22 +431,27 @@ export default {
432
431
  "content.passwordIcon",
433
432
  ""
434
433
  );
435
- this.labelFont = getContainerPropsValue(value, "content.labelFont", {});
436
- this.placeholderFont = getContainerPropsValue(
437
- value,
438
- "content.placeholderFont",
439
- {}
440
- );
441
- this.contentFont = getContainerPropsValue(
442
- value,
443
- "content.contentFont",
444
- {}
445
- );
446
- this.getCodeFont = getContainerPropsValue(
447
- value,
448
- "content.getCodeFont",
449
- {}
450
- );
434
+ this.labelFont = getContainerPropsValue(value, "content.labelFont", {
435
+ color: "#333",
436
+ fontSize: "24rpx",
437
+ fontWeight: "normal",
438
+ });
439
+ this.placeholderFont = getContainerPropsValue( value, "content.placeholderFont", {
440
+ color: "#d4d4d4",
441
+ fontSize: "24rpx",
442
+ fontWeight: "normal",
443
+ });
444
+ this.contentFont = getContainerPropsValue(value, "content.contentFont", {
445
+ //表单内容字体
446
+ color: "#333",
447
+ fontSize: "24rpx",
448
+ fontWeight: "normal",
449
+ });
450
+ this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {
451
+ color: "#ff5a39",
452
+ fontSize: "24rpx",
453
+ fontWeight: "normal",
454
+ });
451
455
  this.getCodeShowType = getContainerPropsValue(
452
456
  value,
453
457
  "content.getCodeShowType",