jufubao-base 1.0.311-beta4 → 1.0.311-beta6

package/package.json

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

package/src/components/JfbBaseCardInfo/Attr.js

@@ -5,11 +5,23 @@ export default {
   advanced: [],
   content: [
     {
-      label: '卡绑定成功回跳地址:',
+      label: '票券绑定成功回跳票券列表地址:',
       ele: 'xd-select-pages-path',
       valueKey: 'back_url',
       groupKey:'advanced',
-      placeholder: '请选择卡绑定成功回跳地址',
+      placeholder: '请选择票券绑定成功回跳票券列表地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券绑定成功回跳票券详情地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_detail_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳票券详情地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -162,7 +162,7 @@ export default {
       backUrl: "",
       is_show_balance: "N", //是否显示余额
       my_card_url: "", //我的票券跳转地址
-
+      back_detail_url:"",//详情页地址
       inCallbackUrlOrg:'',//是否带有回调地址
 
       card_password_focus: false,
@@ -254,7 +254,10 @@ export default {
       if(this.qrcode&&this.info.card_number){
         card_number = this.info.card_number;
       }
-      let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
+      let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+      if(res.jump_page==='detail'){
+        path = this.getUrlCallback(this.back_detail_url)+`?card_number=${card_number}`;
+      }
       //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();
@@ -282,13 +285,6 @@ export default {
 
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
-      let card_number
-      if(this.card_number){
-        card_number = this.card_number;
-      }
-      if(this.qrcode&&this.info.card_number){
-        card_number = this.info.card_number;
-      }
       this.$xdConfirm({
         styles: this.styles,
         width: '90%',
@@ -298,7 +294,8 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+          
             this.$xdUniHelper.redirectTo({ url: path});
           }else{
           }
@@ -307,6 +304,7 @@ export default {
     },
     init(container) {
       this.backUrl = getContainerPropsValue(container, "content.back_url", { value: "/pages/card/card" }).value;
+      this.back_detail_url = getContainerPropsValue(container, "content.back_detail_url", { value: "" }).value;
       this.card_num_placeholder = getContainerPropsValue(container, "content.card_num_placeholder", "请输入券号(电子券除外)");
       this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
       this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -69,11 +69,23 @@ export default {
       ]
     },
     {
-      label: '票券绑定成功回跳地址:',
+      label: '票券绑定成功回跳票券列表地址:', 
       ele: 'xd-select-pages-path',
       valueKey: 'back_url',
       groupKey:'advanced',
-      placeholder: '请选择票券绑定成功回跳地址',
+      placeholder: '请选择票券绑定成功回跳票券列表地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券绑定成功回跳票券详情地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_detail_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳票券详情地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -166,6 +166,7 @@ export default {
 
       //页面跳转地址
       backUrl: "",
+      back_detail_url: "",//票券详情跳转地址
       headerBg: {},
       my_card_url: "",  //我的票券跳转地址
       inCallbackUrlOrg:'',//是否带有回调地址
@@ -273,11 +274,14 @@ export default {
       if(this.qrcode&&this.info.card_number){
         card_number = this.info.card_number;
       }
+      let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+      if(res.jump_page==='detail'){
+        path = this.getUrlCallback(this.back_detail_url)+`?card_number=${card_number}`;
+      }
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
           if(container_id === this.hasCon){
-            let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -287,7 +291,6 @@ export default {
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
-            let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -297,13 +300,6 @@ export default {
     },
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
-      let card_number
-      if(this.card_number){
-        card_number = this.card_number;
-      }
-      if(this.qrcode&&this.info.card_number){
-        card_number = this.info.card_number;
-      }
       this.$xdConfirm({
         styles: this.styles,
         width: '90%',
@@ -313,7 +309,7 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl)
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -324,6 +320,7 @@ export default {
     },
     init(container) {
       this.backUrl = getContainerPropsValue(container, "content.back_url", { value: "/pages/card/card" }).value;
+      this.back_detail_url = getContainerPropsValue(container, "content.back_detail_url", { value: "" }).value;
       this.card_num_placeholder = getContainerPropsValue(container, "content.card_num_placeholder", "请输入券号(电子券除外)");
       this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
       this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;

package/src/components/JfbBaseCardSweepInfo/Attr.js

@@ -5,11 +5,23 @@ export default {
   advanced: [],
   content: [
     {
-      label: '卡绑定成功回跳地址:',
+      label: '票券绑定成功回跳票券列表地址:',
       ele: 'xd-select-pages-path',
       valueKey: 'back_url',
       groupKey:'advanced',
-      placeholder: '请选择卡绑定成功回跳地址',
+      placeholder: '请选择票券绑定成功回跳票券列表地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券绑定成功回跳票券详情地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_detail_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳票券详情地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -106,10 +106,11 @@ export default {
       pa: "", //二维码
       //页面跳转地址
       backUrl: "",
-
+      back_detail_url: "",//票券绑定成功回跳票券详情地址
       inCallbackUrlOrg:'',//是否带有回调地址
       is_show_balance: "N", //是否显示余额
       hasCon: "", //是否有优惠券
+      card_number: "", //票券号码
     };
   },
   watch: {
@@ -164,6 +165,9 @@ export default {
                   //#ifdef H5
                   let base = this.jfbAuthorize.getBasePath(this);
                   let url = `${location.origin}${base}${this.backUrl}`;
+                  if(res.jump_page==='detail'){
+                    url = `${location.origin}${base}${this.back_detail_url}`+`?card_number=${this.card_number}`;
+                  }
                   url = this.getUrlCallback(url)
                   this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
@@ -173,7 +177,10 @@ export default {
                   // #endif
 
                   //#ifndef H5
-                  let wPath = this.getUrlCallback(this.backUrl)
+                  let wPath = this.getUrlCallback(this.backUrl);
+                  if(res.jump_page==='detail'){
+                    wPath = this.getUrlCallback(this.back_detail_url)+`?card_number=${this.card_number}`;
+                  }
                   this.$xdUniHelper.redirectTo({
                     url:wPath,
                   });
@@ -187,6 +194,9 @@ export default {
                   //#ifdef H5
                   let base = this.jfbAuthorize.getBasePath(this);
                   let url = `${location.origin}${base}${this.backUrl}`;
+                  if(res.jump_page==='detail'){
+                    url = `${location.origin}${base}${this.back_detail_url}`+`?card_number=${this.card_number}`;
+                  }
                   url = this.getUrlCallback(url)
                   this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
@@ -197,6 +207,9 @@ export default {
 
                   //#ifndef H5
                   let wPath = this.getUrlCallback(this.backUrl)
+                  if(res.jump_page==='detail'){
+                    wPath = this.getUrlCallback(this.back_detail_url)+`?card_number=${this.card_number}`
+                  }
                   this.$xdUniHelper.redirectTo({
                     url:wPath,
                   });
@@ -212,6 +225,7 @@ export default {
     },
     init() {
       this.backUrl = getContainerPropsValue( this.container, "content.back_url", { value: "" }).value;
+      this.back_detail_url = getContainerPropsValue( this.container, "content.back_detail_url", { value: "" }).value;
       this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
     },
     onJfbLoad(options) {
@@ -239,6 +253,7 @@ export default {
         })
           .then((res) => {
             console.log('getSweepByQrCardDetail',res)
+            this.card_number = res.card_number;
             res.is_exchange_name = res.is_exchange === "Y" ? "可转换" : "不可转换";
             let temp = {};
             Object.keys(res).map((key) => {