jufubao-base 1.0.312-beta2 → 1.0.313

package/package.json

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

package/src/components/JfbBaseCardDetail/Attr.js

@@ -16,5 +16,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '收集手机号地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'collect_phone_url',
+      groupKey:'advanced',
+      placeholder: '请选择收集手机号地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -94,6 +94,49 @@
       <!--        @onClose="handlePwdClose"-->
       <!--      ></xd-pw-pay>-->
     </view>
+    <xd-down-drawer
+    :show.sync="showDialog"
+    height="50vh"
+  >
+    <template>
+      <view class="top_title">请务必先关联，否则影响此卡使用</view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法一</view>
+          <view>复制文本，打开支付宝APP</view>
+        </view>
+        <view class="method_item_bottom">
+          <view class="method_item_bottom_left">吱口令：{{share_code}}</view>
+          <view class="method_item_bottom_right" @click="copy(share_code)">复制吱口令</view>
+        </view>
+      </view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法二</view>
+          <view>复制链接，在默认浏览器打开</view>
+        </view>
+        <view class="method_item_bottom">
+          <view class="method_item_bottom_left">{{sign_url}}</view>
+          <view class="method_item_bottom_right" @click="copy(sign_url)">复制链接</view>
+        </view>
+      </view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法三</view>
+          <view>保存图片，使用支付宝APP扫码</view>
+        </view>
+        <view class="method_item_bottom code_img">
+          <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
+          <view class="code_box">
+            <view class="qr_code">
+              <image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
+            </view>
+            <view>长按保存二维码</view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </xd-down-drawer>
   </view>
 </template>
 
@@ -110,6 +153,7 @@ import getBusinessImageUrl from "@/common/getBusinessImageUrl";
 import { Base64 } from "js-base64";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import {mapState} from 'vuex';
+import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
 
 export default {
   name: "JfbBaseCardDetail",
@@ -118,6 +162,7 @@ export default {
     XdPwPay,
     XdEditPwd,
     XdUnit,
+    XdDownDrawer,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseCardDetailMixin],
   computed:{
@@ -171,9 +216,25 @@ export default {
       isBrandLogo: false,
 
       isShowUnbind: false, //是否启动绑定按钮
+      collect_phone_url: "",//收集手机号地址
+      showDialog:false,
+      sign_url:'',
+      share_code:'',
+      sign_url_qrcode:'',
+      toCollectPhoneUrl:'',
     };
   },
-  created() {},
+  created() {
+     // ifDef小程序拼接问题
+    let url = this.$xdUniHelper.parseURL();
+    // #ifdef MP-WEIXIN
+    this.toCollectPhoneUrl = url.relative
+    // #endif
+    // #ifdef H5
+    this.toCollectPhoneUrl = '@site_domain@'+''+url.relative
+    // #endif
+    console.log(this.toCollectPhoneUrl,encodeURIComponent(this.toCollectPhoneUrl),'this.toCollectPhoneUrl')
+  },
   methods: {
     onJfbLoad(options) {
       if (options["x-params"]) {
@@ -384,6 +445,8 @@ export default {
         this.timeStr = "01分19秒"
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_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')
     },
 
     /**
@@ -413,6 +476,19 @@ export default {
           }
 
           this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
+           //支付宝弹框
+          if(res.enterprise_info&&res.enterprise_info.is_need_activate==='Y'){
+            this.share_code = res.enterprise_info.share_code;
+            this.sign_url = res.enterprise_info.sign_url;
+            this.sign_url_qrcode = res.enterprise_info.sign_url_qrcode;
+            if(res.enterprise_info.is_need_collect_phone_number==='Y'){
+              let url = `${this.collect_phone_url}?callback_url=${encodeURIComponent(this.toCollectPhoneUrl)}`
+              this.$xdUniHelper.navigateTo({
+                url:url,
+              });
+            }
+            this.showDialog = true;
+          }
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
@@ -436,6 +512,26 @@ export default {
     handlePwdClose() {
       this.$helper.navigateBack();
     },
+    /**
+     *@description 复制功能
+     * @param  text
+     */
+    copy(text) {
+      // #ifdef H5
+      this.$copyText(text).then((res) => {
+        this.$xdAlert({ content: "复制成功" });
+      });
+      // #endif
+      // #ifndef H5
+      uni.setClipboardData({
+        data: text,
+        showToast: false,
+        success: () => {
+          //this.$xdAlert({ content: "复制成功" });
+        },
+      });
+      // #endif
+    },
   },
 };
 </script>
@@ -595,5 +691,70 @@ export default {
       }
     }
   }
