jufubao-mall 1.0.0 → 1.0.2

package/package.json

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

package/src/components/JfbMallBrandHome/JfbMallBrandHome.vue

@@ -284,7 +284,7 @@
           }
           else this.prodList = this.prodList.concat(list);
         }).catch(err => {
-
+          this.$xdLog.catch(err);
           console.error(err);
         })
       },

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -271,13 +271,15 @@
         })
       },
       toBrand(brand){
+        let { brand_icon, brand_name, params, ...otherParams } = brand;
+        let otherP = this.$xdUniHelper.jsonToParams(Object.assign(otherParams, params || {}));
         if(brand.brand_type === 'sell'){
           this.$xdUniHelper.navigateTo({
-            url: this.offlineBrandPath + `?brand_id=${brand.brand_id}`
+            url: this.offlineBrandPath + `?consume_mode=SELL&${otherP}`
           })
         }else{
           this.$xdUniHelper.navigateTo({
-            url: this.onlineBrandPath + `?brand_id=${brand.brand_id}&brand_type=${brand.brand_type}`
+            url: this.onlineBrandPath + `?${otherP}`
           })
         }
       },

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -451,6 +451,7 @@ export default {
           console.log(this.originCartList);
         })
         .catch((err) => {
+          this.$xdLog.catch(err);
           this.loaded = true;
           this.originCartList = [];
           this.cartList = [];

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -523,6 +523,8 @@
             else this.addressList = [res];
             resolve(res);
           }).catch(err => {
+			this.$xdLog.catch(err);
+            this.$xdHideLoading();
             reject(err);
           })
         })

package/src/components/JfbMallConfirm/orderMixin.js

@@ -101,7 +101,7 @@ export default {
       }).then(res => {
         cb(res.list)
         this.cardList = res.list
-      }).catch()
+      }).catch(this.$xdLog.catch)
     },
     setSettleSelectCard(options, successCb, errCb) {
       this.$xdShowLoading({})
@@ -116,8 +116,9 @@ export default {
         successCb(res)
         this.$xdHideLoading()
       }).catch(err => {
-        errCb(err)
+        if(errCb) errCb(err)
         this.$xdHideLoading()
+        this.$xdLog.catch(err);
       })
     },
     createSettleOrder(options, successCb, errCb) {
@@ -144,6 +145,7 @@ export default {
         // this.$xdHideLoading()
       }).catch(err => {
         this.$xdHideLoading()
+        this.$xdLog.catch(err);
       })
     },
     p_getOrderInfo(options, cb){
@@ -191,7 +193,8 @@ export default {
       }).catch(err => {
         console.log(err, 'err')
         this.$xdHideLoading();
-        errCb();
+        if(errCb) errCb();
+        this.$xdLog.catch(err);
       })
     },
     handleCreateSuccess(val) {
@@ -226,6 +229,7 @@ export default {
       }).catch(err => {
         console.error(err);
         this.$xdHideLoading();
+        this.$xdLog.catch(err);
       })
     },
     getOrderStatus(request_order_id){

package/src/components/JfbMallExchange/JfbMallExchange.vue

@@ -167,7 +167,10 @@ export default {
           this.navList = this.navList.splice(0,3);
           this.getList();
         })
-        .catch((err) => console.log(err, "err"));
+        .catch((err) => {
+          console.log(err, "err")
+          this.$xdLog.catch(err);
+        });
     },
     getList() {
       const { navList, activeIndex, page_token, page_size } = this;
@@ -192,6 +195,7 @@ export default {
         .catch((err) => {
           console.log("err", err);
           this.$xdHideLoading();
+          this.$xdLog.catch(err);
         });
     },
     handleToList(item) {

package/src/components/JfbMallExchangeList/JfbMallExchangeList.vue

@@ -185,6 +185,7 @@ export default {
         .catch((err) => {
           console.log("err", err);
           this.$xdHideLoading();
+          this.$xdLog.catch(err);
         });
     },
     handleToList(item) {

package/src/components/JfbMallHomeBrand/JfbMallHomeBrand.vue

@@ -344,6 +344,8 @@
             margin-top: unit(44, rpx);
             color: #242424;
             font-size: unit(24, rpx);
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
       }

package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue

@@ -284,7 +284,10 @@
               return item;
             });
             r(res);
