jufubao-mall 2.0.32-beta6 → 2.0.32

package/src/components/CusTab/CusTab.vue

@@ -1,49 +1,36 @@
 <template>
 	<view
 		class="xd-tab"
-    v-if="eleID"
 		:class="{noBorder: noBorder}"
 		:style="{background:bgColor}"
 	>
-
 		<scroll-view
       class="tab-scroll"
       scroll-x
       :scroll-with-animation="scrollWithAnimation"
       :scroll-into-view="toView"
-      :id="eleID"
       :style="{
         width: 'calc(100% - '+ getSettingWidth + 'px)',
         height: height + 'rpx'
       }"
-      @scroll="handleScroll"
+
     >
 			<view class="tab-scroll__box">
 				<view
           :id="`tab-scroll__index-${index}`"
           v-for="(item, index) in list"
           :key="index"
-          :style="{
-            color: activeIndex === index? (actColor||styleMainColor): color,
-            height: height + 'rpx',
-            width: (getItemWidth(item) + (index===0?spacing:0)) + 'rpx',
-            margin: (actBgcColor || bgcColor)? 0:`0 0 0 ${spacing}rpx`
-          }"
+          :style="{color: activeIndex === index? (actColor||styleMainColor): color, height: height + 'rpx'}"
           class="tab-scroll__item"
-          :class="{active:activeIndex === index,'desc': xAbsolute === 'none' && item.subName}"
+          :class="{active:activeIndex === index}"
 				  @click="clickTab(item, index)"
         >
           <view
 						:style="[{
-              width: getItemWidth(item) + 'rpx',
 							fontWeight: activeIndex === index? actFontWeight: fontWeight,
 							fontSize: (activeIndex === index ? actFontSize : fontSize) + 'rpx',
 							height:(xAbsolute === 'none' && item.subName)?(height/2 + 'rpx'):(height + 'rpx'),
-							lineHeight:(xAbsolute === 'none' && item.subName)?(height/2 + 'rpx'):(height + 'rpx'),
-							backgroundColor: activeIndex === index?actBgcColor:bgcColor,
-							borderRadius: (actBgcColor||bgcColor)? '30rpx':0,
-							padding: (actBgcColor||bgcColor) ? '0 16rpx':0,
-							marginLeft: index === 0? `${spacing}rpx`: 0
+							lineHeight:(xAbsolute === 'none' && item.subName)?(height/2 + 'rpx'):(height + 'rpx')
 						}]">{{item.name}}</view>
           <view
             class="xAbsolute"
@@ -51,7 +38,6 @@
 						:style="[
               footerStyleComp,
 						  {backgroundColor: activeIndex === index? (actColor||styleMainColor): ''},
-						  {left: `calc(50% + ${index === 0 ? `${spacing/2}rpx`: '0rpx'})`}
 						 ]"
           >
             <view
@@ -63,33 +49,11 @@
           <view
             v-if="xAbsolute === 'none' && item.subName"
             class="none"
-            :style="[
-              activeIndex === index?subActNameComp:subNameComp,
-              {marginLeft: index === 0? `${spacing}rpx`: 0},
-              {maxWidth: getItemWidth(item) + 'rpx'}
-            ]"
+            :style="[activeIndex === index?subActNameComp:subNameComp]"
           >{{item.subName}}</view>
-          <view
-            class="xAbsolute triangle"
-            v-if="xAbsolute === 'triangle' && activeIndex === index"
-            :style="[{left: `calc(50% + ${index === 0 ? '24rpx': '0rpx'})`}]"
-          >
-            <xd-font-icon icon="iconrepository-xialaxuanxiangup" size="22" :color="actColor||styleMainColor"></xd-font-icon>
-          </view>
-          <view
-            class="xAbsolute center"
-            v-if="xAbsolute === 'center' &&  activeIndex === index"
-            :style="[
-              {background: activeIndex === index? (actColor||styleMainColor): color},
-              {left: `calc(50% + ${index === 0 ? `${spacing/2}rpx`: '0rpx'})`}
-            ]"
-          ></view>
         </view>
 			</view>
 		</scroll-view>
