jufubao-mall 2.0.3 → 2.0.4

package/package.json

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

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -18,7 +18,7 @@
             class="tab_item"
             v-for="(item,index) in titleList"
             :key="index"
-            :class="{long:tabLayout === 'v1', short: tabLayout === 'v2'}"
+            :class="{short: tabLayout === 'v2'}"
             @click="tab=item.value"
             :style="[tab === item.value?tabActItemStyleComp:tabItemStyleComp]"
           >
@@ -41,23 +41,25 @@
             ></xd-baidu-map>
             <!--#endif-->
             <!-- #ifdef MP-WEIXIN -->
-            <map style="width:100%;height: 100%;"
-                 show-location
-                 :longitude="mapCenter.longitude"
-                 :latitude="mapCenter.latitude"
-                 :markers="marketList"
-                 @markertap="handleMarketTap"
+            <map
+              style="width:100%;height: 100%;"
+              show-location
+              :longitude="mapCenter.longitude"
+              :latitude="mapCenter.latitude"
+              :markers="marketList"
+              @markertap="handleMarketTap"
             >
               <cover-view
                 class="cover_view"
                 slot="callout"
               >
-                <cover-view v-for="(item,index) in marketList" :key="index" :marker-id="item.id"
-                            style="background: rgba(0,0,0,.8);border-radius: 20px;padding: 4px 8px;color: #FFFFFF;"
-                            :style="{display: item.id === showMarkerId ? 'block' : 'none'}"
-                >
-                  {{ item.title }}
-                </cover-view>
+                <cover-view
+                  v-for="(item,index) in marketList"
+                  :key="index"
+                  :marker-id="item.id"
+                  style="background: rgba(0,0,0,.8);border-radius: 20px;padding: 4px 8px;color: #FFFFFF;"
+                  :style="{display: item.id === showMarkerId ? 'block' : 'none'}"
+                >{{ item.title }}</cover-view>
               </cover-view>
             </map>
             <!-- #endif -->
@@ -245,11 +247,11 @@
         }
       },
       tabsStyleComp() {
-        let padding = 0, height = '100rpx';
+        let padding = '0 24rpx', height = '100rpx';
         if(this.tabLayout === 'v3') {
-          padding = '16rpx 12rpx';
+          padding = '20rpx 24rpx'
           if(this.titleList.length === 1) padding = '16rpx 0'
-          height = '68rpx';
+          height = '60rpx';
         }
         return {
           padding,
@@ -269,7 +271,7 @@
         }
       },
       contStyleComp(){
-        let height = this.layoutInfo.bodyMinHeightRpx - 110 - 72;
+        let height = this.layoutInfo.bodyMinHeightRpx - 100 - 72;
         if(this.mapIsExtend) height = height - 400;
         height = height - this.getPMValue(this.bodyPadding, 'TB', 0);
         return {
@@ -311,7 +313,7 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.setNameSpace(options);
+        this.setNameSpace(options, false);
         this.uiBaiduAk = this.baiduAk || this.$settings.baiduAk;
         this.myPosition = {
           lng: this.stateLocation.longitude,
@@ -730,30 +732,19 @@
           font-size: 32rpx;
           color: #333;
           font-weight: 400;
-          padding: 0 40rpx;
+          padding: 0 24rpx;
           position: relative;
           border-radius: 60rpx;
 
           & .lineX {
             position: absolute;
             bottom: 14rpx;
-            height: 8rpx;
+            height: 6rpx;
             background-color: var(--main-color);
             border-radius: 6rpx;
-          }
-
-          &.long {
-            & .lineX {
-              left: 40rpx;
-              right: 40rpx;;
-
-            }
-          }
-          &.short {
-            & .lineX {
-              left: 80rpx;
-              right: 80rpx;;
-            }
+            width: 64rpx;
+            left: 50%;
+            transform: translateX(-50%);
           }
         }
       }

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

@@ -29,7 +29,7 @@ export default function (data, gValue, gColor, oldData){
       handleCustom: (cb) => {
         XdBus.getParentApi('getOptionsNamespaces')()
           .then(res => {
-            cb(res.list)
+            cb([{label: '全部', value: 'all'}].concat(res.list))
           })
           .catch();
       }