jufubao-base 1.0.188 → 1.0.190

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.188",
+  "version": "1.0.190",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -706,7 +706,7 @@ export default {
      */
     handleBindLogin(item , entry) {
       //卡券登录
-      if (this.tabIndex === 1||this.tabIndex === 2) {
+      if (this.tabIndex === 1 || this.tabIndex === 2) {
         if (item["is_valid"] !== "Y") {
           return;
         }
@@ -719,6 +719,7 @@ export default {
           }, false);
           return
         }
+
         jfbRootExec("loginEntryCardBind", {
           vm: this,
           data: { card_number: item["card_number"] },
@@ -736,7 +737,6 @@ export default {
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
             }
-
             else {
               this.handleClick(entry);
             }
@@ -775,7 +775,15 @@ export default {
     },
 
     handleClick(entry){
-      if (this.$configProject['isPreview']) return
+      if (this.$configProject['isPreview']) return;
+
+      //登陆成功，有回调地址返回回调地址
+      if(this.inCallbackUrlOrg) {
+        this.$xdUniHelper.redirectTo({
+          url:this.inCallback
+        }, false);
+        return;
+      }
 
       const {dir, path, host, appType} = entry['redirect_data'];
       let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
@@ -848,7 +856,7 @@ export default {
       if(options['x-test'] === 'jfb-console') this.showIndex = true;
       this.options = options;
       let { inCallback } = options;
-      this.force = inCallback?true:false;
+      this.force = !!inCallback;
       if(!inCallback) this.$storage.remove("inCallback"); //作为入口
       else {
         this.$storage.set("inCallback", inCallback);
@@ -950,6 +958,7 @@ export default {
           this.handleCardInit(this.ajaxCardList, type);
           this.cardPageNum = 1;
           this.$xdHideLoading();
+
         })
         .catch(() => this.$xdHideLoading());
     },