jufubao-base 1.0.119-beta2 → 1.0.119-beta21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.119-beta2",
+  "version": "1.0.119-beta21",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -48,6 +48,7 @@
     "@vue/shared": "^3.0.0",
     "color": "^3.1.3",
     "core-js": "^2.6.5",
+    "dingtalk-jsapi": "^3.0.31",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
     "gxd-uni-library-editx": "1.0.17-beta2",
@@ -56,10 +57,10 @@
     "path-to-regexp": "^6.2.1",
     "qs": "^6.9.6",
     "regenerator-runtime": "^0.12.1",
+    "vconsole": "^3.15.0",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",
-    "vuex": "^3.2.0",
-    "vconsole": "^3.15.0"
+    "vuex": "^3.2.0"
   },
   "repository": {
     "type": "git",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -294,6 +294,7 @@ export default {
   data() {
     return {
       options: {},
+      inCallbackUrlOrg:'',//是否带有回调地址
 
       //提示文案
       noticeBackgroundColor: "",
@@ -321,7 +322,7 @@ export default {
       allEntryPath: "", //综合福利入口页
       disabledUrl: "",
       cardLayout: "1",  //票券布局
-      
+
       //样式
       login_text_size: "",
       login_text_color: "",
@@ -389,6 +390,7 @@ export default {
     },
 
     handleToLink(path) {
+      path = this.getUrlCallback(path);
       this.$xdUniHelper.navigateTo({
         url: path,
       });
@@ -414,6 +416,7 @@ export default {
         });
     },
 
+
     /**
      * @description 扫码绑定
      */
@@ -425,10 +428,9 @@ export default {
             needResult: 1,
             scanType: ["qrCode"],
             success: (res) => {
+              let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
               this.$xdUniHelper.navigateTo({
-                url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
-                  res.resultStr
-                )}`,
+                url: path,
               });
             },
             fail: (error) => {
@@ -443,8 +445,9 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
             this.$xdUniHelper.navigateTo({
-              url: `${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`,
+              url: path,
             });
           },
           fail: (error) => {
@@ -469,7 +472,6 @@ export default {
      */
     handleBindLogin(item) {
       if (this.tabIndex === 1) {
-        console.log("bindCardLogin", this.inCallback);
 
         //无效卡
         if (item["is_valid"] !== "Y") {
@@ -534,6 +536,7 @@ export default {
         this.$storage.set("inCallback", inCallback);
         try{
           inCallback = Base64.decode(inCallback);
+          this.inCallbackUrlOrg = options.inCallback;
         }catch (e){
           inCallback = null;
         }

package/src/components/JfbBaseCardBind/JfbBaseCardBind.vue

@@ -69,6 +69,7 @@ export default {
 
       //页面跳转地址
       confirmUrl: "",
+      inCallbackUrlOrg:'',//是否带有回调地址
     };
   },
   computed: {
@@ -107,11 +108,14 @@ export default {
       }
       let cardNumber = Base64.encodeURI(this.cardNumber);
       let pwd = Base64.encodeURI(this.card_password);
-      this.$xdUniHelper.navigateTo({
-        url: `${this.confirmUrl}?card_number=${cardNumber}&pwd=${pwd}`,
-      });
+      let url = this.getUrlCallback(`${this.confirmUrl}?card_number=${cardNumber}&pwd=${pwd}`)
+      this.$xdUniHelper.navigateTo({url});
+    },
+    onJfbLoad(options) {
+      if(options.inCallback) {
+        this.inCallbackUrlOrg = options.inCallback;
+      }
     },
-    onJfbLoad(options) {},
     isEmpty(str) {
       if (str === null || str === "") {
         return true;

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -89,8 +89,8 @@
         },
         jwxSDK: null,
         validImageAPIUrl: "",
-        //todo
         backUrl: "",
+        inCallbackUrlOrg:'',//是否带有回调地址
       }
     },
     watch: {
@@ -101,7 +101,7 @@
     created() {
       this.init(this.container);
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
-      
+
       //#ifdef H5
       if (!this.$configProject.isPreview) {
         jfbRootExec("getH5WxAuthorize", {
@@ -121,7 +121,9 @@
     },
     methods: {
       onJfbLoad(options) {
-      
+        if(options.inCallback) {
+          this.inCallbackUrlOrg = options.inCallback;
+        }
       },
       /**
        * @description 监听事件变化
@@ -129,16 +131,14 @@
        */
       init(container) {
         this.backUrl = getContainerPropsValue(container, "content.backUrl", {value: "/system/card/login"}).value;
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
       handleBindSuccess(){
         this.$xdAlert({
           content: "绑定成功",
           close: () => {
+            let path = this.getUrlCallback(`${this.backUrl}}`)
             this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
+              url: path,
             });
           },
         });
@@ -166,7 +166,7 @@
         let valid_token = this.$xdUniHelper.randomChar(20);
         this.$set(this.cardForm, "valid_token", valid_token);
       },
-      
+
       doScanCode(){
         this.jwxSDK.scanQRCode({
           needResult: 1,

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -422,6 +422,7 @@ export default {
   data() {
     return {
       options:{},
+      inCallbackUrlOrg:'',//是否带有回调地址
 
       //提示文案
       noticeBackgroundColor: "",
@@ -491,6 +492,7 @@ export default {
     },
 
     handleToLink(path) {
+      path = this.getUrlCallback(path)
       this.$xdUniHelper.navigateTo({
         url: path,
       });
@@ -527,10 +529,9 @@ export default {
             needResult: 1,
             scanType: ["qrCode"],
             success: (res) => {
+              let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
               this.$xdUniHelper.navigateTo({
-                url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
-                  res.resultStr
-                )}`,
+                url:path,
               });
             },
             fail: (error) => {
@@ -545,8 +546,9 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
             this.$xdUniHelper.navigateTo({
-              url: `${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`,
+              url:path,
             });
           },
           fail: (error) => {
@@ -664,6 +666,9 @@ export default {
         this.$storage.set("inCallback", inCallback);
         try{
           inCallback = Base64.decode(inCallback);
+          if(options.inCallback) {
+            this.inCallbackUrlOrg = options.inCallback;
+          }
         }catch (e){
           inCallback = null;
         }

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -56,12 +56,8 @@
             v-for="(item, index) in valueKey"
             :key="index"
           >
-            <view class="jfb-base-card-info__body-info-label">{{
-              item.label
-            }}</view>
-            <view class="jfb-base-card-info__body-info-value">{{
-              info[item.key]
-            }}</view>
+            <view class="jfb-base-card-info__body-info-label">{{item.label}}</view>
+            <view class="jfb-base-card-info__body-info-value">{{info[item.key] }}</view>
           </view>
           <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
@@ -95,9 +91,7 @@
           <view :style="{ height: '100rpx' }"></view>
         </view>
         <view class="jfb-base-card-info__body-footer" :style="prod_bottom">
-          <xd-button type="primary" width="360rpx" @click="handleToLink"
-            >立即绑定</xd-button
-          >
+          <xd-button type="primary" width="360rpx" @click="handleToLink">立即绑定</xd-button>
         </view>
       </view>
     </view>
@@ -168,6 +162,8 @@ export default {
       backUrl: "",
       is_show_balance: "N", //是否显示余额
       my_card_url: "", //我的票券跳转地址
+
+      inCallbackUrlOrg:'',//是否带有回调地址
     };
   },
   computed: {
@@ -184,7 +180,6 @@ export default {
   created() {},
   methods: {
     toShowCouponDialog(){
-      // jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: "10001000001133"})
       if(this.info){
         jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
       }
@@ -202,7 +197,8 @@ export default {
             this.handlerAfterBindCard(res);
           })
           .catch();
-      } else {
+      }
+      else {
         jfbRootExec("pwdCardBind", {
           vm: this,
           data: {
@@ -218,31 +214,39 @@ export default {
       }
     },
     handlerAfterBindCard(res){
+      //已绑定卡券处理
       if(res.pop_info && res.pop_info.pop_code === '1001'){
         this.handleBindConfirm();
         return;
       }
 
+      let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+
+      //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
           if(container_id === this.hasCon){
             this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
+              url: path,
             });
           }
         })
-      }else{
+      }
+
+      //票券绑定成功
+      else{
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
             this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
+              url: path,
             });
           },
         });
       }
     },
