diff --git a/package.json b/package.json
index b88f13a..2c50d42 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,14 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
+    "bezier-easing": "^2.1.0",
     "canvas-sketch-util": "^1.10.0",
     "matter-js": "^0.14.2",
     "node-sass": "^4.13.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",
+    "react-swipeable": "^5.5.1",
     "three": "^0.117.1",
     "touches": "^1.2.2"
   },
diff --git a/src/App.js b/src/App.js
index 7b9c289..f0835d5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from "react";
-
 import * as posenet from "@tensorflow-models/posenet";
-import Wall from "./wall/Wall";
-import Sphere from "./wall/Sphere";
+import Wall from "./models/Wall";
+import Sphere from "./models/Sphere";
 import createTouches from "touches";
 import "./App.scss";
-import images from "./images/image-helper";
+import shops from "./data/Shops";
+import Shop from "./components/shop";
 const videoWidth = 600;
 const videoHeight = 500;
 const width = window.innerWidth;
@@ -15,23 +15,16 @@ const displacement = 600;
 const POSENET_URL =
   "https://lg-cjdqwkbo-1256266248.cos.ap-shanghai.myqcloud.com/mobile-net/50/model-stride16.json";
 
-const Mist = ({ style }) => (
-  <div className="mist" style={style}>
-    <div className="ball"></div>
-    <div className="text">
-      touch <br />
-      item
-    </div>
-  </div>
-);
-
 const App = () => {
   const [posenetModel, setPosenetModel] = useState(undefined);
   const [video, setVideo] = useState(undefined);
+  const [shopIndex, setShopIndex] = useState(0);
   const [wall, setWall] = useState(undefined);
   const [sphere, setSphere] = useState(undefined);
   const [list, setList] = useState([]);
-
+  const [minutes, setMinutes] = useState(0);
+  const shop = shops[shopIndex];
+  const [itemData, setItem] = useState(null);
   async function poseDetectionFrame() {
     if (posenetModel) {
       const poses = await posenetModel.estimatePoses(video, {
@@ -94,10 +87,11 @@ const App = () => {
   }, [video]);
 
   const initWall = () => {
+    const { items, imgWidth, imgHeight } = shop;
     const wall = new Wall({
-      items: Object.values(images).map((url) => ({ url })),
-      imgWidth: 90,
-      imgHeight: 100,
+      items,
+      imgWidth,
+      imgHeight,
       containerWidth: width,
       containerHeight: height,
       speed: 1,
@@ -107,11 +101,13 @@ const App = () => {
     setWall(wall);
     return wall;
   };
+
   useEffect(() => {
     if (wall && sphere) {
       wall.attachSphere(sphere);
     }
   }, [wall]);
+
   useEffect(() => {
     if (!sphere) {
       let sphere = new Sphere({
@@ -126,6 +122,26 @@ const App = () => {
     }
   }, [sphere]);
 
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setMinutes((minutes) => minutes + 1);
+    }, 1000 * 60 * 60);
+    return () => clearInterval(interval);
+  }, []);
+
+  // useEffect(() => {
+  //   if (minutes > 0) {
+  //     wall.dispose().then(() => {
+  //       setShopIndex((shopIndex + 1) % shops.length);
+  //       setWall(null);
+  //     });
+  //   }
+  // }, [minutes]);
+
+  useEffect(() => {
+    initWall();
+  }, [shopIndex]);
+
   // useEffect(() => {
   //   if (sphere) {
   //     const container = document.querySelector(".App");
@@ -141,18 +157,29 @@ const App = () => {
   // }, [sphere]);
 
   return (
-    <div
-      className="App"
-      onClick={async (e) => {
-        await wall.dispose();
-        setWall(null);
-        initWall();
-      }}
-    >
+    <div className="App">
       {list.map(([key, el]) => (
-        <div className="block" key={key} style={el.style}></div>
+        <div
+          className="block"
+          key={key}
+          style={el.style}
+          onClick={(e) => {
+            setItem({ dom: e.target, item: el.data, shop });
+          }}
+        ></div>
       ))}
-      {sphere && <Mist style={sphere.style}></Mist>}
+      {sphere && (
+        <div className="mist" style={sphere.style}>
+          <div className="ball"></div>
+          {itemData && <Shop data={itemData}></Shop>}
+          {!itemData && (
+            <div className="text">
+              touch <br />
+              item
+            </div>
+          )}
+        </div>
+      )}
     </div>
   );
 };
diff --git a/src/App.scss b/src/App.scss
index 9fdb41c..5add751 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,9 +1,12 @@
+* {
+  box-sizing: border-box;
+}
 .App {
   position: relative;
   width: 100vw;
   height: 100vh;
   text-align: center;
-  background: rgb(218, 232, 255);
+  background: #f8f8f8;
   display: flex;
   flex-direction: column;
   overflow: hidden;
@@ -20,6 +23,7 @@
     background-position: center;
     opacity: 1;
     position: absolute;
+    border: 1px solid rgb(224, 224, 224);
   }
   .mist {
     position: absolute;
@@ -34,6 +38,7 @@
       filter: blur(50px);
       border-radius: 50%;
       background: rgba(255, 255, 255, 0.8);
+      pointer-events: none;
     }
     .text {
       text-align: center;
diff --git a/src/components/shop.js b/src/components/shop.js
new file mode 100644
index 0000000..a488539
--- /dev/null
+++ b/src/components/shop.js
@@ -0,0 +1,145 @@
+import React, { useState, useEffect } from "react";
+import { Swipeable } from "react-swipeable";
+import "./shop.scss";
+const itemVh = 380;
+const Shop = ({ data }) => {
+  const { item, shop } = data;
+  const { name, items, imgWidth, imgHeight, categoryLogoMap } = shop;
+  const categoryUrl = categoryLogoMap[item.category];
+  const list = items.filter(({ category }) => category === item.category);
+  const [index, setIndex] = useState(null);
+  const itemVw = (itemVh / imgHeight) * imgWidth;
+
+  const [stage, setStage] = useState(null);
+
+  const [phStyle, setPhStyle] = useState(null);
+  const init = () => {
+    setPhStyle({
+      position: "absolute",
+      width: itemVw + "px",
+      height: itemVh + "px",
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0,
+      margin: "auto",
+      opacity: 1,
+      backgroundImage: `url(${item.url})`,
+    });
+    setTimeout(() => {
+      setStage(1);
+    }, 1000);
+  };
+  const entrance = () => {
+    setStage(2);
+  };
+  useEffect(() => {
+    if (stage !== null && stage !== 2) return;
+    const { dom, item } = data;
+    const { width, height, left, top } = dom.getBoundingClientRect();
+    setIndex(list.findIndex(({ id }) => item.id === id));
+    setStage(-1);
+    setTimeout(() => {
+      setPhStyle({
+        position: "fixed",
+        width: width + "px",
+        height: height + "px",
+        left: left + "px",
+        top: top + "px",
+        opacity: dom.style.opacity,
+        backgroundImage: `url(${item.url})`,
+      });
+      setStage(0);
+    });
+  }, [data]);
+  useEffect(() => {
+    switch (stage) {
+      case 0:
+        init();
+        break;
+      case 1:
+        entrance();
+        break;
+      default:
+        break;
+    }
+  }, [stage]);
+
+  const pre = () => setIndex((index - 1 + list.length) % list.length);
+  const nxt = () => setIndex((index + 1 + list.length) % list.length);
+  return (
+    <>
+      {(stage === 0 || stage === 1) && (
+        <div className="ph" style={phStyle}></div>
+      )}
+      {stage >= 1 && (
+        <div className="shop">
+          <div className="up">
+            <div className="title">{name}</div>
+          </div>
+          <div className="middle">
+            <div className="arrow left" onClick={pre}>
+              {"<"}
+            </div>
+            <Swipeable className="imgs" onSwipedLeft={nxt} onSwipedRight={pre}>
+              {list.map(({ url }, i) => {
+                let leftD = index - i;
+                let rightD = i - index;
+                if (leftD < 0) leftD += list.length;
+                if (rightD < 0) rightD += list.length;
+                const isCurrent = i === index;
+                const isLeft = leftD < rightD;
+                const dis = isCurrent ? 0 : isLeft ? leftD : rightD;
+                const scale = 1 - 0.25 * dis;
+                return (
+                  <div
+                    className={"img"}
+                    style={{
+                      zIndex: 2 - dis,
+                      top: `${((1 - scale) / 2) * itemVh}px`,
+                      width: `${scale * itemVw}px`,
+                      height: `${scale * itemVh}px`,
+                      backgroundImage: `url(${url})`,
+                      opacity: dis <= 2 ? 1 : 0,
+                      ...(isCurrent
+                        ? {
+                            left: `calc(50% - ${itemVw / 2}px)`,
+                          }
+                        : isLeft
+                        ? {
+                            left:
+                              dis === 2 ? 0 : `calc((100% - ${itemVw}px) / 4)`,
+                          }
+                        : {
+                            left:
+                              dis === 2
+                                ? `calc(100% - ${scale * itemVw}px)`
+                                : `calc(100% - ((100% - ${itemVw}px) / 4) - ${
+                                    scale * itemVw
+                                  }px)`,
+                          }),
+                    }}
+                    key={url}
+                  ></div>
+                );
+              })}
+            </Swipeable>
+            <div className="arrow right" onClick={nxt}>
+              {">"}
+            </div>
+          </div>
+          <div className="down">
+            <div className="texts">
+              <div className="name">
+                <img src={categoryUrl}></img> {list[index].name}
+              </div>
+              <div className="price">{list[index].price}元</div>
+              <div>{list[index].desc}</div>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
+export default Shop;
diff --git a/src/components/shop.scss b/src/components/shop.scss
new file mode 100644
index 0000000..726fc83
--- /dev/null
+++ b/src/components/shop.scss
@@ -0,0 +1,73 @@
+.shop {
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  padding: 100px;
+  @keyframes fadeIn {
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
+  }
+  .up,
+  .down {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    animation: fadeIn 0.5s ease-in-out;
+    .title {
+      font-size: 60px;
+      margin: auto;
+    }
+    .texts {
+      margin: auto;
+    }
+  }
+  .middle {
+    position: relative;
+    flex: 0 0 380px;
+    padding: 0 40px;
+    .arrow {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      margin: auto;
+      width: 40px;
+      line-height: 40px;
+      height: 40px;
+      font-size: 40px;
+      font-weight: bold;
+      &.left {
+        left: 0;
+      }
+      &.right {
+        right: 0;
+      }
+    }
+    .imgs {
+      position: relative;
+      width: 100%;
+      height: 100%;
+      .img {
+        transition: width 1s, height 1s, top 1s, left 1s;
+        position: absolute;
+        background-size: cover;
+        background-position: center;
+        margin: auto;
+        border: 1px solid rgb(224, 224, 224);
+      }
+    }
+  }
+}
+.ph {
+  position: fixed;
+  transition: all 1s ease-out;
+  background-position: center;
+  background-size: cover;
+  border: 1px solid rgb(224, 224, 224);
+}
diff --git a/src/data/Shops.js b/src/data/Shops.js
new file mode 100644
index 0000000..0a4d8e5
--- /dev/null
+++ b/src/data/Shops.js
@@ -0,0 +1,402 @@
+import swatch from "../images/swatch/image-helper";
+import uniqlo from "../images/uniqlo/image-helper";
+import lego from "../images/lego/image-helper";
+const shops = [
+  {
+    name: "LEGO",
+    categories: ["哈利·波特", "机械组", "星球大战"],
+    categoryLogoMap: {
+      "哈利·波特": lego["HarryPotter-logo"],
+      机械组: lego["Technic-Logo"],
+      星球大战: lego["star_wars_logo"],
+    },
+    items: [
+      {
+        id: 75968,
+        url: lego[75968],
+        name: "女贞路4号",
+        category: "哈利·波特",
+        desc: `乐高®哈利·波特女贞路 4 号 (75968) 将孩子们带入《哈利·波特》系列电影中最臭名昭著的房屋之一。
+
+        带有小人仔和魔法电影场景的玩具屋
+        哈利·波特粉丝们可以使用哈利、罗恩·韦斯莱、达力·德思礼、弗农·德思礼、佩妮·德思礼和多比小人仔体验无穷乐趣。功能丰富的 2 层房屋能够为他们带来丰富多彩的创意乐趣，其中包括找到哈利位于楼下的隐蔽橱柜，通过信箱使霍格沃茨的来信涌入。
+        
+        可收藏的哈利·波特飞行汽车玩具
+        激动人心的魔法在屋外继续，罗恩驾驶着会飞的福特安格里亚车出现在楼上窗户外。孩子们可以打开行李箱，将链子连接到钩子上，窗户很快会被拉掉，然后让哈利掏出来！
+        
+        选择最棒的哈利·波特礼物
+        如果你正在寻找最理想的儿童玩具，那么乐高哈利·波特套装就是很好的选择，其可以凭借可收藏的小人仔和神奇的功能带来丰富多彩的创意乐趣。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75979,
+        url: lego[75979],
+        name: "海德薇",
+        category: "哈利·波特",
+        desc: `将海德薇的奇妙个性和优雅的动作带入现实生活，这只著名的白色猫头鹰源自《哈利·波特》系列电影。这款可收藏的乐高®哈利·波特海德薇 (75979) 展示玩具能够带来具有成就感的拼搭体验，并且展示起来非常引人注目。
+
+        可拼搭的猫头鹰海德薇 ，带有“可飞翔”的翅膀
+        这款积木拼搭版模型包含 630 块积木颗粒，展示了飞翔中的海德薇，它正在递送一封重要的信件，海德薇的翼展为 34 厘米（13 英寸）。拼搭完成后，转动手柄会使铰接式翅膀优雅地上下扇动。这款可收藏的模型站立在坚固的底板上，配有可拆下的乐高®哈利·波特小人仔和另一只较小的展开翅膀的猫头鹰海德薇。
+        
+        可收藏的哈利·波特玩具——可作为很棒的圣诞节或生日礼物
+        如果你正在为孩子或所有年龄段的哈利·波特粉丝们寻找炫酷的礼物或热门的可拼搭模型，那么乐高哈利·波特系列玩具就是很好的选择，一定能够带来丰富的魔法乐趣。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75980,
+        url: lego[75980],
+        name: "陋居攻击",
+        category: "哈利·波特",
+        desc: `乐高®哈利·波特陋居攻击 (75980) 将富有想象力的玩具屋角色扮演与《哈利·波特》系列故事中最具戏剧性的场景之一结合起来。
+
+        食死徒会烧掉陋居吗？
+        陋居——韦斯莱一家的房屋——包含如此多可供玩乐和探索的地方，打开这款非常精致的玩具屋的一侧，可为孩子提供更多玩乐空间。包含 8 个小人仔，玩乐可以立即开始。孩子们可以重现这个著名的场景：邪恶的食死徒贝拉特里克斯·莱斯特兰奇和芬里尔·格雷伯克进行攻击，其中火元件可用来重现烧毁这座房屋的烈火。
+        
+        为孩子选择哈利·波特礼物
+        如果您正在寻找一套很酷的玩具，那么乐高哈利·波特系列套装就很不错，其基于源自深受人们喜爱的电影的精彩场景。这些套装包含可收藏的小人仔、熟悉的地点和令人惊叹的功能，可将哈利·波特的魔法世界放到孩子手中。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75969,
+        url: lego[75969],
+        name: "霍格沃茨天文塔",
+        category: "哈利·波特",
+        desc: `乐高®哈利·波特霍格沃茨天文塔 (75969) 包含许多源自《哈利·波特》系列电影的标志性地点、很酷角色和逼真细节。
+
+        充满《哈利·波特》电影动作的玩具积木城堡
+        玩乐这款乐高霍格沃茨玩具套装，孩子们可以与哈利·波特、赫敏·格兰杰、霍拉斯·斯拉格霍恩、卢娜·洛夫古德、纳威·隆巴顿、罗恩·韦斯莱、拉文德·布朗 (Lavender Brown)、德拉科·马尔福和海德薇一起自由探索魔法城堡中的有趣房间。借助如此多熟悉的地点和受欢迎的角色，孩子们可以重温如《哈利·波特与混血王子》等电影中的场景和故事，编创属于自己的冒险。
+        
+        可收藏的玩具、魔法小人仔及无止歇的行动
+        如果你正在为家庭成员或最要好的朋友寻找最理想的礼物，那么乐高哈利·波特玩具就是很好的选择，其能够为喜欢使用乐高积木进行拼搭和玩乐的孩子带来丰富多彩的创意乐趣。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75966,
+        url: lego[75966],
+        name: "霍格沃茨有求必应屋",
+        category: "哈利·波特",
+        desc: `乐高®哈利·波特霍格沃茨有求必应屋 (75966) 可以将小男巫和女巫带入魔法世界，与一群朋友们一起进行秘密任务，对抗黑魔法。
+
+        《哈利·波特与凤凰社》角色扮演玩具
+        《哈利·波特》的粉丝们可以重现经典的电影时刻，使用哈利、赫敏·格兰杰和卢娜·洛夫古德创造属于他们自己的精彩冒险。“邓布利多的军队”正在神秘的有求必应屋中练习咒语。孩子们可以帮助哈利教授守护神咒。本套装包含卢娜的兔子和赫敏的水獭。能量发射器可放入小人仔的手中，射击机械食死徒。包含许多炫酷的功能和配件，魔法乐趣永无止尽！
+        
+        神秘且丰富多彩的魔法冒险
+        乐高哈利·波特系列套装可以重现电影中动作精彩丰富的场景。这些有趣的玩具套装包含受人喜爱的角色、神话中的动物和熟悉的地点，可以将魔法世界带入现实生活。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 71043,
+        url: lego[71043],
+        name: "乐高®哈利·波特系列-霍格沃兹城堡(豪华收藏版)",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75946,
+        url: lego[75946],
+        name: "三强争霸赛之匈牙利树蜂龙",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75950,
+        url: lego[75950],
+        name: "乐高®哈利·波特系列-勇闯禁忌森林",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75954,
+        url: lego[75954],
+        name: "乐高®哈利·波特系列-霍格沃茨城堡",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75953,
+        url: lego[75953],
+        name: "乐高®哈利·波特系列-霍格沃茨城门与打人柳",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75955,
+        url: lego[75955],
+        name: "乐高®哈利·波特系列-霍格沃茨特快列车",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75956,
+        url: lego[75956],
+        name: "乐高®哈利·波特系列-魁地奇球赛",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75958,
+        url: lego[75958],
+        name: "布斯巴顿魔法学校的飞行马车",
+        category: "哈利·波特",
+        desc: `玩乐这款乐高®哈利·波特 75958 布斯巴顿魔法学校的飞行马车拼搭套装，让你的想象力跟随马车一起飞翔。年轻的巫师们将会再现电影《哈利·波特与火焰杯》中惊心动魄的一幕：一辆华丽的飞行马车疾速赶往霍格沃茨，海格正在等候，准备引导马车安全着陆。一旦来到地面，可将这辆马车重新拼搭为 2 层的卧室和茶点区，这里是与马克西姆夫人、芙蓉·德拉库尔和加布丽·德拉库尔一起计划新冒险的理想地点。这款布斯巴顿魔法学校的马车套装包含 4 个小人仔和 2 匹飞马（拥有可以活动的翅膀、腿部和头部），可以把哈利·波特的粉丝们载往一个充满想象力的神奇世界。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75947,
+        url: lego[75947],
+        name: "海格小屋-营救巴克比克",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75945,
+        url: lego[75945],
+        name: "疾疾护法现身",
+        category: "哈利·波特",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75957,
+        url: lego[75957],
+        name: "骑士巴士",
+        category: "哈利·波特",
+        desc: `让年轻的女巫或男巫们乘坐乐高®哈利·波特 75957 骑士巴士，体验旅行生活！当孩子们赶上紫色的三层巴士时，他们知道自己将会经历一次疯狂的旅行。这款神奇的玩具巴士游戏套装拥有无尽的玩乐可能，可通过它的铰接式侧部面板轻松进入内部，还可以拆下车顶，欣赏汽车顶层。一旦装好哈利的行李箱，就该紧紧抓住汽车了。当这辆汽车快速行驶、转弯躲闪和颠簸起伏时，孩子们会喜欢上床铺来回滑动和吊灯在顶篷上晃来晃去的样子。包含 3 个小人仔`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42111,
+        url: lego[42111],
+        name: "Dom's Dodge Charger 道奇Charger （速度与激情同款）",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42115,
+        url: lego[42115],
+        name: "Lamborghini Sián FKP 37 跑车",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42107,
+        url: lego[42107],
+        name: "杜卡迪 Ducati Panigale V4 R",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42083,
+        url: lego[42083],
+        name: "BUGATTI Chiron®",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42093,
+        url: lego[42093],
+        name: "Chevrolet Corvette ZR1 跑车",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42110,
+        url: lego[42110],
+        name: "Land Rover Defender模型",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42100,
+        url: lego[42100],
+        name: "Liebherr R 9800 挖掘机",
+        category: "机械组",
+        desc: `让这款由 4108 块积木组成的乐高机械组 Liebherr R 9800 挖掘机为你带来丰富多彩且激动人心的乐高®拼搭和玩乐体验。这款复刻版模型与 Liebherr 合作开发，其通过直观的乐高®机械组 CONTROL+ 应用程序进行控制，并由先进的智能集线器（配备 7 个电机）提供动力。先进的应用程序技术可实现超精确的运动和惊人的功能，同时通过 4 个带有炫酷图形的不同控制屏幕，还可提供逼真的数字游戏。这些多功能控制屏幕能够帮助用户控制机车向各个方向移动、转动上部结构、延伸并抬升吊杆、打开并倾斜铲斗、播放逼真的音效，以及获得实时反馈，如吊杆位置、功耗和驾驶距离。通过单触式屏幕，用户可以使用拖动模式来控制吊杆、挖掘臂和铲斗，而自定义拼搭屏幕能够使他们选择预设的指令或记录模型的动作，创建复杂的运动序列。并且，用户可以通过“挑战与成绩”界面完成挑战，解锁成就徽章。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42096,
+        url: lego[42096],
+        name: "Porsche 911 RSR赛车",
+        category: "机械组",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 42078,
+        url: lego[42078],
+        name: "马克卡车 MACK Anthem",
+        category: "机械组",
+        desc: `通过这款乐高®机械组版马克卡车MACK Anthem仿真模型，探索世界顶尖的工程技术和设计。这款模型由乐高集团与马克卡车有限公司共同开发，拥有一系列仿真的技术细节和功能，包括前桥转向、后轮驱动和带有可移动活塞和可旋转散热器风扇的直列6缸发动机。这辆可拆离的拖车配有可伸缩的斜撑、支撑架、具有侧面装载能力的同步伸缩式起重臂，以及一个可装载的集中箱，其带有可锁闭的车门，而驾驶舱配有可打开的车门、可调座椅、精致的仪表板、方向盘、遮阳板和一张双层床。这款2合1高级拼搭套装还配有马克斗牛犬引擎盖标志，并可重拼为标志性的马克LR垃圾车。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75288,
+        url: lego[75288],
+        name: "AT-AT步行机",
+        category: "星球大战",
+        desc: `玩乐这款 AT-AT (75288) 乐高®儿童拼搭组合，重温霍斯战役及其它经典的《星球大战》三部曲场景。这款全地形装甲运输车辆的不同部分可以打开，以便于轻松玩乐，其还配有弹簧发射器和内部的飞行摩托 (speeder bike)。粉丝们还会喜欢上系列逼真的细节，如拉起卢克的绞车及他的热能手雷。
+
+        帝国对战义军联盟
+        这款动作丰富的套装包含 6 个乐高小人仔：卢克·天行者、维尔斯将军、2 名 AT-AT 驾驶员和 2 名冲锋队员。他们全配有武器，其中包括卢克的光剑、冲锋队员的三角架机枪，能够启发有趣的星球大战角色扮演。这款套装既适于单独玩乐，也可以群体玩乐，可作为乐高星球大战收藏者的很棒礼物。
+        
+        对乐高星球大战套装的喜爱之情！
+        二十多年来，乐高集团一直在重现星球大战世界中的标志性星际飞船、交通工具、地点和人物，并且乐高星球大战已成为一个非常成功的主题。精彩纷呈，难以取舍`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75274,
+        url: lego[75274],
+        name: "TIE 战斗机飞行员头盔",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75276,
+        url: lego[75276],
+        name: "冲锋队员头盔",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75286,
+        url: lego[75286],
+        name: "格里弗斯将军的星际战斗机",
+        category: "星球大战",
+        desc: `玩乐这款超棒的乐高®星球大战太空飞船儿童拼搭玩具：雷沃斯将军的星际战斗机 (75286)，开启一个充满冒险的创意玩乐世界！粉丝们会喜欢上这些逼真且富有启发性的功能，如可打开的驾驶舱、弹簧发射器和可伸缩的起落架。
+
+        格雷沃斯将军对战欧比旺
+        这款拼搭套装包含 3 个配有武器的乐高®小人仔：格雷沃斯将军、欧比旺·克诺比和克隆人空降兵，孩子们可以对《星球大战：西斯的复仇》中的经典战斗进行角色扮演，或者编创属于他们自己的故事。这款拼搭组合非常适合单独或群体玩乐，是乐高藏品的不错补充，可作为年轻星球大战粉丝的超级礼物。
+        
+        乐高风格的星球大战行动！
+        自 1999 年以来，乐高集团一直致力于使用积木创造标志性的星球大战星际战机、交通工具、地点和人物。它已成为一个非常成功的主题，拥有一系列能够令所有年龄段粉丝心动不已的有趣拼装玩具！`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75291,
+        url: lego[75291],
+        name: "死星决战",
+        category: "星球大战",
+        desc: `玩乐这款乐高®星球大战：绝地归来拼搭套装，孩子们可以演绎卢克·天行者与达斯·维德之间的经典死星对决 (75291)。帕尔帕庭大帝的宫殿包含许多能够启发创意玩乐的很酷功能，其中包括乐高小人仔原力跳跃功能。楼梯和桥可以坍塌，达斯·维德还可以把大帝扔进反应堆坑井，就像经典情景一样。
+
+        行动角色扮演
+        这款死星拼搭组合能够提供测试性拼搭挑战，还包含 5 个乐高星球大战小人仔，配有光剑和长矛 (force pike)，可供粉丝们进行动作丰富的战斗角色扮演。本组合还附有密码，可以解锁电子游戏《乐高®星球大战：天行者传奇》中的角色。
+        
+        超棒的礼物
+        自 1999 年以来，乐高集团一直致力于重现星球大战世界中标志性的星际飞船、交通工具、地点和人物。乐高星球大战现在是其最成功的主题，能够为不同年龄段的粉丝提供激动人心的礼物。`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75283,
+        url: lego[75283],
+        name: "装甲突击坦克 (AAT)",
+        category: "星球大战",
+        desc: `玩乐这款乐高®星球大战：克隆人战争装甲突击坦克 (AAT) 拼搭套装(75283)，孩子们可以长时间体验经典战斗行动的乐趣。AAT 包含大量逼真的细节，其中包括可打开的舱门（内部可容纳战斗机器人）、乐高小人仔、2 个弹簧发射器及带有升降式大炮的可旋转炮塔，能够启发有趣且富有创意的玩乐。
+
+        501 军团大战战斗机器人！
+        这款充满精彩行动的套装包含 2 个乐高星球大战小人仔（阿索卡·塔诺和她的克隆人士兵）、AAT 驾驶员战斗机器人、战斗机器人，以及各式武器，可供启发精彩的角色扮演。这款玩具拼搭组合既适于单独玩乐，也可以群体玩乐，可作为一份超棒的礼物，丰富粉丝们的乐高星球大战藏品。
+        
+        乐高风格的星球大战行动！
+        自 1999 年以来，乐高集团一直致力于使用积木创造标志性的星球大战星际战机、交通工具、地点和人物。它已成为一个非常成功的主题，拥有一系列能够令所有年龄段粉丝心动不已的套装！`,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75252,
+        url: lego[75252],
+        name: "Imperial Star Destroyer™",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75192,
+        url: lego[75192],
+        name: "豪华千年隼",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75237,
+        url: lego[75237],
+        name: "帝国钛战机(4+版)",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75234,
+        url: lego[75234],
+        name: "AT-AP 全地形攻击步行机",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75254,
+        url: lego[75254],
+        name: "AT-ST步行机侵袭者",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75218,
+        url: lego[75218],
+        name: "X-翼星际战机(经典战役版)",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+      {
+        id: 75181,
+        url: lego[75181],
+        name: "Y-翼星际战机",
+        category: "星球大战",
+        desc: ``,
+        price: Math.floor(Math.random() * 100) + 100,
+      },
+    ],
+    imgWidth: 100,
+    imgHeight: 90,
+  },
+  {
+    name: "UNIQLO",
+    items: Object.values(uniqlo).map((url, i) => ({
+      id: i,
+      url,
+      name: "衣服" + i,
+      price: Math.floor(Math.random() * 100) + 100,
+    })),
+    imgWidth: 90,
+    imgHeight: 100,
+  },
+  {
+    name: "SWATCH",
+    items: Object.values(swatch).map((url, i) => ({
+      id: i,
+      url,
+      name: "手表" + i,
+      price: Math.floor(Math.random() * 500) + 200,
+    })),
+    imgWidth: 120,
+    imgHeight: 200,
+  },
+];
+export default shops;
diff --git a/src/images/lego/42078.jpg b/src/images/lego/42078.jpg
new file mode 100644
index 0000000..040453b
Binary files /dev/null and b/src/images/lego/42078.jpg differ
diff --git a/src/images/lego/42083.jpg b/src/images/lego/42083.jpg
new file mode 100644
index 0000000..f7c4bf1
Binary files /dev/null and b/src/images/lego/42083.jpg differ
diff --git a/src/images/lego/42093.jpg b/src/images/lego/42093.jpg
new file mode 100644
index 0000000..e974d87
Binary files /dev/null and b/src/images/lego/42093.jpg differ
diff --git a/src/images/lego/42096.jpg b/src/images/lego/42096.jpg
new file mode 100644
index 0000000..d260954
Binary files /dev/null and b/src/images/lego/42096.jpg differ
diff --git a/src/images/lego/42100.jpg b/src/images/lego/42100.jpg
new file mode 100644
index 0000000..7a41ca3
Binary files /dev/null and b/src/images/lego/42100.jpg differ
diff --git a/src/images/lego/42107.jpg b/src/images/lego/42107.jpg
new file mode 100644
index 0000000..bdee309
Binary files /dev/null and b/src/images/lego/42107.jpg differ
diff --git a/src/images/lego/42110.jpg b/src/images/lego/42110.jpg
new file mode 100644
index 0000000..0a17a34
Binary files /dev/null and b/src/images/lego/42110.jpg differ
diff --git a/src/images/lego/42111.jpg b/src/images/lego/42111.jpg
new file mode 100644
index 0000000..32d3b07
Binary files /dev/null and b/src/images/lego/42111.jpg differ
diff --git a/src/images/lego/42115.jpg b/src/images/lego/42115.jpg
new file mode 100644
index 0000000..b7e3e0d
Binary files /dev/null and b/src/images/lego/42115.jpg differ
diff --git a/src/images/lego/71043.jpg b/src/images/lego/71043.jpg
new file mode 100644
index 0000000..8b0cb73
Binary files /dev/null and b/src/images/lego/71043.jpg differ
diff --git a/src/images/lego/75181.jpg b/src/images/lego/75181.jpg
new file mode 100644
index 0000000..4e61c49
Binary files /dev/null and b/src/images/lego/75181.jpg differ
diff --git a/src/images/lego/75192.jpg b/src/images/lego/75192.jpg
new file mode 100644
index 0000000..ef31ea2
Binary files /dev/null and b/src/images/lego/75192.jpg differ
diff --git a/src/images/lego/75218.jpg b/src/images/lego/75218.jpg
new file mode 100644
index 0000000..2bf1654
Binary files /dev/null and b/src/images/lego/75218.jpg differ
diff --git a/src/images/lego/75234.jpg b/src/images/lego/75234.jpg
new file mode 100644
index 0000000..4a0c839
Binary files /dev/null and b/src/images/lego/75234.jpg differ
diff --git a/src/images/lego/75237.jpg b/src/images/lego/75237.jpg
new file mode 100644
index 0000000..e6dfd21
Binary files /dev/null and b/src/images/lego/75237.jpg differ
diff --git a/src/images/lego/75252.jpg b/src/images/lego/75252.jpg
new file mode 100644
index 0000000..9fd6733
Binary files /dev/null and b/src/images/lego/75252.jpg differ
diff --git a/src/images/lego/75254.jpg b/src/images/lego/75254.jpg
new file mode 100644
index 0000000..44c0a5f
Binary files /dev/null and b/src/images/lego/75254.jpg differ
diff --git a/src/images/lego/75274.jpg b/src/images/lego/75274.jpg
new file mode 100644
index 0000000..93e6e8c
Binary files /dev/null and b/src/images/lego/75274.jpg differ
diff --git a/src/images/lego/75276.jpg b/src/images/lego/75276.jpg
new file mode 100644
index 0000000..c7ad433
Binary files /dev/null and b/src/images/lego/75276.jpg differ
diff --git a/src/images/lego/75283.jpg b/src/images/lego/75283.jpg
new file mode 100644
index 0000000..fd65e18
Binary files /dev/null and b/src/images/lego/75283.jpg differ
diff --git a/src/images/lego/75286.jpg b/src/images/lego/75286.jpg
new file mode 100644
index 0000000..574e7da
Binary files /dev/null and b/src/images/lego/75286.jpg differ
diff --git a/src/images/lego/75288.jpg b/src/images/lego/75288.jpg
new file mode 100644
index 0000000..52da737
Binary files /dev/null and b/src/images/lego/75288.jpg differ
diff --git a/src/images/lego/75291.jpg b/src/images/lego/75291.jpg
new file mode 100644
index 0000000..f788504
Binary files /dev/null and b/src/images/lego/75291.jpg differ
diff --git a/src/images/lego/75293.jpg b/src/images/lego/75293.jpg
new file mode 100644
index 0000000..c0e9916
Binary files /dev/null and b/src/images/lego/75293.jpg differ
diff --git a/src/images/lego/75945.jpg b/src/images/lego/75945.jpg
new file mode 100644
index 0000000..e5a69fc
Binary files /dev/null and b/src/images/lego/75945.jpg differ
diff --git a/src/images/lego/75946.jpg b/src/images/lego/75946.jpg
new file mode 100644
index 0000000..5f8f1a4
Binary files /dev/null and b/src/images/lego/75946.jpg differ
diff --git a/src/images/lego/75947.jpg b/src/images/lego/75947.jpg
new file mode 100644
index 0000000..2844eb2
Binary files /dev/null and b/src/images/lego/75947.jpg differ
diff --git a/src/images/lego/75950.jpg b/src/images/lego/75950.jpg
new file mode 100644
index 0000000..aef8378
Binary files /dev/null and b/src/images/lego/75950.jpg differ
diff --git a/src/images/lego/75953.jpg b/src/images/lego/75953.jpg
new file mode 100644
index 0000000..e299b53
Binary files /dev/null and b/src/images/lego/75953.jpg differ
diff --git a/src/images/lego/75954.jpg b/src/images/lego/75954.jpg
new file mode 100644
index 0000000..4623222
Binary files /dev/null and b/src/images/lego/75954.jpg differ
diff --git a/src/images/lego/75955.jpg b/src/images/lego/75955.jpg
new file mode 100644
index 0000000..8acd73f
Binary files /dev/null and b/src/images/lego/75955.jpg differ
diff --git a/src/images/lego/75956.jpg b/src/images/lego/75956.jpg
new file mode 100644
index 0000000..4530899
Binary files /dev/null and b/src/images/lego/75956.jpg differ
diff --git a/src/images/lego/75957.jpg b/src/images/lego/75957.jpg
new file mode 100644
index 0000000..71574b5
Binary files /dev/null and b/src/images/lego/75957.jpg differ
diff --git a/src/images/lego/75958.jpg b/src/images/lego/75958.jpg
new file mode 100644
index 0000000..8cf3d4a
Binary files /dev/null and b/src/images/lego/75958.jpg differ
diff --git a/src/images/lego/75966.jpg b/src/images/lego/75966.jpg
new file mode 100644
index 0000000..1d67734
Binary files /dev/null and b/src/images/lego/75966.jpg differ
diff --git a/src/images/lego/75968.jpg b/src/images/lego/75968.jpg
new file mode 100644
index 0000000..a5e06a8
Binary files /dev/null and b/src/images/lego/75968.jpg differ
diff --git a/src/images/lego/75969.jpg b/src/images/lego/75969.jpg
new file mode 100644
index 0000000..ea012a0
Binary files /dev/null and b/src/images/lego/75969.jpg differ
diff --git a/src/images/lego/75979.jpg b/src/images/lego/75979.jpg
new file mode 100644
index 0000000..4d89559
Binary files /dev/null and b/src/images/lego/75979.jpg differ
diff --git a/src/images/lego/75980.jpg b/src/images/lego/75980.jpg
new file mode 100644
index 0000000..445ad7c
Binary files /dev/null and b/src/images/lego/75980.jpg differ
diff --git a/src/images/lego/HarryPotter-logo.png b/src/images/lego/HarryPotter-logo.png
new file mode 100644
index 0000000..2c6bdd6
Binary files /dev/null and b/src/images/lego/HarryPotter-logo.png differ
diff --git a/src/images/lego/Technic-Logo.png b/src/images/lego/Technic-Logo.png
new file mode 100644
index 0000000..144588c
Binary files /dev/null and b/src/images/lego/Technic-Logo.png differ
diff --git a/src/images/lego/image-helper.js b/src/images/lego/image-helper.js
new file mode 100644
index 0000000..4a4a3f4
--- /dev/null
+++ b/src/images/lego/image-helper.js
@@ -0,0 +1,11 @@
+function importAll(r) {
+  let obj = {};
+  r.keys().forEach((key) => {
+    obj[key.replace("./", "").replace(".jpg", "").replace(".png", "")] = r(key);
+  });
+  return obj;
+}
+
+const uniqlo = importAll(require.context("./", false, /\.(png|jpe?g|svg)$/));
+
+export default uniqlo;
diff --git a/src/images/lego/star_wars_logo.png b/src/images/lego/star_wars_logo.png
new file mode 100644
index 0000000..98f94fe
Binary files /dev/null and b/src/images/lego/star_wars_logo.png differ
diff --git a/src/images/swatch/1.jpg b/src/images/swatch/1.jpg
new file mode 100644
index 0000000..2844af4
Binary files /dev/null and b/src/images/swatch/1.jpg differ
diff --git a/src/images/swatch/10.jpg b/src/images/swatch/10.jpg
new file mode 100644
index 0000000..3270532
Binary files /dev/null and b/src/images/swatch/10.jpg differ
diff --git a/src/images/swatch/2.jpg b/src/images/swatch/2.jpg
new file mode 100644
index 0000000..16493fa
Binary files /dev/null and b/src/images/swatch/2.jpg differ
diff --git a/src/images/swatch/3.jpg b/src/images/swatch/3.jpg
new file mode 100644
index 0000000..430401e
Binary files /dev/null and b/src/images/swatch/3.jpg differ
diff --git a/src/images/swatch/4.jpg b/src/images/swatch/4.jpg
new file mode 100644
index 0000000..fe499a8
Binary files /dev/null and b/src/images/swatch/4.jpg differ
diff --git a/src/images/swatch/5.jpg b/src/images/swatch/5.jpg
new file mode 100644
index 0000000..8049f10
Binary files /dev/null and b/src/images/swatch/5.jpg differ
diff --git a/src/images/swatch/6.jpg b/src/images/swatch/6.jpg
new file mode 100644
index 0000000..6f9a67c
Binary files /dev/null and b/src/images/swatch/6.jpg differ
diff --git a/src/images/swatch/7.jpg b/src/images/swatch/7.jpg
new file mode 100644
index 0000000..fabb0e5
Binary files /dev/null and b/src/images/swatch/7.jpg differ
diff --git a/src/images/swatch/8.jpg b/src/images/swatch/8.jpg
new file mode 100644
index 0000000..065a003
Binary files /dev/null and b/src/images/swatch/8.jpg differ
diff --git a/src/images/swatch/9.jpg b/src/images/swatch/9.jpg
new file mode 100644
index 0000000..2d755f9
Binary files /dev/null and b/src/images/swatch/9.jpg differ
diff --git a/src/images/image-helper.js b/src/images/swatch/image-helper.js
similarity index 66%
rename from src/images/image-helper.js
rename to src/images/swatch/image-helper.js
index 729f2a4..6d67f16 100644
--- a/src/images/image-helper.js
+++ b/src/images/swatch/image-helper.js
@@ -6,6 +6,6 @@ function importAll(r) {
   return obj;
 }
 
-const images = importAll(require.context("./", false, /\.(png|jpe?g|svg)$/));
+const swatch = importAll(require.context("./", false, /\.(png|jpe?g|svg)$/));
 
-export default images;
+export default swatch;
diff --git a/src/images/1.jpg b/src/images/uniqlo/1.jpg
similarity index 100%
rename from src/images/1.jpg
rename to src/images/uniqlo/1.jpg
diff --git a/src/images/10.jpg b/src/images/uniqlo/10.jpg
similarity index 100%
rename from src/images/10.jpg
rename to src/images/uniqlo/10.jpg
diff --git a/src/images/11.jpg b/src/images/uniqlo/11.jpg
similarity index 100%
rename from src/images/11.jpg
rename to src/images/uniqlo/11.jpg
diff --git a/src/images/12.jpg b/src/images/uniqlo/12.jpg
similarity index 100%
rename from src/images/12.jpg
rename to src/images/uniqlo/12.jpg
diff --git a/src/images/13.jpg b/src/images/uniqlo/13.jpg
similarity index 100%
rename from src/images/13.jpg
rename to src/images/uniqlo/13.jpg
diff --git a/src/images/14.jpg b/src/images/uniqlo/14.jpg
similarity index 100%
rename from src/images/14.jpg
rename to src/images/uniqlo/14.jpg
diff --git a/src/images/2.jpg b/src/images/uniqlo/2.jpg
similarity index 100%
rename from src/images/2.jpg
rename to src/images/uniqlo/2.jpg
diff --git a/src/images/3.jpg b/src/images/uniqlo/3.jpg
similarity index 100%
rename from src/images/3.jpg
rename to src/images/uniqlo/3.jpg
diff --git a/src/images/4.jpg b/src/images/uniqlo/4.jpg
similarity index 100%
rename from src/images/4.jpg
rename to src/images/uniqlo/4.jpg
diff --git a/src/images/5.jpg b/src/images/uniqlo/5.jpg
similarity index 100%
rename from src/images/5.jpg
rename to src/images/uniqlo/5.jpg
diff --git a/src/images/6.jpg b/src/images/uniqlo/6.jpg
similarity index 100%
rename from src/images/6.jpg
rename to src/images/uniqlo/6.jpg
diff --git a/src/images/7.jpg b/src/images/uniqlo/7.jpg
similarity index 100%
rename from src/images/7.jpg
rename to src/images/uniqlo/7.jpg
diff --git a/src/images/8.jpg b/src/images/uniqlo/8.jpg
similarity index 100%
rename from src/images/8.jpg
rename to src/images/uniqlo/8.jpg
diff --git a/src/images/9.jpg b/src/images/uniqlo/9.jpg
similarity index 100%
rename from src/images/9.jpg
rename to src/images/uniqlo/9.jpg
diff --git a/src/images/uniqlo/image-helper.js b/src/images/uniqlo/image-helper.js
new file mode 100644
index 0000000..84268a5
--- /dev/null
+++ b/src/images/uniqlo/image-helper.js
@@ -0,0 +1,11 @@
+function importAll(r) {
+  let obj = {};
+  r.keys().forEach((key) => {
+    obj[key.replace("./", "").replace(".jpg", "")] = r(key);
+  });
+  return obj;
+}
+
+const uniqlo = importAll(require.context("./", false, /\.(png|jpe?g|svg)$/));
+
+export default uniqlo;
diff --git a/src/wall/Sphere.js b/src/models/Sphere.js
similarity index 100%
rename from src/wall/Sphere.js
rename to src/models/Sphere.js
diff --git a/src/wall/Wall.js b/src/models/Wall.js
similarity index 72%
rename from src/wall/Wall.js
rename to src/models/Wall.js
index fde22ff..2018367 100644
--- a/src/wall/Wall.js
+++ b/src/models/Wall.js
@@ -1,5 +1,9 @@
 import { Vector3 } from "three";
-const g = 0.55 / 1000;
+import BezierEasing from "bezier-easing";
+const easeIn = BezierEasing(0.5, 0.16, 0.74, 0.38);
+const easeOut = BezierEasing(0, 0, 0.58, 1);
+const enterDuration = 3000;
+const exitDuration = 5000;
 class El {
   constructor(seed) {
     const { data, row, wall, key, index } = seed;
@@ -16,10 +20,10 @@ class El {
       scale = ((1 - displacementAmount / sphere.displacement) / 1) * 0.3 + 0.7;
       direction.setLength(displacementAmount);
       direction.add(point);
-      point.lerp(direction, 0.725); // ✨ magic number
+      point.lerp(direction, 0.725);
     }
     if (point.distanceTo(targetPoint) > 0.01) {
-      point.lerp(targetPoint, 0.27); // ✨ magic number
+      point.lerp(targetPoint, 0.27);
     }
     const top = point.y - imgHeight / 2;
     const left = point.x - imgWidth / 2;
@@ -31,7 +35,8 @@ class El {
       left: `${left}px`,
       backgroundImage: `url(${url})`,
       transform: `scale(${scale})`,
-      zIndex: row.size - Math.floor(Math.abs(row.size / 2 - row.index)),
+      opcaity: scale,
+      zIndex: wall.rowNum - Math.floor(Math.abs(wall.rowNum / 2 - row.index)),
     };
     Object.assign(this, { seed, data, style, key, point });
   }
@@ -39,18 +44,22 @@ class El {
 }
 
 class Row {
-  falled = false;
   q = [];
+  est;
   fst;
   t1;
   t2;
   constructor({ wall, index }) {
+    const initY = index * wall.blockHeight + wall.blockHeight / 2;
+    const offsetY = initY - wall.containerHeight - wall.blockHeight;
     Object.assign(this, {
       wall,
-      minSize: wall.colNum + 1,
+      minSize: wall.colNum + 2,
       index,
       ratio: Math.random(),
-      y: index * wall.blockHeight + wall.blockHeight / 2,
+      initY,
+      y: offsetY,
+      offsetY,
     });
   }
   get size() {
@@ -85,14 +94,24 @@ class Row {
       this.wall.elMap.set(el.key, new El(el.seed));
     });
   }
-  fall(now) {
+  enter(now) {
+    if (!this.est) {
+      this.est = now;
+    } else {
+      this.y =
+        this.offsetY +
+        (this.wall.containerHeight + this.wall.blockHeight) *
+          easeOut((now - this.est) / enterDuration);
+    }
+    this.update();
+  }
+  exit(now) {
     if (!this.fst) {
       this.fst = now;
-      this.t1 = 0;
     } else {
-      this.t2 = now - this.fst;
-      this.y += (g * (this.t2 * this.t2 - this.t1 * this.t1)) / 2;
-      this.t1 = this.t2;
+      this.y =
+        this.initY +
+        this.wall.containerHeight * easeIn((now - this.fst) / exitDuration);
     }
     this.update();
   }
@@ -113,7 +132,8 @@ class Row {
 export default class Wall {
   #rafID = null;
   #lastTime;
-  falling = false;
+  entering = false;
+  exiting = false;
   rows = [];
   key = 0;
   time = 0;
@@ -128,12 +148,12 @@ export default class Wall {
     speed,
     onListChange,
   }) {
-    const colNum = Math.floor(containerWidth / imgWidth);
-    const rowNum = Math.floor(containerHeight / imgHeight);
+    const colNum = Math.floor(containerWidth / imgWidth) - 1;
+    const rowNum = Math.floor(containerHeight / imgHeight) - 1;
     const elNum = items.length;
     const ratioSpeed = speed / (containerWidth / colNum);
-    const blockWidth = containerWidth / (colNum - 1);
-    const blockHeight = containerHeight / (rowNum - 1);
+    const blockWidth = containerWidth / colNum;
+    const blockHeight = containerHeight / rowNum;
     const elMap = new Map();
     Object.assign(this, {
       items,
@@ -155,7 +175,7 @@ export default class Wall {
     const { items } = this;
     return items[Math.floor(Math.random() * items.length)];
   }
-  init() {
+  async init() {
     const { rowNum } = this;
     for (let i = 0; i < rowNum; i++) {
       const row = new Row({ wall: this, index: i });
@@ -164,6 +184,13 @@ export default class Wall {
     }
     this.#rafID = window.requestAnimationFrame(this.animate);
     this.isRunning = true;
+    this.entering = true;
+    await new Promise((resolve) => {
+      setTimeout(() => {
+        this.entering = false;
+        resolve();
+      }, enterDuration);
+    });
     return this;
   }
   animate = () => {
@@ -171,7 +198,11 @@ export default class Wall {
     const now = performance.now();
     const dt = Math.min(this.maxDeltaTime, (now - this.#lastTime) / 1000);
     this.rows.forEach((row) =>
-      this.falling ? row.fall(now) : row.nextFrame(this.ratioSpeed)
+      this.entering
+        ? row.enter(now)
+        : this.exiting
+        ? row.exit(now)
+        : row.nextFrame(this.ratioSpeed)
     );
     this.getList();
     this.time += dt;
@@ -180,17 +211,16 @@ export default class Wall {
   };
   async dispose() {
     if (this.#rafID === null) return;
-    this.falling = true;
+    this.exiting = true;
     await new Promise((resolve) => {
       setTimeout(() => {
-        this.falling = false;
+        this.exiting = false;
         window.cancelAnimationFrame(this.#rafID);
         this.#rafID = null;
         this.isRunning = false;
         resolve();
-      }, Math.sqrt((this.containerHeight * 2) / g) + 500);
+      }, exitDuration + 500);
     });
-
     return this;
   }
   getKey() {
diff --git a/yarn.lock b/yarn.lock
index f28c509..61c36e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2146,6 +2146,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bezier-easing@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/bezier-easing/download/bezier-easing-2.1.0.tgz#c04dfe8b926d6ecaca1813d69ff179b7c2025d86"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -7975,6 +7979,12 @@ react-scripts@3.4.1:
   optionalDependencies:
     fsevents "2.1.2"
 
+react-swipeable@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.npm.taobao.org/react-swipeable/download/react-swipeable-5.5.1.tgz#48ae6182deaf62f21d4b87469b60281dbd7c4a76"
+  dependencies:
+    prop-types "^15.6.2"
+
 react@^16.13.1:
   version "16.13.1"
   resolved "https://registry.npm.taobao.org/react/download/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"