jufubao-base 1.0.159-beta8 → 1.0.159-beta9

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +9 -7
  3. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +9 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.159-beta8",
3
+ "version": "1.0.159-beta9",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue CHANGED
@@ -371,7 +371,7 @@ export default {
371
371
  let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
372
372
  let regSp = /(-apiuri\/v)/;
373
373
 
374
- if(appType === undefined) entry.redirect_data.appType = 'h5';
374
+ if(!appType) entry.redirect_data.appType = 'h5';
375
375
  let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
376
376
 
377
377
  //外站配置地址
@@ -389,15 +389,16 @@ export default {
389
389
  }
390
390
 
391
391
  //站内应用处理
392
- let jumpUrl = '';
392
+ let jumpUrl = path;
393
393
  let cardPathStr = '';
394
394
  const {deploy_dir} = this.projectAttr;
395
- if(dir === deploy_dir) jumpUrl = path;
396
- else jumpUrl = `//${host}/${dir}${path}`;
395
+ if(host === this.projectAttr.host && deploy_dir !== dir){
396
+ jumpUrl = `//${host}/${dir}${path}`;
397
+ //#ifdef MP-WEIXIN
398
+ jumpUrl = `https:${jumpUrl}`;
399
+ //#endif
400
+ }
397
401
 
398
- //#ifdef MP-WEIXIN
399
- jumpUrl = `https:${jumpUrl}`;
400
- //#endif
401
402
 
402
403
  //#ifdef MP-WEIXIN
403
404
  //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
@@ -412,6 +413,7 @@ export default {
412
413
  //#endif
413
414
 
414
415
  jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
416
+ console.warn(`entry.path:${jumpUrl}`);
415
417
  if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
416
418
  else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
417
419
  },
package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue CHANGED
@@ -660,7 +660,7 @@ export default {
660
660
  let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
661
661
  let regSp = /(-apiuri\/v)/;
662
662
 
663
- if(appType === undefined) entry.redirect_data.appType = 'h5';
663
+ if(!appType) entry.redirect_data.appType = 'h5';
664
664
  let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
665
665
 
666
666
  //外站配置地址
@@ -678,15 +678,16 @@ export default {
678
678
  }
679
679
 
680
680
  //站内应用处理
681
- let jumpUrl = '';
681
+ let jumpUrl = path;
682
682
  let cardPathStr = '';
683
683
  const {deploy_dir} = this.projectAttr;
684
- if(dir === deploy_dir) jumpUrl = path;
685
- else jumpUrl = `//${host}/${dir}${path}`;
684
+ if(host === this.projectAttr.host && deploy_dir !== dir){
685
+ jumpUrl = `//${host}/${dir}${path}`;
686
+ //#ifdef MP-WEIXIN
687
+ jumpUrl = `https:${jumpUrl}`;
688
+ //#endif
689
+ }
686
690
 
687
- //#ifdef MP-WEIXIN
688
- jumpUrl = `https:${jumpUrl}`;
689
- //#endif
690
691
 
691
692
  //#ifdef MP-WEIXIN
692
693
  //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
@@ -701,6 +702,7 @@ export default {
701
702
  //#endif
702
703
 
703
704
  jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
705
+ console.warn(`entry.path:${jumpUrl}`);
704
706
  if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
705
707
  else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
706
708
  },