Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

zxl

2025-07-29 66c550a7021c5685e8b7dde4a92e6efd3625689f

 pages/commodity-square/commoditySquare.vue

@@ -16,7 +16,7 @@
            </scroll-view>

         </view>
         <view class="goodsInfos" >
         <view class="goodsInfos" style="position: relative;">
            <scroll-view :scroll-y="true" :show-scrollbar="false" style="height: 100%;" @scrolltolower="loadMoreData()">

               <view class="goodsItem" v-for="item in goodsList" :key="item.id"
@@ -59,6 +59,10 @@
               </view>
            </scroll-view>
         </view>
            <view   @click="gotoCardList()" style="position: absolute;bottom: 120rpx; right: 32rpx;">
              <div class="settlement" >去购物车结算</div>
            </view>
         </view>
      </view>

   </view>
@@ -87,6 +91,8 @@
      },
      data() {
         return {
            canGoToCarList:false,
            nums:10,
            searchInfo: '',
            //商品列表
            goodsList: [],
@@ -114,6 +120,11 @@
         }
      },
      methods: {
         gotoCardList(){
            uni.navigateTo({
               url:'/pages/cusbar/cart/cartList'
            })
         },
         addCardNum(e, id) {
            this.goodsList.forEach(item => {
               if (item.id === id) {
@@ -269,6 +280,7 @@
            const cardInfos = await getCarts();
            // 处理购物车信息
            let cardMap = new Map();
         this.canGoToCarList =   cardInfos.data.result.cartList.length>0
            cardInfos.data.result.cartList.forEach(item => {

               item.skuList.forEach(sku => {
@@ -333,7 +345,16 @@
      overflow: hidden;

   }

   .settlement {
     width: 180rpx;
     height: 70rpx;
     line-height: 70rpx;
     background: linear-gradient(91deg, $light-color 1%, $aider-light-color 99%);
     border-radius: 900rpx;
     text-align: center;
     color: #fff;
     margin-right: 10rpx;
   }

   .navigatorMenue {
      margin-left: -32rpx;