jufubao-base 1.0.311-beta2 → 1.0.311-beta4

package/package.json

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

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -129,7 +129,7 @@
           <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
           <view class="code_box">
             <view class="qr_code">
-              <image mode="aspectFit" :src="sign_url_qrcode"></image>
+              <image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
             </view>
             <view>长按保存二维码</view>
           </view>
@@ -445,7 +445,7 @@ export default {
         this.timeStr = "01分19秒"
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
-      this.collect_phone_url = getContainerPropsValue(container,  "content.collect_phone_url", { value: "" }).value;
+      this.collect_phone_url = getContainerPropsValue(this.container,  "content.collect_phone_url", { value: "" }).value;
       console.log(this.collect_phone_url,'collect_phone_url')
     },
 

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -143,7 +143,7 @@
           <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
           <view class="code_box">
             <view class="qr_code">
-              <image mode="aspectFit" :src="sign_url_qrcode"></image>
+              <image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
             </view>
             <view>长按保存二维码</view>
           </view>

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -247,8 +247,14 @@ export default {
         this.handleBindConfirm();
         return;
       }
-
-      let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${this.card_number}`;
+      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;
+      }
+      let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
       //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();
@@ -276,6 +282,13 @@ 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%',
@@ -285,7 +298,7 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${this.card_number}`;
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
             this.$xdUniHelper.redirectTo({ url: path});
           }else{
           }

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -266,12 +266,18 @@ export default {
         this.handleBindConfirm();
         return;
       }
-
+      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;
+      }
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
           if(container_id === this.hasCon){
-            let path = this.getUrlCallback(this.backUrl)
+            let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -281,7 +287,7 @@ export default {
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
-            let path = this.getUrlCallback(this.backUrl)
+            let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -291,6 +297,13 @@ 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%',
@@ -300,7 +313,7 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -327,7 +340,6 @@ export default {
         this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
-
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }