diff --git a/App.vue b/App.vue
index d06ff34..8187f76 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,13 @@
diff --git a/common/common.scss b/common/common.scss
index 7efe9e0..a575b86 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -3,30 +3,6 @@
width: 100%;
}
-// 导航栏
-.nav_title{
- position: fixed;
- z-index: 99;
- top: 0;
- width: 100%;
- background-color: white;
- &::after{
- content: "";
- background-color: #F6F5FA;
- height: 14.67rpx;
- width: 100%;
- position: absolute;
- bottom: -14.67rpx;
- }
- .uni-navbar{
- font-size: 32rpx;
- font-weight: bold;
- }
-
-}
-.nav_body{
- padding-top: 100rpx + var(--status-bar-height);
-}
//地址信息
.address{
@@ -395,4 +371,75 @@
margin: 0 4px;
}
}
- }
\ No newline at end of file
+ }
+
+ // 商品展示
+.good_info{
+ padding: 40rpx 0;
+ font-size: 22.67rpx;
+ color: #666666;
+ font-weight: bold;
+ border-bottom: 2.67rpx solid #F1F1F1;
+ &:last-child{
+ border-bottom: none;
+ }
+ .good_info_left{
+ display: flex;
+ align-items: center;
+ .good_info_image{
+ width: 200rpx ;
+ height: 200rpx;
+ background-color: #999999;
+ margin-right: 32.67rpx;
+ }
+ .left_info{
+
+ .info_name{
+ font-size: 26.67rpx;
+ font-weight: 400;
+ width: 461.33rpx;
+ }
+ .left_info_bottom{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 32rpx;
+ color: #909090;
+ margin-top: 24rpx;
+ .info_lable{
+ padding: 5.33rpx 20rpx;
+ font-size: 22.67rpx;
+ border-radius: 33.33rpx;
+ border: 1px solid #D3D3D3;
+ image{
+ width: 17.33rpx;
+ height: 17.33rpx;
+ margin-left: 14.67rpx;
+ }
+ }
+ }
+ .info_price{
+ font-size: 28rpx;
+ color: black;
+ font-weight: bold;
+ margin-top: 43.33rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ button{
+ margin: 0;
+ height: 45.33rpx;
+ line-height: 45.33rpx;
+ border: #999999 solid 1px;
+ font-size: 17.33rpx;
+ color: #999999;
+ background: none;
+ &::after{
+ content: none;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/common/scss/order.scss b/common/scss/order.scss
index fc9a282..a58442c 100644
--- a/common/scss/order.scss
+++ b/common/scss/order.scss
@@ -1,76 +1,7 @@
.order_popup_commodity{
padding:0 26rpx;
- .good_info{
- padding: 40rpx 0;
- font-size: 22.67rpx;
- color: #666666;
- font-weight: bold;
- border-bottom: 2.67rpx solid #F1F1F1;
- &:last-child{
- border-bottom: none;
- }
- .good_info_left{
- display: flex;
- align-items: center;
- width: 100%;
- .good_info_image{
- width: 200rpx ;
- height: 200rpx;
- background-color: #999999;
- margin-right: 32.67rpx;
- }
- .left_info{
-
- .info_name{
- font-size: 26.67rpx;
- font-weight: 400;
- width: 461.33rpx;
- }
- .left_info_bottom{
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 32rpx;
- color: #909090;
- margin-top: 24rpx;
- .info_lable{
- padding: 5.33rpx 20rpx;
- font-size: 22.67rpx;
- border-radius: 33.33rpx;
- border: 1px solid #D3D3D3;
- image{
- width: 17.33rpx;
- height: 17.33rpx;
- margin-left: 14.67rpx;
- }
- }
- }
- .info_price{
- font-size: 28rpx;
- color: black;
- font-weight: bold;
- margin-top: 43.33rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- button{
- margin: 0;
- height: 45.33rpx;
- line-height: 45.33rpx;
- border: #999999 solid 1px;
- font-size: 17.33rpx;
- color: #999999;
- background: none;
- &::after{
- content: none;
- }
- }
- }
- }
- }
- }
+
}
diff --git a/pages.json b/pages.json
index 802d5bf..7bd4e60 100644
--- a/pages.json
+++ b/pages.json
@@ -173,6 +173,18 @@
"navigationBarTitleText": "Refund Details",
"navigationBarBackgroundColor":"#FFFFFF"
}
+ },
+ {
+ "path": "pages/category/productList",
+ "style": {
+ "titleNView":false
+ }
+ },
+ {
+ "path": "pages/shippingCart/index",
+ "style": {
+ "titleNView":false
+ }
}
],
"globalStyle": {
@@ -206,9 +218,9 @@
"text": "Category"
},
{
- "pagePath": "pages/tabbar/tabbar-4/tabbar-4",
+ "pagePath": "pages/shippingCart/index",
"iconPath": "static/img/Cart.png",
- "selectedIconPath": "static/img/Cart1.png",
+ "selectedIconPath": "static/img/cart1.png",
"text": "Cart"
},
{
diff --git a/pages/account/pointsDetails.vue b/pages/account/pointsDetails.vue
index d22ca1a..fa816dd 100644
--- a/pages/account/pointsDetails.vue
+++ b/pages/account/pointsDetails.vue
@@ -1,20 +1,13 @@
-
-
-
-
-
-
-
-
-
-
- Order return
- +US$314.00
-
- 21/04/2022 15:42:31
+
+
+
+
+ Order return
+ +US$314.00
+ 21/04/2022 15:42:31
@@ -36,6 +29,11 @@
\ No newline at end of file
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 817718c..95c6a97 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -92,7 +92,7 @@
US$314.00
-
+
diff --git a/pages/order/refundDetails.vue b/pages/order/refundDetails.vue
index d86cfc7..06daa04 100644
--- a/pages/order/refundDetails.vue
+++ b/pages/order/refundDetails.vue
@@ -180,6 +180,7 @@
export default {
data() {
return {
+ // 0、售后已取消 1、商家驳回申请 2、待买家退货 3、待商家收货 4、待退款 5、等待商家审核 6、退款成功
details_index:0,
isShow:false,
}
diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue
new file mode 100644
index 0000000..7bec8f4
--- /dev/null
+++ b/pages/shippingCart/index.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+ Your cart is empty
+
+
+
+
+
+ Buy US$32.00 more to enjoy FREE STANDARD SHIPPING!
+ Add
+
+
+
+
+
+
+
+
+ Adidas Yeezy Boost 350 V2 DazzlingBlue Black GY7164 Men's
+
+
+ Multicolor;41
+
+
+ x1
+
+
+ US$314.00
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sold out
+
+
+
+ Adidas Yeezy Boost 350 V2 DazzlingBlue Black GY7164 Men's
+
+
+ Multicolor;41
+
+
+ x1
+
+
+ US$314.00
+
+
+
+
+
+
+
+
+
+
+
+
+ RECOMMEND
+
+
+
+ Adidas Yeezy Boost 350 DazzlingBlue Black
+ US$314.00
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/img/bottom1.png b/static/img/bottom1.png
new file mode 100644
index 0000000..9291778
Binary files /dev/null and b/static/img/bottom1.png differ
diff --git a/static/img/cart3.png b/static/img/cart3.png
new file mode 100644
index 0000000..12a0229
Binary files /dev/null and b/static/img/cart3.png differ
diff --git a/static/img/delete1.png b/static/img/delete1.png
new file mode 100644
index 0000000..522d3ae
Binary files /dev/null and b/static/img/delete1.png differ
diff --git a/static/img/delete2.png b/static/img/delete2.png
new file mode 100644
index 0000000..5c3fc73
Binary files /dev/null and b/static/img/delete2.png differ
diff --git a/static/img/pets_nav.png b/static/img/pets_nav.png
new file mode 100644
index 0000000..7bcde90
Binary files /dev/null and b/static/img/pets_nav.png differ
diff --git a/static/img/pets_nav1.png b/static/img/pets_nav1.png
new file mode 100644
index 0000000..d684319
Binary files /dev/null and b/static/img/pets_nav1.png differ
diff --git a/static/img/seach1.png b/static/img/seach1.png
new file mode 100644
index 0000000..9c60b36
Binary files /dev/null and b/static/img/seach1.png differ
diff --git a/static/img/top.png b/static/img/top.png
new file mode 100644
index 0000000..b9fa766
Binary files /dev/null and b/static/img/top.png differ