+
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
@@ -254,9 +258,8 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            this.$xdUniHelper.redirectTo({
-              url: this.my_card_url || this.backUrl,
-            });
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+            this.$xdUniHelper.redirectTo({ url: path});
           }else{
           }
         }
@@ -284,17 +287,9 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
-      console.log(this.$configProject.isPreview, "898989989");
-      //正式环境判断参数错误
-      // if(!this.$configProject.isPreview) {
-      //   if(!this.qrcode) {
-      //     this.$xdAlert({
-      //       content: '参数配置错误',
-      //       type: 'error'
-      //     });
-      //     return
-      //   }
-      // }
+      if(options.inCallback) {
+        this.inCallbackUrlOrg = options.inCallback;
+      }
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetail", {
           vm: this,
@@ -353,10 +348,7 @@ export default {
         .catch();
     },
     isEmpty(str) {
-      if (str === null || str === "") {
-        return true;
-      }
-      return false;
+      return str === null || str === "";
     },
     handleGetInfo() {
       if (this.isEmpty(this.card_password)) {

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -163,6 +163,7 @@ export default {
       backUrl: "",
       headerBg: {},
       my_card_url: "",  //我的票券跳转地址
+      inCallbackUrlOrg:'',//是否带有回调地址
     };
   },
   watch: {
@@ -195,7 +196,7 @@ export default {
           }
         },
       });
-      return 
+      return
       }
       this.handleToBind()
     },
@@ -240,8 +241,9 @@ export default {
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
           if(container_id === this.hasCon){
+            let path = this.getUrlCallback(this.backUrl)
             this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
+              url: path,
             });
           }
         })
@@ -249,8 +251,9 @@ export default {
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
+            let path = this.getUrlCallback(this.backUrl)
             this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
+              url: path,
             });
           },
         });