-          }).catch(err => j(err))
+          }).catch(err => {
+            this.$xdLog.catch(err);
+            j(err)
+          })
         })
       },
       getList(isTabLoading=false){
@@ -320,13 +323,18 @@
           //首次加载成功计算最大滚动高度进行吸顶操作
           if(this.loading === false) {
             this.$nextTick(() => {
-              this.getEleTop()
+              this.$xdUniHelper.getWindowHeight(['.jfb-mall-home-product-list__body'], this)
+                .then(res => {
+                  this.fixedTop = (res['.jfb-mall-home-product-list__body'].top - this.layoutInfo.top * this.$rpxNum);
+                  this.loading = true
+                })
+                .catch()
             });
           }
           this.$nextTick(()=>{
             if(isTabLoading && this.scrollTop >= this.fixedTop){
               uni.pageScrollTo({
-                scrollTop: this.fixedTop + 2,
+                scrollTop: this.fixedTop,
                 duration: 0
               });
             }
@@ -338,6 +346,7 @@
         }).catch(err => {
           console.log("err", err);
           this.$xdHideLoading();
+          this.$xdLog.catch(err);
         })
       },
       toDetail(item){
@@ -353,12 +362,15 @@
         if(this.isPreview || this.loading === false) return;
         //#ifdef H5
         this.scrollTop = e.scrollTop;
-        if (e.scrollTop > this.fixedTop) {
-          this.fixed = true;
-        }
-        else {
-          this.fixed = false;
-        }
+        this.$xdUniHelper.getWindowHeight(['.jfb-mall-home-product-list__body'], this)
+          .then(res => {
+            let top = (res['.jfb-mall-home-product-list__body'].top - this.layoutInfo.top * this.$rpxNum);
+            if(this.fixedTop < top) {
+              this.fixedTop = top
+            }
+            this.fixed = (top+2) < 0;
+          })
+          .catch()
         // #endif
       },
       onJfbReachBottom(options) {

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -435,6 +435,7 @@
           this.buyButton = res;
         }).catch(err => {
           this.$xdHideLoading();
+          this.$xdLog.catch(err);
         })
       },
       p_getAddressList(){
@@ -477,6 +478,7 @@
           cb(res);
         }).catch(err => {
           this.$xdHideLoading();
+          this.$xdLog.catch(err);
         })
       },
       //点击加入购物车
@@ -526,7 +528,10 @@
               url: this.orderConfirmPath + `?order_id=${res.cart_order_id}`
             })
           })
-        }).catch(() => this.$xdHideLoading())
+        }).catch((err) => {
+          this.$xdHideLoading()
+          this.$xdLog.catch(err);
+        })
       },
       toChooseSkus(){
         this.action = "";

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -408,6 +408,7 @@
             
           }).catch(err => {
             if (!this.isFirst) this.$xdHideLoading();
+            this.$xdLog.catch(err);
           })
         }, 100)
       },
@@ -432,6 +433,7 @@
           this.loaded = true;
         }).catch(err => {
           //this.$xdHideLoading();
+          this.$xdLog.catch(err);
         })
       },
       getSearchFilterList(){
@@ -580,6 +582,7 @@
           }).catch(err => {
             this.$xdHideLoading();
             this.subCategory = [];
+            this.$xdLog.catch(err);
             reject();
           })
         })

package/src/components/JfbMallProductType/JfbMallProductType.vue

@@ -118,6 +118,7 @@
           this.allNavList = items;
           resolve(items)
         }).catch(err => {
+          this.$xdLog.catch(err);
           resolve([])
         })
       },
@@ -165,6 +166,7 @@
           })
           resolve(items)
         }).catch(err => {
+          this.$xdLog.catch(err);
           this.$xdHideLoading();
           resolve([]);
         })

package/src/components/JfbMallSearch/JfbMallSearch.vue

@@ -256,6 +256,7 @@
             if(this.page_token == 1) this.prodList = res.list;
             else this.prodList = this.prodList.concat(list);
           }).catch(err => {
+            this.$xdLog.catch(err);
             console.log(err);
           })
         }else{

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -153,6 +153,7 @@
           else throw new Error('数据错误')
         }).catch(error=>{
           console.error(error);
+          this.$xdLog.catch(error);
           this.$xdHideLoading();
         })
       },