jufubao-base 1.0.105-beta6 → 1.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.105-beta6",
+  "version": "1.0.105",
   "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,
-      time: 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", "");
       this.type = getContainerPropsValue(value, "content.type", 1);
       this.isHide = getContainerPropsValue(value, "content.isHide", false);
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
@@ -142,105 +121,16 @@ export default {
         this.isShow = !this.isHide;
       }
     },
-    //领取优惠券
-    handleGetCoupon(item){
-      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,
-        },
-      })
-        .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.time = 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.time = 0;
-              clearTimeout(this.timer);
-            }
-            return;
-          }
-
-          this.timer = setTimeout(() => {
-            this.getResult();
-            if (this.time > 5) {
-              this.$xdLog.setARMSInfo(
-                { message: "领取中" },
-                `pay_${res.status_type}`
-              );
-            }
-            this.time++;
-          }, Math.pow(2, this.time > 5 ? 5 : this.time) * 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,
         },
       })
         .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
           );
@@ -254,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);
@@ -286,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();
@@ -313,7 +167,7 @@ export default {
     },
     handleToList() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}`,
+        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=homed`,
       });
     },
     handleClose() {
@@ -347,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',

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -16,14 +16,15 @@
       <view class="jfb-base-con-list__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-con-list__body" v-if="done" :style="{
-      backgroundImage: `url(${background})`,
-      backgroundSize: '100%',
-      backgroundRepeat: 'no-repeat',
-      minHeight: `${layoutInfo.bodyMinHeightRpx}rpx`,
-    }">
+    <view class="jfb-base-con-list__body" v-if="done">
       <view
         v-if="couponList&&couponList.length > 0"
+        :style="{
+          backgroundImage: `url(${background})`,
+          backgroundSize: '100%',
+          backgroundRepeat: 'no-repeat',
+          height: `${layoutInfo.bodyMinHeightRpx}rpx`,
+        }"
       >
         <view class="jfb-base-con-list__body-content">
           <view class="jfb-base-con-list__body-content-header">
@@ -40,7 +41,7 @@
               <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>
-          <view v-if="can_take === 'Y' && has_times === 'Y'" class="jfb-base-con-list__body-content-list">
+          <view class="jfb-base-con-list__body-content-list">
             <view v-for="(item, index) in couponList" :key="index">
               <view
                 class="jfb-base-con-list__body-content-list-item"
@@ -105,27 +106,24 @@
                     <view></view>
 
                     <xd-button
+                      v-if="item.can_take_num !== 'Y'"
                       size="small"
-                      :disabled="item.can_take_num !=='Y' && item.remain_card_count == 0"
+                      :disabled="item.remain_card_count == 0"
                       @click="getCoupont(item)"
                       type="primary"
-                      style="width: 170rpx;height: 60rpx;"
                       :style="item.btn"
                       :color="item.infoColor"
-                      >{{ item.btn_txt }}</xd-button>
+                      >领取</xd-button
+                    >
                   </view>
                 </view>
               </view>
             </view>
           </view>
-          <view v-else class="jfb-base-con-list__body-content-list" style="padding-bottom: 60rpx;">
-            <image mode="widthFix" :src="used_up_url"></image>
-          </view>
+          <view class="jfb-base-con-list__body-content-foot"
+            >可在我的-我的票券进行查看</view
+          >
         </view>
-        <view class="jfb-base-con-list__body-content-foot"
-          @click="toCoupon"
-          >查看已领票券</view
-        >
       </view>
       <view
         v-else
