From a8f0f648688620002d61e8b54a8b4dcb767b458e Mon Sep 17 00:00:00 2001 From: zyronon Date: Mon, 1 Apr 2024 03:19:49 +0800 Subject: [PATCH] save --- public/data/goods.json | 653 ++++++++++++++++++ .../img => public/images}/goods/g1-0.jpg | Bin .../img => public/images}/goods/g1-1.jpg | Bin .../img => public/images}/goods/g1-2.jpg | Bin .../img => public/images}/goods/g1-3.jpg | Bin .../img => public/images}/goods/g2-0.webp | Bin .../img => public/images}/goods/g2-1.webp | Bin .../img => public/images}/goods/g2-2.webp | Bin .../img => public/images}/goods/g2-3.webp | Bin .../img => public/images}/goods/g3-0.jpg | Bin .../img => public/images}/goods/g3-1.jpg | Bin .../img => public/images}/goods/g3-2.jpg | Bin .../img => public/images}/goods/g3-3.jpg | Bin .../img => public/images}/goods/g3-4.jpg | Bin .../img => public/images}/goods/g4-0.png | Bin .../img => public/images}/goods/g4-1.png | Bin .../img => public/images}/goods/g4-2.png | Bin .../img => public/images}/goods/g4-3.png | Bin .../img => public/images}/goods/g5-0.jpg | Bin .../img => public/images}/goods/g5-1.jpg | Bin .../img => public/images}/goods/g5-2.jpg | Bin .../img => public/images}/goods/g5-3.jpg | Bin .../img => public/images}/goods/g5-4.jpg | Bin .../img => public/images}/goods/g6-0.jpg | Bin .../img => public/images}/goods/g6-1.jpg | Bin .../img => public/images}/goods/g6-2.jpg | Bin .../img => public/images}/goods/g6-3.jpg | Bin .../img => public/images}/goods/g6-4.jpg | Bin public/images/icon/love.webp | Bin 0 -> 3968 bytes src/api/user.js | 5 + src/assets/data/goods.js | 65 -- src/components/DouyinCode.vue | 25 +- src/components/Share.vue | 13 +- src/components/dialog/FromBottomDialog.vue | 6 +- src/components/slide/BVideo.vue | 154 +++-- src/components/slide/ItemDesc.vue | 17 + .../slide/SlideVerticalInfinite.vue | 17 +- src/mock/index.js | 17 +- src/pages/home/LivePage.vue | 129 +++- src/pages/home/index.vue | 37 +- src/pages/home/slide/LongVideo2.vue | 228 ------ src/pages/home/slide/Slide2.vue | 17 +- src/pages/message/Message.vue | 48 +- src/pages/message/RedPacketDetail.vue | 1 + src/pages/message/chat/Chat.vue | 70 +- src/pages/other/VideoDetail.vue | 170 ++++- src/pages/other/VideoDetail2.vue | 201 ++++++ src/pages/shop/GoodsDetail.vue | 173 +++-- src/pages/shop/Shop.vue | 197 +++--- 49 files changed, 1590 insertions(+), 653 deletions(-) create mode 100644 public/data/goods.json rename {src/assets/img => public/images}/goods/g1-0.jpg (100%) rename {src/assets/img => public/images}/goods/g1-1.jpg (100%) rename {src/assets/img => public/images}/goods/g1-2.jpg (100%) rename {src/assets/img => public/images}/goods/g1-3.jpg (100%) rename {src/assets/img => public/images}/goods/g2-0.webp (100%) rename {src/assets/img => public/images}/goods/g2-1.webp (100%) rename {src/assets/img => public/images}/goods/g2-2.webp (100%) rename {src/assets/img => public/images}/goods/g2-3.webp (100%) rename {src/assets/img => public/images}/goods/g3-0.jpg (100%) rename {src/assets/img => public/images}/goods/g3-1.jpg (100%) rename {src/assets/img => public/images}/goods/g3-2.jpg (100%) rename {src/assets/img => public/images}/goods/g3-3.jpg (100%) rename {src/assets/img => public/images}/goods/g3-4.jpg (100%) rename {src/assets/img => public/images}/goods/g4-0.png (100%) rename {src/assets/img => public/images}/goods/g4-1.png (100%) rename {src/assets/img => public/images}/goods/g4-2.png (100%) rename {src/assets/img => public/images}/goods/g4-3.png (100%) rename {src/assets/img => public/images}/goods/g5-0.jpg (100%) rename {src/assets/img => public/images}/goods/g5-1.jpg (100%) rename {src/assets/img => public/images}/goods/g5-2.jpg (100%) rename {src/assets/img => public/images}/goods/g5-3.jpg (100%) rename {src/assets/img => public/images}/goods/g5-4.jpg (100%) rename {src/assets/img => public/images}/goods/g6-0.jpg (100%) rename {src/assets/img => public/images}/goods/g6-1.jpg (100%) rename {src/assets/img => public/images}/goods/g6-2.jpg (100%) rename {src/assets/img => public/images}/goods/g6-3.jpg (100%) rename {src/assets/img => public/images}/goods/g6-4.jpg (100%) create mode 100644 public/images/icon/love.webp delete mode 100644 src/assets/data/goods.js delete mode 100644 src/pages/home/slide/LongVideo2.vue create mode 100644 src/pages/other/VideoDetail2.vue diff --git a/public/data/goods.json b/public/data/goods.json new file mode 100644 index 000000000..9a46c7aac --- /dev/null +++ b/public/data/goods.json @@ -0,0 +1,653 @@ +[ + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + }, + { + "name": "小米电视6 65\" OLED 65英寸", + "cover": "g6-0.jpg", + "imgs": [ + "g6-0.jpg", + "g6-1.jpg", + "g6-2.jpg", + "g6-3.jpg", + "g6-4.jpg" + ], + "price": 6699, + "real_price": 399, + "isLowPrice": false, + "discount": "", + "sold": 863 + }, + { + "name": "红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫", + "cover": "g1-0.jpg", + "imgs": [ + "g1-0.jpg", + "g1-1.jpg", + "g1-2.jpg", + "g1-3.jpg" + ], + "isLowPrice": true, + "discount": "满4减3", + "sold": 134, + "price": 39.9, + "real_price": 9.9 + }, + { + "name": "森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮", + "imgs": [ + "g2-0.webp", + "g2-1.webp", + "g2-2.webp", + "g2-3.webp" + ], + "cover": "g2-0.webp", + "real_price": 9.9, + "price": 49.99, + "isLowPrice": false, + "discount": "满20减5", + "sold": 3314 + }, + { + "name": "ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫", + "cover": "g3-0.jpg", + "imgs": [ + "g3-0.jpg", + "g3-1.jpg", + "g3-2.jpg", + "g3-3.jpg", + "g3-4.jpg" + ], + "real_price": 9.9, + "price": 22.90, + "isLowPrice": true, + "discount": "满10减3", + "sold": 129 + }, + { + "name": "Redmi K60狠快狠强，狠旗舰！2023，第一台梦幻手机", + "cover": "g4-0.png", + "imgs": [ + "g4-0.png", + "g4-1.png", + "g4-2.png", + "g4-3.png" + ], + "real_price": 199.9, + "price": 2999, + "isLowPrice": true, + "discount": "", + "sold": 967 + }, + { + "name": "小米笔记本Pro X 14", + "imgs": [ + "g5-0.jpg", + "g5-1.jpg", + "g5-2.jpg", + "g5-3.jpg", + "g5-4.jpg" + ], + "cover": "g5-0.jpg", + "real_price": 1559.9, + "price": 6999, + "isLowPrice": false, + "discount": "", + "sold": 473 + } +] \ No newline at end of file diff --git a/src/assets/img/goods/g1-0.jpg b/public/images/goods/g1-0.jpg similarity index 100% rename from src/assets/img/goods/g1-0.jpg rename to public/images/goods/g1-0.jpg diff --git a/src/assets/img/goods/g1-1.jpg b/public/images/goods/g1-1.jpg similarity index 100% rename from src/assets/img/goods/g1-1.jpg rename to public/images/goods/g1-1.jpg diff --git a/src/assets/img/goods/g1-2.jpg b/public/images/goods/g1-2.jpg similarity index 100% rename from src/assets/img/goods/g1-2.jpg rename to public/images/goods/g1-2.jpg diff --git a/src/assets/img/goods/g1-3.jpg b/public/images/goods/g1-3.jpg similarity index 100% rename from src/assets/img/goods/g1-3.jpg rename to public/images/goods/g1-3.jpg diff --git a/src/assets/img/goods/g2-0.webp b/public/images/goods/g2-0.webp similarity index 100% rename from src/assets/img/goods/g2-0.webp rename to public/images/goods/g2-0.webp diff --git a/src/assets/img/goods/g2-1.webp b/public/images/goods/g2-1.webp similarity index 100% rename from src/assets/img/goods/g2-1.webp rename to public/images/goods/g2-1.webp diff --git a/src/assets/img/goods/g2-2.webp b/public/images/goods/g2-2.webp similarity index 100% rename from src/assets/img/goods/g2-2.webp rename to public/images/goods/g2-2.webp diff --git a/src/assets/img/goods/g2-3.webp b/public/images/goods/g2-3.webp similarity index 100% rename from src/assets/img/goods/g2-3.webp rename to public/images/goods/g2-3.webp diff --git a/src/assets/img/goods/g3-0.jpg b/public/images/goods/g3-0.jpg similarity index 100% rename from src/assets/img/goods/g3-0.jpg rename to public/images/goods/g3-0.jpg diff --git a/src/assets/img/goods/g3-1.jpg b/public/images/goods/g3-1.jpg similarity index 100% rename from src/assets/img/goods/g3-1.jpg rename to public/images/goods/g3-1.jpg diff --git a/src/assets/img/goods/g3-2.jpg b/public/images/goods/g3-2.jpg similarity index 100% rename from src/assets/img/goods/g3-2.jpg rename to public/images/goods/g3-2.jpg diff --git a/src/assets/img/goods/g3-3.jpg b/public/images/goods/g3-3.jpg similarity index 100% rename from src/assets/img/goods/g3-3.jpg rename to public/images/goods/g3-3.jpg diff --git a/src/assets/img/goods/g3-4.jpg b/public/images/goods/g3-4.jpg similarity index 100% rename from src/assets/img/goods/g3-4.jpg rename to public/images/goods/g3-4.jpg diff --git a/src/assets/img/goods/g4-0.png b/public/images/goods/g4-0.png similarity index 100% rename from src/assets/img/goods/g4-0.png rename to public/images/goods/g4-0.png diff --git a/src/assets/img/goods/g4-1.png b/public/images/goods/g4-1.png similarity index 100% rename from src/assets/img/goods/g4-1.png rename to public/images/goods/g4-1.png diff --git a/src/assets/img/goods/g4-2.png b/public/images/goods/g4-2.png similarity index 100% rename from src/assets/img/goods/g4-2.png rename to public/images/goods/g4-2.png diff --git a/src/assets/img/goods/g4-3.png b/public/images/goods/g4-3.png similarity index 100% rename from src/assets/img/goods/g4-3.png rename to public/images/goods/g4-3.png diff --git a/src/assets/img/goods/g5-0.jpg b/public/images/goods/g5-0.jpg similarity index 100% rename from src/assets/img/goods/g5-0.jpg rename to public/images/goods/g5-0.jpg diff --git a/src/assets/img/goods/g5-1.jpg b/public/images/goods/g5-1.jpg similarity index 100% rename from src/assets/img/goods/g5-1.jpg rename to public/images/goods/g5-1.jpg diff --git a/src/assets/img/goods/g5-2.jpg b/public/images/goods/g5-2.jpg similarity index 100% rename from src/assets/img/goods/g5-2.jpg rename to public/images/goods/g5-2.jpg diff --git a/src/assets/img/goods/g5-3.jpg b/public/images/goods/g5-3.jpg similarity index 100% rename from src/assets/img/goods/g5-3.jpg rename to public/images/goods/g5-3.jpg diff --git a/src/assets/img/goods/g5-4.jpg b/public/images/goods/g5-4.jpg similarity index 100% rename from src/assets/img/goods/g5-4.jpg rename to public/images/goods/g5-4.jpg diff --git a/src/assets/img/goods/g6-0.jpg b/public/images/goods/g6-0.jpg similarity index 100% rename from src/assets/img/goods/g6-0.jpg rename to public/images/goods/g6-0.jpg diff --git a/src/assets/img/goods/g6-1.jpg b/public/images/goods/g6-1.jpg similarity index 100% rename from src/assets/img/goods/g6-1.jpg rename to public/images/goods/g6-1.jpg diff --git a/src/assets/img/goods/g6-2.jpg b/public/images/goods/g6-2.jpg similarity index 100% rename from src/assets/img/goods/g6-2.jpg rename to public/images/goods/g6-2.jpg diff --git a/src/assets/img/goods/g6-3.jpg b/public/images/goods/g6-3.jpg similarity index 100% rename from src/assets/img/goods/g6-3.jpg rename to public/images/goods/g6-3.jpg diff --git a/src/assets/img/goods/g6-4.jpg b/public/images/goods/g6-4.jpg similarity index 100% rename from src/assets/img/goods/g6-4.jpg rename to public/images/goods/g6-4.jpg diff --git a/public/images/icon/love.webp b/public/images/icon/love.webp new file mode 100644 index 0000000000000000000000000000000000000000..1efebe116cdcfdfabe4d86a71a92deb3f5898005 GIT binary patch literal 3968 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
- +
-
@名字
-
#窃书不能算偷……窃书！……读书人的事，能算偷么？
+
@{{item.author.nickname}}
+
{{item.desc}}
@@ -43,9 +43,12 @@ - - - - - \ No newline at end of file diff --git a/src/pages/home/slide/Slide2.vue b/src/pages/home/slide/Slide2.vue index a1f438abb..5c2e909bd 100644 --- a/src/pages/home/slide/Slide2.vue +++ b/src/pages/home/slide/Slide2.vue @@ -4,17 +4,18 @@ :class="state.subTypeIsTop?'top':''" ref="subTypeRef">
-
- - 美食美食美食美食美食美食美食 +
+ + {{ i.nickname }}
1个直播 + @click.stop="showSubType">{{store.users.length}}个直播
{ box-sizing: border-box; display: flex; overflow: auto; + gap: 10rem; + padding-left: 20rem; } .nav-item { @@ -126,7 +131,7 @@ onUnmounted(() => { img { width: @width; height: @width; - margin-bottom: 5rem; + border-radius: 50%; } } } diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index a0e35d0b0..a90ead257 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -62,6 +62,30 @@
+ +
+
+ +
+
+
+
+ {{ userinfo.nickname }} +
+
+ 哈哈哈哈哈哈 +
+ 10-10 +
+
+
+ + + +
12
+
+
+
@@ -195,30 +219,6 @@
- -
-
- -
-
-
-
- {{ userinfo.nickname }} -
-
- 哈哈哈哈哈哈 -
- 10-10 -
-
-
- - - -
12
-
-
-
diff --git a/src/pages/message/RedPacketDetail.vue b/src/pages/message/RedPacketDetail.vue index 93a6a7bf0..f6b747473 100644 --- a/src/pages/message/RedPacketDetail.vue +++ b/src/pages/message/RedPacketDetail.vue @@ -67,6 +67,7 @@ export default { .avatar { margin-top: 55rem; width: 55rem; + height: 55rem; border-radius: 50%; margin-bottom: 20rem; } diff --git a/src/pages/message/chat/Chat.vue b/src/pages/message/chat/Chat.vue index fb33a29aa..f68d293dd 100644 --- a/src/pages/message/chat/Chat.vue +++ b/src/pages/message/chat/Chat.vue @@ -219,36 +219,7 @@ export default { avatar: '../../assets/img/icon/head-image.jpg' } }, - { - type: MESSAGE_TYPE.RED_PACKET, - state: AUDIO_STATE.NORMAL, - mode: RED_PACKET_MODE.MULTIPLE, - data: { - money: 5.11, - title: '大吉大利', - state: '未领取' - }, - time: '2021-01-02 21:21', - user: { - id: '2739632844317827', - avatar: '../../assets/img/icon/head-image.jpg' - } - }, - { - type: MESSAGE_TYPE.RED_PACKET, - state: AUDIO_STATE.NORMAL, - mode: RED_PACKET_MODE.SINGLE, - data: { - money: 5.11, - title: '大吉大利', - state: '已过期' - }, - time: '2021-01-02 21:21', - user: { - id: 1, - avatar: '../../assets/img/icon/head-image.jpg' - } - }, + { type: MESSAGE_TYPE.MEME, state: AUDIO_STATE.NORMAL, @@ -441,6 +412,36 @@ export default { avatar: '../../../assets/img/icon/head-image.jpg' } }, + { + type: MESSAGE_TYPE.RED_PACKET, + state: AUDIO_STATE.NORMAL, + mode: RED_PACKET_MODE.MULTIPLE, + data: { + money: 5.11, + title: '大吉大利', + state: '未领取' + }, + time: '2021-01-02 21:21', + user: { + id: '2739632844317827', + avatar: '../../assets/img/icon/head-image.jpg' + } + }, + { + type: MESSAGE_TYPE.RED_PACKET, + state: AUDIO_STATE.NORMAL, + mode: RED_PACKET_MODE.SINGLE, + data: { + money: 5.11, + title: '大吉大利', + state: '已过期' + }, + time: '2021-01-02 21:21', + user: { + id: 1, + avatar: '../../assets/img/icon/head-image.jpg' + } + }, ], typing: false, loading: false, @@ -466,15 +467,19 @@ export default { created() { }, mounted() { + $('img').on('load', this.scrollBottom) this.scrollBottom() }, + unmounted() { + $('img').off('load', this.scrollBottom) + }, methods: { _checkImgUrl, scrollBottom() { nextTick(() => { let wrapper = this.$refs.msgWrapper - console.log('wrapper.clientHeight', wrapper.clientHeight) - console.log('wrapper.scrollHeight', wrapper.scrollHeight) + // console.log('wrapper.clientHeight', wrapper.clientHeight) + // console.log('wrapper.scrollHeight', wrapper.scrollHeight) wrapper.scrollTo({top: wrapper.scrollHeight - wrapper.clientHeight}) }) @@ -804,6 +809,7 @@ export default { .avatar { margin-top: 60rem; width: 55rem; + height: 55rem; border-radius: 50%; margin-bottom: 20rem; } diff --git a/src/pages/other/VideoDetail.vue b/src/pages/other/VideoDetail.vue index bb3e2b418..ac18a553c 100644 --- a/src/pages/other/VideoDetail.vue +++ b/src/pages/other/VideoDetail.vue @@ -15,7 +15,6 @@
- + 善语结善缘，恶言伤人心
@@ -41,22 +40,92 @@
+ + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/src/pages/other/VideoDetail2.vue b/src/pages/other/VideoDetail2.vue new file mode 100644 index 000000000..0d8aab2d0 --- /dev/null +++ b/src/pages/other/VideoDetail2.vue @@ -0,0 +1,201 @@ + + + + + \ No newline at end of file diff --git a/src/pages/shop/GoodsDetail.vue b/src/pages/shop/GoodsDetail.vue index ce9421258..0106cdef7 100644 --- a/src/pages/shop/GoodsDetail.vue +++ b/src/pages/shop/GoodsDetail.vue @@ -56,7 +56,7 @@
- +
{{ state.index + 1 }}/{{ state.detail.imgs.length }}
@@ -66,20 +66,20 @@
￥ - 8 - .8 + {{ state.detail.price }} +
热销款券后
￥ - 5 - .9 + {{ state.detail.real_price }} +
{{ state.detail.name }}
-
已售20/100
+
已售{{ state.detail.sold }}
@@ -145,9 +145,9 @@
推荐 18
商用服务好 15
-
+
- + 花***栽
@@ -159,14 +159,31 @@ china款/超值【买る双+送2双】共5双
- + +
+ +
+
+ + 花***栽 +
+
+
+
+ 东西不错质量也很好 性价比很高 良心商家就冲这图必须给好评 +
+
+ china款/超值【买る双+送2双】共5双 +
+
+
- +
店铺名
@@ -207,9 +224,36 @@
-
- -
【热销中】袜子男潮流百搭中筒袜子袜子男潮流百搭中筒袜子
+
+ +
小米电视6 65" OLED 65英寸
+
+ ￥ + 8 + .8 +
+
+
+ +
红白撞色条纹软糯针织上衣女2022年秋季新款甜美减龄短款毛衣开衫
+
+ ￥ + 8 + .8 +
+
+
+ +
森马t恤男2023男士纯棉上衣白色情侣装凉感短袖打底衫纯色体恤潮
+
+ ￥ + 8 + .8 +
+
+
+ +
ins潮牌长袖t恤男宽松纯色内搭上衣潮牌百搭秋冬季潮流帅气打底衫
￥ 8 @@ -221,7 +265,7 @@
-
+
商品详情 @@ -229,7 +273,7 @@
- +
@@ -254,34 +298,39 @@ 你可以还会喜欢 -
-
-
- -
-
- {{ item.name }} -
-
{{ item.discount }}
-
-
- ￥ -
{{ item.price }}
+ + +
@@ -312,19 +361,21 @@