jufubao-base 1.0.197-beta4 → 1.0.197-beta5

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -287,8 +287,10 @@
               <view v-for="(item,index) in cardList" :key="item.card_number">
                 <xd-card-new
                   :item="item"
+                  :tabIndex="subTabIndex"
                   :cardBgColor="cardBgColor"
                   :cardFontColor="cardFontColor"
+                  :mainColor="mainColor"
                   @onLogin="handleBindLogin(item,item['entries'][0])"
                   @onClick="toDetail(item)"
                 ></xd-card-new>

package/src/components/JfbBaseCardEntry/Mock.js

@@ -58,6 +58,7 @@ module.exports = {
         "other_card_point": 0,
         "is_exchange": "N",
         "is_transfering":"N",
+        "is_login":'Y',
         "card_point_type": 1,
         "business_codes": ["cake"]
       }, {

package/src/components/JfbBaseCardEntry/XdCardNew.vue

@@ -11,7 +11,14 @@
     <view class="card-center">
       <view><text class="_b">{{item.card_point}}</text>{{item.unit}}</view>
       <view>
-        <xd-button type="primary" size="small" @click.stop="doLogin">登录</xd-button>
+        <xd-button type="primary" size="small"
+          :style="{
+            backgroundColor: item['is_login'] === 'Y' ?  alphaColor: mainColor,
+          }"
+          @click.stop="doLogin"
+        >
+          {{ tabIndex === 1 ? (item['is_login'] === 'Y' ? "已登录" : "登录") : "票券转换"}}
+        </xd-button>
       </view>
     </view>
     <view class="card-bottom">
@@ -23,6 +30,7 @@
 
 <script>
   import XdButton from "@/components/XdButton/XdButton.vue"
+  import Color from "color"
   export default {
     components: {
       XdButton,
@@ -39,15 +47,24 @@
       },
       cardFontColor: {
         type: String,
-      }
+      },
+      loggedBgColor: {
+        type: String,
+      },
+      mainColor: {
+        type: String,
+      },
+      tabIndex: {
+        type: Number,
+      },
     },
     data(){
       return {
-
+        alphaColor: "",
       }
     },
     created(){
-
+      this.alphaColor = Color(this.mainColor).alpha(0.1).string();
     },
     methods: {
       doLogin(){

package/src/components/JfbBaseHeader/Attr.js

@@ -200,6 +200,14 @@ export default {
         classNmae: 'input80',
         groupKey:'style',
       },
+      {
+        label: "底部边框设置:",
+        ele: "xd-border",
+        valueKey: "bottomBorder",
+        value: data['bottomBorder'] || {},
+        className: 'input80',
+        groupKey: 'style',
+      },
       {
         ele: 'title',
         label: '定位功能样式设置',
@@ -266,7 +274,7 @@ export default {
         value: data['inputBackgroundColor'] || '',
         groupKey:'style',
         placeholder: '请选择背景颜色',
-        classNmae: 'input80',
+        className: 'input80',
       },
       {
         label: '输入框文字颜色:',
@@ -275,64 +283,15 @@ export default {
         groupKey:'style',
         value: data['inputTextColor'] || '',
         placeholder: '请选择输入框文字颜色',
-        classNmae: 'input80',
-      },
-      {
-        ele: 'title',
-        label: '投影设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '是否有投影:',
-        ele: 'xd-radio',
-        valueKey: 'is_shadow',
-        value: data['is_shadow'] || 'N',
-        placeholder: '请选择是否投影',
-        groupKey:'style',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      data['is_shadow'] === 'Y' && {
-        label: '投影颜色:',
-        ele: 'xd-color',
-        valueKey: 'is_shadow_bg',
-        value: data['is_shadow_bg'] || '',
-        groupKey:'style',
-        placeholder: '请选择投影颜色',
-        classNmae: 'input80',
-      },
-      data['is_shadow'] === 'Y' && {
-        label: '投影范围:',
-        ele: 'xd-site-select-list',
-        groupKey:'style',
-        valueKey: 'is_shadow_w',
-        value: data['is_shadow_w'] || '10',
-        placeholder: '请选择投影范围',
-        multiple: false,
         className: 'input80',
-        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);
-            });
-        },
       },
+      
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
+        hidden: true,
       },
       {
         label: '是否有边框:',
@@ -346,7 +305,8 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ]
+        ],
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
@@ -356,6 +316,7 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
@@ -366,6 +327,7 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
+        hidden: true,
       },
       {
         label: '搜索页面链接:',

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -18,8 +18,7 @@
         class="header_wrap"
         :style="{
           background: backgroundColor,
-          boxShadow,
-          borderBottom:boxBorder
+          borderBottom: bottomBorder
         }"
       >
         <view class="header_wrap-back" @click="onJfbBack" v-if="showBack==='Y'">