+  .method_item{
+    padding: unit(32, rpx);
+    border-bottom: 1px solid #F8F8F8;
+    color: #333333;
+    font-size: unit(28,rpx);
+    &_top{
+      display: flex;
+      align-items: center;
+    }
+    &_bottom{
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      margin-top: unit(16, rpx);
+      height: unit(32,rpx);
+      line-height: unit(32,rpx);
+      font-size: unit(24,rpx);
+      color: #666666;
+      &_right{
+        min-width: unit(180,rpx);
+        text-align: right;
+        color: #FF8D1A;
+      }
+      &_left{
+        color: #666666;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+    .code_img{
+      height: auto!important;
+    }
+
+  }
+  .method_title{
+    color: #fff;
+    background-color: #FF8D1A;
+    width: unit(120,rpx);
+    height: unit(50,rpx);
+    line-height: unit(50,rpx);
+    border-radius: unit(25,rpx);
+    text-align: center;
+    margin-right: unit(20,rpx);
+    font-size: unit(24,rpx);
+  }
+  .top_title{
+    height: unit(100,rpx);
+    text-align: center;
+    line-height:unit(100,rpx);
+    color:#333333;
+    font-size:unit(32,rpx);
+    border-bottom: 1px solid #F8F8F8;
+  }
+  .code_box{
+    text-align: center;
+    .qr_code{
+      width: unit(168,rpx);
+      height: unit(168,rpx);
+      image{
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
 }
 </style>

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -73,5 +73,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '收集手机号地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'collect_phone_url',
+      groupKey:'advanced',
+      placeholder: '请选择收集手机号地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -108,6 +108,49 @@
         </view>
       </view>
     </view>
+  <xd-down-drawer
+    :show.sync="showDialog"
+    height="50vh"
+  >
+    <template>
+      <view class="top_title">请务必先关联，否则影响此卡使用</view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法一</view>
+          <view>复制文本，打开支付宝APP</view>
+        </view>
+        <view class="method_item_bottom">
+          <view class="method_item_bottom_left">吱口令：{{share_code}}</view>
+          <view class="method_item_bottom_right" @click="copy(share_code)">复制吱口令</view>
+        </view>
+      </view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法二</view>
+          <view>复制链接，在默认浏览器打开</view>
+        </view>
+        <view class="method_item_bottom">
+          <view class="method_item_bottom_left">{{sign_url}}</view>
+          <view class="method_item_bottom_right" @click="copy(sign_url)">复制链接</view>
+        </view>
+      </view>
+      <view class="method_item">
+        <view class="method_item_top">
+          <view class="method_title">方法三</view>
+          <view>保存图片，使用支付宝APP扫码</view>
+        </view>
+        <view class="method_item_bottom code_img">
+          <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
+          <view class="code_box">
+            <view class="qr_code">
+              <image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
+            </view>
+            <view>长按保存二维码</view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </xd-down-drawer>
   </view>
 </template>
 
@@ -126,6 +169,7 @@ import XdPwPay from "./XdPwPay";
 import XdEditPwd from "./XdEditPwd";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from '@/components/XdButton/XdButton'
+import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
 import {parsePath} from "@/utils/linkUrl";
 export default {
   name: "JfbBaseCardDetailEntry",
@@ -134,7 +178,8 @@ export default {
     XdPwPay,
     XdEditPwd,
     XdUnit,
-    XdButton
+    XdButton,
+    XdDownDrawer,
   },
   mixins: [
     componentsMixins,extsMixins,JfbBaseCardDetailEntryMixin,colorCardMixins,
@@ -176,7 +221,13 @@ export default {
       isBrandLogo: false,
       isShowUnbind: false, //是否启动绑定按钮
       headerBg: {},
-      give_url: ""
+      give_url: "",
+      collect_phone_url: "",//收集手机号地址
+      showDialog:false,
+      sign_url:'',
+      share_code:'',
+      sign_url_qrcode:'',
+      toCollectPhoneUrl:'',
     };
   },
   watch: {
@@ -193,6 +244,15 @@ export default {
     },
   },
   created() {
+    // ifDef小程序拼接问题
+    let url = this.$xdUniHelper.parseURL();
+    // #ifdef MP-WEIXIN
+    this.toCollectPhoneUrl = url.relative
+    // #endif
+    // #ifdef H5
+    this.toCollectPhoneUrl = '@site_domain@'+''+url.relative
+    // #endif
+    console.log(this.toCollectPhoneUrl,encodeURIComponent(this.toCollectPhoneUrl),'this.toCollectPhoneUrl')
     this.init(this.container)
   },
   methods: {
@@ -228,6 +288,8 @@ export default {
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
       this.give_url = getContainerPropsValue(container,  "content.give_url", { value: "" }).value;
+      this.collect_phone_url = getContainerPropsValue(container,  "content.collect_phone_url", { value: "" }).value;
+      console.log(this.collect_phone_url,'collect_phone_url')
       //'wechat_mini_program|default'
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
@@ -279,6 +341,19 @@ export default {
           this.show = false;
           console.log(this.getCardThemes(res.card_type_name),'this.getCardThemes(res.card_type_name)');
           this.headerBg = this.getCardThemes(res.card_type_name);
+          //支付宝弹框
+          if(res.enterprise_info&&res.enterprise_info.is_need_activate==='Y'){
+            this.share_code = res.enterprise_info.share_code;
+            this.sign_url = res.enterprise_info.sign_url;
+            this.sign_url_qrcode = res.enterprise_info.sign_url_qrcode;
+            if(res.enterprise_info.is_need_collect_phone_number==='Y'){
+              let url = `${this.collect_phone_url}?callback_url=${encodeURIComponent(this.toCollectPhoneUrl)}`
+              this.$xdUniHelper.navigateTo({
+                url:url,
+              });
+            }
+            this.showDialog = true;
+          }
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
@@ -558,6 +633,26 @@ export default {
         clearTimeout(this.refrushTimeer);
       }
     },
+    /**
+     *@description 复制功能
+     * @param  text
+     */
+    copy(text) {
+      // #ifdef H5
+      this.$copyText(text).then((res) => {
+        this.$xdAlert({ content: "复制成功" });
+      });
+      // #endif
+      // #ifndef H5
+      uni.setClipboardData({
+        data: text,
+        showToast: false,
+        success: () => {
+          //this.$xdAlert({ content: "复制成功" });
+        },
+      });
+      // #endif
+    },
   },
 };
 </script>
@@ -1008,5 +1103,71 @@ export default {
 
     }
   }
+  .method_item{
+    padding: unit(32, rpx);
+    border-bottom: 1px solid #F8F8F8;
+    color: #333333;
+    font-size: unit(28,rpx);
+    &_top{
+      display: flex;
+      align-items: center;
+    }
+    &_bottom{
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      margin-top: unit(16, rpx);
+      height: unit(32,rpx);
+      line-height: unit(32,rpx);
+      font-size: unit(24,rpx);
+      color: #666666;
+      &_right{
+        min-width: unit(180,rpx);
+        text-align: right;
+        color: #FF8D1A;
+      }
+      &_left{
+        color: #666666;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+    .code_img{
+      height: auto!important;
+    }
+
+  }
+  .method_title{
+    color: #fff;
+    background-color: #FF8D1A;
+    width: unit(120,rpx);
+    height: unit(50,rpx);
+    line-height: unit(50,rpx);
+    border-radius: unit(25,rpx);
+    text-align: center;
+    margin-right: unit(20,rpx);
+    font-size: unit(24,rpx);
+  }
+  .top_title{
+    height: unit(100,rpx);
+    text-align: center;
+    line-height:unit(100,rpx);
+    color:#333333;
+    font-size:unit(32,rpx);
+    border-bottom: 1px solid #F8F8F8;
+  }
+  .code_box{
+    text-align: center;
+    .qr_code{
+      width: unit(168,rpx);
+      height: unit(168,rpx);
+      image{
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+  
 }
 </style>

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,
@@ -247,8 +247,17 @@ 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;
+      }
       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();
@@ -286,6 +295,7 @@ export default {
         success: (res) => {
           if (res.confirm) {
             let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+          
             this.$xdUniHelper.redirectTo({ url: path});
           }else{
           }
@@ -294,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:'',//是否带有回调地址
@@ -266,12 +267,21 @@ 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;
+      }
+      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)
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -281,7 +291,6 @@ export default {
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
-            let path = this.getUrlCallback(this.backUrl)
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -311,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;
@@ -327,7 +337,6 @@ export default {
         this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
-
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }

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'),