Merge remote-tracking branch 'origin/dev_v3_zb' into dev_v3_lqw

pages/order_addcart/order_addcart.vue

@@ -218,11 +218,6 @@
           <view
             v-if="cartList.invalid.length > 0"
             class="invalidGoods borRadius14"
-            :style="
-              cartList.valid.length === 0 && cartList.invalid.length > 0
-                ? 'position: relative;z-index: 111;top: -120rpx;'
-                : 'position: static;'
-            "
           >
             <view class="goodsNav acea-row row-between-wrapper">
               <view
@@ -413,7 +408,7 @@ const canShow = ref(false);
 const shopCheckbox = ref([]);
 const showProductPopup = ref(false);
 
-const isLogin = appStore.isLogin;
+const isLogin = computed(()=>appStore.isLogin);
 
 // 添加全选的值控制
 const allCheckboxValue = ref([]);