diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index d94b44a..8f7728b 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -145,7 +145,9 @@ 订单编号: {{ order.sn }} - + + + @@ -395,7 +397,11 @@ function gotoGoodsDetail(sku: any) { } function onCopy(orderSnText: string) { - setClipboard(orderSnText) + if (!orderSnText) { + uni.showToast({ title: '暂无订单编号', icon: 'none' }) + return + } + setClipboard(String(orderSnText)) } function onAfterSales(orderSnText: string, sku: any) { diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index a4b56b8..caa1bf0 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -69,30 +69,28 @@

{{skuItem.goodsSku.simpleSpecs}}

批发商品

-

+

{{ goodsFormatPrice(skuItem.goodsSku.price)[0] }} .{{ goodsFormatPrice(skuItem.goodsSku.price)[1] }}
- - + + - -
-
- 距秒杀结束: - -
+ + +
+
+ 距秒杀结束: +
- -
- {{skuItem.errorMessage}} -
-

+
+
+ {{ skuItem.errorMessage }} +
@@ -889,11 +887,16 @@ page { .sp-number { + width: 100%; font-weight: bold; - display: flex; + align-items: center; justify-content: space-between; + box-sizing: border-box; + > .sp-price { + flex-shrink: 0; + ::v-deep span:nth-of-type(1) { font-size: 38rpx; } @@ -901,6 +904,17 @@ page { font-size: 24rpx; } } + + > .sp-numbox { + flex-shrink: 0; + margin-left: auto; + } +} + +.sku-error { + margin-top: 8rpx; + font-size: 24rpx; + color: #999; } .priceDetail-flowPrice { font-weight: bold;