jufubao-base 1.0.164 → 1.0.165-beta2

package/package.json

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

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -65,7 +65,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec } from "@/utils/xd.event";
+import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
 import JfbBaseCardSweepInfoMixin from "./JfbBaseCardSweepInfoMixin";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
@@ -111,6 +111,7 @@ export default {
 
       inCallbackUrlOrg:'',//是否带有回调地址
       is_show_balance: "N", //是否显示余额
+      hasCon: "", //是否有优惠券
     };
   },
   watch: {
@@ -143,6 +144,11 @@ export default {
 
   },
   methods: {
+    toShowCouponDialog(){
+      if(this.info){
+        jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
+      }
+    },
     handleToLink(path) {
       if (this.pa) {
         jfbRootExec("qrCardBind", {
@@ -152,30 +158,56 @@ export default {
           },
         })
           .then((res) => {
-            this.$xdAlert({
-              content: "绑定成功",
-              close: () => {
-                //#ifdef H5
-                let base = this.jfbAuthorize.getBasePath(this);
-                let url = `${location.origin}${base}${this.backUrl}`;
-                url = this.getUrlCallback(url)
-                this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
+            //有优惠券处理
+            if(this.hasCon){
+              this.toShowCouponDialog();
+              this.$bus.$on("onCloseConDialog",(container_id) => {
+                if(container_id === this.hasCon){
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
-                setTimeout(()=>{
-                  window.location.href = url;
-                },50);
-                // #endif
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-                //#ifndef H5
-                let wPath = this.getUrlCallback(this.backUrl)
-                this.$xdUniHelper.redirectTo({
-                  url:wPath,
-                });
-                // #endif
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+                }
+              })
+            } else {
+              this.$xdAlert({
+                content: "绑定成功",
+                close: () => {
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-              },
-            });
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+
+
+                },
+              });
+            }
           })
           .catch();
       }
@@ -233,6 +265,12 @@ export default {
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
+    onJfbCustomEvent({action, data}){
+      if(action === 'baseConDialog@hasCon'){
+        this.hasCon = data;
+      }
+      console.log('onJfbCustomEvent',action, data);
+    }
   },
 };
 </script>

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -69,11 +69,35 @@
               :color="item.iconColor"
               :icon="item.icon"
             ></xd-font-icon>
-            <view class="btn">
+            <view v-if="item.can_take_num==='Y'" class="btn">
               <xd-button
                 size="small"
                 type="primary"
-                :disabled="item.remain_card_count == 0"
+                :style="{
+                  backgroundImage: item.btnImage,
+                  backgroundSize: '100% 100%',
+                }"
+                @click="getCoupont(item)"
+                >{{ item.btn_txt }}</xd-button
+              >
+            </view>
+            <view class="btn" v-else>
+              <xd-button
+                v-if="item.remain_card_count == 0"
+                size="small"
+                type="primary"
+                :disabled="true"
+                :style="{
+                  backgroundImage: item.btnImage,
+                  backgroundSize: '100% 100%',
+                }"
+                @click="getCoupont(item)"
+                >{{ item.btn_txt }}</xd-button
+              >
+              <xd-button
+                v-else                
+                size="small"
+                type="primary"
                 :style="{
                   backgroundImage: item.btnImage,
                   backgroundSize: '100% 100%',