diff --git a/src/App.css b/src/App.css index b5686ad..cc98f58 100644 --- a/src/App.css +++ b/src/App.css @@ -52,7 +52,6 @@ border: 3px solid #494949; display: inline-block; height: 62px; - line-height: 62px; width: 62px; cursor: pointer; outline: none; @@ -67,7 +66,7 @@ } .pane-btn + .pane-btn { - margin-left: 10px; + margin-left: 14px; } .generate-btn { diff --git a/src/Components/deviceFrame/index.css b/src/Components/deviceFrame/index.css index a6ba0f9..7374629 100644 --- a/src/Components/deviceFrame/index.css +++ b/src/Components/deviceFrame/index.css @@ -22,21 +22,20 @@ right: 24px; top: 82px; background: #DBDBDB; + width: 156px; + text-align: center; border-radius: 5px; padding-top: 14px; - padding-left: 14px; - padding-right: 14px; padding-bottom: 11px; } .qrCode p { display: flex; + justify-content: center; align-items: center; - padding-left: 22px; color: #666666; font-size: 14px; } .qrCode img { - margin-left: 8px; } \ No newline at end of file diff --git a/src/Components/deviceFrame/index.js b/src/Components/deviceFrame/index.js index 447cd98..e64ea79 100644 --- a/src/Components/deviceFrame/index.js +++ b/src/Components/deviceFrame/index.js @@ -19,14 +19,12 @@ var configMap = { bkg: androidVPng, rotate: true, width: "666px", - height: "321px", - offsetv: "4px", + height: "321px" }, "android-v": { bkg: androidVPng, - width: "321px", + width: "323px", height: "666px", - offsetv: "5px", }, "iphone-h": { bkg: iphoneVPng, @@ -40,16 +38,15 @@ var configMap = { height: "693px", }, "ipad-h": { - bkg: ipadHPng, - width: "433px", - height: "326px", - offsetv: "5px", + bkg: ipadVPng, + rotate: true, + width: "460px", + height: "320px", }, "ipad-v": { bkg: ipadVPng, - width: "324px", - height: "433px", - offsetv: "5px", + width: "320px", + height: "460px", }, }; @@ -82,7 +79,7 @@ function DeviceFrame(props) {

{t("scan")} setOpenPopup(true)}> - 复制链接 + 复制链接

diff --git a/src/Components/pane/index.js b/src/Components/pane/index.js index ea21864..88d3192 100644 --- a/src/Components/pane/index.js +++ b/src/Components/pane/index.js @@ -79,37 +79,50 @@ function Pane(props) { return (
- +
+ {props.loading ? ( + + ) : ( + project && ( + + ) + )} +
-
+
{_device.name} {_device.name}
@@ -152,34 +163,7 @@ function Pane(props) { ))} -
- {props.loading ? ( - - ) : ( - project && ( - - ) - )} -
+ {!props.hideLogo &&
logo
}
); diff --git a/src/images/iPad-v.png b/src/images/iPad-v.png index 7975360..e61ec54 100644 Binary files a/src/images/iPad-v.png and b/src/images/iPad-v.png differ