jufubao-mall 2.0.17-beta3 → 2.0.17-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.17-beta3",
+  "version": "2.0.17-beta5",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallSpecialHome/JfbMallSpecialHome.vue

@@ -25,7 +25,7 @@
             :style="{
               top: isFixed?(layoutInfo.top + 'rpx'):0,
               position: isFixed ? 'fixed' : 'relative',
-              zIndex: 999,
+              zIndex: 9999,
             }"
           >
             <xd-tab
@@ -50,6 +50,8 @@
             :style="[height]"
             @scroll="handleProdScroll"
           >
+          <!--解决遮挡问题-->
+          <view v-if="categories.length > 1" :style="{height:'88rpx',width:'100%'}"></view>
             <!--banner-->
             <view
               v-if="hasBanner || video !== null"
@@ -348,7 +350,7 @@ export default {
         }
       }
       return {
-        paddingTop: this.categories.length > 1 ? "88rpx" : "",
+        //paddingTop: this.categories.length > 1 ? "88rpx" : "",
         height: this.layoutInfo.bodyMinHeight,
       }
     },
@@ -644,7 +646,7 @@ export default {
       let products = this.products;
       //获取第一个超过滚动位置的索引,则当前滚动位置则是上一个
       let index = products.findIndex(item => {
-        return scrollTop < item.top;
+        return scrollTop < item.top-200;
       })
       //超过最后一个，则定位最后一个
       if(index === -1) index = products.length;

package/src/components/JfbMallSpecialHome/cusAttr/style.js

@@ -177,6 +177,8 @@ export default function (data = {}, gValue = {}, gColor = {}, oldData = {}) {
       handleCustom({ action, data }) {
         XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
           .then(res => {
+            console.log(res,'resresres');
+            
             res.list = res.list.filter(item => {
               return item.label !== '无';
             })

package/src/components/JfbMallSpecialInfo/cusAttr/style.js

@@ -204,7 +204,7 @@ export default function (data = {}, gValue = {}, gColor = {}, oldData = {}) {
     },
     { ele: 'group_start' },
     {
-      label: '大小',
+      label: '',
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'contRadius',
@@ -246,7 +246,7 @@ export default function (data = {}, gValue = {}, gColor = {}, oldData = {}) {
     },
     { ele: 'group_start' },
     {
-      label: '大小',
+      label: '',
       ele: 'xd-site-select-list',
       valueKey: 'imageRadius',
       labelInline: true,

package/src/components/JfbMallSpecialProduct/JfbMallSpecialProduct.vue

@@ -30,7 +30,7 @@
           class="jfb-mall-special-product__body-list"
         >
           <Title 
-            v-if="is_title === 'Y'" 
+            v-if="is_title === 'Y'&&initStatus" 
             :title="Pitem.special_name" 
             :moreName="moreName"
             :wrapStyle="[{
@@ -46,6 +46,7 @@
             :titleStyle="titleStyle"
             :moreStyle="moreStyle"
             :isMore="isMore==='Y'"
+            :key="titleKey"
             :titleType="title_type"
             @click.native="handleTo(Pitem)"
           ></Title>
@@ -174,6 +175,7 @@
                     :cell="row_num"
                     :name-font="itemFont"
                     :product-config="productConfig"
+                    :color="mainColor"
                     :item="item"
                     :isPlus="is_plus_site"
                     :row-spacing="rowMainSpacing"
@@ -218,6 +220,9 @@ import SkeProduct from "@/components/SkeProduct/SkeProduct.vue";
 import CusProduct from "@/components/CusProduct/CusProduct.vue";
 import XdVideo from "./XdVideo.vue";
 import Title from './components/title.vue'
+import {
+  statusShow,
+} from "@/utils/AttrTools";
 const Color = require('color');
 
 export default {
@@ -306,8 +311,9 @@ export default {
       is_plus_site: false,
 
       columnOneLayout: 'H', //V=垂直 H=水平
-      title_type: ''
-
+      title_type: '',
+      titleKey: 'titleKey',
+      initStatus: false
     };
   },
   computed: {
@@ -434,6 +440,9 @@ export default {
         this.onJfbLoad(this.options)
       }
     },
+    title_type() {
+      this.titleKey = new Date().getTime();
+    }
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
@@ -447,6 +456,12 @@ export default {
      */
     init(container) {
       let moreBackgeound = Color(this.mainColor).alpha(0.15).toString();
+      let titleStyleDefault = [{
+        color: '#333',
+        fontSize: '28rpx',
+        fontWeight: '500',
+        bgColor: 'rgba(255, 255, 255, 0)'
+      }]
       //content
       this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code, {});
       this.is_title = gCPVal(container, "is_title", "Y");
@@ -498,16 +513,21 @@ export default {
       this.listBgColor = gCPVal(container, "listBgColor", '',{sKey:'listBgColorStatus',fields:['listBgColor']});
       this.itemMargin = gCPVal(container, 'itemMargin', { top: 16, right: 0, bottom: 0, left: 0 }, {sKey:'itemMarginStatus', isPMR: true, fields:['itemMargin']});
       this.listRadius = gCPVal(container, 'listRadius', [16], { sKey: 'listRadiusStatus', fields: ['listRadius'] }) || 0;
-      this.titleBg = getServiceUrl(gCPVal(container, 'titleBg', {url:''}, { sKey: 'titleStyleStatus', fields: ['titleBg'] }).url);
-      this.titleStyle = gCPVal(
-        container,
-        "titleStyle",
-        [{
-          color: '#333',
+      this.title_type = gCPVal(container, 'title_type', 'default');
+      this.titleBg = getServiceUrl(gCPVal(container, 'titleBg', { url: '' }, { sKey: 'titleStyleStatus', fields: ['titleBg'] }).url);
+
+      if (this.title_type == 'four' || this.title_type == 'five') {
+        titleStyleDefault = [{
+          color: '#fff',
           fontSize: '28rpx',
           fontWeight: '500',
           bgColor: 'rgba(255, 255, 255, 0)'
-        }],
+        }]
+      }
+      this.titleStyle = gCPVal(
+        container,
+        "titleStyle",
+        titleStyleDefault,
         {sKey:'titleStyleStatus',fields:['titleStyle'],isMerge: true}
       );
       this.titleStyle.backgroundColor = this.titleStyle.bgColor || '#fff';
@@ -515,7 +535,6 @@ export default {
       this.titleBorder = gCPVal(container, 'titleBorder', [{color: '#fff',width: 2,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['productStyle','border']});
       this.titleShadow = gCPVal(container, 'titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
       this.titleRradius = gCPVal(container, 'titleRradius', [16], { sKey: 'titleRradiusStatus', fields: ['titleRradius'] }) || 0;
-      this.title_type = gCPVal(container, 'title_type', 'default');
       let moreStyle = gCPVal(
         container,
         "moreStyle",
@@ -562,6 +581,7 @@ export default {
       this.itemPadding = gCPVal(container, 'itemPadding', [16], {sKey:'itemPaddingStatus', isPMR: true, fields:['itemPadding']});
       //advanced
       this.productInfoPath = getContainerPropsValue(container, "content.productInfoPath", { value: "" }).value;
+      this.initStatus=true
     },
 
     getSkeleton(cellIndex){
@@ -748,16 +768,17 @@ export default {
 
 
     handleTo(item) {
-      if(this.isPreview) return;
-      item.special_url = this.checkUrlIsValid(item.special_url);
-      if(!item.special_url) {
+      if (this.isPreview) return;
+      let temp = this.$xdUniHelper.cloneDeep(item);
+      temp.special_url = this.checkUrlIsValid(temp.special_url);
+      if(!temp.special_url) {
         this.$xdAlert({
           content:'专题地址配置错误！'
         })
         return
       }
       this.$xdUniHelper.navigateTo({
-        url: `${item.special_url}?special_id=${item.special_id}`,
+        url: `${temp.special_url}?special_id=${temp.special_id}`,
       });
     },
 

package/src/components/JfbMallSpecialProduct/components/title.vue

@@ -30,7 +30,7 @@
         >{{ subTitle }}</view
       >
     </view>
-    <view :style="[solidStyle,titleStyle]" v-else>
+    <view :style="[titleStyle,solidStyle]" v-else>
       {{ title }}
     </view>
     <view

package/src/components/JfbMallSpecialProduct/cusAttr/content.js

@@ -197,6 +197,7 @@ export default (data, gValue, gColor, oldData = {}) => {
       groupKey: 'content',
       ele: 'el-input',
       valueKey: "product_limit",
+      cusStyle: { marginTop: '10px' },
       value: dataVal({ data, key: 'product_limit', dValue: 6, gValue }),
       type: 'text',
       groupKey: 'content',

package/src/components/JfbMallSpecialProduct/cusAttr/style.js

@@ -272,7 +272,7 @@ export default (data, gValue, gColor, oldData = {}) => {
         bgColor: true,
         selected: false,
         default: {
-          color: '#333',
+          color:  '#333',
           fontSize: '28rpx',
           fontWeight: '500',
           bgColor: 'rgba(255, 255, 255, 0)'