@@ -108,15 +107,6 @@
     mixins: [componentsMixins,extsMixins,JfbBaseHeaderMixin],
     computed:{
       ...mapState(['siteInfo']),
-
-      boxShadow() {
-        if (this.is_shadow === 'Y') return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
-        else return '0 0 0 rgba(0,0,0,0)';
-      },
-      boxBorder() {
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-        else return '0';
-      },
       searchBtnStyle(){
         return {
           background: this.searchBtnBgColor,
@@ -131,6 +121,7 @@
         saveKey: 'xd_user_current_access_city', //用户选中城市存储key
         loaded: false,
         keyword: "",
+        isPreview: false,
 
         //面板
         showLocation: "",
@@ -157,12 +148,6 @@
         icon: '',
         iconColor: '',
 
-        //投影
-        is_shadow: 'Y',
-        is_shadow_bg: 0,
-        is_shadow_w: 0,
-
-
         //边框
         is_border: 'Y',
         is_border_w: 0,
@@ -182,6 +167,7 @@
         searchBtnTextColor: "",
         searchBtnRadius: 0,
         searchBoxRadius: 30,
+        bottomBorder: "",
       }
     },
     watch: {
@@ -192,6 +178,7 @@
     },
     created() {
       this.init(this.container);
+      this.isPreview = this.$configProject['isPreview'];
     },
     methods: {
       ...mapMutations(['setShowSwitchCity', 'setCityInfo']),
@@ -223,10 +210,6 @@
         this.locationIcon = getContainerPropsValue(container, "content.locationIcon", "icondizhitubiao")
         this.locationBackgroundColor = getContainerPropsValue(container, "content.locationBackgroundColor", "")
 
-        this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
-        this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
-        this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
-
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '2');
@@ -240,6 +223,12 @@
         this.searchBtnTextColor = getContainerPropsValue(container, 'content.searchBtnTextColor', "");
         this.searchBtnRadius = getContainerPropsValue(container, 'content.searchBtnRadius', 0);
         this.searchBoxRadius = getContainerPropsValue(container, 'content.searchBoxRadius', 30);
+        let bottomBorder = getContainerPropsValue(container, 'content.bottomBorder', "Y");
+        this.bottomBorder = this.getBorderCompatibleOldStyle(bottomBorder, {
+          type: this.is_border,
+          width: this.is_border_w,
+          color: this.is_border_c
+        })
 
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
@@ -249,8 +238,9 @@
         this.logo = platform_logo || logo || '//dummyimage.com/100x100';
         this.partnerName  = name || '聚福宝福利';
 
-
-
+        if(this.isPreview){
+          document.querySelector('.xd-Layout__top').style.zIndex = 149099;
+        }
       },
       handleInput(e){
         this.keyword = e.detail.value;
@@ -403,9 +393,11 @@
             padding-left: 20rpx;
           }
           .search_placeholder{
+            flex: 1;
             width: 100%;
             text-align: left;
             font-size: unit(28, rpx);
+            padding-left: 20rpx;
           }
         }
       }

package/src/components/JfbBaseHeaderElephant/Attr.js

@@ -397,6 +397,14 @@ export default {
         groupKey:'content',
         hidden: data.showCategory !== "Y" || data.navExpand !== "Y"
       },
