jufubao-mall 2.0.32-beta1 → 2.0.32-beta3

package/package.json

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

package/src/components/JfbMallNetworkMedia/JfbMallNetworkMedia.vue

@@ -124,9 +124,16 @@
             <view v-if="item.product_id  === productId"></view>
           </view>
         </view>
-        <view class="media-detail">
+        <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 v-if="prodcutInfo">
+          <view>
             <xd-content-xss :key="prodcutContKey" v-if="prodcutInfo" :html="prodcutInfo"></xd-content-xss>
           </view>
         </view>
@@ -209,7 +216,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)`
         }
@@ -474,6 +482,7 @@
         this.twoViewId = '';
         this.threeViewId = ''
         this.productList = null;
+        this.prodcutInfo = '';
         this.productId = -1
         this.shopId = -1;
 
@@ -626,6 +635,7 @@
 
       },
       getProductInfo(item = null){
+        this.prodcutInfo = '';
         if(item === null)  this.hasProducts = 'N';
         else {
           this.hasProducts = 'Y';
@@ -635,67 +645,84 @@
       //====分类数据=========
 
       //==商品相关操作=======
-      handleProductOperate(){
-        this.getProductContent(this.productId);
-        this.getProductBtns(this.productId);
-        this.getProductForm(this.productId);
+      async handleProductOperate(){
+        await this.getProductContent(this.productId);
+        await this.getProductBtns(this.productId);
+        await this.getProductForm(this.productId);
+        this.$xdHideLoading();
       },
 
       handleSelectProduct(i){
         if(i === this.productId) return
         this.productId = i;
+        this.$xdShowLoading({});
         this.handleProductOperate()
       },
 
       getProductBtns(product_id){
-        jfbRootExec("getMallMediaProductBuyButton", {
-          vm: this,
-          data: {
-            product_id,
-            xnamespace: this.xnamespace,
-          }
-        }).then(res=>{
-          let isCanBuyItem = res['buttons'].filter(item=>{
-            return item.code === 'buy-now' && item.enabled === true;
-          });
-          this.isCanBuy = isCanBuyItem.length > 0;
-        }).catch(err=>{
-          this.isCanBuy = false
+        return new Promise((resolve)=>{
+          jfbRootExec("getMallMediaProductBuyButton", {
+            vm: this,
+            data: {
+              product_id,
+              xnamespace: this.xnamespace,
+            }
+          }).then(res=>{
+            let isCanBuyItem = res['buttons'].filter(item=>{
+              return item.code === 'buy-now' && item.enabled === true;
+            });
+            this.isCanBuy = isCanBuyItem.length > 0;
+            resolve();
+          }).catch(err=>{
+            this.isCanBuy = false
+            resolve();
+          })
         })
+
       },
 
       getProductForm(product_id){
-        jfbRootExec("getMallMediaProductForm", {
-          vm: this,
-          data: {
-            product_id,
-            xnamespace: this.xnamespace,
-          }
-        }).then(res=>{
-          this.blessingData = res['form_data']||[];
-        }).catch(err=>{
-          this.blessingData = [];
-          console.error(err);
+        return new Promise((resolve)=>{
+          jfbRootExec("getMallMediaProductForm", {
+            vm: this,
+            data: {
+              product_id,
+              xnamespace: this.xnamespace,
+            }
+          }).then(res=>{
+            this.blessingData = res['form_data']||[];
+            resolve()
+          }).catch(err=>{
+            this.blessingData = [];
+            console.error(err);
+            resolve()
+          })
         })
+
       },
 
       getProductContent(product_id){
-        this.prodcutInfo = '';
-        this.prodcutContKey = Date.now();
-
-        jfbRootExec("getMallMediaProductContent", {
-          vm: this,
-          data: {
-            product_id,
-            xnamespace: this.xnamespace,
-          }
-        }).then(res=>{
-          this.prodcutInfo = res.content;
-          this.prodcutContKey = Date.now()
-        }).catch(err=>{
+        return new Promise((resolve)=>{
           this.prodcutInfo = '';
-          this.prodcutContKey = Date.now()
+          this.prodcutContKey = Date.now();
+
+          jfbRootExec("getMallMediaProductContent", {
+            vm: this,
+            data: {
+              product_id,
+              xnamespace: this.xnamespace,
+            }
+          }).then(res=>{
+            this.prodcutInfo = res.content;
+            this.prodcutContKey = Date.now();
+            resolve()
+          }).catch(err=>{
+            this.prodcutInfo = '';
+            this.prodcutContKey = Date.now();
+            resolve()
+          })
         })
+
       },
 
       filterProdcutData(list = []){
@@ -717,13 +744,13 @@
           page_token: this.page_token,
           page_size: this.page_size,
           custom_category_id: cate.category_id,
-          is_remove_same_prefix_nam: 'Y'
+          is_remove_same_prefix_name: 'Y'
         }
 
         //设置是否展示划线价格
         if(this.isShowDiscount==='Y') data.is_show_uprice = this.$xdUniHelper.multiplyFloatNumber(this.differ,100)
         else data.is_show_uprice = -1
-
+        this.$xdShowLoading({});
         jfbRootExec("getMallMediaProductList", {
           vm: this,
           data: data
@@ -737,8 +764,12 @@
             this.productId = item.product_id;
             this.handleProductOperate()
           }
+          else {
+            this.$xdHideLoading();
+          }
 
         }).catch(err=>{
+          this.$xdHideLoading();
           this.productList = [ ]
         })
       },
@@ -838,7 +869,7 @@
           display: flex;
           justify-content: flex-start;
           white-space: nowrap;
-          padding: 16rpx 32rpx 30rpx;
+          padding: 16rpx 0 30rpx 32rpx;
         }
         &-item {
           margin-right: 16rpx;
@@ -920,7 +951,6 @@
         margin: 0 16rpx 16rpx;
         background-color: #fff;
         border-radius: 16rpx;
-        min-height: var(--g-comp-min-height);
       }
 
       .media-input {
@@ -999,7 +1029,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);
@@ -1012,6 +1049,8 @@
         align-items: center;
         flex-flow: wrap;
 
+
+
         &-item {
           width: calc((100% - 48rpx)/3);
           flex-shrink: 0;

package/src/components/JfbMallProductList/Attr.js

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