jufubao-base 1.0.115 → 1.0.116-beta2

package/package.json

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

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -6,13 +6,13 @@
       <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>
+          <view class="item_sub">{{ item.prize_name }}</view>
+
           <xd-font-icon class="ticket_icon" :icon="item.icon"></xd-font-icon>
           <view class="btn">
             <xd-button
@@ -63,11 +63,11 @@ 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";
         }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";
         }
@@ -116,6 +116,7 @@ export default{
     
     .ticket_item{
       display: flex;
+      flex-direction: column;
       position: relative;
       width: 540rpx;
       height: @ticketHeight;
@@ -123,19 +124,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 +149,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/JfbBaseConList/JfbBaseConList.vue

@@ -44,76 +44,36 @@
             <view v-for="(item, index) in couponList" :key="index">
               <view
                 class="jfb-base-con-list__body-content-list-item"
+                :class="'status_' + item.can_take_num"
                 :style="{
                   backgroundColor: item.can_take_num==='Y'||item.can_take_num==='P'? contentBackground:'#F3F3F3',
                 }"
               >
-                <view class="jfb-base-con-list__body-content-list-item-left">
-                  <view
-                    :style="item.couponBackground"
-                    class="jfb-base-con-list__body-content-list-item-left-info"
-                  >
-                    <view
-                      :style="{
-                        color: item.nameColor,
-                        textAlign: 'center',
-                      }"
-                      >{{ item.prize_type }}</view
-                    >
-                    <view
-                      :style="{
-                        color: item.infoColor,
-                      }"
-                      >{{ item.prize_name }}</view
-                    >
-                  </view>
+                <view class="item_head">
+                  <image class="t_icon" mode="widthFix" :src="item.headIcon"></image>
+                  <view>{{  item.prize_type }}</view>
                 </view>
-                <view class="jfb-base-con-list__body-content-list-item-right">
-                  <view
-                    class="jfb-base-con-list__body-content-list-item-right-name"
-                  >
-                    <view>{{ item.prize_name }}</view>
-                    <xd-font-icon
-                      size="100"
-                      :style="{
-                        color: item.iconColor,
-                        position: 'absolute',
-                        right: '0rpx',
-                        top: '0rpx',
-                      }"
-                      :icon="item.icon"
-                    ></xd-font-icon>
-                  </view>
-                  <view
-                    class="jfb-base-con-list__body-content-list-item-right-num"
-                  >
-                    <!-- <view
-                    :style="{
-                      color: '#FF4D4A',
-                      display: 'flex',
-                      alignItems: 'center',
-                      fontSize: '28rpx',
-                    }"
-                  >
-                    <xd-font-icon
-                      style="margin-right: 10rpx"
-                      size="22"
-                      icon="icondanchuangguanbi_xian"
-                    ></xd-font-icon>
-                    {{ item.prize_num }}
-                  </view> -->
-                    <view></view>
-
-                    <xd-button
-                      size="small"
-                      :disabled="item.can_take_num !=='Y' && 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>
-                  </view>
+                <view class="item_sub">{{ item.prize_name }}</view>
+                <xd-font-icon
+                  size="100"
+                  :style="{
+                    color: item.iconColor,
+                    position: 'absolute',
+                    right: '0rpx',
+                    top: '0rpx',
+                  }"
+                  :icon="item.icon"
+                ></xd-font-icon>
+                <view class="btn_wrap">
+                  <xd-button
+                    size="small"
+                    :disabled="item.can_take_num !=='Y' && 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>
                 </view>
               </view>
             </view>
@@ -261,6 +221,7 @@ export default {
                       margin: "0",
                     };
                 //整块背景