-    <view class="center" v-if="xAbsolute === 'center'">
-      <view :style="{left:left, background: styleMainColor}"></view>
-    </view>
 		<view
       class="tab-icons"
       @click="handleClickSetting"
@@ -126,10 +90,6 @@
           return {}
         },
       },
-      spacing:{
-        type: Number,
-        default: 40
-      },
       settingWidth: {
         type: Number,
         default: 70
@@ -188,14 +148,6 @@
         type: Number | String, //rpx
         default: 500
       },
-      bgcColor: {
-        type: String,
-        default: ''
-      },
-      actBgcColor: {
-        type: String,
-        default: ''
-      },
       height: {
         type: Number | String, //rpx
         default: 90
@@ -207,11 +159,10 @@
       actColor: {
         type: String,
         default: ''
-      },
+      }
     },
     data() {
       return {
-        eleID:null,
         activeIndex: 0,
         toView: null,
         styleMainColor: '', //插件主题风格样式
@@ -223,11 +174,6 @@
 
         xAbsolute: 'absolute',//绝对定位｜无
         styleSolid: 'Y',
-        itemWidth: 0,
-
-        //居中处理
-        left:0,
-        boxWidth:0
       };
     },
 
@@ -239,17 +185,19 @@
         return 0;
       },
       footerStyleComp(){
+        //circle/line/none/trigon/desc
         let temp = {};
         temp['bottom'] = this.lineBottom + 'rpx';
         if(this.styleType === 'line') {
           temp['height'] = this.styleHeight + 'rpx';
-          temp['width'] = '64rpx';
-          temp['transform'] = 'translateX(-50%)';
+          temp['left'] = this.styleLong;
+          temp['right'] = this.styleLong;
           temp['borderRadius'] = this.styleRadius;
         }
         if(this.styleType === 'circle'){
           temp['height'] = this.styleHeight + 'rpx';
           temp['width'] = this.styleHeight + 'rpx';
+          temp['left'] = '50%';
           temp['marginLeft'] = -this.styleHeight/2 + 'rpx'
           temp['borderRadius'] = this.styleRadius;
         }
@@ -263,6 +211,7 @@
         temp['backgroundColor'] = '#fff';
         if(this.styleType === 'circle'){
           temp['borderRadius'] = '50%';
+
         }
         return temp
       },
@@ -302,7 +251,6 @@
       },
     },
     async created() {
-      this.eleID = `tab-${this.$xdUniHelper.randomChar(5)}`;
       this.initStyle();
       this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor');
 		},
@@ -322,14 +270,6 @@
           this.toView = `tab-scroll__index-${this.tabIndex}`;
           this.$emit('onInit', this.list[this.activeIndex], this.activeIndex);
 				}
-
-        const query = uni.createSelectorQuery().in(this);
-        query
-          .select(`#${this.eleID }`)
-          .boundingClientRect((data) => {
-            this.boxWidth = data.width;
-          })
-          .exec();
       });
     },
 
@@ -338,19 +278,10 @@
         let arr = this.footerStyle.split('-');
         this.styleType = arr[0];
         this.xAbsolute = 'absolute';
-
         if(this.styleType === 'desc') {
           this.xAbsolute = 'none';
         }
 
-        if(this.styleType === 'center') {
-          this.xAbsolute = 'center';
-        }
-
-        if(this.styleType === 'triangle') {
-          this.xAbsolute = 'triangle';
-        }
-
         //圆与三角
         if(arr.length === 3) {
           this.styleHeight = this.styleWidth =  Number(arr[1])
@@ -362,25 +293,14 @@
 
         //线
         if(arr.length === 4) {
-          this.styleHeight = 6;
-          this.styleRadius = 4 + 'rpx';
+          this.styleHeight = arr[2];
+          this.styleRadius = arr[1] + 'rpx';
           if(arr[3] === 'l') this.styleLong = '20rpx'
           else this.styleLong = '35%'
         }
 
       },
 
