jufubao-base 1.0.232-beta3 → 1.0.232-beta4

package/src/components/JfbBaseOpenVip/XdVipList.vue

@@ -0,0 +1,81 @@
+<template>
+  <view class="xd_vip_wrap">
+    <view class="vip_list">
+      <view class="vip_item" :class="{active: i==1}" v-for="i in 6" :key="i">
+        <view class="vip_name">1日体验</view>
+        <view class="vip_price">10.00</view>
+      </view>
+    </view>
+    <view class="vip_pay">
+      <xd-button type="primary" width="600rpx">立即支付￥148/年</xd-button>
+      <view class="vip_tip">开通视为同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdButton from "@/components/XdButton/XdButton.vue"
+  export default {
+    components: {
+      XdButton
+    },
+    data(){
+      return {
+        
+      }
+    },
+    methods: {
+      handlePrivacy(type){
+        this.$emit('handlePrivacy', type)
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .xd_vip_wrap{
+    background: #FFFFFF;
+    .vip_list{
+      width: 100%;
+      overflow: auto;
+      white-space: nowrap;
+      padding: 32rpx 16rpx;
+      .vip_item{
+        display: inline-block;
+        width: 160rpx;
+        height: 112rpx;
+        border-radius: 24rpx;
+        text-align: center;
+        color: #999999;
+        border: 4rpx solid #EEEEEE;
+        background-color: #EEEEEE;
+        box-sizing: border-box;
+        margin: 0 16rpx;
+        padding: 20rpx 0;
+        line-height: 1;
+        font-weight: 500;
+        &.active{
+          border-color: #AB6900;
+          background-color: #FFF2DE;
+          color: #AB6900;
+        }
+        .vip_name{
+          font-size: 24rpx;
+          margin-bottom: 12rpx;
+        }
+        .vip_price{
+          font-size: 36rpx;
+        }
+      }
+    }
+    .vip_pay{
+      padding: 24rpx 0 50rpx;
+    }
+    .vip_tip{
+      text-align: center;
+      font-size: 22rpx;
+      color: #999999;
+      margin-top: 24rpx;
+    }
+  }
+</style>

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -14,13 +14,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-open-vip-detail__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view class="combo_section">
+        <view class="combo_section-title">套餐名称：年卡会员</view>
+        <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
+        <xd-list-item label="套餐期限" paddingLR="40rpx">30天</xd-list-item>
+      </view>
+
+      <view class="combo_section">
+        <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
+        <xd-list-item label="平台优惠" paddingLR="40rpx">-¥125.00</xd-list-item>
+      </view>
+
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdListItem from "@/components/XdListItem/XdListItem"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseOpenVipDetailMixin from "./JfbBaseOpenVipDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,14 +40,15 @@
   export default {
     name: "JfbBaseOpenVipDetail",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdListItem
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseOpenVipDetailMixin
     ],
     data() {
       return {
-
+        //hideMask: true,
         //todo
       }
     },
@@ -105,7 +117,24 @@
 
   .jfb-base-open-vip-detail {
     &__body{
-
+      .combo_section{
+        border-radius: 24rpx;
+        overflow: hidden;
+        margin: 20rpx;
+        background-color: #FFFFFF;
+        &-title{
+          height: 72rpx;
+          line-height: 72rpx;
+          text-align: center;
+          background: linear-gradient(90deg, #FCD083 0%, #FFDEAD 100%);
+          font-size: 28rpx;
+          color: #915714;
+          font-weight: 500;
+        }
+        ::v-deep .my-list_value{
+          color: #999999;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbBasePointsCard/Attr.js

@@ -8,41 +8,216 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
+        label: '预览plus样式:',
+        ele: 'xd-radio',
+        valueKey: 'is_plus_preview',
+        value: data['is_plus_preview'] || 'Y',
+        groupKey: 'content',
+        placeholder: '请选择预览plus样式',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: 'plus用户样式', value: 'Y' },
+          { label: '普通用户样式', value: 'N' },
+        ]
       },
       {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        label: '是否展示积分入口:',
+        labelInline: true,
+        ele: 'xd-radio',
+        valueKey: 'isPoints',
+        groupKey: 'content',
+        value: data['isPoints'] || 'Y',
+        list: [
+          { "label": "展示", "value": 'Y' },
+          { "label": "隐藏", "value": 'N' },
+        ]
+      },
+      {
+        label: '是否展示余额入口:',
+        labelInline: true,
+        ele: 'xd-radio',
+        valueKey: 'isYue',
+        groupKey: 'content',
+        value: data['isYue'] || 'Y',
+        list: [
+          { "label": "展示", "value": 'Y' },
+          { "label": "隐藏", "value": 'N' },
+        ]
+      },
+      {
+        label: '是否展示优惠券入口:',
+        labelInline: true,
+        ele: 'xd-radio',
+        valueKey: 'isConpon',
+        groupKey: 'content',
+        value: data['isConpon'] || 'Y',
+        list: [
+          { "label": "展示", "value": 'Y' },
+          { "label": "隐藏", "value": 'N' },
+        ]
+      },
+      {
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyMargin',
+        groupKey: 'style',
+        value: data['bodyMargin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '外填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyPadding',
+        groupKey: 'style',
+        value: data['bodyPadding'] || null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          type: 'padding',
         },
+        placeholder: '请设置外填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data.bgColor && {
-        label: '高度:',
+      {
+        ele: 'title',
+        label: '主体设置',
+        size: 'small',
+        groupKey: 'style',
+      },
+      {
+        label: '主体圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '20',
+        labelInline: true,
+        groupKey: 'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input60',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: 'plus用户主体背景颜色:',
+        ele: 'el-input',
+        valueKey: 'plusBodyBgColor',
+        groupKey: 'style',
+        value: data['plusBodyBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        label: '普通用户主体背景颜色:',
         ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        valueKey: 'normalBodyBgColor',
+        groupKey: 'style',
+        value: data['normalBodyBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        ele: 'title',
+        label: '入口设置',
+        size: 'small',
+        groupKey: 'style',
+      },
+      {
+        label: '入口圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'itemRadius',
+        value: data['itemRadius'] || '16',
+        labelInline: true,
+        groupKey: 'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
         className: 'input60',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: 'plus用户入口背景颜色:',
+        ele: 'el-input',
+        valueKey: 'plusItemBgColor',
+        groupKey: 'style',
+        value: data['plusItemBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        label: '普通用户入口背景颜色:',
+        ele: 'el-input',
+        valueKey: 'normalItemBgColor',
+        groupKey: 'style',
+        value: data['normalItemBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        label: '积分兑换地址路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'pointsPath',
+        groupKey:'advanced',
+        placeholder: '请选择积分兑换地址路径',
+        value: data['addressUrl'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '余额提现路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'withdrawPath',
+        groupKey:'advanced',
+        placeholder: '请选择余额提现路径',
+        value: data['withdrawPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
       {
-        label: '', //label
+        label: '优惠券路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'couponPath',
         groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        placeholder: '请选择余额提现路径',
+        value: data['couponPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
-    ].filter(i=>i)
+    ].filter(i => i)
   },
   advanced: [],
 };

package/src/components/JfbBasePointsCard/JfbBasePointsCard.vue

@@ -1,20 +1,20 @@
 <template>
-  <view
-    class="jfb-base-points-card"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-points-card" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-points-card__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-points-card__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-points-card__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-points-card__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view :style="[bodyStyleComp]" class="jfb-base-points-card__body-list">
+        <view :style="[itemStyleComp]" @click="handleTo(item)" v-for="(item,index) in typeList" :key="index" class="jfb-base-points-card__body-list-item">
+          <view class="jfb-base-points-card__body-list-item-label">
+            {{item.label}}
+            <view :style="{background:is_vip==='N'?mainColor:'',color:is_vip==='N'?'#fff':''}" class="jfb-base-points-card__body-list-item-operate" v-if="item.operate">{{item.operate}}</view>
+          </view>
+          <view class="jfb-base-points-card__body-list-item-value">{{item.value}}</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -34,10 +34,59 @@
     mixins: [
       componentsMixins, extsMixins, JfbBasePointsCardMixin
     ],
+    computed: {
+      bodyStyleComp() {
+        return {
+          background: this.is_vip === 'Y' ? this.plusBodyBgColor : this.normalBodyBgColor,
+          borderRadius: `${this.radius}rpx`,
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding: this.getMarginAndPadding(this.padding, 32),
+        }
+      },
+      itemStyleComp() {
+        return {
+          background: this.is_vip === 'Y' ? this.plusItemBgColor : this.normalItemBgColor,
+          borderRadius: `${this.itemRadius}rpx`,
+        }
+      }
+    },
     data() {
       return {
-
-        //todo
+        isPoints: '',
+        isYue: '',
+        isConpon: '',
+        typeList: [
+          {
+            label: "积分",
+            key: "points",
+            value: 0
+          },
+          {
+            label: "余额",
+            key: "yue",
+            operate: '提现',
+            value: 0
+          },
+          {
+            label: "优惠券",
+            key: "conpon",
+            value: 0
+          },
+        ],
+        is_vip: 'N',
+        plusBodyBgColor: '',
+        plusItemBgColor: '',
+        normalBodyBgColor: '',
+        normalItemBgColor: '',
+        is_plus_preview: 'N',
+        radius: 0,
+        itemRadius: 0,
+        margin: {},
+        padding: {},
+        is_vip: 'N',
+        pointsPath: '',
+        withdrawPath: '',
+        couponPath: '',
       }
     },
     watch: {
@@ -45,6 +94,67 @@
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
+      isPoints(n, o) {
+        if (n === "Y") {
+          let flag = this.typeList.find((item) => item.key === "points");
+          if (!flag) {
+            this.typeList.splice(0, 0, {
+              label: "积分",
+              key: "points",
+              operate: '兑换'
+            });
+          }
+        } else {
+          let flagIndex = this.typeList.findIndex(
+            (item) => item.key === "points"
+          );
+          if (flagIndex !== -1) {
+            this.typeList.splice(flagIndex, 1);
+          }
+        }
+      },
+      isYue(n, o) {
+        if (n === "Y") {
+          let flag = this.typeList.find((item) => item.key === "yue");
+          if (!flag) {
+            this.typeList.splice(1, 0, {
+              label: "余额",
+              key: "yue",
+              operate: '提现'
+            });
+          }
+        } else {
+          let flagIndex = this.typeList.findIndex(
+            (item) => item.key === "yue"
+          );
+          if (flagIndex !== -1) {
+            this.typeList.splice(flagIndex, 1);
+          }
+        }
+      },
+      isConpon(n, o) {
+        if (n === "Y") {
+          let flag = this.typeList.find((item) => item.key === "conpon");
+          if (!flag) {
+            this.typeList.splice(2, 0, {
+              label: "优惠券",
+              key: "conpon",
+            });
+          }
+        } else {
+          let flagIndex = this.typeList.findIndex(
+            (item) => item.key === "conpon"
+          );
+          if (flagIndex !== -1) {
+            this.typeList.splice(flagIndex, 1);
+          }
+        }
+      },
+      is_plus_preview() {
+        if (this.$configProject['isPreview']) {
+          this.is_vip = this.is_plus_preview
+        }
+      }
     },
     created() {
       this.init(this.container);
@@ -53,26 +163,53 @@
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.typeList = this.typeList.map(item => {
+          if (item.key === 'points') {
+            // item.value = 'score_amount'
+            item.value = 89144
+          }
+          if (item.key === 'yue') {
+            // item.value = 'total_amount'
+            item.value = 4545
+          }
+          if (item.key === 'conpon') {
+            // item.value = 'coupon_count'
+            item.value = 3
+          }
+          return item
+        })
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.isPoints = getContainerPropsValue(container, "content.isPoints", "Y");
+        this.isYue = getContainerPropsValue(container, "content.isYue", "Y");
+        this.isConpon = getContainerPropsValue(container, "content.isConpon", "Y");
+        this.plusBodyBgColor = getContainerPropsValue(container, 'content.plusBodyBgColor', 'linear-gradient(180deg, #FFFCF8 0%, #FFF3E2 100%)');
+        this.plusItemBgColor = getContainerPropsValue(container, 'content.plusItemBgColor', 'linear-gradient(136.55deg, #FFECD1 0%, #F6D6AB 100%)');
+        this.normalBodyBgColor = getContainerPropsValue(container, 'content.normalBodyBgColor', '#fff');
+        this.normalItemBgColor = getContainerPropsValue(container, 'content.normalItemBgColor', '#F7F7F7');
+        this.is_plus_preview = getContainerPropsValue(container, 'content.is_plus_preview', 'N');
+        this.radius = getContainerPropsValue(container, 'content.radius', '20');
+        this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', '16');
+        this.margin = getContainerPropsValue(container, 'content.bodyMargin', {});
+        this.padding = getContainerPropsValue(container, 'content.bodyPadding', {});
+        this.pointsPath = getContainerPropsValue(container, 'content.pointsPath', { value: "" }).value;
+        this.withdrawPath = getContainerPropsValue(container, 'content.withdrawPath', { value: "" }).value;
+        this.couponPath = getContainerPropsValue(container, 'content.couponPath', { value: "" }).value;
+      },
+      handleTo(item) {
+        if (item.key === 'points') {
+          this.$router.push(this.pointsPath)
+        }
+        if (item.key === 'yue') {
+          this.$router.push(this.withdrawPath)
+        }
+        if (item.key === 'conpon') {
+          this.$router.push(this.couponPath)
+        }
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +241,51 @@
   @import "./JfbBasePointsCardLess.less";
 
   .jfb-base-points-card {
-    &__body{
+    &__body {
+      &-list {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: linear-gradient(180deg, #FFFCF8 0%, #FFF3E2 100%);
 
+        &-item:last-child {
+          margin-right: 0;
+        }
+
+        &-item {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          padding: 20rpx 0;
+          margin-right: 32rpx;
+          background: linear-gradient(136.55deg, #FFECD1 0%, #F6D6AB 100%);
+          border-radius: 16rpx;
+          font-size: 24rpx;
+
+          &-label {
+            display: flex;
+            margin-bottom: 8rpx;
+          }
+
+          &-operate {
+            background: linear-gradient(90deg, #333231 0%, #6C5A46 100%);
+            border-radius: 24rpx;
+            padding: 4rpx 8rpx;
+            color: #F8DCB4;
+            font-size: 20rpx;
+            margin-left: 8rpx;
+            text-align: center;
+            vertical-align: middle;
+          }
+
+          &-value {
+            color: #333332;
+            font-weight: 700;
+          }
+        }
+      }
     }
   }
-</style>
+</style>