+                item.headIcon = getServiceUrl(res.app_coupon_url);
                 item.couponBackground = {
                   backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
                   backgroundSize: "100%",
@@ -278,6 +239,7 @@ export default {
                 //按钮样式
                 item.btn = { background: "#D6D6D6", margin: "0" };
                 //整块背景
+                item.headIcon = getServiceUrl(res.app_coupon_invalid_url)
                 item.couponBackground = {
                   backgroundImage: `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
                   backgroundSize: "100%",
@@ -520,43 +482,74 @@ export default {
 
         &-item {
           display: flex;
-          justify-content: space-between;
-          align-items: center;
-          padding: unit(20, rpx) unit(30, rpx);
+          flex-direction: column;
+          padding: unit(40, rpx) unit(40, rpx);
           border-radius: unit(12, rpx);
           margin: unit(20, rpx) auto 0 auto;
           position: relative;
-          &-left {
-            display: flex;
-            &-info {
-              padding: unit(20, rpx) unit(36, rpx);
-              & > view:first-child {
-                font-size: unit(44, rpx);
-                font-weight: 500;
-                margin-bottom: unit(36, rpx);
-              }
-              & > view:nth-child(2) {
-                font-size: unit(28, rpx);
-                color: #fff;
-              }
+
+          &.status_N{
+            .item_head{
+              color: #BBBBBB;
             }
-          }
-          &-right {
-            margin-left: unit(24, rpx);
-            flex: 1;
-            &-name {
-              font-size: unit(40, rpx);
-              color: #000;
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
+            .item_sub{
+              color: #BBBBBB;
             }
-            &-num {
-              margin-top: unit(40, rpx);
-              display: flex;
-              justify-content: space-between;
+          }
+          .btn_wrap{
+            position: absolute;
+            right: 30rpx;
+            bottom: 40rpx;
+          }
+        
+          .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: 26rpx;
+            color: #FF4D4A;
+            font-size: 36rpx;
+            font-weight: 400;
+          }
+          // &-left {
+          //   display: flex;
+          //   &-info {
+          //     padding: unit(20, rpx) unit(36, rpx);
+          //     & > view:first-child {
+          //       font-size: unit(44, rpx);
+          //       font-weight: 500;
+          //       margin-bottom: unit(36, rpx);
+          //     }
+          //     & > view:nth-child(2) {
+          //       font-size: unit(28, rpx);
+          //       color: #fff;
+          //     }
+          //   }
+          // }
+          // &-right {
+          //   margin-left: unit(24, rpx);
+          //   flex: 1;
+          //   &-name {
+          //     font-size: unit(40, rpx);
+          //     color: #000;
+          //     display: flex;
+          //     align-items: center;
+          //     justify-content: space-between;
+          //   }
+          //   &-num {
+          //     margin-top: unit(40, rpx);
+          //     display: flex;
+          //     justify-content: space-between;
+          //   }
+          // }
         }
       }
       &-foot {

package/src/components/JfbBaseSaasBlessDetail/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/JfbBaseSaasBlessDetail/Attr.js

@@ -0,0 +1,106 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '背景颜色:', //label
+        ele: 'xd-color', //package 名称
+        valueKey: 'bgcolor', //form[valueKey]
+        value: data.bgcolor || '', //v-model
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框背景颜色',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '选中路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'select-pages-path', //form[valueKey]
+        value: data['select-pages-path'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      data.bgcolor && {
+        label: '高度:', //label
+        ele: 'el-input', //package 名称
+        type: 'number',
+        valueKey: 'height', //form[valueKey]
+        value: data.height || 100, //v-model
+        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框高度',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '', //label
+        ele: 'slot', //package 名称
+        slot: 'is_reference',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [
+    {
+      label: '背景颜色:', //label
+      ele: 'xd-color', //package 名称
+      valueKey: 'bgcolor', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入占位框背景颜色',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框背景颜色',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '选中路径:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'select-pages-path', //form[valueKey]
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree')
+      },
+      inline: false,
+    },
+    {
+      label: '高度:', //label
+      ele: 'el-input', //package 名称
+      type: 'number',
+      valueKey: 'height', //form[valueKey]
+      value: null, //v-model
+      placeholder: '请输入占位框高度，单位像素，默认：10px',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框高度',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '', //label
+      ele: 'slot', //package 名称
+      slot: 'is_reference',
+    },
+  ],
+};