jufubao-mall 2.0.6 → 2.0.7

package/package.json

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

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -139,6 +139,7 @@
               </view>
             </uni-swipe-action>
           </view>
+             <view :style="[positionBottom]"></view>
         </view>
       <xd-no-data v-else height="600rpx" :hasImg="hasImg" iconType="cart" scaleSize="2">
         <slot>
@@ -149,8 +150,8 @@
         </slot>
       </xd-no-data>
       </template>
-      <view v-if="cartList.length" class="bottom_fixed" :style="cart_bottom">
-        <view class="bottom_fixed_body" :style="[bottomFixedBoxStyle]">
+      <view v-if="cartList.length" class="bottom_fixed" id="bottom_fixed" :style="cart_bottom">
+        <view class="bottom_fixed_body" id="bottom_fixed_body" :style="[bottomFixedBoxStyle]">
           <view class="flex-sub">
             <view class="flex">
               <xd-radio size="mini" :width="40" :height="60" :is-old="false" :value="allCheck" @change="handleAllCheck"></xd-radio>
@@ -293,6 +294,7 @@ export default {
       hasImg:['cart'],
       cartStyle:null,
       cardHeaderHeight:0,
+      bottomFixedHeight:0,
     };
   },
   watch: {
@@ -303,7 +305,26 @@ export default {
     cartList(n, o) {
       if (n && JSON.stringify(n) !== JSON.stringify(o)) {
         jfbRootFnExec(this, "onCustomEvent")("mallCart@cartList", n);
-      }
+        if(n.length){
+          setTimeout(() => {
+            this.$nextTick(() => {
+              const query = uni.createSelectorQuery().in(this);
+              query
+                .select("#bottom_fixed_body")
+                .boundingClientRect((data) => {
+                  if (data) {
+                    this.bottomFixedHeight = data.height;
+                    console.log("目标元素信息:", data);
+                  } else {
+                    console.error("未找到目标元素");
+                  }
+                })
+                .exec();
+                })
+              },50)
+        
+        }
+        }
     },
     checkedProdList: {
       handler(n, o) {
@@ -384,7 +405,8 @@ export default {
     },
     listMarTop(){
       return {
-        top:this.cardHeaderHeight+'px'
+        top:this.cardHeaderHeight+'px',
+        marginBottom: this.cardHeaderHeight+'px'
       }
     },
     fixedHeaderStyle(){
@@ -396,6 +418,11 @@ export default {
         top: this.layoutInfo['top']+'rpx'
       }
     },
+    positionBottom(){
+      return{
+        height: this.bottomFixedHeight+'px'
+      }
+    }
   },
   created() {
     this.init(this.container);
@@ -839,7 +866,6 @@ export default {
     height: 100%;
     .cart_wrap {
       position: relative;
-      padding-bottom: 120rpx;
       .cart_header {
         position: relative;
         display: flex;
@@ -897,7 +923,6 @@ export default {
           }
         }
         .cart_item {
-          margin-bottom: 40rpx;
           .shop_name {
             display: flex;
             align-items: center;

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -28,11 +28,18 @@
           height="750rpx"
           :indicatorDots="false"
           @animationfinish="animationfinish"
-        >
+        >            
+         <!--#ifdef H5-->
           <template slot-scope="{ item,index }">
-            <image v-if="item.status===true" @error="item.status=false" @click="handlePreview(index,item)" :src="item.src"></image>
-            <image v-if="item.status===false" :src="errorProductUrl" @click="handlePreview(index,item)"></image>
+            <image v-show="item.status===true" @error="item.status=false" @click="handlePreview(index,item)" :src="item.src"></image>
+            <image v-show="item.status===false" :src="errorProductUrl" @click="handlePreview(index,item)"></image>
           </template>
+          <!-- #endif -->
+          <!--#ifdef MP-WEIXIN-->
+          <template slot-scope="{ item,index }">
+            <image @click="handlePreview(index)" :src="item.src"></image>
+          </template>
+          <!-- #endif -->
         </xd-swiper>
         <view class="xd-store-product__swiper-tips">{{swiperCurrent + 1}}/{{images.length}}</view>
       </view>
@@ -229,6 +236,7 @@
               :cusStyle="[bottomBtnStyle, {
                 color: shopBtnTextColor
               }]"
+              :isAuto="!btnAddBuy||!btnBuyNow"
               :wrapStyle="[wrapStyle]"
               :bg-color="shopBtnBgColor"
               :radius="bottomBtnRadius+'rpx'"
@@ -238,6 +246,7 @@
             >加入购物车</xd-button>
             <xd-button
               v-if="btnBuyNow"
+              :isAuto="!btnAddBuy||!btnBuyNow"
               :disabled="!btnBuyNow.enabled"
               :cusStyle="[bottomBtnStyle, {
                 color: buyBtnTextColor
@@ -645,7 +654,7 @@
         return style;
       },
       wrapStyle() {
-        let style = {color:'red'};
+        let style = {};
         if(this.bottomBtnFill === 'fill'){
           style['flex'] = 1;
           style['display'] = 'flex';
@@ -1021,8 +1030,9 @@
       },
 
       // 实现轮播图的预览效果
-      handlePreview(i,item) {
-        // 调用 uni.previewImage() 方法预览图片
+      handlePreview(i, item) {
+        //#ifdef H5
+         // 调用 uni.previewImage() 方法预览图片
         let images = this.images.map(item => item.src)
         if (!item.status) {
           images = [this.errorProductUrl]
@@ -1034,6 +1044,16 @@
           // 所有图片 url 路径的数组  //这里直接把图片列表的数组放入即可
           urls: images
         })
+        //#endif
+        //#ifdef MP-WEIXIN
+        uni.previewImage({
+          // 预览时，默认显示图片的索引
+          current: i,
+          indicator: "number",
+          // 所有图片 url 路径的数组  //这里直接把图片列表的数组放入即可
+          urls: this.images.map(item => item.src)
+        })
+       //#endif
       },
       handleToMapArea(){
         let city_code = "";