* update

add introduce video lugia-web version update
lugia-ysstech · Sep 12, 2019 · 658ff95 · 658ff95
1 parent 15d1136
commit 658ff95
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.1",
   "private": true,
   "dependencies": {
-    "@lugia/lugia-web": "^1.1.4",
+    "@lugia/lugia-web": "^1.1.7",
     "@lugia/lugiax": "^1.0.13",
     "@lugia/lugiax-router": "^1.0.16",
     "clipboard": "^2.0.4",

diff --git a/src/home/index.js b/src/home/index.js
@@ -343,7 +343,7 @@ const spendLineRight = keyframes`
     height:0px;
   }
   100% {
-    height:1100px;
+    height:1800px;
   }
 `;
 
@@ -393,9 +393,22 @@ const CardTitle = styled.div`
   text-align: center;
 `;
 
+const VideoBox = styled.div`
+ width:1068px;
+ height: 601px;
+ margin: 118px 0 56px;
+ position: relative;
+ z-index: 10;
+ 
+ & > iframe{
+    width:100%;
+    height:100%;
+ }
+`;
+
 const ModelThird = styled.div`
   width:100%;
-  padding:226px 50px 0 53% ;
+  padding:120px 50px 0 53% ;
   position:relative;
   min-height:800px;
   position:relative;
@@ -411,7 +424,7 @@ const TextBox = styled.div`
 const SquareRight = styled.div`
   position:absolute;
   right:5px;
-  top:220px;
+  top:110px;
   width:22px;
   background:#4d63ff;
   border-radius:22px;
@@ -536,6 +549,10 @@ export default class Pages extends React.Component<any, any> {
                 </DesignCardBox>
               </ModelTwo>
               <LineRight/>
+              <VideoBox>
+                <iframe src="//player.bilibili.com/player.html?aid=67434572&cid=116925497&page=1" scrolling="no"
+                        border="0" frameBorder="no" framespacing="0" allowFullScreen="true" />
+              </VideoBox>
               <ModelThird>
                 <BgImg3 src={pic3}/>
                 <BgImg4 src={pic4}/>

diff --git a/src/mobile/home/index.js b/src/mobile/home/index.js
@@ -409,6 +409,19 @@ const CardTitle = styled.div`
   text-align: center;
 `;
 
+
+const VideoBox = styled.div`
+ width: 100%;
+ height: 288px;
+ padding: 25px 20px;
+ & > iframe{
+    width:100%;
+    height:100%;
+    z-index: 10;
+ }
+`;
+
+
 const ModelThird = styled.div`
   width:100%;
   padding: 45px 0 0;
@@ -573,6 +586,10 @@ export default class Pages extends React.Component<any, any> {
 
             </DesignCardBox>
           </ModelTwo>
+          <VideoBox>
+            <iframe src="//player.bilibili.com/player.html?aid=67434572&cid=116925497&page=1" scrolling="no"
+                    border="0" frameBorder="no" framespacing="0" allowFullScreen="true" />
+          </VideoBox>
           <ModelThird>
             <Design>解决方案</Design>
             <Square/>

diff --git a/yarn.lock b/yarn.lock
@@ -1038,10 +1038,10 @@
     immutable "^3.8.2"
     yargs "^13.2.2"
 
-"@lugia/lugia-web@^1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@lugia/lugia-web/-/lugia-web-1.1.4.tgz#890416ef02cfd968557c9d4a4ffcbc38796d234c"
-  integrity sha512-6PRyDS3u3BFTce0TRCogM4wjyQ4DluDfTTPtpiiv71zxmZ1J9WaPB1Jo/AJlCMfGdNfZcbfvm+S/gMZYe77MJw==
+"@lugia/lugia-web@^1.1.7":
+  version "1.1.7"
+  resolved "https://registry.npm.taobao.org/@lugia/lugia-web/download/@lugia/lugia-web-1.1.7.tgz?cache=0&sync_timestamp=1568275400158&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40lugia%2Flugia-web%2Fdownload%2F%40lugia%2Flugia-web-1.1.7.tgz#0a87727da9fe4aa33818c7faddd094805bcbd9b5"
+  integrity sha1-Codyfan+SqM4GMf63dCUgFvL2bU=
   dependencies:
     "@lugia/css" "^1.0.18"
     "@lugia/math" "^1.0.8"