jufubao-base 1.0.67-beta223 → 1.0.68

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-beta223",
3
+ "version": "1.0.68",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
@@ -975,7 +975,8 @@ export default {
975
975
  res.codes &&
976
976
  res.codes.map((item) => {
977
977
  if (item.show_type === "qrcode" || item.show_type === "barcode") {
978
- item.code_url = `${this.brandInfo.api_host}${item.code_url}`;
978
+ let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
979
+ item.code_url = reg.test(item.code_url)? item.code_url:`${this.brandInfo['api_host']}${item.code_url}`
979
980
  }
980
981
  return item;
981
982
  });
@@ -1442,8 +1443,8 @@ export default {
1442
1443
  white-space: nowrap;
1443
1444
  overflow: hidden;
1444
1445
  text-overflow: ellipsis;
1445
-
1446
-
1446
+
1447
+
1447
1448
  &>view {
1448
1449
  white-space: pre-wrap;
1449
1450
  word-wrap: break-word;
@@ -406,7 +406,7 @@ export default {
406
406
  }
407
407
  },
408
408
  methods: {
409
-
409
+
410
410
  onJfbLoad(options) {
411
411
  this.params = options;
412
412
  this.order_id = options.order_id;
@@ -539,8 +539,7 @@ export default {
539
539
  info.codes.map((item) => {
540
540
  if (item.show_type === "qrcode" || item.show_type === "barcode") {
541
541
  let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
542
- if (!reg.test(item.code_url))
543
- item.code_url = `${this.brandInfo["api_host"]}${item.code_url}`;
542
+ if (!reg.test(item.code_url)) item.code_url = `${this.brandInfo["api_host"]}${item.code_url}`;
544
543
  }
545
544
  return item;
546
545
  });
@@ -563,13 +562,13 @@ export default {
563
562
  });
564
563
  }
565
564
  this.info = info;
566
-
565
+
567
566
  //显示核销信息
568
567
  info['settleInfo'] = null;
569
568
  if(info['settle_info'] && info['settle_info'].length > 0) {
570
569
  info['settleInfo'] = info['settle_info']
571
570
  }
572
-
571
+
573
572
  //订单完成
574
573
  if (this.info.status.status_type === "success") {
575
574
  if (this.timeer) {
@@ -676,7 +675,7 @@ export default {
676
675
  white-space: nowrap;
677
676
  overflow: hidden;
678
677
  text-overflow: ellipsis;
679
-
678
+
680
679
  & > view {
681
680
  white-space: pre-wrap;
682
681
  word-wrap: break-word;
@@ -818,13 +817,13 @@ export default {
818
817
  &:last-child {
819
818
  border-bottom:0;
820
819
  }
821
-
820
+
822
821
  &>view:first-child {
823
822
  color: #666;
824
823
  font-size: unit(28, rpx);
825
824
  }
826
825
  }
827
-
826
+
828
827
  margin-bottom: unit(20, rpx);
829
828
  }
830
829
  </style>