jufubao-base 1.0.118 → 1.0.119-beta2

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -145,7 +145,10 @@
                   :color="mainColor"
                   icon="iconyouhuiquan1-011"
                 ></xd-font-icon>
-                <view>{{ tabIndex === 1 ? login_name : "转换" }}</view>
+                <view class="login_style" :style="{
+                  backgroundColor: '#FFFFFF',
+                  ...loginStyle
+                }">{{ tabIndex === 1 ? login_name : "转换" }}</view>
               </view>
               <view class="jfb-base-card__body-card-item-right">
                 <view class="jfb-base-card__body-card-item-right-top">
@@ -179,7 +182,10 @@
                   </view>
                   <view
                     @click.stop="toDetail(item)"
-                    :style="{ background: mainColor }"
+                    :style="{
+                      backgroundColor: mainColor,
+                      ...lookStyle
+                    }"
                     >查看</view
                   >
                 </view>
@@ -194,6 +200,8 @@
               :key="index"
               :cardInfo="item"
               :tabIndex="tabIndex"
+              :loginStyle="loginStyle"
+              :lookStyle="lookStyle"
               @toDetail="toDetail(item)"
               @bindLogin="handleBindLogin(item)">
             </xd-card-v2>
@@ -254,6 +262,22 @@ export default {
       jwxSDK: (state) => state.jwxSDK,
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
+    loginStyle(){
+      let style = {};
+      if(this.login_text_size) style['fontSize'] = this.login_text_size + 'rpx';
+      if(this.login_text_color) style['color'] = this.login_text_color;
+      if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
+      if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
+      return style;
+    },
+    lookStyle(){
+      let style = {};
+      if(this.look_text_size) style['fontSize'] = this.look_text_size + 'rpx';
+      if(this.look_text_color) style['color'] = this.look_text_color;
+      if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
+      if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx'
+      return style;
+    }
   },
   watch: {
     tabIndex(newVal, oldVal) {
@@ -297,6 +321,16 @@ export default {
       allEntryPath: "", //综合福利入口页
       disabledUrl: "",
       cardLayout: "1",  //票券布局
+      
+      //样式
+      login_text_size: "",
+      login_text_color: "",
+      login_text_bg_color: "",
+      login_text_radius: "",
+      look_text_size: "",
+      look_text_color: "",
+      look_text_bg_color: "",
+      look_text_radius: "",
 
       showDisabled: 'Y',
 
@@ -342,6 +376,16 @@ export default {
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+      //样式
+      this.login_text_size = getContainerPropsValue(container, 'content.login_text_size', 24);
+      this.login_text_color = getContainerPropsValue(container, 'content.login_text_color', '');
+      this.login_text_bg_color = getContainerPropsValue(container, 'content.login_text_bg_color', '');
+      this.login_text_radius = getContainerPropsValue(container, 'content.login_text_radius', '');
+
+      this.look_text_size = getContainerPropsValue(container, 'content.look_text_size', 24);
+      this.look_text_color = getContainerPropsValue(container, 'content.look_text_color', '');
+      this.look_text_bg_color = getContainerPropsValue(container, 'content.look_text_bg_color', '');
+      this.look_text_radius = getContainerPropsValue(container, 'content.look_text_radius', '');
     },
 
     handleToLink(path) {
@@ -701,6 +745,11 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: unit(24, rpx);
+          .login_style{
+            min-width: 80rpx;
+            padding: 4rpx 16rpx;
+            text-align: center;
+          }
         }
 
         &-right {

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -43,10 +43,6 @@
         </view> -->
       <view class="qrcode_card">
         <view class="jfb-base-card-detail-entry__body-qrcode">
-          <view class="qrcode_card-title">
-            <xd-font-icon style="margin-right: 24rpx;" icon="iconsaoma-02" size="32"></xd-font-icon>
-            向商家付款
-          </view>
           <view class="barcode_wrap">
             <view>
               <image mode="aspectFit" :src="info.barcode"></image>

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/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: [
+    
+  ],
+};