@@ -267,8 +270,9 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl)
             this.$xdUniHelper.redirectTo({
-              url: this.my_card_url || this.backUrl,
+              url: path,
             });
           }else{
           }
@@ -296,17 +300,9 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
-      console.log(this.$configProject.isPreview, "898989989");
-      //正式环境判断参数错误
-      // if(!this.$configProject.isPreview) {
-      //   if(!this.qrcode) {
-      //     this.$xdAlert({
-      //       content: '参数配置错误',
-      //       type: 'error'
-      //     });
-      //     return
-      //   }
-      // }
+      if(options.inCallback) {
+        this.inCallbackUrlOrg = options.inCallback;
+      }
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetailEntry", {
           vm: this,
@@ -469,18 +465,18 @@ export default {
   overflow: hidden;
   border-radius: unit(16, rpx);
   margin-bottom: unit(30, rpx);
-  
+
   &:last-child {
     margin-bottom: 0;
   }
-  
-  
+
+
   &__title {
     height: unit(56, rpx);
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    
+
     & > view {
       padding: 0 unit(80, rpx);
       font-size: unit(24, rpx);
@@ -489,23 +485,23 @@ export default {
       color: #fff;
       border-radius: 0 0 unit(16, rpx) 0;
     }
-    
+
   }
-  
+
   &__content {
     padding: unit(10, rpx) unit(40, rpx) 0;
     height: unit(86, rpx);
     display: flex;
     justify-content: space-between;
     align-items: center;
-    
+
     & > view:first-child {
       font-size: unit(36, rpx);
       line-height: unit(86, rpx);
       color: #fff;
       font-weight: 700;
     }
-    
+
     & > view:nth-child(2) {
       font-size: unit(24, rpx);
       display: flex;
@@ -516,32 +512,32 @@ export default {
       color: #fff;
     }
   }
-  
+
   &__date {
     padding: 0 unit(40, rpx);
     font-size: unit(28, rpx);
     line-height: unit(32, rpx);
     color: #fff;
   }
-  
+
   &__yue {
     padding: unit(10, rpx) unit(40, rpx) 0;
     font-size: unit(28, rpx);
     line-height: unit(32, rpx);
     color: #fff;
-    
+
     & > text:nth-child(2) {
       font-weight: 700;
     }
   }
-  
+
   &__other {
     display: flex;
     justify-content: flex-start;
     align-items: center;
     padding: unit(20, rpx) unit(40, rpx) 0;
     margin-top: unit(0, rpx);
-    
+
     & > view {
       border-radius:unit(8, rpx);
       background: rgba(255, 255, 255, 0.2);
@@ -555,17 +551,17 @@ export default {
       padding: 0 unit(20, rpx);
       color: #fff;
     }
-    
-    
+
+
   }
-  
+
   &__nodata {
     padding: unit(20, rpx) unit(40, rpx) 0;
     margin-top: unit(0, rpx);
     color: #fff;
     font-size: unit(28, rpx);
   }
-  
+
   &__entry {
     padding: unit(20, rpx) unit(40, rpx) 0;
     & > view {
@@ -578,26 +574,26 @@ export default {
       font-weight: 500;
     }
   }
-  
+
   &__entrys {
     margin: unit(20, rpx) unit(20, rpx) 0;
     padding: unit(30, rpx);
     border-radius: unit(16, rpx);
     background: rgba(255, 255, 255, 1);
     box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
-    
+
     &-title {
       display: flex;
       justify-content: space-between;
       align-items: center;
-     
-      
+
+
       & > view:first-child {
         font-size: unit(28, rpx);
         font-weight: 500;
         flex: 1;
       }
-      
+
       & > view:nth-child(2) {
         display: flex;
         justify-content: flex-start;
@@ -607,11 +603,11 @@ export default {
         color: #999;
       }
     }
-    
+
     &-scroll {
-    
+
     }
-  
+
     &-item {
       display: flex;
       justify-content: flex-start;
@@ -619,7 +615,7 @@ export default {
       flex-flow: nowrap;
       margin-left: unit(-14, rpx);
       padding-top: unit(20, rpx);
-      
+
       & > view {
         width: unit(120, rpx);
         margin-right: unit(10, rpx);
@@ -628,25 +624,25 @@ export default {
         justify-content: center;
         flex-direction: column;
         align-items: center;
-        
+
         & > view:first-child {
           width: unit(76, rpx);
           height: unit(76, rpx);
           overflow: hidden;
-    
+
           & > image {
             height: 100%;
             width: 100%;
           }
         }
-        
+
         & > view:nth-child(2) {
           margin-top: unit(10, rpx);
           font-size: unit(24, rpx);
           line-height: unit(36, rpx);
           margin-bottom: unit(10, rpx);
         }
-        
+
         & > view:nth-child(3) {
           display: flex;
           justify-content: flex-start;
@@ -655,17 +651,17 @@ export default {
           font-size: unit(20, rpx);
           color: #999;
         }
-        
+
         &:last-child {
           margin-right: 0;
         }
-        
+
       }
-      
-      
+
+
     }
   }
-  
+
   &-warp {
     width: unit(700, rpx);
     // min-height: unit(290, rpx);