jufubao-mall 2.0.32-beta2 → 2.0.32-beta6

package/package.json

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

package/src/components/JfbMallNetworkMedia/JfbMallNetworkMedia.vue

@@ -80,7 +80,12 @@
             v-for="item in blessingData"
             :key="item.id"
           >
-            <input :maxlength="item.struct.maxlength||16" v-model="item.data" :placeholder="item.value" />
+            <input
+              :maxlength="item.struct.maxlength||16"
+              :minlength="item.struct.minlength||0"
+              v-model="item.data"
+              placeholder-style="color: #ccc"
+              :placeholder="item.value || item.struct.placeholder" />
             <view
               class="media-input-tip"
               v-if="item.struct && item.struct.explain"
@@ -124,6 +129,13 @@
             <view v-if="item.product_id  === productId"></view>
           </view>
         </view>
+        <view class="media-product-nodata" v-if="productList && productList.length === 0">
+          <xd-no-data
+            icon-type="product"
+            :scale-size="2"
+            height="100%"
+          >当前暂无商品</xd-no-data>
+        </view>
         <view class="media-detail" v-if="prodcutInfo">
           <view>商品详情</view>
           <view>
@@ -209,7 +221,8 @@
         if(this.cateTwoList.length > 0) other += 190 //二级分类高度
         other += 80 //底部缝隙高度
         other += 120 //底部高度
-        other += 32
+        other += 32;
+        if(this.cateThreeList.length === 0)  other -= 80
         return {
           height: `calc(${this.layoutInfo.bodyMinHeightPx}px - ${other* this.$rpxNum}px)`
         }
@@ -389,7 +402,6 @@
         if(this.$configProject['isPreview']) {
           this.addressPid = 157696
         }
-
         await this.getCategoryList();
       },
 
@@ -407,7 +419,7 @@
           else this.parentId = categoryParent;
         }
 
-        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
+        this.xnamespace = 'ad5cb47e'//gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
         this.showIndex = gCPVal(container, 'showIndex', 'Y');
         this.nowBuyText = gCPVal(container, 'nowBuyText', '立即充值');
         let showIndexIcon = 'iconshouye1';
@@ -736,7 +748,7 @@
           page_token: this.page_token,
           page_size: this.page_size,
           custom_category_id: cate.category_id,
-          //is_remove_same_prefix_name: 'Y'
+          is_remove_same_prefix_name: 'Y'
         }
 
         //设置是否展示划线价格
@@ -758,6 +770,7 @@
           }
           else {
             this.$xdHideLoading();
+            this.blessingData = [];
           }
 
         }).catch(err=>{
@@ -861,7 +874,7 @@
           display: flex;
           justify-content: flex-start;
           white-space: nowrap;
-          padding: 16rpx 32rpx 30rpx;
+          padding: 16rpx 0 30rpx 32rpx;
         }
         &-item {
           margin-right: 16rpx;
@@ -943,7 +956,6 @@
         margin: 0 16rpx 16rpx;
         background-color: #fff;
         border-radius: 16rpx;
-        min-height: var(--g-comp-min-height);
       }
 
       .media-input {
@@ -965,7 +977,8 @@
 
           & > input {
             padding: 20rpx;
-            background-color: #f8f8f8;
+            background-color: #fff;
+            border: 1px solid #ccc;
             height: 40rpx;
             line-height: 40rpx;
             border-radius: 16rpx;
@@ -1022,7 +1035,14 @@
 
         }
       }
-
+      .media-product-nodata {
+        padding: 24rpx;
+        border-radius: var(--g-comp-radius);
+        overflow: hidden;
+        background: rgba(255, 255, 255, 1);
+        margin-bottom: 24rpx;
+        height: 700rpx;
+      }
       .media-product {
         padding: 24rpx;
         border-radius: var(--g-comp-radius);
@@ -1035,6 +1055,8 @@
         align-items: center;
         flex-flow: wrap;
 
+
+
         &-item {
           width: calc((100% - 48rpx)/3);
           flex-shrink: 0;