diff --git a/src/assets/data/goods.js b/src/assets/data/goods.js index 7c31d5b..661c70b 100644 --- a/src/assets/data/goods.js +++ b/src/assets/data/goods.js @@ -1,9 +1,52 @@ export default { - goods: [ + list: [ { - "name": "适用苹果13/14手机壳iPhone12ProMax气囊11防摔XR新款7/8Plus透明se3保护Xs套男X镜头高级感女款S硅胶7全包2", - "cover": "0.jpg", - price: 5.74 - } + "name": "小米电视6 65\" OLED 65英寸", + "cover": new URL('../img/goods/g6-0.jpg', import.meta.url).href, + price: 6699, + isLowPrice: false, + discount: '', + sold: 863, + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": new URL('../img/goods/g1-0.jpg', import.meta.url).href, + isLowPrice: true, + discount: '满4减3', + sold: 134, + price: 39.9, + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "cover": new URL('../img/goods/g2-0.webp', import.meta.url).href, + price: 49.99, + isLowPrice: false, + discount: '满20减5', + sold: 3314, + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": new URL('../img/goods/g3-0.jpg', import.meta.url).href, + price: 22.90, + isLowPrice: true, + discount: '满10减3', + sold: 129, + }, + { + "name": "Redmi K60狠快狠强,狠旗舰!2023,第一台梦幻手机", + "cover": new URL('../img/goods/g4-0.png', import.meta.url).href, + price: 2999, + isLowPrice: true, + discount: '', + sold: 967, + }, + { + "name": "小米笔记本Pro X 14", + "cover": new URL('../img/goods/g5-0.jpg', import.meta.url).href, + price: 6999, + isLowPrice: false, + discount: '', + sold: 473, + }, ] } \ No newline at end of file diff --git a/src/assets/img/goods/g1-0.jpg b/src/assets/img/goods/g1-0.jpg new file mode 100644 index 0000000..a42187a Binary files /dev/null and b/src/assets/img/goods/g1-0.jpg differ diff --git a/src/assets/img/goods/g1-1.jpg b/src/assets/img/goods/g1-1.jpg new file mode 100644 index 0000000..728c039 Binary files /dev/null and b/src/assets/img/goods/g1-1.jpg differ diff --git a/src/assets/img/goods/g1-2.jpg b/src/assets/img/goods/g1-2.jpg new file mode 100644 index 0000000..8b34a4c Binary files /dev/null and b/src/assets/img/goods/g1-2.jpg differ diff --git a/src/assets/img/goods/g1-3.jpg b/src/assets/img/goods/g1-3.jpg new file mode 100644 index 0000000..db0c8da Binary files /dev/null and b/src/assets/img/goods/g1-3.jpg differ diff --git a/src/assets/img/goods/g2-0.webp b/src/assets/img/goods/g2-0.webp new file mode 100644 index 0000000..e7f0be0 Binary files /dev/null and b/src/assets/img/goods/g2-0.webp differ diff --git a/src/assets/img/goods/g2-1.webp b/src/assets/img/goods/g2-1.webp new file mode 100644 index 0000000..673437e Binary files /dev/null and b/src/assets/img/goods/g2-1.webp differ diff --git a/src/assets/img/goods/g2-2.webp b/src/assets/img/goods/g2-2.webp new file mode 100644 index 0000000..4cab3c7 Binary files /dev/null and b/src/assets/img/goods/g2-2.webp differ diff --git a/src/assets/img/goods/g2-3.webp b/src/assets/img/goods/g2-3.webp new file mode 100644 index 0000000..6a494e3 Binary files /dev/null and b/src/assets/img/goods/g2-3.webp differ diff --git a/src/assets/img/goods/g3-0.jpg b/src/assets/img/goods/g3-0.jpg new file mode 100644 index 0000000..cf56459 Binary files /dev/null and b/src/assets/img/goods/g3-0.jpg differ diff --git a/src/assets/img/goods/g3-1.jpg b/src/assets/img/goods/g3-1.jpg new file mode 100644 index 0000000..93ae27d Binary files /dev/null and b/src/assets/img/goods/g3-1.jpg differ diff --git a/src/assets/img/goods/g3-2.jpg b/src/assets/img/goods/g3-2.jpg new file mode 100644 index 0000000..8fafa7a Binary files /dev/null and b/src/assets/img/goods/g3-2.jpg differ diff --git a/src/assets/img/goods/g3-3.jpg b/src/assets/img/goods/g3-3.jpg new file mode 100644 index 0000000..091e2d0 Binary files /dev/null and b/src/assets/img/goods/g3-3.jpg differ diff --git a/src/assets/img/goods/g3-4.jpg b/src/assets/img/goods/g3-4.jpg new file mode 100644 index 0000000..105e532 Binary files /dev/null and b/src/assets/img/goods/g3-4.jpg differ diff --git a/src/assets/img/goods/g4-0.png b/src/assets/img/goods/g4-0.png new file mode 100644 index 0000000..83b4034 Binary files /dev/null and b/src/assets/img/goods/g4-0.png differ diff --git a/src/assets/img/goods/g4-1.png b/src/assets/img/goods/g4-1.png new file mode 100644 index 0000000..ab770a7 Binary files /dev/null and b/src/assets/img/goods/g4-1.png differ diff --git a/src/assets/img/goods/g4-2.png b/src/assets/img/goods/g4-2.png new file mode 100644 index 0000000..2e7e9d6 Binary files /dev/null and b/src/assets/img/goods/g4-2.png differ diff --git a/src/assets/img/goods/g4-3.png b/src/assets/img/goods/g4-3.png new file mode 100644 index 0000000..83b4034 Binary files /dev/null and b/src/assets/img/goods/g4-3.png differ diff --git a/src/assets/img/goods/g5-0.jpg b/src/assets/img/goods/g5-0.jpg new file mode 100644 index 0000000..9dc38ce Binary files /dev/null and b/src/assets/img/goods/g5-0.jpg differ diff --git a/src/assets/img/goods/g5-1.jpg b/src/assets/img/goods/g5-1.jpg new file mode 100644 index 0000000..f42d85e Binary files /dev/null and b/src/assets/img/goods/g5-1.jpg differ diff --git a/src/assets/img/goods/g5-2.jpg b/src/assets/img/goods/g5-2.jpg new file mode 100644 index 0000000..3349583 Binary files /dev/null and b/src/assets/img/goods/g5-2.jpg differ diff --git a/src/assets/img/goods/g5-3.jpg b/src/assets/img/goods/g5-3.jpg new file mode 100644 index 0000000..a1b2a27 Binary files /dev/null and b/src/assets/img/goods/g5-3.jpg differ diff --git a/src/assets/img/goods/g5-4.jpg b/src/assets/img/goods/g5-4.jpg new file mode 100644 index 0000000..8fb7e40 Binary files /dev/null and b/src/assets/img/goods/g5-4.jpg differ diff --git a/src/assets/img/goods/g6-0.jpg b/src/assets/img/goods/g6-0.jpg new file mode 100644 index 0000000..854772b Binary files /dev/null and b/src/assets/img/goods/g6-0.jpg differ diff --git a/src/assets/img/goods/g6-1.jpg b/src/assets/img/goods/g6-1.jpg new file mode 100644 index 0000000..f6ad3f1 Binary files /dev/null and b/src/assets/img/goods/g6-1.jpg differ diff --git a/src/assets/img/goods/g6-2.jpg b/src/assets/img/goods/g6-2.jpg new file mode 100644 index 0000000..5ddb744 Binary files /dev/null and b/src/assets/img/goods/g6-2.jpg differ diff --git a/src/assets/img/goods/g6-3.jpg b/src/assets/img/goods/g6-3.jpg new file mode 100644 index 0000000..7958f94 Binary files /dev/null and b/src/assets/img/goods/g6-3.jpg differ diff --git a/src/assets/img/goods/g6-4.jpg b/src/assets/img/goods/g6-4.jpg new file mode 100644 index 0000000..bd6a1f9 Binary files /dev/null and b/src/assets/img/goods/g6-4.jpg differ diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 81b8626..ec8e262 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -115,7 +115,7 @@ import FollowSetting2 from "@/pages/home/components/FollowSetting2.vue"; import ShareToFriend from "@/pages/home/components/ShareToFriend.vue"; import UserPanel from "@/components/UserPanel.vue"; import Community from "@/pages/home/slide/Community.vue"; -import Shop from "@/pages/home/slide/Shop.vue"; +import Shop from "@/pages/shop/Shop.vue"; import Slide0 from "@/pages/home/slide/Slide0.vue"; import Slide2 from "@/pages/home/slide/Slide2.vue"; import Slide4 from "@/pages/home/slide/Slide4.vue"; @@ -130,7 +130,7 @@ const bodyWidth = computed(() => store.state.bodyWidth) const state = reactive({ baseIndex: 0, - navIndex: 4, + navIndex: 3, test: '', recommendList: [ // { diff --git a/src/pages/shop/GoodsDetail.vue b/src/pages/shop/GoodsDetail.vue new file mode 100644 index 0000000..48d2580 --- /dev/null +++ b/src/pages/shop/GoodsDetail.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/pages/home/slide/Shop.vue b/src/pages/shop/Shop.vue similarity index 88% rename from src/pages/home/slide/Shop.vue rename to src/pages/shop/Shop.vue index 85f3a13..e0dd35b 100644 --- a/src/pages/home/slide/Shop.vue +++ b/src/pages/shop/Shop.vue @@ -39,23 +39,24 @@ :class="{fixed:state.fixed}" transition-duration="0s" item-selector=".goods"> -
+
- - +
- 2022新款Apple/苹果iPhone 14 Plus手机6.7 + {{ item.name }}
-
满4减3
+
{{ item.discount }}
¥ -
6099
+
{{ item.price }}
-
已售223件
+
已售{{ item.sold }}件
-
+
近30天低价
@@ -70,9 +71,12 @@ import {onMounted, reactive} from "vue"; import Utils from "@/utils"; import Scroll from "@/components/Scroll.vue"; +import goods from "@/assets/data/goods"; +import {useNav} from "@/utils/hooks/useNav"; +const nav = useNav() const state = reactive({ - list: [], + list: goods.list, listEl: null, fixed: false }) @@ -84,7 +88,7 @@ function loadData() { src: new URL(`../../../assets/img/poster/${i}.jpg`, import.meta.url).href, author: new URL(`../../../assets/img/avatar.png`, import.meta.url).href, } - state.list.push(temp) + // state.list.push(temp) } } @@ -94,7 +98,7 @@ onMounted(() => { src: new URL(`../../../assets/img/poster/${i}.jpg`, import.meta.url).href, author: new URL(`../../../assets/img/avatar.png`, import.meta.url).href, } - state.list.push(temp) + // state.list.push(temp) } }) @@ -255,6 +259,10 @@ onMounted(() => { color: black; font-size: 16rem; margin-bottom: 8rem; + @lh: 18rem; + line-height: @lh; + height: @lh * 2; + overflow: hidden; } .discounts { diff --git a/src/pages/test/Test.vue b/src/pages/test/Test.vue index 2628eb4..6ac1b59 100644 --- a/src/pages/test/Test.vue +++ b/src/pages/test/Test.vue @@ -25,7 +25,7 @@ import slideHooks from '../home/index.vue' import TestSwiperJs from "./TestSwiperJs"; import {mat4} from "gl-matrix"; import UserPanel from "@/components/UserPanel.vue"; -import Shop from "@/pages/home/slide/Shop.vue"; +import Shop from "@/pages/shop/Shop.vue"; import Community from "@/pages/home/slide/Community.vue"; export default { diff --git a/src/router/routes.js b/src/router/routes.js index 80771ed..1052b1d 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -64,6 +64,7 @@ import VerificationCode from "../pages/login/VerificationCode"; import RetrievePassword from "../pages/login/RetrievePassword"; import Help from "../pages/login/Help"; import Uploader from "../pages/me/Uploader"; +import GoodsDetail from "@/pages/shop/GoodsDetail.vue"; const routes = [ {path: '/', redirect: '/home'}, @@ -80,6 +81,8 @@ const routes = [ {path: '/home/live', component: LivePage}, {path: '/home/search', component: Search}, + {path: '/shop/detail', component: GoodsDetail}, + {path: '/me', component: Me,}, {path: '/me/edit-userinfo', component: EditUserInfo}, {path: '/me/edit-userinfo-item', component: EditUserInfoItem},