jufubao-base 1.0.67-beta200 → 1.0.67-beta202

package/package.json

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

package/src/components/JfbBaseConDialog/Attr.js

@@ -41,6 +41,19 @@ export default {
         className: 'input80',
         unit: '小时'
       },
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'isHide',
+        value: data['isHide']||false,
+        placeholder: '请选择是否隐藏弹框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ]
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -23,6 +23,26 @@
           <view class="jfb-base-con-dialog__body-dialog-content-num">
             <text>{{ currentIndex + 1 }}/{{ list.length }}</text>
           </view>
+          <view style="display: flex; align-items: center">
+            <view
+              @click="handleChange('left')"
+              v-if="this.type === 2 && this.currentIndex !== 0"
+              class="jfb-base-con-dialog__body-dialog-content-left"
+            >
+              <xd-font-icon icon="iconxiangzuo_xian"></xd-font-icon>
+            </view>
+            <view class="jfb-base-con-dialog__body-dialog-content-image">
+              <image :src="currentImage"></image>
+              <image @click="handleToList" :src="currentBtnImage"></image>
+            </view>
+            <view
+              v-if="this.type === 2 && this.currentIndex !== list.length - 1"
+              @click="handleChange('right')"
+              class="jfb-base-con-dialog__body-dialog-content-right"
+            >
+              <xd-font-icon icon="iconxiangyou_xian"></xd-font-icon>
+            </view>
+          </view>
           <xd-font-icon
             @click="handleClose"
             class="jfb-base-con-dialog__body-dialog-content-close"
@@ -30,41 +50,26 @@
             color="#fff"
             size="64"
           ></xd-font-icon>
-          <view
-            @click="handleChange('left')"
-            v-if="this.type === 2 && this.currentIndex !== 0"
-            class="jfb-base-con-dialog__body-dialog-content-left"
-          >
-            <xd-font-icon icon="iconxiangzuo_xian"></xd-font-icon>
-          </view>
-          <view
-            v-if="this.type === 2 && this.currentIndex !== list.length - 1"
-            @click="handleChange('right')"
-            class="jfb-base-con-dialog__body-dialog-content-right"
-          >
-            <xd-font-icon icon="iconxiangyou_xian"></xd-font-icon>
-          </view>
-          <view class="jfb-base-con-dialog__body-dialog-content-image">
-            <image :src="currentImage"></image>
-            <image @click="handleToList" :src="currentBtnImage"></image>
-          </view>
         </view>
       </view>
+      <view
+        :style="{ background: backgroundColor, color: warningColor }"
+        class="jfb-base-con-dialog__body-pop"
+        v-if="isPreview"
+        >弹框方便编辑(占位)，在线上此模块不显</view
+      >
     </view>
   </view>
 </template>
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import XdButton from "@/components/XdButton/XdButton";
 import { jfbRootExec, JfbEvent } from "@/utils/xd.event";
 import JfbBaseConDialogMixin from "./JfbBaseConDialogMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
-import XdDailog from "@/components/XdDailog/XdDailog";
-import XdContentXss from "@/components/XdContentXss/XdContentXss";
 import colorCardMixins from "@/mixins/colorCardMixins";
 const Color = require("color");
 import { mapState } from "vuex";
