Commit 42fcece850d2bc720269e20fc3d31deb67b28c33
1 parent
fa22b06b
优选库，2021.03.22，Bug修复~
Showing
4 changed files
with
28 additions
and
19 deletions
src/components/goodsItem_8/goodsItem_8.vue
| ... | ... | @@ -28,10 +28,11 @@ |
| 28 | 28 | <img src="static/img/icon_list_arrow_right.png" class="icon-img" v-if="sty == 2" /> |
| 29 | 29 | <div class="btn btn-disabled" v-else-if="sty == '1' && discountType == '2'">已结束</div> |
| 30 | 30 | <div class="btn btn-disabled" v-else-if="sty == '1' && (item.num == '2' || (item.num == '1' && item.stock == '0'))">已抢光</div> |
| 31 | - <img src="static/img/icon_shopping_cart_active.png" class="icon-img" v-else /> | |
| 32 | - | |
| 31 | + | |
| 33 | 32 | <!-- 限购几件，不能再加入购物车展示效果，灰度图片 --> |
| 34 | - <!-- <img src="static/img/icon_shopping_cart.png" class="icon-img" v-else /> --> | |
| 33 | + <img src="static/img/icon_shopping_cart.png" class="icon-img" v-else-if="item.stock == '0'" /> | |
| 34 | + | |
| 35 | + <img src="static/img/icon_shopping_cart_active.png" class="icon-img" v-else /> | |
| 35 | 36 | </div> |
| 36 | 37 | </div> |
| 37 | 38 | </div> | ... | ... |
src/components/tabsCom/tabsCom.less
src/pages/labourUnion/labourUnion.less
| ... | ... | @@ -76,12 +76,12 @@ |
| 76 | 76 | align-items: flex-start; |
| 77 | 77 | .title { |
| 78 | 78 | color: rgba(255, 255, 255, 0.69); |
| 79 | - font-size: 28px; | |
| 79 | + font-size: 28px !important; | |
| 80 | 80 | font-weight: 500; |
| 81 | 81 | } |
| 82 | 82 | .sub-title { |
| 83 | 83 | color: #FFE450; |
| 84 | - font-size: 22px; | |
| 84 | + font-size: 22px !important; | |
| 85 | 85 | font-weight: 400; |
| 86 | 86 | } |
| 87 | 87 | } |
| ... | ... | @@ -97,14 +97,14 @@ |
| 97 | 97 | color: #FFFFFF; |
| 98 | 98 | font-weight: bold; |
| 99 | 99 | .sy { |
| 100 | - font-size: 60px; | |
| 100 | + font-size: 60px !important; | |
| 101 | 101 | } |
| 102 | 102 | .integer { |
| 103 | 103 | display: flex; |
| 104 | - font-size: 84px; | |
| 104 | + font-size: 84px !important; | |
| 105 | 105 | } |
| 106 | 106 | .decimal { |
| 107 | - font-size: 60px; | |
| 107 | + font-size: 60px !important; | |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | .btn { |
| ... | ... | @@ -117,7 +117,7 @@ |
| 117 | 117 | border-radius: 30px; |
| 118 | 118 | .text { |
| 119 | 119 | color: #3A3A3B; |
| 120 | - font-size: 28px; | |
| 120 | + font-size: 28px !important; | |
| 121 | 121 | font-weight: 500; |
| 122 | 122 | } |
| 123 | 123 | .icon-back-arrow-right { | ... | ... |
src/pages/labourUnion/labourUnion.vue
| ... | ... | @@ -241,18 +241,26 @@ |
| 241 | 241 | */ |
| 242 | 242 | change(item, index) { |
| 243 | 243 | |
| 244 | - // 切换tab | |
| 245 | - this.$set(this.tabs, 'active', index); | |
| 244 | + // 切换前检查网络状态 | |
| 245 | + if (this.$parent.onLine) { | |
| 246 | 246 | |
| 247 | - // 根据参数判断请求哪个接口，获取哪个列表 | |
| 248 | - if (this.tabs.list[this.tabs.active].type == '1' && (!this.tabs.list[this.tabs.active].page || this.tabs.list[this.tabs.active].page == 1)) { | |
| 247 | + // 切换tab | |
| 248 | + this.$set(this.tabs, 'active', index); | |
| 249 | + | |
| 250 | + // 根据参数判断请求哪个接口，获取哪个列表 | |
| 251 | + if (this.tabs.list[this.tabs.active].type == '1' && (!this.tabs.list[this.tabs.active].page || this.tabs.list[this.tabs.active].page == 1)) { | |
| 252 | + | |
| 253 | + // 工会商品列表（初始化） | |
| 254 | + this.ghGoodsList(this.CALL_STATUS.INIT); | |
| 255 | + } | |
| 256 | + | |
| 257 | + // 回到顶部 | |
| 258 | + this.gotoTop(); | |
| 259 | + } else { | |
| 249 | 260 | |
| 250 | - // 工会商品列表（初始化） | |
| 251 | - this.ghGoodsList(this.CALL_STATUS.INIT); | |
| 261 | + // 网络异常提醒 | |
| 262 | + Toast("网络异常，请检查网络"); | |
| 252 | 263 | } |
| 253 | - | |
| 254 | - // 回到顶部 | |
| 255 | - this.gotoTop(); | |
| 256 | 264 | }, |
| 257 | 265 | |
| 258 | 266 | /** | ... | ... |