jufubao-base 1.0.232-beta3 → 1.0.232-beta5

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/CusListItem/CusListItem"
   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 {
-
+        closeMask: 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/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -1,26 +1,52 @@
 <template>
-  <view
-    class="jfb-base-personal-data"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-personal-data" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-personal-data__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-personal-data__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-personal-data__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-personal-data__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">头像</view>
+        <image class="profile" :src="data.profile"  ></image>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">账号</view>
+        <view class="jfb-base-personal-data__body-item-value">{{data.account}}</view>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">名称</view>
+        <input class="jfb-base-personal-data__body-item-value" v-model="data.name" type="text">
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">性别</view>
+        <XdSelect padding="0" color="#999" class="select" :defaultValue="data.sex" v-model="data.sex" :list="sexList">
+          <template>
+            <view class="jfb-base-personal-data__body-item-value">
+              <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+            </view>
+          </template>
+
+        </XdSelect>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">生日</view>
+        <view style="display: flex;align-items: center" @click="showDate=true">
+          <view class="jfb-base-personal-data__body-item-value">{{data.birthday}}</view>
+          <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+        </view>
+      </view>
+      <XdDate ref="calendar" :selectType="false" :main-color="mainColor" :current-is-show-other-month="false" :show.sync="showDate"
+        :clear-date="true" :insert="false" :lunar="false" :selected-circle="false" :date="data.birthday"
+        @confirm="confirmDate" @close="closeDate"></XdDate>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdDate from '@/components/XdDate/XdDate.vue'
+  import XdSelect from "@/components/XdSelect/XdSelect";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePersonalDataMixin from "./JfbBasePersonalDataMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,15 +55,35 @@
   export default {
     name: "JfbBasePersonalData",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdSelect,
+      XdDate
     },
     mixins: [
       componentsMixins, extsMixins, JfbBasePersonalDataMixin
     ],
     data() {
       return {
-
-        //todo
+        single: '',
+        showDate: false,
+        birthday: '',
+        sexList: [
+          {
+            label: '男',
+            value: 1
+          },
+          {
+            label: '女',
+            value: 2
+          }
+        ],
+        data: {
+          sex: 1,
+          profile: 'https://img.js.design/assets/smartFill/img316164da746310.jpg',
+          account: 5455645545,
+          name: '张三',
+          birthday: '2025-04-09'
+        }
       }
     },
     watch: {
@@ -48,31 +94,21 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
+      onJfbLoad(options) { },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+      },
+      confirmDate(e) {
+        console.log(e, 'confirmDate');
+        this.data.birthday = e.fulldate
+      },
+      closeDate() {
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +140,37 @@
   @import "./JfbBasePersonalDataLess.less";
 
   .jfb-base-personal-data {
-    &__body{
+    &__body {
+      .icon {
+        margin-left: 8rpx;
+      }
 
+      &-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-radius: 20rpx;
+        background: #FFFFFF;
+        padding: 32rpx 46rpx;
+        margin: 20rpx;
+
+        &-label {
+          color: #333;
+          font-size: 28rpx;
+        }
+
+        &-value {
+          color: #999999;
+          font-size: 28rpx;
+          text-align: right;
+        }
+
+        .profile {
+          width: 80rpx;
+          height: 80rpx;
+          border-radius: 50%;
+        }
+      }
     }
   }
-</style>
+</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: [],
 };