jufubao-base 1.0.110-beta2 → 1.0.113-beta2

package/package.json

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

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -106,7 +106,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
+import { jfbRootExec } from "@/utils/xd.event";
 import { Base64 } from "js-base64";
 import JfbBaseCardInfoMixin from "./JfbBaseCardInfoMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -162,7 +162,6 @@ export default {
 
       qrcode: "", //二维码
       showForm: true,
-      hasCon: "", //是否有优惠券
 
       //页面跳转地址
       backUrl: "",
@@ -175,12 +174,6 @@ export default {
   },
   created() {},
   methods: {
-    toShowCouponDialog(){
-      // jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: "10001000001133"})
-      if(this.info){
-        jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
-      }
-    },
     handleToLink(path) {
       if (this.qrcode) {
         jfbRootExec("qrCardBind", {
@@ -190,7 +183,14 @@ export default {
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.$xdAlert({
+              content: "绑定成功",
+              close: () => {
+                this.$xdUniHelper.redirectTo({
+                  url: this.backUrl,
+                });
+              },
+            });
           })
           .catch();
       } else {
@@ -202,32 +202,19 @@ export default {
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            console.log(this.$xdAlert, "this.$xdAlertfsdfs");
+            this.$xdAlert({
+              content: "绑定成功",
+              close: () => {
+                this.$xdUniHelper.redirectTo({
+                  url: this.backUrl,
+                });
+              },
+            });
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
-      if(this.hasCon){
-        this.toShowCouponDialog();
-        this.$bus.$on("onCloseConDialog",(container_id) => {
-          if(container_id === this.hasCon){
-            this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
-            });
-          }
-        })
-      }else{
-        this.$xdAlert({
-          content: "票券绑定成功",
-          close: () => {
-            this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
-            });
-          },
-        });
-      }
-    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -340,12 +327,6 @@ 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/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -124,7 +124,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
+import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseCardInfoEntryMixin from "./JfbBaseCardInfoEntryMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
@@ -157,7 +157,6 @@ export default {
 
       qrcode: "", //二维码
       showForm: true,
-      hasCon: "",
 
       //页面跳转地址
       backUrl: "",
@@ -176,12 +175,6 @@ export default {
   },
   created() {},
   methods: {
-    toShowCouponDialog(){
-      // jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: "10001000001133"})
-      if(this.info){
-        jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
-      }
-    },
     handleToLink() {
       if(this.info.card_point===0) {
         this.$xdConfirm({
@@ -207,7 +200,14 @@ export default {
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.$xdAlert({
+              content: "票券绑定成功",
+              close: () => {
+                this.$xdUniHelper.redirectTo({
+                  url: this.backUrl,
+                });
+              },
+            });
           })
           .catch();
       } else {
@@ -221,32 +221,18 @@ export default {
         })
           .then((res) => {
             console.log(this.$xdAlert, "this.$xdAlertfsdfs");
-            this.handlerAfterBindCard();
+            this.$xdAlert({
+              content: "票券绑定成功",
+              close: () => {
+                this.$xdUniHelper.redirectTo({
+                  url: this.backUrl,
+                });
+              },
+            });
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
-      if(this.hasCon){
-        this.toShowCouponDialog();
-        this.$bus.$on("onCloseConDialog",(container_id) => {
-          if(container_id === this.hasCon){
-            this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
-            });
-          }
-        })
-      }else{
-        this.$xdAlert({
-          content: "票券绑定成功",
-          close: () => {
-            this.$xdUniHelper.redirectTo({
-              url: this.backUrl,
-            });
-          },
-        });
-      }
-    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -376,12 +362,6 @@ 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/Api.js

@@ -16,39 +16,4 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
-  {
-    mapFnName: 'getCouponList', //自定义方法名字（必选）
-    title: '获取优惠券列表',
-    path: '/sms-coupon/v1/activity-prizes-user/list',
-    isRule: false,
-    params: {
-      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
-      namespace: ['业务线', 'String', '必填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'getAllCoupon', //自定义方法名字（必选）
-    title: '领取优惠券',
-    path: '/sms-coupon/v1/activity-prizes-user/set',
-    isRule: false,
-    params: {
-      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
-      namespace: ['业务线', 'String', '必填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'getCouponResult', //自定义方法名字（必选）
-    title: '轮询查询活动结果',
-    path: '/sms-coupon/v1/activity-prizes-user/get',
-    isRule: false,
-    params: {
-      tmp_order_number: ['tmp_order_number', 'String', '选填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
 ];

package/src/components/JfbBaseConDialog/Attr.js

@@ -31,19 +31,6 @@ export default {
           { label: '切换', value: 2 },
         ]
       },
-      {
-        label: "触发事件:",
-        ele: "xd-select-list",
-        valueKey: "distribution_method",
-        value: data.distribution_method || "",
-        placeholder: "请选择触发事件",
-        className: 'input80',
-        list: [
-          { label: "首页发放", value: "homed" },
-          { label: "支付成功", value: "paid" },
-          { label: "绑卡成功", value: "card_binded" },
-        ]
-      },
       {
         label: '弹窗间隔:',
         ele: 'el-input',

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -17,9 +17,9 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-con-dialog__body">
-      <view v-if="isShow" class="jfb-base-con-dialog__body-dialog">
+      <view class="jfb-base-con-dialog__body-dialog" v-if="isShow">
         <view class="jfb-base-con-dialog__body-dialog-mask"></view>
-        <view v-if="distribution_method !== 'card_binded'" class="jfb-base-con-dialog__body-dialog-content">
+        <view class="jfb-base-con-dialog__body-dialog-content">
           <view v-if="list.length>1" class="jfb-base-con-dialog__body-dialog-content-num">
             <text>{{ currentIndex + 1 }}/{{ list.length }}</text>
           </view>
@@ -51,16 +51,7 @@
             size="64"
           ></xd-font-icon>
         </view>
-        <view v-else class="jfb-base-con-dialog__body-dialog-content">
-          <xd-cou-card-bind
-            :list="couponList"
-            :setting="couponOther"
-            @closeDialog="handleCardBindClose"
-            @getCoupont="handleGetCoupon"
-          ></xd-cou-card-bind>
-        </view>
       </view>
-      
       <view
         :style="{ background: backgroundColor, color: warningColor }"
         class="jfb-base-con-dialog__body-pop"
@@ -73,7 +64,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec, JfbEvent, jfbRootFnExec } from "@/utils/xd.event";
+import { jfbRootExec, JfbEvent } from "@/utils/xd.event";
 import JfbBaseConDialogMixin from "./JfbBaseConDialogMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
@@ -83,13 +74,11 @@ import colorCardMixins from "@/mixins/colorCardMixins";
 const Color = require("color");
 import { mapState } from "vuex";
 import storage from "@/common/storage";
-import XdCouCardBind from "./XdCouCardBind";
 
 export default {
   name: "JfbBaseConDialog",
   components: {
     XdFontIcon,
-    XdCouCardBind
   },
   mixins: [componentsMixins, extsMixins, JfbBaseConDialogMixin],
   data() {
@@ -104,15 +93,6 @@ export default {
       isPreview: false, //是否预览
       activity_id: "",
       backgroundColor: "",
-      distribution_method: "homed", //触发事件
-      dispatchData: "", //触发事件参数
-
-      couponList: [],
-      couponOther: {},
-      order_num: null,
-      timer: null,
-      timeNum: 0,
-
     };
   },
   computed: {
@@ -134,7 +114,6 @@ export default {
       this.list_url = getContainerPropsValue(value, "content.list_url", {
         value: "",
       }).value;
-      this.distribution_method = getContainerPropsValue(value, "content.distribution_method", "homed");
       this.type = getContainerPropsValue(value, "content.type", 1);
       this.isHide = getContainerPropsValue(value, "content.isHide", false);
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
@@ -142,108 +121,16 @@ export default {
         this.isShow = !this.isHide;
       }
     },
-    //领取优惠券
-    handleGetCoupon(item){
-      this.$xdShowLoading({});
-      jfbRootExec("getAllCoupon", {
-        vm: this,
-        data: {
-          prize_id: item.prize_id,
-          distribution_method: this.distribution_method,
-          ...this.dispatchData
-        }
-      }).then(res => {
-        if (res.code == 400) {
-          this.$xdHideLoading();
-          this.$xdAlert({
-            content: res.message,
-            zIndex: 3200,
-            time: 2000,
-            isClose: false,
-          });
-          this.getDialogList();
-          return;
-        }
-        this.order_num = res.tmp_order_number;
-        setTimeout(()=>{
-          this.getResult();
-        },1000)
-      }).catch((err) => {
-        console.log(err, "err");
-      });
-    },
-    getResult() {
-      jfbRootExec("getCouponResult", {
-        vm: this,
-        data: {
-          tmp_order_number: this.order_num,
-          ...this.dispatchData
-        },
-      })
-        .then((res) => {
-          if (res.status_type === "success") {
-            this.order_num = null;
-            this.$xdHideLoading();
-            this.$xdAlert({
-              content: "领取成功",
-              zIndex: 3200,
-              time: 2000,
-              isClose: false,
-            });
-            this.getDialogList();
-            if (this.timer) {
-              this.timeNum = 0;
-              clearTimeout(this.timer);
-            }
-            return;
-          }
-          if (res.status_type === "error") {
-            this.$xdHideLoading();
-            this.$xdAlert({
-              content: res.message,
-              zIndex: 3200,
-              time: 2000,
-              isClose: false,
-            });
-            if (res.code == 400) {
-              this.getDialogList();
-            }
-            if (this.timer) {
-              this.timeNum = 0;
-              clearTimeout(this.timer);
-            }
-            return;
-          }
-
-          this.timer = setTimeout(() => {
-            this.getResult();
-            if (this.timeNum > 5) {
-              this.$xdLog.setARMSInfo(
-                { message: "领取中" },
-                `pay_${res.status_type}`
-              );
-            }
-            this.timeNum++;
-          }, Math.pow(2, this.timeNum > 5 ? 5 : this.timeNum) * 1000);
-        })
-        .catch((err) => {
-          this.$xdHideLoading();
-          console.log(err, "err");
-        });
-    },
-    p_getDialogList(){
+    getDialogList() {
       jfbRootExec("getCouponDialogList", {
         vm: this,
         data: {
           namespace: this.pageBusinessCode,
-          distribution_method: this.distribution_method,
-          ...this.dispatchData
         },
       })
         .then((res) => {
           console.log(res, "resresres");
           this.list = res.list;
-          if(res.list.length === 0) return;
           this.currentImage = getServiceUrl(
             this.list[this.currentIndex].app_activity_url
           );
@@ -257,31 +144,6 @@ export default {
           console.log(err, "err");
         });
     },
-    p_getCouponList(){
-      jfbRootExec("getCouponList", {
-        vm: this,
-        data: {
-          distribution_method: this.distribution_method,
-          ...this.dispatchData
-        }
-      }).then(res => {
-        const { list, ...other } = res;
-        this.couponList = list;
-        this.couponOther = other;
-        if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
-          this.isShow = true;
-        }else{
-          this.handleCardBindClose();
-        }
-      })
-    },
-    getDialogList() {
-      if(this.distribution_method === 'card_binded'){
-        this.p_getCouponList();
-      }else{
-        this.p_getDialogList();
-      }
-    },
     handlePop() {
       console.log("this.time", this.time * 60 + "分钟");
       storage.set(this.containerId, 1, this.time);
@@ -289,23 +151,12 @@ export default {
     },
     onJfbLoad(options) {
       console.log(11111);
-      //支付跟绑卡是主动触发
       try {
-        if (!storage.get(this.containerId) &&
-          this.distribution_method !== "paid" && 
-          this.distribution_method !== "card_binded") this.getDialogList();
+        if (!storage.get(this.containerId)) this.getDialogList();
       } catch (error) {
         console.log(error, "errorerror");
       }
-      if(this.distribution_method === 'card_binded'){
-        jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);
-      }
     },
-    handleCardBindClose(){
-      this.isShow = false;
-      this.$bus.$emit("onCloseConDialog", this.containerId);
-    },
-    
     onJfbUpdate(data) {
       storage.remove(this.containerId);
       this.getDialogList();
@@ -315,15 +166,8 @@ export default {
       this.onJfbLoad(options);
     },
     handleToList() {
-      let otherParams = "";
-      try {
-        if(this.dispatchData && this.$xdUniHelper.checkVarType(this.dispatchData) === 'object') {
-          otherParams = this.$xdUniHelper.jsonToParams(this.dispatchData);
-        }
-      } catch (error) {}
-
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
+        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=homed`,
       });
     },
     handleClose() {
@@ -357,13 +201,6 @@ export default {
       );
       this.activity_id = this.list[this.currentIndex].activity_id;
     },
-    onJfbCustomEvent({action, data}){
-      if(action === '@showBaseConDialog'){
-        this.dispatchData = data;
-        this.getDialogList();
-      }
-      console.log('onJfbCustomEvent',action, data);
-    }
   },
 };
 </script>

package/src/components/JfbBaseConList/Attr.js

@@ -6,17 +6,6 @@
 export default {
   style: [],
   content: [
-    {
-      label: '查看已领票券路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'collectedPath', //form[valueKey]
-      placeholder: '请选择查看已领票券路径',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
     // {
     //   label: '领券规则:',
     //   ele: 'xd-site-news',