jufubao-base 1.0.115 → 1.0.116-beta10

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -177,7 +177,7 @@
                     <text>券号：</text>
                     <text>{{item.card_number}}</text>
                   </view>
-                  <view @click.stop="toDetail(item)" v-if="0">
+                  <view @click.stop="toDetail(item)">
                     <view>
                       <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
                     </view>

package/src/components/JfbBaseCardInfo/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',
@@ -33,5 +44,15 @@ export default {
       placeholder: '请输入密码框自定义文案',
       className: 'input80'
     },
+    {
+      label: "票券过期是否展示余额",
+      ele: "xd-radio",
+      valueKey: "is_show_balance",
+      value: "N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    }
   ],
 };

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -63,7 +63,7 @@
               info[item.key]
             }}</view>
           </view>
-          <view class="jfb-base-card-info__body-residue">
+          <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
               <view class="jfb-base-card-info__body-residue-label">
                 <view :style="{ color: '#242424', fontSize: '28rpx' }"
@@ -166,12 +166,20 @@ export default {
 
       //页面跳转地址
       backUrl: "",
+      is_show_balance: "N", //是否显示余额
+      my_card_url: "", //我的票券跳转地址
     };
   },
   computed: {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    isShowBalance(){
+      if(this.info.is_expired === "Y"){
+        return this.is_show_balance === "Y";
+      }
+      return true;
+    }
   },
   created() {},
   methods: {
@@ -187,10 +195,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -199,15 +208,21 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -228,6 +243,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -244,6 +278,8 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -162,6 +162,7 @@ export default {
       //页面跳转地址
       backUrl: "",
       headerBg: {},
+      my_card_url: "",  //我的票券跳转地址
     };
   },
   watch: {
@@ -204,10 +205,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -216,17 +218,24 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
-            is_show_entry_settings: "Y"
+            is_show_entry_settings: "Y",
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
             console.log(this.$xdAlert, "this.$xdAlertfsdfs");
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -247,6 +256,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -263,6 +291,7 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -62,7 +62,7 @@
           </view>
         </view>
       </view>
-      <view class="code">
+      <view class="code" v-if="0">
         <view>验证码：</view>
         <view>
           <input v-model="valid_code" class="uni-input" placeholder="请输入验证码"/>
@@ -248,13 +248,13 @@ export default {
     },
     
     handleToSubmit() {
-      if (!this.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
@@ -269,8 +269,8 @@ export default {
           let params = {
             from_card_number: this.fromSelect.value,
             to_card_number: this.toSelect.value,
-            valid_code: this.valid_code,
-            valid_token: this.valid_token
+            // valid_code: this.valid_code,
+            // valid_token: this.valid_token
           };
           
           if (action.confirm) {

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -321,9 +321,14 @@ export default {
           otherParams = this.$xdUniHelper.jsonToParams(this.dispatchData);
         }
       } catch (error) {}
+      let curCoup = this.list[this.currentIndex];
+      let linkUrl = this.list_url;
+      if(curCoup.show_url){
+        linkUrl = curCoup.show_url
+      }
 
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
+        url: `${linkUrl}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
       });
     },
     handleClose() {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -6,21 +6,22 @@
       <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 class="item_head">
+            <image class="t_icon" mode="widthFix" :src="item.headIcon"></image>
+            <view>{{  item.prize_type }}</view>
           </view>
-          <view class="name_tit">{{item.prize_name}}</view>
-          <xd-font-icon class="ticket_icon" :icon="item.icon"></xd-font-icon>
+          <view class="item_sub">{{ item.prize_name }}</view>
+
+          <xd-font-icon class="ticket_icon" :color="item.iconColor" :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
+                backgroundImage: item.btnImage,
+                backgroundSize: '100% 100%',
               }"
               @click="getCoupont(item)"
             >{{item.btn_txt}}</xd-button>
@@ -63,13 +64,15 @@ export default{
         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.headIcon = 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";
+          item.iconColor = item.can_take_num === "Y"?'#D6D6D6':"#FF4D4A"
         }else if(item.can_take_num === "N"){
-          item.backgroundImage = `url(${getServiceUrl(this.setting.app_coupon_invalid_url)})`;
+          item.headIcon = getServiceUrl(this.setting.app_coupon_invalid_url);
           item.btnImage = "";
           item.icon = "iconyifawan";
+          item.iconColor = '#D6D6D6'
         }
         return item;
       })
@@ -116,6 +119,7 @@ export default{
     
     .ticket_item{
       display: flex;
+      flex-direction: column;
       position: relative;
       width: 540rpx;
       height: @ticketHeight;
@@ -123,19 +127,19 @@ export default{
       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;
+      background: #FFF8F8;
 
       &.P,
       &.Y{
 
       }
       &.N{
-        .ticket_names{
-          .name_main{
-            color: #BBBBBB;
-          }
+        background: #F3F3F3;
+        .item_head{
+          color: #BBBBBB;
+        }
+        .item_sub{
+          color: #BBBBBB;
         }
         .ticket_icon{
           color: #D6D6D6;
@@ -148,25 +152,23 @@ export default{
           }
         }
       }
-      .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;
+      .item_head{
+        display: flex;
+        align-items: center;
+        font-size: 40rpx;
+        color: #000000;
+        font-weight: 500;
+        .t_icon{
+          width: 44rpx;
+          margin-right: 20rpx;
         }
       }
+      .item_sub{
+        margin-top: 20rpx;
+        color: #FF4D4A;
+        font-size: 36rpx;
+        font-weight: 400;
+      }
       .ticket_icon{
         font-size: 80rpx !important;
         position: absolute;

package/src/components/JfbBaseConFlashHome/Api.js

@@ -0,0 +1,60 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseConFlashHome/Attr.js

@@ -0,0 +1,129 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: "选择业务线",
+        ele: "xd-choose-namespace",
+        valueKey: "xnamespace",
+        value: data.xnamespace || null,
+        handleCustom: (cb) => {
+          XdBus.getParentApi('getOptionsNamespaces')()
+            .then(res => {
+              cb(res.list)
+            })
+            .catch();
+        }
+      },
+      {
+        label: '样式:',
+        ele: 'xd-radio',
+        valueKey: 'position',
+        value: data['position'] || 1,
+        rules: [
+          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "商品靠左", "value": 1},
+          {"label": "商品靠右", "value": 2},
+        ]
+      },
+      {
+        label: '是否显示价格:',
+        ele: 'xd-radio',
+        valueKey: 'isPrice',
+        value: data['isPrice'] || 'Y',
+        placeholder: '请选择是否显示价格',
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ]
+      },
+      {
+        label: '是否展示原价:',
+        ele: 'xd-radio',
+        valueKey: 'isShowDiscount',
+        value: data.isShowDiscount || "Y",
+        rules: [
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "显示", "value": "Y"},
+          {"label": "隐藏", "value": "N"},
+        ]
+      },
+      data.isShowDiscount==='Y'&&{
+        label: '价差大于多少展示原价:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'differ',
+        value: data['differ'] || '',
+        placeholder: '价差',
+        className: 'input80',
+      },
+      {
+        label: '展示商品个数:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'number',
+        value: data.number || '',
+        placeholder: '请输入',
+        className: 'input80',
+      },
+      {
+        label: '商品展示方式:',
+        ele: 'xd-radio',
+        valueKey: 'productShowType',
+        value: data.productShowType,
+        rules: [
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "固定展示", "value": "regular"},
+          {"label": "向左轮播", "value": "left"},
+          {"label": "向上轮播", "value": "top"},
+        ]
+      },
+      {
+        label: '限时秒杀背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'secondBackground', //form[valueKey]
+        value: data.secondBackground || null, //v-model
+        defaultValue: data.secondBackground || null, //默认图片对象
+        slot: true, //按钮是否使用slot
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*800像素',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+      },
+      {
+        label: '场次文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'textColor',
+        value: data.textColor,
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '场次文字背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'textBgColor',
+        value: data.textBgColor,
+        placeholder: '请选择场次文字背景颜色',
+        classNmae: 'input80',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [
+    
+  ],
+};