-      getItemWidth(item){
-        let maxFontSize = Math.max(parseInt(this.actFontSize),parseInt(this.fontSize))
-        let nameWidth =  item.name.length * maxFontSize;
-        let actFontSize = Math.max(parseInt(this.subNameStyle['actFontSize']||24),parseInt(this.subNameStyle['fontSize']||24))
-        let subNameWidth = this.xAbsolute==='none' ? (item.subName.length * actFontSize): 0;
-        if(this.actBgcColor || this.bgcColor) {
-          nameWidth += 16*2
-        }
-        return Math.max(nameWidth,subNameWidth);
-      },
-
 			clickTab(item, index) {
 				this.activeIndex = index;
         this.toView = `tab-scroll__index-${this.activeIndex}`;
@@ -389,14 +309,6 @@
       handleClickSetting(){
 			  this.$emit('onSetting');
       },
-
-      handleScroll({detail}){
-        if(this.xAbsolute === 'center'){
-          let maxScrollW = detail.scrollWidth - this.boxWidth;
-          this.left = ((detail.scrollLeft* 30 * this.$rpxNum)/ maxScrollW) + 'px';
-        }
-
-      }
 		}
 	}
 </script>
@@ -410,30 +322,10 @@
     flex-wrap: wrap;
     overflow: hidden;
     padding: 0;
-    position: relative;
+    height: unit(100, rpx);
 		&.noBorder {
 			border-bottom: 1px #f5f5f5 solid;
 		}
