diff --git a/assets/img/goods/skill.png b/assets/img/goods/skill.png
new file mode 100644
index 0000000..68a4993
Binary files /dev/null and b/assets/img/goods/skill.png differ
diff --git a/assets/img/goods/tips.png b/assets/img/goods/tips.png
new file mode 100644
index 0000000..65d5a0c
Binary files /dev/null and b/assets/img/goods/tips.png differ
diff --git a/components/BsAddress.vue b/components/BsAddress.vue
index 6704e87..94d3db5 100644
--- a/components/BsAddress.vue
+++ b/components/BsAddress.vue
@@ -10,9 +10,9 @@
收货地址:
{{
- curAddressListItem.area +
- curAddressListItem.city +
curAddressListItem.province +
+ curAddressListItem.city +
+ curAddressListItem.area +
curAddressListItem.detailAddress
}}
diff --git a/components/BsChosen.vue b/components/BsChosen.vue
new file mode 100644
index 0000000..1d74d0d
--- /dev/null
+++ b/components/BsChosen.vue
@@ -0,0 +1,81 @@
+
+
+
+
为你精选
+
+
+
换一组
+
+
+
+
+
+
+
+
+
+
diff --git a/components/UiRadio.vue b/components/UiRadio.vue
deleted file mode 100644
index d409acf..0000000
--- a/components/UiRadio.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index e81305e..c9c2662 100644
--- a/layouts/module/header/index.vue
+++ b/layouts/module/header/index.vue
@@ -215,10 +215,6 @@ export default {
tabPath: "/",
tabList: [
{ label: "首页", value: "/" },
- {
- label: "爆款推荐",
- value: `/goods/list?id=recommend`,
- },
{
label: "开发书籍",
value: `/goods/list?id=6&levelType=${CATEGROY_LEVEL.ONE}`,
diff --git a/pages/account/index/address.vue b/pages/account/index/address.vue
index ada90e8..97b0987 100644
--- a/pages/account/index/address.vue
+++ b/pages/account/index/address.vue
@@ -23,9 +23,9 @@
{{
- scope.row.area +
- scope.row.city +
scope.row.province +
+ scope.row.city +
+ scope.row.area +
scope.row.detailAddress
}}
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index c3e371c..db6fd87 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-05-03 22:41:15
* @LastEditors: ch
- * @LastEditTime: 2022-05-12 17:36:08
+ * @LastEditTime: 2022-05-12 18:11:55
* @Description: file content
-->
@@ -72,19 +72,21 @@
+
@@ -384,6 +537,31 @@ export default {
}
}
+ &-skill {
+ width: 100%;
+ height: 32px;
+ background: url(@/assets/img/goods/skill.png) no-repeat;
+ background-size: contain;
+ padding: 0 20px;
+ font-size: 14px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #ffffff;
+ span {
+ width: 22px;
+ height: 22px;
+ background: #e83710;
+ border-radius: 2px;
+ margin-left: 10px;
+ font-size: 14px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #ffffff;
+ line-height: 22px;
+ text-align: center;
+ }
+ }
+
&-msg {
width: 714px;
height: 127px;
@@ -411,6 +589,34 @@ export default {
&--price {
padding-bottom: 30px;
}
+
+ &--skill {
+ margin-left: auto;
+
+ .skill-1 {
+ font-size: 16px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #e83710;
+ }
+
+ .skill-2 {
+ margin-top: 6px;
+ span {
+ display: inline-block;
+ width: 22px;
+ height: 22px;
+ background: #e83710;
+ border-radius: 2px;
+ font-size: 14px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #ffffff;
+ text-align: center;
+ line-height: 22px;
+ }
+ }
+ }
.hr {
width: 673px;
height: 1px;
@@ -444,7 +650,7 @@ export default {
border-color: #ccc;
}
.attr-item__active {
- border: 1px solid #FF512B;
+ border: 1px solid #ff512b;
}
.attr-item__disabled {
color: #999999;
@@ -454,6 +660,27 @@ export default {
}
}
+ &-none {
+ width: 713px;
+ height: 40px;
+ background: #f3f3f3;
+ margin-top: 20px;
+ padding: 0 20px;
+
+ img {
+ width: 18px;
+ height: 18px;
+ margin-right: 12px;
+ }
+
+ span {
+ font-size: 14px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+
&-pay {
margin-top: 40px;
button {
@@ -470,6 +697,21 @@ export default {
}
}
}
+ &-none-img {
+ display: block;
+ width: 228px;
+ height: 144px;
+ margin: 60px auto 20px;
+ }
+ &-none-txt {
+ width: 100%;
+ text-align: center;
+ font-size: 14px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #999999;
+ margin-bottom: 50px;
+ }
}
.section {
width: 1200px;
@@ -484,6 +726,24 @@ export default {
}
&-details {
width: 960px;
+
+ &--none {
+ img {
+ display: block;
+ width: 228px;
+ height: 144px;
+ margin: 133px auto 20px;
+ }
+
+ p {
+ width: 100%;
+ text-align: center;
+ font-size: 14px;
+ font-family: PingFang SC-常规体, PingFang SC;
+ font-weight: normal;
+ color: #999999;
+ }
+ }
}
&-title {
width: 100%;
diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue
index df3a2af..c7dba3f 100644
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@@ -54,7 +54,6 @@
:item="item"
v-for="item in listData"
:key="item.id"
- :isRecommend="isRecommend"
>
没有搜到你想要的商品哦,换个关键词试试
-
-
-
为你精选
-
-
-
换一组
-
-
-
-
-
-
-
+