@@ -74,9 +79,6 @@ export default {
   name: "JfbBaseConDialog",
   components: {
     XdFontIcon,
-    XdButton,
-    XdDailog,
-    XdContentXss,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseConDialogMixin],
   data() {
@@ -90,10 +92,11 @@ export default {
       type: "",
       isPreview: false, //是否预览
       activity_id: "",
+      backgroundColor: "",
     };
   },
   computed: {
-    ...mapState(["xnamespace"]),
+    ...mapState(["pageBusinessCode"]),
   },
   watch: {
     container(value) {
@@ -103,10 +106,7 @@ export default {
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
-    if (this.isPreview) {
-      this.isShow = true;
-      return;
-    }
+    this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.init(this.container);
   },
   methods: {
@@ -115,13 +115,17 @@ export default {
         value: "",
       }).value;
       this.type = getContainerPropsValue(value, "content.type", 1);
+      this.isHide = getContainerPropsValue(value, "content.isHide", false);
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
+      if (this.isPreview) {
+        this.isShow = !this.isHide;
+      }
     },
     getDialogList() {
       jfbRootExec("getCouponDialogList", {
         vm: this,
         data: {
-          namespace: this.xnamespace,
+          namespace: this.pageBusinessCode,
         },
       })
         .then((res) => {
@@ -148,7 +152,6 @@ export default {
     onJfbLoad(options) {
       console.log(11111);
       try {
-        this.setNameSpace(options);
         if (!storage.get(this.containerId)) this.getDialogList();
       } catch (error) {
         console.log(error, "errorerror");
@@ -160,7 +163,7 @@ export default {
     },
     handleToList() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}`,
+        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=homed`,
       });
     },
     handleClose() {
@@ -203,13 +206,21 @@ export default {
 
 .jfb-base-con-dialog {
   &__body {
+     &-pop {
+      min-height: 100rpx;
+      text-align: center;
+      vertical-align: middle;
+      color: #666;
+      font-size: unit(24, rpx);
+      line-height: 100rpx;
+    }
     &-dialog {
       position: fixed;
       top: 0;
       bottom: 0;
       left: 0;
       right: 0;
-      z-index: 2000;
+      z-index: 3000;
 
       &-mask {
         position: absolute;
@@ -221,12 +232,17 @@ export default {
       }
 
       &-content {
+        max-height: unit(1000, rpx);
+        overflow-y: auto;
+        overflow-x: hidden;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        display: flex;
+        flex-direction: column;
         &-num {
-          position: absolute;
-          top: 16%;
-          right: 50%;
-          z-index: 3000;
-          transform: translateX(50%);
+          margin: 0 auto;
           background: rgba(255, 255, 255, 0.5);
           border-radius: unit(40, rpx);
           padding: unit(8, rpx) unit(24, rpx);
@@ -234,42 +250,29 @@ export default {
           font-size: unit(40, rpx);
         }
         &-close {
-          position: absolute;
-          bottom: 12%;
-          right: 50%;
-          z-index: 3000;
-          transform: translateX(50%);
+          margin: 0 auto;
         }
         &-left {
-          position: absolute;
-          top: 50%;
-          left: 1%;
-          z-index: 3000;
           background: rgba(255, 255, 255, 0.1);
           padding: unit(40, rpx) unit(10, rpx);
           color: #fff;
           border-radius: unit(40, rpx);
         }
         &-right {
-          position: absolute;
-          top: 50%;
-          right: 1%;
-          z-index: 3000;
           background: rgba(255, 255, 255, 0.1);
           padding: unit(40, rpx) unit(10, rpx);
           color: #fff;
           border-radius: unit(40, rpx);
         }
         &-image {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          width: unit(600, rpx);
+          min-width: unit(600, rpx);
+          min-height: unit(800, rpx);
           height: unit(800, rpx);
           display: flex;
           align-items: center;
           flex-direction: column;
+          margin: 20rpx;
+          position: relative;
 
           & > image:first-child {
             width: 100%;
@@ -280,7 +283,7 @@ export default {
             width: unit(448, rpx);
             height: unit(70, rpx);
             position: absolute;
-            bottom: unit(110, rpx);
+            bottom: unit(100, rpx);
           }
         }
       }

package/src/components/JfbBaseConList/Api.js

@@ -44,4 +44,15 @@ module.exports = [
     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/JfbBaseConList/JfbBaseConList.vue

@@ -18,9 +18,7 @@
     <!-- #endif -->
     <view class="jfb-base-con-list__body">
       <view class="jfb-base-con-list__body-header">
-        <image
-          :src="background"
-        ></image>
+        <image :src="background"></image>
       </view>
       <view class="jfb-base-con-list__body-content">
         <view class="jfb-base-con-list__body-content-header">
@@ -46,25 +44,25 @@
           >
             <view class="jfb-base-con-list__body-content-list-item-left">
               <view
-                style="
-                  background: url('https://i.niupic.com/images/2023/11/22/d1bV.webp');
-                  background-size: 100% 100%;
-                  background-repeat: no-repeat;
-                "
+                :style="couponBackground"
                 class="jfb-base-con-list__body-content-list-item-left-info"
               >
                 <view :style="{ color: mainColor }">满减券</view>
-                <view>{{item.prize_name}}</view>
+                <view>{{ item.prize_name }}</view>
               </view>
               <view class="jfb-base-con-list__body-content-list-item-left-num">
-                <view>{{item.prize_name}}</view>
-                <view :style="{ color: mainColor }">X{{item.prize_num}}</view>
+                <view>{{ item.prize_name }}</view>
+                <view :style="{ color: mainColor,display:'flex',alignItems:'center' }">
+                  <xd-font-icon style="margin-right:10rpx" size="24" icon="icondanchuangguanbi_xian"></xd-font-icon>
+                  {{ item.prize_num }}
+                  </view>
               </view>
             </view>
             <view class="jfb-base-con-list__body-content-list-item-right">
               <xd-font-icon
+                size="100"
                 :style="{ color: disabled ? '#D6D6D6' : mainColor }"
-                icon="iconerweima"
+                :icon="disabled ? 'iconyilingqu' : 'icondailingqu'"
               ></xd-font-icon>
             </view>
           </view>
@@ -73,11 +71,12 @@
       <view style="height: 120rpx"></view>
       <view class="bottom_btn" :style="prod_bottom">
         <xd-button
+          :disabled="disabled"
           @click="getCoupont"
-          :style="{ backgroundColor: btnBackground }"
+          type="primary"
+          :style="btn"
           width="60%"
-          :type="disabled ? 'info' : 'primary'"
-          >一键领取</xd-button
+          >{{ disabled ? "已领取" : "一键领取" }}</xd-button
         >
       </view>
       <xd-dailog
@@ -102,7 +101,7 @@ import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import XdDailog from "@/components/XdDailog/XdDailog";
 import XdContentXss from "@/components/XdContentXss/XdContentXss";
-import getServiceUrl from '@/common/getServiceUrl'
+import getServiceUrl from "@/common/getServiceUrl";
 import colorCardMixins from "@/mixins/colorCardMixins";
 import { mapState } from "vuex";
 const Color = require("color");
@@ -124,19 +123,29 @@ export default {
       notice: "",
       showRule: false,
       btn: "",
-      activity_id: '',
-      background: ''
+      activity_id: "",
+      background: "",
+      app_coupon_url: "",
+      method: "entry",
+      maxTime: 5, //最长轮询2的N次方（秒）
+      date: 2, //时间底数
+      time: 1, //时间幂指数
+      timeer: null,
+      order_num: null,
     };
   },
   computed: {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
-    btnBackground() {
-      if (this.disabled) return;
-      return this.btn ? this.btn : this.mainColor;
+    couponBackground() {
+      return {
+        background: `url(${this.app_coupon_url})`,
+        backgroundSize: "100% 100%",
+        backgroundRepeat: "no-repeat",
+      };
     },
-    ...mapState(["xnamespace"]),
+    ...mapState(["pageBusinessCode"]),
   },
   watch: {
     container(value) {
@@ -146,6 +155,11 @@ export default {
   created() {
     this.init(this.container);
   },
+  destroyed() {
+    if (this.timeer) {
+      clearTimeout(this.timeer);
+    }
+  },
   methods: {
     init(value) {
       this.contentBackground = Color(this.mainColor).alpha(0.2).toString();
@@ -154,36 +168,95 @@ export default {
       jfbRootExec("getCouponList", {
         vm: this,
         data: {
-          distribution_method: "entry",
-          namespace: this.xnamespace,
-          activity_id: this.activity_id
+          distribution_method: this.method,
+          namespace: this.pageBusinessCode,
+          activity_id: this.activity_id,
         },
-      }).then(res=>{
-        this.background = getServiceUrl(res.background)
-        this.couponList = res.list
-      }).catch(err=>{
-        console.log(err,'err');
       })
+        .then((res) => {
+          this.background = getServiceUrl(res.background);
+          this.app_coupon_url = getServiceUrl(res.app_coupon_url);
+          this.btn = res.app_activity_button
+            ? {
+                background: `url(${getServiceUrl(res.app_activity_button)})`,
+                backgroundSize: "100% 100%",
+                backgroundRepeat: "no-repeat",
+              }
+            : { background: this.mainColor };
+          this.couponList = res.list;
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
     getCoupont() {
+      this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
         data: {
-          distribution_method: "entry",
-          namespace: this.xnamespace,
-          activity_id: this.activity_id
+          distribution_method: this.method,
+          namespace: this.pageBusinessCode,
+          activity_id: this.activity_id,
         },
-      }).then(res=>{
-        this.$xdAlert({
-          content: "领取成功",
-          zIndex: 3200,
-          time: 2000,
-          isClose: false,
+      })
+        .then((res) => {
+          this.order_num = res.tmp_order_number;
+          this.getResult();
+        })
+        .catch((err) => {
+          console.log(err, "err");
         });
-        this.disabled=true
-      }).catch(err=>{
-        console.log(err,'err');
+    },
+    getResult() {
+      jfbRootExec("getCouponResult", {
+        vm: this,
+        data: {
+          tmp_order_number: this.order_num,
+        },
       })
+        .then((res) => {
+          if (res.status_type === "success") {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: "领取成功",
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            this.disabled = true;
+            if (this.timeer) {
+              clearTimeout(this.timeer);
+            }
+            return;
+          }
+          if (res.status_type === "error") {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: "领取失败",
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            this.disabled = false;
+            if (this.timeer) {
+              clearTimeout(this.timeer);
+            }
+            return;
+          }
+          this.time++;
+          this.timeer = setTimeout(() => {
+            this.getResult();
+            if (this.time > 5)
+              this.$xdLog.setARMSInfo(
+                { message: "领取中" },
+                `pay_${res.status_type}`
+              );
+          }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
+        })
+        .catch((err) => {
+          this.$xdHideLoading();
+          console.log(err, "err");
+        });
     },
     getContent() {
       jfbRootExec("getListBaseNewsContentCoupon", {
@@ -205,14 +278,35 @@ export default {
         });
     },
     onJfbLoad(options) {
-      this.activity_id = options.activity_id
-      this.setNameSpace(options);
+      console.log(this.pageBusinessCode, "pageNamespace");
+      this.activity_id = options.activity_id;
+      this.method = options.distribution_method
+        ? options.distribution_method
+        : "entry";
       this.getContent();
       this.getList();
     },
 
-    onJfbCustomEvent(data) {
-      console.log("onJfbCustomEvent", data);
+    onJfbShow() {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      this.time = 0;
+      if (this.order_num) this.getResult();
+    },
+
+    onJfbUnload() {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+    },
+
+    onJfbBack(options) {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.$configProject.isPreview) return;
+      this.$xdUniHelper.navigateBack();
     },
   },
 };
@@ -225,7 +319,6 @@ export default {
   &__body {
     position: relative;
     &-header {
-      width: 100%;
       height: unit(600, rpx);
       & > image {
         width: 100%;
@@ -236,9 +329,11 @@ export default {
       border-radius: unit(20, rpx);
       background: #fff;
       padding: unit(40, rpx);
-      position: relative;
-      top: unit(-340, rpx);
-      margin: 0 unit(20, rpx);
+      position: absolute;
+      top: unit(164, rpx);
+      left: 50%;
+      transform: translateX(-50%);
+      width: unit(600, rpx);
 
       &-header {
         display: flex;
@@ -267,6 +362,7 @@ export default {
 
       &-list {
         margin-top: unit(20, rpx);
+
         &-item {
           margin-top: unit(20, rpx);
           display: flex;

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -400,6 +400,11 @@ export default {
     this.isPreview = this.$configProject.isPreview;
     this.init(this.container);
   },
+  destroyed() {
+    if (this.timeer) {
+      clearTimeout(this.timeer);
+    }
+  },
   methods: {
     
     onJfbLoad(options) {
@@ -639,12 +644,6 @@ export default {
       }
     },
 
-    destroyed() {
-      if (this.timeer) {
-        clearTimeout(this.timeer);
-      }
-    },
-
     /**
      * @description 页面返回按钮
      * @param options