@@ -182,9 +180,6 @@ export default {
       activity_id: "",
       background: "",
       app_coupon_url: "",
-      used_up_url: "",
-      can_take: "",
-      has_times: "",
       method: "entry",
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
@@ -193,8 +188,6 @@ export default {
       order_num: null,
       done: false,
       message: "",
-
-      collectedPath: "",
     };
   },
   computed: {
@@ -220,7 +213,6 @@ export default {
     init(value) {
       this.contentBackground = '#FFF8F8';
       this.iconColor = '#FF4D4A';
-      this.collectedPath = getContainerPropsValue(value, "content.collectedPath", {value: ''}).value;
     },
     getList() {
       jfbRootExec("getCouponList", {
@@ -233,22 +225,16 @@ export default {
       })
         .then((res) => {
           this.background = getServiceUrl(res.background);
-          this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
-          this.can_take = res.can_take;
-          this.has_times = res.has_times;
-          
           this.couponList =
             res.list &&
             res.list.length > 0 &&
             res.list.map((item) => {
-              let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
-              item.btn_txt = mapArr[item.can_take_num];
               if (item.can_take_num === "Y" || item.can_take_num === "P") {
                 //按钮样式
                 item.btn = res.app_coupon_button_bg_url
                   ? {
                       backgroundImage: `url(${getServiceUrl(
-                        item.can_take_num === "Y" ? res.app_coupon_button_see_url : res.app_coupon_button_bg_url
+                        res.app_coupon_button_bg_url
                       )})`,
                       backgroundSize: "100%",
                       backgroundRepeat: "no-repeat",
@@ -302,16 +288,7 @@ export default {
           console.log(err, "err");
         });
     },
-    toCoupon(){
-      this.$xdUniHelper.navigateTo({
-        url: this.collectedPath,
-      });
-    },
     getCoupont(item) {
-      if(item.can_take_num === "Y") {
-        this.toCoupon();
-        return;
-      }
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
@@ -352,7 +329,6 @@ export default {
       })
         .then((res) => {
           if (res.status_type === "success") {
-            this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
               content: "领取成功",
@@ -462,9 +438,6 @@ export default {
   &__body {
     position: relative;
     overflow-y: auto;
-    padding-top: 82px;
-    box-sizing: border-box;
-    background-color: #FAFAFA;
     .empty_data {
       text-align: center;
       color: #999999;
@@ -482,6 +455,8 @@ export default {
       border-radius: unit(20, rpx);
       background: #fff;
       padding: unit(34, rpx);
+      position: relative;
+      top: unit(164, rpx);
       margin-right: auto;
       margin-left: auto;
       width: unit(650, rpx);
@@ -559,7 +534,7 @@ export default {
         color: #a6a6a6;
         font-size: unit(24, rpx);
         text-align: center;
-        margin: unit(40, rpx) 0;
+        margin-top: unit(40, rpx);
       }
     }
   }

package/src/components/JfbBaseConList/Mock.js

@@ -1,25 +1,11 @@
 'use strict';
 
 module.exports = {
-  getCouponList: {
-    "list":[
-      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
-    ],
-    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
-    "used_up_url": "",
-    "has_times": "Y",
-    "can_take":"Y",
-    "message":"",
-    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
-    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
-    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
-    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
-    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
-    "rule":"<p>打发&middot;</p>",
-    "request_id":"a2603f2a480485f4"
-  },
+  getCouponList: {"list":[
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+  ],"background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg","can_take":"Y","message":"","app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg","app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg","app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png","app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg","request_id":"a2603f2a480485f4"},
   getAllCoupon: {
     "request_id": "5987aa28c709d4ef"
   }

package/src/components/JfbBasePoster/Attr.js

@@ -221,27 +221,27 @@ export default {
           {required: true, message: '请选择广告位置', trigger: 'change'},
         ],
       },
-      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
-        label: '广告背景图:',
-        ele: 'xd-upload',
-        valueKey: 'background',
-        value: params.background || {},
-        defaultValue: params.background || null,
-        slot: true,
-        oneWidth: 100,
-        oneHeight: 100,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-        maxlen: 100,
+      {
+        ele: 'title',
+        label: '广告位轮廓设置',
+        size: 'small', //default/mini/small
+      },
+      {
+        label: '广告位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置广告位边距设置',
+        inline: false,
+        notice: '设置边距充，<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
+
       },
       params.poster && params.poster['type']&& params.poster['type'] !== '1' &&{
-        label: '填充设置:',
+        label: '广告位填充设置:',
         ele: 'xd-margin-padding',
         valueKey: 'bgImagePadding',
         value: params['bgImagePadding'] || null,
@@ -251,17 +251,17 @@ export default {
         },
         placeholder: '请填充设置',
         inline: false,
-        notice: '设置内填充，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置内填充，<span style="color: red">单位：像素（px）</span>。无背景时候默认值：<span style="color: red">20</span>像素。有背景时候默认值：<span style="color: red">20</span>像素。',
       },
-      params.poster &&  params.poster['type']&& params.poster['type'] !== '1' && {
-        label: '广告位内容间距设置:',
+      params.poster &&  params.poster['type'] &&params.number > 1 && {
+        label: '广告内容之间间距设置:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
         value: params.padding || 0,
         className: 'input40',
-        placeholder: '请广告位内容间距设置',
-        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
+        placeholder: '请广告内容之间间距设置',
+        notice: '请广告内容之间间距设置。<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
         inline: false,
       },
       {
@@ -283,16 +283,28 @@ export default {
         },
       },
       {
-        label: '广告位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置广告位边距设置',
-
+        ele: 'title',
+        label: '广告位参数配置',
+        size: 'small', //default/mini/small
+      },
+      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+        label: '广告背景图:',
+        ele: 'xd-upload',
+        valueKey: 'background',
+        value: params.background || {},
+        defaultValue: params.background || null,
+        slot: true,
+        oneWidth: 100,
+        oneHeight: 100,
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
       },
       {
         label: '广告位置使用张数:',
@@ -360,7 +372,7 @@ export default {
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,
       },
-      params['isCarousel'] === 2 && {
+      params.poster['type'] !== '1' && params['isCarousel'] === 2 && {
         label: '广告位内容显示行数:',
         ele: 'xd-radio',
         valueKey: 'rows',
@@ -370,7 +382,7 @@ export default {
           {"label": "两行", "value": 2},
         ]
       },
-      params['isCarousel']===2&&params['rows']===1&&{
+      params['isCarousel']===2 && params['rows'] === 1 && {
         label: '是否启用配套背景:',
         ele: 'xd-radio',
         valueKey: 'isSupport',
@@ -380,7 +392,6 @@ export default {
           {"label": "禁用", "value": 'N'},
         ]
       },
-
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -31,19 +31,21 @@
 					class="jfb-base-poster__one notCarousel"
 					:style="{
 						width: width + 'rpx',
-						height: height + 'rpx',
-						borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
+						height: outOneHeight + 'rpx',
 					}"
 				>
-					<view @click="handleClick(info[0])">
-						<image
-							:style="{
-								width: width + 'rpx',
-								height: height + 'rpx'
-							}"
-							:src="info[0].image_url"
-							mode="aspectFill"
-						></image>
+					<view
+            :style="{
+            	width: width + 'rpx',
+              height: height + 'rpx',
+              borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
+              marginBottom: padding + 'rpx'
+            }"
+            @click="handleClick(item)"
+            v-for="(item,index) in info"
+            :key="index"
+          >
+						<image :src="item.image_url" mode="aspectFill"></image>
 					</view>
 				</view>
 				<view
@@ -137,6 +139,7 @@
         carouselTime: 5,//轮播图轮播周期
 				useNumber: null, //广告使用张数
         height: 0, //广告高度
+        outOneHeight:0,//焦点图显示高度
         width: 0, //广告高度
 				padding: 0, //广告内容之间间距
         rows: 1, //四分屏起作用
@@ -177,9 +180,13 @@
     },
 		computed: {
       getConfig(){
-        let cell = this.posterType === '2' ? 2: (this.posterType === '3' ? 3: 4);
+        let cell = this.posterType === '2' ? 2: (this.posterType === '3' ? 3 : 4);
         let spacing = Math.floor((cell - 1) * this.padding * this.$rpxNum);
-        let viewWidth = uni.getSystemInfoSync().safeArea.width - ((this.mS.right || 0) + (this.mS.left || 0)) * this.$rpxNum - spacing;
+        let padding = 0;
+        if(this.$xdUniHelper.isEmpty(this.background)) padding = 20;
+        let addPadding = ((this.bgImagePadding.right !== null? this.bgImagePadding.right:padding) +
+          (this.bgImagePadding.left !== null? this.bgImagePadding.left : padding)) * this.$rpxNum;
+        let viewWidth = uni.getSystemInfoSync().safeArea.width - ((this.mS.right || 0) + (this.mS.left || 0)) * this.$rpxNum - addPadding - spacing;
         if(this.$configProject.isPreview) viewWidth -= 2;
         let width = Math.floor(viewWidth / cell);
         let height = this.height * width / this.width;
@@ -288,7 +295,7 @@
         } catch (error) {
           console.log(error,'amamamam');
         }
-        
+
       },
 		},
     watch: {
@@ -381,7 +388,6 @@
           this.current = e.detail.current;
         }
       },
-
       handleClick(item) {
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
@@ -486,6 +492,7 @@
         if(this.poster.size) {
           this.width = this.poster.size.width;
           this.height = this.poster.size.height;
+          this.outOneHeight = this.height * Number(this.useNumber) + (Number(this.padding)  * (Number(this.useNumber) - 1));
 				}
       },
 
@@ -567,16 +574,19 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			overflow: hidden;
-
+      flex-flow: wrap;
 
 			& > view {
-				width: 100%;
-				height: 100%;
 				box-sizing: border-box;
+        overflow: hidden;
 
-				& > image {
+        &:last-child {
+          margin-bottom: 0!important;
+        }
 
+				& > image {
+          width: 100%;
+          height: 100%;
 				}
 			}
 		}

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -48,6 +48,7 @@
 					<template slot-scope="{ item, index}">
 						<view
 							class="sreen__box-list"
+              :class="{s3:config.cell === 3,s4:config.cell === 4}"
 							:style="{
 								height: getHeight + 'px'
 							}"
@@ -256,6 +257,14 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 
+      &.s3 > view:nth-child(3n)  {
+        margin-right: 0 !important;
+      }
+
+      &.s4 > view:nth-child(4n)  {
+        margin-right: 0 !important;
+      }
+
 			& view {
 				display: flex;
 				justify-content: center;
@@ -264,10 +273,6 @@
 				box-sizing: border-box;
 				overflow: hidden;
 
-				&:nth-child(4n) {
-					margin-right: 0 !important;
-				}
-
 				& > image {
 
 				}

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -321,7 +321,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdDailog from "@/components/XdDailog/XdDailog";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
-import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
+import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseSuccessMixin from "./JfbBaseSuccessMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
@@ -495,9 +495,6 @@ export default {
         },
       })
         .then((res) => {
-          if(res.status.status_type === 'success') {
-            jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {order_id: this.order_id});
-          }
           this.handleOrderResolve(res);
         })
         .catch((err) => {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -1,197 +0,0 @@
-<template>
-  <view class="xd-cou-card-bind">
-    <view class="ticket_box" :style="{
-      backgroundImage: dialogBackground
-    }">
-      <view class="ticket_list">
-        <view class="ticket_item" :class="item.can_take_num"
-          v-for="(item,i) in uiList" :key="i"
-          :style="{backgroundImage: item.backgroundImage}"
-        >
-          <view class="ticket_names">
-            <view class="name_main">{{item.prize_type}}</view>
-            <view class="name_sub">{{item.prize_name}}</view>
-          </view>
-          <view class="name_tit">{{item.prize_name}}</view>
-          <xd-font-icon class="ticket_icon" :icon="item.icon"></xd-font-icon>
-          <view class="btn">
-            <xd-button
-              size="small"
-              type="primary"
-              :disabled="item.remain_card_count == 0"
-              :style="{
-                backgroundImage: item.btnImage
-              }"
-              @click="getCoupont(item)"
-            >{{item.btn_txt}}</xd-button>
-          </view>
-        </view>
-      </view>
-    </view>
-    
-    <xd-font-icon
-      @click="handleClose"
-      class="dialog_close"
-      icon="iconguanbi_xian"
-      color="#fff"
-      size="64"
-    ></xd-font-icon>
-  </view>
-</template>
-<script>
-import XdButton from "@/components/XdButton/XdButton";
-import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import getServiceUrl from "@/common/getServiceUrl";
-export default{
-  name: "XdCouCardBind",
-  components: {
-    XdButton,
-    XdFontIcon
-  },
-  props: {
-    list: {
-      type: Array,
-      default(){
-        return []
-      }
-    },
-    setting: {}
-  },
-  computed: {
-    uiList(){
-      return this.list.map(item => {
-        let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
-        item.btn_txt = mapArr[item.can_take_num];
-        if(item.can_take_num === "Y" || item.can_take_num === "P"){
-          item.backgroundImage = `url(${getServiceUrl(this.setting.app_coupon_url)})`;
-          item.btnImage = `url(${getServiceUrl(this.setting.app_coupon_button_bg_url)})`;
-          item.icon = item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
-        }else if(item.can_take_num === "N"){
-          item.backgroundImage = `url(${getServiceUrl(this.setting.app_coupon_invalid_url)})`;
-          item.btnImage = "";
-          item.icon = "iconyifawan";
-        }
-        return item;
-      })
-    },
-    dialogBackground(){
-      return `url(${getServiceUrl(this.setting.background)})`;
-    }
-  },
-  data(){
-    return {
-
-    }
-  },
-  methods: {
-    //领取优惠券
-    getCoupont(item){
-      if(item.can_take_num === "P"){
-        this.$emit("getCoupont", item);
-      }
-    },
-    handleClose(){
-      this.$emit("closeDialog");
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@ticketHeight: 180rpx;
-@bgHeight: @ticketHeight - 40rpx;
-  .xd-cou-card-bind{
-    width: 600rpx;
-    max-height: 800rpx;
-    padding-bottom: 80rpx;
-    .ticket_box{
-      background-color: #fff;
-      background-size: 100% auto;
-      background-repeat: no-repeat;
-      padding-top: 100rpx;
-      border-radius: 20rpx;
-      box-sizing: border-box;
-      padding-bottom: 20rpx;
-    }
-    
-    .ticket_item{
-      display: flex;
-      position: relative;
-      width: 540rpx;
-      height: @ticketHeight;
-      margin: 20rpx auto;
-      border-radius: 20rpx;
-      padding: 30rpx;
-      box-sizing: border-box;
-      background: #EEEEEE url("//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg") no-repeat;
-      background-size: auto @bgHeight;
-      background-position: 30rpx center;
-
-      &.P,
-      &.Y{
-
-      }
-      &.N{
-        .ticket_names{
-          .name_main{
-            color: #BBBBBB;
-          }
-        }
-        .ticket_icon{
-          color: #D6D6D6;
-          
-        }
-        .btn{
-          .xd-button{
-            background-color: #DDDDDD !important;
-            color: #999999 !important;
-          }
-        }
-      }
-      .name_tit{
-        font-size: 28rpx;
-        margin-left: 20rpx;
-      }
-      .ticket_names{
-        width: 168rpx;
-        height: 120rpx;
-        text-align: center;
-        font-size: 28rpx;
-        .name_main{
-          margin-bottom: 26rpx;
-          margin-top: 20rpx;
-          color: #fb5b3f;
-        }
-        .name_sub{
-          font-size: 24rpx;
-          color: #FFFFFF;
-        }
-      }
-      .ticket_icon{
-        font-size: 80rpx !important;
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
-      .btn{
-        position: absolute;
-        right: 20rpx;
-        bottom: 20rpx;
-        .xd-button{
-          height: 30rpx;
-          width: 100rpx;
-          font-size: 28rpx;
-          background-size: cover !important;
-          background-color: #fb5b3f;
-        }
-      }
-
-    }
-    .dialog_close{
-      position: absolute;
-      bottom: 0rpx;
-      left: 50%;
-      transform: translateX(-50%);
-    }
-  }
-</style>