jufubao-base 1.0.197 → 1.0.198-beta1

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -186,7 +186,7 @@ export default {
       });
     },
 
-    getResult() {
+    getResult(is_auto='N') {
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -196,6 +196,16 @@ export default {
       })
         .then((res) => {
           if (res.status_type === "success") {
+            if(is_auto==='Y') {
+              this.order_num = null;
+              this.handleCardBindClose();
+              this.$xdHideLoading();
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+              return
+            }
             this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
@@ -214,6 +224,15 @@ export default {
             return;
           }
           if (res.status_type === "error") {
+            if(is_auto==='Y') {
+              this.handleCardBindClose();
+              this.$xdHideLoading();
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+              return
+            }
             this.$xdHideLoading();
             this.$xdAlert({
               content: res.message,
@@ -269,7 +288,6 @@ export default {
             this.list[this.currentIndex].app_activity_button
           );
           this.activity_id = this.list[this.currentIndex].activity_id;
-          this.isAll = 
           this.handlePop();
         })
         .catch((err) => {
@@ -301,13 +319,17 @@ export default {
             this.handleCardBindClose();
           }
         } else {
-          if(res.can_take === "Y"){
-          if (this.isPreview) {
-            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
-            }else this.isShow = true;
-          }else{
-            this.handleCardBindClose();
+          if(res.receive_type==='auto') {
+            this.getAllCoupont('Y')
+          } else {
+            if(res.can_take === "Y"){
+            if (this.isPreview) {
+              console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
+              this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+              }else this.isShow = true;
+            }else{
+              this.handleCardBindClose();
+            }
           }
         }
       })
@@ -321,11 +343,11 @@ export default {
       }
     },
 
-    getAllCoupont(info) {
-      this.p_getAllDialogList();
+    getAllCoupont(is_auto='N') {
+      this.p_getAllDialogList(is_auto);
     },
 
-    p_getAllDialogList() {
+    p_getAllDialogList(is_auto='N') {
       //getAllCoupon
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
@@ -333,10 +355,16 @@ export default {
         data: {
           distribution_method: this.distribution_method,
           activity_id: this.activity_id,
+          is_auto: is_auto,
           ...this.dispatchData
         }
       }).then(res => {
         if (res.code === 400) {
+          if(is_auto==='Y') {
+            this.$xdHideLoading();
+            this.handleCardBindClose()
+            return
+          }
           this.$xdHideLoading();
           this.$xdAlert({
             content: res.message,
@@ -351,7 +379,7 @@ export default {
         }
         this.order_num = res.tmp_order_number;
         setTimeout(()=>{
-          this.getResult();
+          this.getResult(is_auto);
         },1000)
       }).catch((err) => {
         console.log(err, "err");