+      {
+        label: '单个导航字体颜色:',
+        ele: "xd-color",
+        valueKey: "navFontColor",
+        value: data.navFontColor,
+        groupKey:'content',
+        hidden: data.showCategory !== "Y" || data.navExpand !== "Y"
+      },
       {
         label: "导航横向间距:",
         ele: "el-input",

package/src/components/JfbBaseHeaderElephant/JfbBaseHeaderElephant.vue

@@ -27,13 +27,13 @@
             >{{ site_name }}</view>
           </view>
           <view v-if="showCategory === 'Y'" class="box_r" @click="isExtendCate=!isExtendCate">
-            <xd-font-icon :icon=" categoryIcon || 'iconfenlei1'"></xd-font-icon>
+            <xd-font-icon :icon=" categoryIcon || 'iconfenlei1'" :color="siteNameFont.color"></xd-font-icon>
           </view>
         </view>
         <view v-if="isExtendCate && showCategory==='Y'" class="cate_pop" :style="[catePopBoxStyle]">
           <view class="cate_list" :style="[cateListBoxStyle]">
             <view class="cate_item"
-              v-for="item in cateList" :key="item"
+              v-for="(item, i) in cateList" :key="i"
               :style="[cateItemBoxStyle]"
               @click="handleClick(item)"
             >
@@ -46,6 +46,7 @@
         </view>
 
       </view>
+      <view v-if="isExtendCate && showCategory==='Y'" class="_modal"></view>
     </view>
   </view>
 </template>
@@ -89,6 +90,7 @@
         iconWidth: "",
         iconHeight: "",
         navBgColor: "",
+        navFontColor: "",
         navColumnGap: "",
         navRowGap: "",
         navExpand: "",
@@ -117,7 +119,8 @@
       },
       cateItemBoxStyle(){
         return {
-          backgroundColor: this.navBgColor
+          backgroundColor: this.navBgColor,
+          color: this.navFontColor
         }
       },
       cateIconStyle(){
@@ -190,6 +193,7 @@
         this.iconWidth = getContainerPropsValue(container, 'content.iconWidth', 100);
         this.iconHeight = getContainerPropsValue(container, 'content.iconHeight', 100);
         this.navBgColor = getContainerPropsValue(container, 'content.navBgColor', '');
+        this.navFontColor = getContainerPropsValue(container, 'content.navFontColor', '');
         this.navColumnGap = getContainerPropsValue(container, 'content.navColumnGap', 10);
         this.navRowGap = getContainerPropsValue(container, 'content.navRowGap', 10);
         this.navExpand = getContainerPropsValue(container, 'content.navExpand', '');
@@ -205,8 +209,13 @@
 
         this.useNumber = this.navRow * this.navColumn;
         if(this.isPreview){
-          if(!this.cateList.length) this.handleOne(this.getTestData());
+          this.handleOne(this.getTestData());
           this.isExtendCate = this.navExpand === 'Y' ? true : false;
+          if(this.isExtendCate){
+            document.querySelector('.xd-Layout__top').style.zIndex = 149099;
+          }else{
+            document.querySelector('.xd-Layout__top').style.zIndex = 1490;
+          }
         }
       },
       handleClick(item) {
@@ -378,8 +387,18 @@
 
   .jfb-base-header-elephant {
     &__body{
+      ._modal{
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vh;
+        height: 100vh;
+        background: rgba(0, 0, 0, .5);
+        z-index: 999;
+      }
       .box_wrap{
         position: relative;
+        z-index: 1000;
         .cate_pop{
           top: 100%;
           left: 0;

package/src/components/JfbBaseNotice/Attr.js

@@ -275,6 +275,32 @@ export default {
           { label: '否', value: 'N' },
         ]
       },
+      {
+        label: "按钮长度:",
+        ele: "el-input",
+        valueKey: "btnConfirmWidth",
+        value: data['btnConfirmWidth'] || '',
+        placeholder: '请输入按钮长度',
+        className: 'input60',
+        groupKey: "content",
+      },
+      {
+        label: "按钮背景颜色:",
+        ele: "xd-color",
+        valueKey: "btnConfirmBgColor",
+        groupKey:'content',
+        value: data['btnConfirmBgColor'] || '',
+        placeholder: '请选择按钮背景颜色',
+        groupKey: "content",
+      },
+      {
+        label: "按钮文字颜色:",
+        ele: "xd-color",
+        valueKey: "btnConfirmTextColor",
+        groupKey:'content',
+        value: data['btnConfirmTextColor'] || '',
+        placeholder: '请选择按钮文字颜色',
+      },
       {
         ele: 'title',
         label: '静态显示',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -220,7 +220,11 @@
         backgroundColor: '',
         is_hide_dailog:'N',
 
-        isMp:false
+        isMp:false,
+
+        btnConfirmWidth: "",
+        btnConfirmBgColor: "",
+        btnConfirmTextColor: "",
       }
     },
     watch: {
@@ -330,11 +334,16 @@
         this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.fontSize = Number(getContainerPropsValue(container, 'content.fontSize', '20'));
+        this.btnConfirmWidth = getContainerPropsValue(container, 'content.btnConfirmWidth', '');
+        this.btnConfirmBgColor = getContainerPropsValue(container, 'content.btnConfirmBgColor', '');
+        this.btnConfirmTextColor = getContainerPropsValue(container, 'content.btnConfirmTextColor', '');
         if (this.fontSize === 20) this.titleFontSize = 28;
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
 
+        console.log("this.btnConfirmTextColor", this.btnConfirmTextColor);
+
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
           //#ifdef H5
@@ -358,6 +367,9 @@
           isHtml: true,
           zIndex: 2000,
           cancel: false,
+          btnConfirmWidth: this.btnConfirmWidth,
+          btnConfirmBgColor: this.btnConfirmBgColor,
+          btnConfirmTextColor: this.btnConfirmTextColor,
         });
       },
 

package/src/components/JfbBaseUserInfo/Attr.js

@@ -65,9 +65,6 @@ export default {
         action: 'aliyun',
         sort: true, //当上传图片列表时候，是否启用排序
         maxlen: 100, //当上传图片列表时候，最大数量数量
-        rules: [
-          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
-        ]
       },
       {
         label: '内容背景颜色:',