-    & > .center {
-      position: absolute;
-      height: 8rpx;
-      left: 50%;
-      bottom: 8rpx;
-      width: 80rpx;
-      margin-left: -40rpx;
-      border-radius: 5rpx;
-      background-color: #ccc;
-      overflow: hidden;
-      &> view {
-        position: absolute;
-        top:0;
-        bottom: 0;
-        width: 50rpx;
-        border-radius: 5rpx;
-        height: 8rpx;
-        background-color: #ccc;
-      }
-    }
 
 		.tab-scroll {
 			.tab-scroll__box {
@@ -443,29 +335,19 @@
 				box-sizing: border-box;
 
 				.tab-scroll__item {
-          position: relative;
 					flex-shrink: 0;
-					padding: 0;
+					padding: 0 unit(20, rpx);
 					color: #333;
 					font-size: unit(30, rpx);
 					height: unit(100, rpx);
+          position: relative;
 					display: flex;
 					align-items: center;
 					align-content: center;
           flex-flow: column;
-          text-align: center;
-          &:first-child {
-            margin-left: 0!important;
-          }
-
-          &.desc {
-            justify-content: center;
-            min-width: 3.5rem;
-          }
-
 
 
-          &.active {
+					&.active {
 						color: @xd-base-color;
 					}
 
@@ -476,34 +358,15 @@
             display: flex;
             justify-content: center;
             align-items: center;
-            line-height: 1.1rem;
-
-            &.triangle {
-              bottom: unit(0,rpx);
-              transform: translateX(-50%);
-            }
-
-            &.center {
-              position: absolute;
-              bottom: 22rpx;
-              width: 70rpx;
-              height: 10rpx;
-              opacity: .25;
-              border-radius:40%;
-              z-index: 0;
-              transform: translateX(-50%);
-            }
           }
 
           & > view.none {
-            padding:0;
-            text-align: center;
+            padding: 0 10rpx;
             color:#000;
-            border-radius:18rpx;
-            width: 100%;
-            font-size: 24rpx;
-            line-height: 36rpx;
-            height: 36rpx;
+            border-radius:20rpx;
+            font-size: 20rpx;
+            line-height: 1.2rem;
+            margin-top: 4rpx;
           }
 				}
 			}

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

@@ -284,8 +284,6 @@ export default (data, gValue, gColor, oldData) => {
         type: 'notice', //normal,notice,privacy
         isNew: true,
       },
-      notice: '商品详情里头部显示的固定内容',
-      inline: false,
       handleCustom({ action, data }) {
         if (data && data.params) {
           //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接

package/src/components/JfbMallProductList/Attr.js

@@ -8,7 +8,6 @@ export default {
   style: [],
   advanced: [],
   content: (data, gValue, gColor, oldData={})=>{
-    debugger
     console.log(data['row_num'],"data['row_num']");
 
     let defContShadow = oldTonNewBorAndSha(

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -854,6 +854,7 @@
           actFontWeight: 'normal',
         }
         const level2Name = gCPVal(container, 'level2Name', [defNewLvel2Name,defOldLvel2Name],{sKey:'level2NameStatus', fields:['level2Name','level2Color'],isMerge: true});
+        const subTitleRadius = gCPVal(container, 'subTitleRadius', ['40rpx'],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
         const subTitleIconShadow  = gCPVal(container, 'subTitleIconShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
         const subTitleIconBorder  = gCPVal(container, 'subTitleIconBorder', [{style:'solid', width: '2', color: this.mainColor},'0'], {isBorder:true});
         let navStyle = gCPVal(container, 'navStyle', 'line-6-8-s');
@@ -862,13 +863,6 @@
         const iconImageSp = gCPVal(container, 'iconImageSp', [16],{sKey:'iconImageSpStatus', fields:['iconImageSp']});
         const iconBgColor = gCPVal(container, 'iconBgColor', [100],{sKey:'iconBgColorStatus', fields:['iconBgColor']});
 
-        let defTitleRadius = '50%';
-        if(category === 'v4') {
-          defTitleRadius = 40*Number(iconWdith)/96 + 'rpx';
-        }
-        const subTitleRadius = gCPVal(container, 'subTitleRadius', [defTitleRadius],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
-
-
         this.tabStyle = {
           titleColor,
           titleActColor,

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -334,6 +334,7 @@ export default {
 
   methods: {
     init(navList, pid){
+      debugger
       if(navList.length === 0) return;
 
       //预览模式生效

package/src/components/SkeProduct/SkeProduct.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="skeleton-wrap-item" :class="{display: cell===1 && columnOneLayout === 'H',display0:cell===1 && columnOneLayout === 'V' }">
+  <view class="skeleton-wrap-item" :class="{display: cell===1}">
     <template v-if="cell===1">
       <view class="image skeleton-item" :style="{marginRight:cellSpacing + 'rpx'}"></view>
       <view class="content">
@@ -25,7 +25,7 @@
       </view>
     </template>
     <template v-if="cell >= 2">
-      <view class="image2 skeleton-item" :style="{marginBottom:cellSpacing + 'rpx', height: height + 'rpx'}"></view>
+      <view class="image2 skeleton-item" :style="{marginBottom:rowSpacing + 'rpx', height: height + 'rpx'}"></view>
       <view class="content2">
         <view class="top">
           <view class="title skeleton-item"></view>
@@ -75,10 +75,6 @@ export default {
       type:Object|null,
       default: null
     },
-    columnOneLayout:{
-      type: String,
-      default:'H'
-    }
   }
 }
 </script>
@@ -99,7 +95,6 @@ export default {
     }
 
 
-
     & .content {
       flex: 1;
       min-height: 200rpx;
@@ -169,86 +164,6 @@ export default {
     }
   }
 
-  &.display0 {
-    & .image {
-      .skeleton-item(100%, 740rpx);
-      margin-bottom: 20rpx;
-    }
-
-    & .content {
-      flex: 1;
-      min-height: 200rpx;
-
-      .top {
-        height: 140rpx;
-
-        & .title {
-          .skeleton-item(100%, 60rpx);
-
-        }
-
-        & .brand {
-          margin-top: 16rpx;
-          .skeleton-item(70%, 32rpx);
-        }
-
-        .tags {
-          display: flex;
-          justify-content: flex-start;
-          align-items: center;
-          flex-flow: wrap;
-          margin-top: 16rpx;
-
-          & > view {
-            margin-bottom: 16rpx;
-            .skeleton-item(80rpx, 36rpx);
-            margin-left: 10rpx;
-
-            &:first-child {
-              margin-left: 0;
-              width: 120rpx;
-            }
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: flex-end;
-        align-content: center;
-        align-items: center;
-        width: 100%;
-        height: 60rpx;
-        margin-top: 20rpx;
-
-        & .price {
-          flex-shrink: 0;
-          .skeleton-item(120rpx, 35rpx);
-        }
-
-        & .orgPrice {
-          flex-shrink: 0;
-          margin-left: 20rpx;
-          .skeleton-item(130rpx, 20rpx);
-        }
-
-        & .cart {
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          align-items: center;
-          & > view {
-            .skeleton-item(64rpx, 64rpx);
-            border-radius: 32rpx;
-          }
-        }
-      }
-    }
-
-  }
-
-
-
   & .image2 {
     .skeleton-item();
   }
@@ -257,7 +172,7 @@ export default {
     flex: 1;
 
     .top {
-      //min-height: 140rpx;
+      min-height: 140rpx;
 
       & .title {
         .skeleton-item(100%, 60rpx);

package/src/components/CusListItem/CusListItem.vue

@@ -1,141 +0,0 @@
-<template>
-  <view class="xd-my-list-item"
-    :class="'size_'+size + ' ' + className"
-    :style="{
-      borderBottom: showBottom ? '1px solid #F6F6F6':'none',
-      // marginTop: showBottom? paddingTB: 0,
-      paddingLeft: paddingLR,
-      paddingRight: paddingLR,
-      paddingTop: paddingTB,
-      paddingBottom: paddingTB,
-    }"
-    @click="$emit('click')">
-    <view v-if="listIcon" class="my-list_icon">
-      <image mode="widthFix" :src="listIcon" />
-    </view>
-    <view class="my-list_label">
-      <slot name="label">
-        <view v-html="label"></view>
-      </slot>
-    </view>
-    <view class="my-list_value">
-      <slot></slot>
-      <xd-font-icon
-        v-if="showRight"
-        :style="{
-          marginLeft: '10rpx',
-          color: '#B1B1B1'
-        }"
-        size="24"
-        icon="iconxiangyou_xian"
-      ></xd-font-icon>
-    </view>
-
-  </view>
-</template>
-
-<script>
-import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-export default {
-  components: {
-    XdFontIcon
-  },
-  data(){
-    return {
-    
-    }
-  },
-  props: {
-    size: {
-      type: String,
-      default: "default"
-    },
-    paddingTB:{
-      type: String,
-      default: "24rpx"
-    },
-    paddingLR: {
-      type: String,
-      default: "0rpx"
-    },
-    //是否显示border-bottom
-    showBottom: {
-      type: Boolean,
-      default: false
-    },
-    //是否显示右箭头
-    showRight: {
-      type: Boolean,
-      default: false
-    },
-    //是否显示图标
-    listIcon: {
-      type: String,
-      default: ''
-    },
-    //label
-    label: {
-      type: String,
-      default: ''
-    },
-    className: {
-      type: String,
-      default: ''
-    }
-  }
-
-}
-</script>
-
-<style lang="less" scoped>
-.xd-my-list-item{
-  display: flex;
-  align-items: center;
-  padding: 30rpx 0;
-  font-size: 28rpx;
-
-  &.size_large{
-    .my-list_value,
-    .my-list_label{
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
-  &.size_default{
-    .my-list_value,
-    .my-list_label{
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
-  &.size_small{
-    .my-list_value,
-    .my-list_label{
-      font-size: 24rpx;
-      font-weight: 400;
-    }
-  }
-
-  .my-list_icon{
-    width: 32rpx;
-    margin-right: 24rpx;
-
-    image{
-      width: 32rpx;
-    }
-  }
-
-  .my-list_label{
-    // flex: 1;
-  }
-  .my-list_value{
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
-  .arrow_right{
-    width: 44rpx;
-  }
-}
-</style>