update rewrite the home page.

diff --git a/package.json b/package.json
index 10d084a..2c61d57 100644 (file)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "chrome-extension-wallet",
     "description": "Bytom Chrome Extension Wallet",
     "version": "0.6.0",
-    "author": "yanbo@it709.com",
+    "author": "zhiting.fly@8btc.com",
     "license": "MIT",
     "private": true,
     "scripts": {
@@ -62,4 +62,4 @@
         "webpack-dev-server": "^2.9.1",
         "webpack-merge": "^4.1.2"
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/fonts/iconfont.eot b/src/assets/fonts/iconfont.eot
new file mode 100644 (file)
index 0000000..3be1a0f
Binary files /dev/null and b/src/assets/fonts/iconfont.eot differ

diff --git a/src/assets/fonts/iconfont.svg b/src/assets/fonts/iconfont.svg
new file mode 100644 (file)
index 0000000..cda560b
--- /dev/null
+++ b/src/assets/fonts/iconfont.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="icon--check" unicode="&#58885;" d="M0 896m170.666667 0l682.666666 0q170.666667 0 170.666667-170.666667l0-682.666666q0-170.666667-170.666667-170.666667l-682.666666 0q-170.666667 0-170.666667 170.666667l0 682.666666q0 170.666667 170.666667 170.666667ZM216.007111 353.223111l65.649778 65.820445 131.697778-131.640889 329.329777 328.988444 65.820445-65.820444-329.329778-328.988445-65.820444-65.991111z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--openeye" unicode="&#58886;" d="M861.226667 384a442.624 442.624 0 0 1-698.453334 0 442.624 442.624 0 0 1 698.453334 0zM125.952 439.466667a505.386667 505.386667 0 0 0 772.650667-0.682667l22.229333-28.544a42.666667 42.666667 0 0 0 0-52.48l-22.784-29.226667a505.386667 505.386667 0 0 0-772.650667 0.682667l-22.229333 28.544a42.666667 42.666667 0 0 0 0 52.48zM617.557333 399.36a106.666667 106.666667 0 1 0-90.197333 90.197333 64 64 0 0 1 90.197333-90.197333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--github" unicode="&#58887;" d="M981.333333 372.266667a475.946667 475.946667 0 0 0-89.6-282.88 460.8 460.8 0 0 0-231.338666-173.781334 25.898667 25.898667 0 0 0-24.106667 4.266667 25.301333 25.301333 0 0 0-7.68 18.773333v132.48a113.109333 113.109333 0 0 1-31.744 88.917334 409.301333 409.301333 0 0 1 62.634667 11.306666 246.272 246.272 0 0 1 57.429333 24.405334 171.989333 171.989333 0 0 1 49.493333 41.685333 195.84 195.84 0 0 1 32.426667 65.749333 324.266667 324.266667 0 0 1 12.501333 94.293334 185.301333 185.301333 0 0 1-48.256 129.024 170.666667 170.666667 0 0 1-4.906666 127.786666 78.464 78.464 0 0 1-49.493334-6.869333 325.717333 325.717333 0 0 1-56.234666-27.562667l-23.210667-15.061333a430.464 430.464 0 0 1-234.666667 0q-9.813333 6.912-25.984 17.066667a362.666667 362.666667 0 0 1-51.2 24.106666 83.754667 83.754667 0 0 1-52.522666 8.533334 172.202667 172.202667 0 0 1-4.266667-127.786667 185.173333 185.173333 0 0 1-48.298667-129.024 320.981333 320.981333 0 0 1 12.501334-93.866667 204.330667 204.330667 0 0 1 32.085333-65.792 165.504 165.504 0 0 1 49.194667-41.984 245.461333 245.461333 0 0 1 57.472-24.405333 407.466667 407.466667 0 0 1 62.634666-11.306667 102.4 102.4 0 0 1-29.866666-64.512 118.229333 118.229333 0 0 0-27.52-9.386666 168.277333 168.277333 0 0 0-34.816-3.114667 70.869333 70.869333 0 0 0-40.021334 13.44 109.866667 109.866667 0 0 0-34.133333 39.168 100.096 100.096 0 0 1-29.653333 32.554667 88.661333 88.661333 0 0 1-30.250667 15.061333l-12.202667 1.877333a38.954667 38.954667 0 0 1-17.749333-2.816 5.376 5.376 0 0 1-3.029333-7.253333 34.602667 34.602667 0 0 1 5.504-8.533333 46.933333 46.933333 0 0 1 7.936-7.509334l4.266666-3.114666a74.325333 74.325333 0 0 0 26.581334-23.808 155.178667 155.178667 0 0 0 19.242666-31.957334l6.144-14.421333a79.317333 79.317333 0 0 1 26.88-38.4 94.122667 94.122667 0 0 1 40.96-18.773333 253.013333 253.013333 0 0 1 42.666667-4.266667 171.989333 171.989333 0 0 1 33.92 2.218667l14.08 2.474666q0-23.808 0.256-55.722666l0.341333-33.834667a24.789333 24.789333 0 0 0-7.978666-18.773333 26.666667 26.666667 0 0 0-24.405334-4.266667 460.245333 460.245333 0 0 0-231.338666 173.824A486.4 486.4 0 0 0 276.48 788.778667a462.122667 462.122667 0 0 0 471.082667 0 473.258667 473.258667 0 0 0 170.666666-174.933334 479.829333 479.829333 0 0 0 62.933334-241.493333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--closeeye" unicode="&#58888;" d="M958.72 243.242667a37.077333 37.077333 0 0 0-8.96-23.04c-1.28-1.152-2.56-2.432-3.84-2.432a24.917333 24.917333 0 0 0-19.2-6.528 31.829333 31.829333 0 0 0-23.168 8.96l-56.192 56.448a479.445333 479.445333 0 0 0-172.928-101.12l20.48-75.52a38.4 38.4 0 0 0-3.712-24.448 28.757333 28.757333 0 0 0-20.48-15.36 21.333333 21.333333 0 0 0-8.96-1.152 25.6 25.6 0 0 0-14.208 3.84 24.533333 24.533333 0 0 0-13.952 19.072l-20.48 76.8a511.104 511.104 0 0 0-101.12-10.24 511.104 511.104 0 0 0-101.12 10.24l-20.48-76.8a29.568 29.568 0 0 0-14.08-19.072 33.152 33.152 0 0 0-24.32-2.688 27.861333 27.861333 0 0 0-19.2 14.208 27.776 27.776 0 0 0-3.84 24.192l20.48 76.8a478.890667 478.890667 0 0 0-172.8 101.248l-56.32-56.448a36.778667 36.778667 0 0 0-23.04-8.96 31.530667 31.530667 0 0 0-19.2 6.528c-1.28 1.28-2.56 1.28-3.84 2.432a31.018667 31.018667 0 0 0-8.96 23.04 30.250667 30.250667 0 0 0 8.96 21.888l34.56 34.432 21.76 21.76a2484.608 2484.608 0 0 0-28.8 36.992 39.168 39.168 0 0 0 0 50.048c7.424 9.984 15.786667 19.157333 22.186667 26.581333a392.789333 392.789333 0 0 1 37.333333-52.181333 212.778667 212.778667 0 0 1 14.08-16.64 304.213333 304.213333 0 0 1 46.08-44.8 420.821333 420.821333 0 0 1 144.64-83.2 348.842667 348.842667 0 0 1 61.44-17.92 450.944 450.944 0 0 1 84.48-7.552 450.944 450.944 0 0 1 84.48 7.552 344.362667 344.362667 0 0 1 61.312 17.92 419.626667 419.626667 0 0 1 144.64 83.2 305.024 305.024 0 0 1 46.208 44.8c5.12 5.12 13.738667 15.957333 18.858667 22.229333a304.426667 304.426667 0 0 1 33.237333 46.933333c6.4-7.424 14.208-16.853333 21.333333-26.837333a39.04 39.04 0 0 0 0-50.048c-12.8-16.768-27.392-35.456-28.8-36.992l21.76-21.76 34.56-34.432a36.650667 36.650667 0 0 0 9.130667-21.973333"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--uncheck" unicode="&#58889;" d="M28.444444 867.555556m142.222223 0l682.666666 0q142.222222 0 142.222223-142.222223l0-682.666666q0-142.222222-142.222223-142.222223l-682.666666 0q-142.222222 0-142.222223 142.222223l0 682.666666q0 142.222222 142.222223 142.222223ZM853.333333 839.111111a113.777778 113.777778 0 0 0 113.777778-113.777778v-682.666666a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666m0 56.888889H170.666667a171.178667 171.178667 0 0 1-170.666667-170.666667v-682.666666a171.178667 171.178667 0 0 1 170.666667-170.666667h682.666666a171.178667 171.178667 0 0 1 170.666667 170.666667v682.666666a171.178667 171.178667 0 0 1-170.666667 170.666667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--send" unicode="&#58890;" d="M0.028443-127.943114V384.028443h204.788623v-102.394312H102.422754v-307.182934h819.154492v307.182934h-102.394312V384.028443H1023.971557v-511.971557z m459.067829 423.514249V706.741181L328.827954 582.445864 259.029165 657.07994 512.3982 896l250.809177-238.92006L694.034331 582.445864 561.433698 706.741181v-411.226932z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--option" unicode="&#58891;" d="M85.333333 746.666667h853.333334V640H85.333333zM85.333333 128h853.333334v-106.666667H85.333333zM85.333333 437.333333h853.333334v-106.666666H85.333333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--refresh" unicode="&#58893;" d="M511.957333-85.333333a465.962667 465.962667 0 0 0-331.861333 137.472 462.506667 462.506667 0 0 0-135.338667 287.701333l152.874667-114.176A354.133333 354.133333 0 0 1 325.12 85.76a350.506667 350.506667 0 0 1 186.837333-53.802667 349.525333 349.525333 0 0 1 200.533334 62.890667 352.170667 352.170667 0 0 1 127.317333 161.109333h123.733333a468.522667 468.522667 0 0 0-119.978666-203.861333A465.962667 465.962667 0 0 0 511.957333-85.333333zM42.666667 341.333333l258.645333-129.322666L213.333333 128zM512 853.290667a465.92 465.92 0 0 0 331.861333-137.472 462.677333 462.677333 0 0 0 135.381334-288.170667l-134.997334 72.533333A352.725333 352.725333 0 0 1 512 735.872a348.074667 348.074667 0 0 1-218.24-75.989333A354.133333 354.133333 0 0 1 170.666667 469.290667H50.602667a465.066667 465.066667 0 0 0 129.834666 246.570666A465.877333 465.877333 0 0 0 512 853.290667zM981.333333 426.624l-259.072 132.053333L810.666667 639.957333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--setting" unicode="&#58894;" d="M769.3312-59.1872H256.1536L0 383.9488l254.2592 443.2384h513.1776l256.512-443.2384-254.5664-443.136zM299.5712 749.2096l-209.5616-365.2608 211.0976-365.2608h422.9632l209.8688 365.2608-211.4048 365.2608h-422.912zM512 230.4c-84.6848 0-153.6 68.9152-153.6 153.6s68.9152 153.6 153.6 153.6c84.6336 0 153.5488-68.9152 153.5488-153.6s-68.9152-153.6-153.6-153.6z m0 245.1968A91.648 91.648 0 0 1 420.352 384a91.648 91.648 0 0 1 183.296 0c0 50.4832-41.1136 91.5968-91.648 91.5968z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--support" unicode="&#58895;" d="M204.8-76.8a102.4 102.4 0 0 0-102.4 102.4V742.4a102.4 102.4 0 0 0 102.4 102.4h614.4a102.4 102.4 0 0 0 102.4-102.4v-716.8a102.4 102.4 0 0 0-102.4-102.4z m614.4 76.8a25.6 25.6 0 0 1 25.6 25.6V742.4a25.6 25.6 0 0 1-25.6 25.6h-51.2V384l-153.6 51.2-153.6-51.2V768H317.44v-768zM179.2 742.4v-716.8a25.6 25.6 0 0 1 25.6-25.6h51.2v768H204.8a25.6 25.6 0 0 1-25.6-25.6zM614.4 499.2512l92.8256-30.72V768.1024h-185.856v-299.5712l92.928 30.72z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--create" unicode="&#58896;" d="M512.0512-128a512.6144 512.6144 0 0 0-512 512 512.6144 512.6144 0 0 0 512 512 512.5632 512.5632 0 0 0 512-512 512.5632 512.5632 0 0 0-512-512z m0 947.2a435.7632 435.7632 0 0 1-435.2-435.2 435.712 435.712 0 0 1 435.2-435.2 435.6608 435.6608 0 0 1 435.2 435.2 435.6608 435.6608 0 0 1-435.2 435.2zM473.6 128v217.6H256.0512v76.8h217.6V640h76.8v-217.6h217.6v-76.8h-217.6V128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--wallet" unicode="&#58897;" d="M179.968 540.672L445.44 584.8576l322.56-558.6944-265.472-44.288L179.968 540.672M121.4464 604.0064a56.7808 56.7808 0 0 1-20.6336-77.5168l342.784-593.7664a56.7808 56.7808 0 0 1 58.368-27.5968l305.5104 50.8928a56.32 56.32 0 0 1 39.9872 84.3776L504.6784 634.1632a56.7808 56.7808 0 0 1-58.4704 27.2384l-305.408-50.5344a56.32 56.32 0 0 1-19.3536-6.8608zM613.3248 596.8896l65.4848 37.8368-110.08 190.6176A56.7296 56.7296 0 0 1 491.1616 846.336L109.0048 625.664a56.6784 56.6784 0 0 1-20.736-77.4656l12.5952-21.8112a56.7808 56.7808 0 0 0 20.5824 77.6192 56.32 56.32 0 0 0 19.3536 6.8608l131.7376 21.9136 240.0256 138.5984zM714.24 421.9904l126.1056-218.3168-65.536-37.7856 37.7856-65.4848 81.92 47.3088a56.7296 56.7296 0 0 1 20.8384 77.4144L779.776 459.776z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--backup" unicode="&#58898;" d="M512.3584 883.2l489.9328-282.88-486.7584-282.88L25.6 600.32z m2.7136-488.3968l353.7408 205.5168-355.9424 205.6192-353.8432-205.6192L515.072 394.752M823.552 409.9584l45.1072-26.0608-353.28-205.3632-356.1984 205.568 45.3632 26.368-66.9184 38.6048L25.7536 384.1024l489.9328-282.8288 486.4 282.6752-112.0256 64.6144zM823.808 193.6384l45.0048-26.0096-353.7408-205.568-356.0448 205.6192 45.4656 26.4192-66.9184 38.6048L25.6 167.68l489.9328-282.8288 486.7072 282.88-111.9744 64.6144z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--back" unicode="&#58899;" d="M56.874667 379.690667l422.4 422.4L554.666667 726.698667 207.701333 379.733333 554.666667 32.768l-75.392-75.392z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--close" unicode="&#58900;" d="M515.925333 310.912l-318.08-318.08-69.077333 69.162667 317.952 318.037333-318.037333 318.037333 69.162666 69.162667 318.08-318.08 318.08 318.08 69.162667-69.162667-318.037333-318.037333 318.037333-318.037333-69.162667-69.162667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--dropdown" unicode="&#58901;" d="M457.1648 257.8432L204.8 510.208l54.8352 54.8352L512 312.6784l252.3648 252.3648L819.2 510.208l-307.2-307.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon--receive" unicode="&#58902;" d="M0-128v341.276454h340.423263v-341.276454z m84.636561 84.920958h171.150141v171.662056H84.636561z m383.879131-84.807199V341.312004H0v85.319113h553.948564v-469.255124h468.572571v-85.319114z m469.937677 213.240904v255.957341h-170.638227v-255.957341h-85.319114v341.276454h341.73149v-341.276454z m-254.990391 469.255124v341.276454h340.423263v-341.276454z m84.75032 84.807199h171.036383V811.135922h-171.036383zM468.515692 554.609787v341.276454h85.319113v-341.276454zM0 554.609787v341.276454h340.423263v-341.276454z m84.636561 84.807199h171.150141V811.135922H84.636561z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf
new file mode 100644 (file)
index 0000000..41cd90f
Binary files /dev/null and b/src/assets/fonts/iconfont.ttf differ

diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff
new file mode 100644 (file)
index 0000000..0a10574
Binary files /dev/null and b/src/assets/fonts/iconfont.woff differ

diff --git a/src/assets/fonts/iconfont.woff2 b/src/assets/fonts/iconfont.woff2
new file mode 100644 (file)
index 0000000..5c3081f
Binary files /dev/null and b/src/assets/fonts/iconfont.woff2 differ

diff --git a/src/assets/img/backgroundHead/protocol.svg b/src/assets/img/backgroundHead/protocol.svg
new file mode 100644 (file)
index 0000000..05dc0cb
--- /dev/null
+++ b/src/assets/img/backgroundHead/protocol.svg
@@ -0,0 +1,39 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="320" height="80" viewBox="0 0 320 80">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: url(#linear-gradient);
+      }
+
+      .cls-2 {
+        fill: url(#linear-gradient-2);
+      }
+
+      .cls-3 {
+        opacity: 0.372;
+        clip-path: url(#clip-path);
+      }
+
+      .cls-4 {
+        fill: #281ad3;
+      }
+    </style>
+    <linearGradient id="linear-gradient" y1="1" x2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#035bd4"/>
+      <stop offset="1" stop-color="#3cffda"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" y1="1" x2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#035bd4"/>
+      <stop offset="1" stop-color="#b43cff"/>
+    </linearGradient>
+    <clipPath id="clip-path">
+      <path id="Rectangle_5307" data-name="Rectangle 5307" class="cls-1" d="M4,0H316a4,4,0,0,1,4,4V80a0,0,0,0,1,0,0H0a0,0,0,0,1,0,0V4A4,4,0,0,1,4,0Z" transform="translate(20 20)"/>
+    </clipPath>
+  </defs>
+  <g id="background-head" transform="translate(-20 -20)">
+    <path id="Rectangle_5308" data-name="Rectangle 5308" class="cls-2" d="M4,0H316a4,4,0,0,1,4,4V80a0,0,0,0,1,0,0H0a0,0,0,0,1,0,0V4A4,4,0,0,1,4,0Z" transform="translate(20 20)"/>
+    <g id="Mask_Group_107" data-name="Mask Group 107" class="cls-3">
+      <ellipse id="Ellipse_130" data-name="Ellipse 130" class="cls-4" cx="204.5" cy="151.481" rx="204.5" ry="151.481" transform="translate(-84 -168.466)"/>
+    </g>
+  </g>
+</svg>

diff --git a/src/assets/img/icon/neticon.svg b/src/assets/img/icon/neticon.svg
new file mode 100644 (file)
index 0000000..f393b33
--- /dev/null
+++ b/src/assets/img/icon/neticon.svg
@@ -0,0 +1,50 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #035bd4;
+      }
+
+      .cls-2 {
+        fill: none;
+      }
+
+      .cls-3 {
+        clip-path: url(#clip-path);
+      }
+
+      .cls-4 {
+        fill: url(#radial-gradient);
+      }
+
+      .cls-5 {
+        fill: url(#radial-gradient-2);
+      }
+    </style>
+    <clipPath id="clip-path">
+      <path id="Path_4940" data-name="Path 4940" class="cls-1" d="M13.047,5.751A4.5,4.5,0,1,1,4.5,7.72a4.481,4.481,0,0,1,.418-1.9,2.283,2.283,0,0,0-.414-2.6h0a2.246,2.246,0,0,0-3.6.56,9.089,9.089,0,0,0-.677,6A9,9,0,0,0,18,7.72a8.955,8.955,0,0,0-.879-3.884,2.257,2.257,0,0,0-3.628-.609h0A2.211,2.211,0,0,0,13.047,5.751Z" transform="translate(0 -2.559)"/>
+    </clipPath>
+    <radialGradient id="radial-gradient" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox">
+      <stop offset="0"/>
+      <stop offset="0.259" stop-color="#101010"/>
+      <stop offset="1" stop-color="#035bd4"/>
+    </radialGradient>
+    <radialGradient id="radial-gradient-2" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0f76ff"/>
+      <stop offset="1" stop-color="#035bd4"/>
+    </radialGradient>
+  </defs>
+  <g id="icon-18-mainnet" transform="translate(6021 -335)">
+    <path id="Path_4938" data-name="Path 4938" d="M9,0a9,9,0,1,0,9,9A9,9,0,0,0,9,0ZM9,13.5A4.5,4.5,0,1,1,13.5,9,4.5,4.5,0,0,1,9,13.5Z" transform="translate(-6021 335)"/>
+    <g id="icon-12-loading" transform="translate(-6003 335) rotate(90)">
+      <path id="Path_4936" data-name="Path 4936" class="cls-2" d="M9,0a9,9,0,1,0,9,9A9,9,0,0,0,9,0ZM9,13.5A4.5,4.5,0,1,1,13.5,9,4.5,4.5,0,0,1,9,13.5Z" transform="translate(0)"/>
+      <path id="Path_4937" data-name="Path 4937" class="cls-1" d="M13.047,5.751A4.5,4.5,0,1,1,4.5,7.72a4.481,4.481,0,0,1,.418-1.9,2.283,2.283,0,0,0-.414-2.6h0a2.246,2.246,0,0,0-3.6.56,9.089,9.089,0,0,0-.677,6A9,9,0,0,0,18,7.72a8.955,8.955,0,0,0-.879-3.884,2.257,2.257,0,0,0-3.628-.609h0A2.211,2.211,0,0,0,13.047,5.751Z" transform="translate(0 1.28)"/>
+      <g id="Mask_Group_2" data-name="Mask Group 2" class="cls-3" transform="translate(0 3.839)">
+        <path id="Path_4941" data-name="Path 4941" class="cls-4" d="M8.688-.353A10.277,10.277,0,1,1-1.589,9.924,10.277,10.277,0,0,1,8.688-.353Z" transform="translate(6.738 -8.483)"/>
+      </g>
+      <g id="Mask_Group_1" data-name="Mask Group 1" class="cls-3" transform="translate(0 3.839)">
+        <path id="Path_4942" data-name="Path 4942" class="cls-5" d="M9.1-.628A9.738,9.738,0,1,1-.641,9.11,9.738,9.738,0,0,1,9.1-.628Z" transform="translate(-6.296 -7.129)"/>
+      </g>
+    </g>
+  </g>
+</svg>

diff --git a/src/assets/language/cn.js b/src/assets/language/cn.js
index 2fedb40..cb90fba 100644 (file)
--- a/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@ -1,10 +1,17 @@
 const cn = {
+  home:{
+    title:"比原钱包"
+  },
   welcome: {
     title: '欢迎使用BYTOM精简Chrome钱包',
     use: '开始',
     terms: '使用条款',
     confirm: '确认',
-    cancel: '取消'
+    cancel: '取消',
+    register: '注册',
+    restore: '恢复',
+    term1:'我同意',
+    term2:'使用条款'
   },
   dialog: {
     header: '提示',
@@ -40,12 +47,12 @@ const cn = {
     tips:'提示：点击地址进行拷贝。'
   },
   main: {
-    mainNet: 'BYTOM主网络',
-    testNet: 'BYTOM测试网络',
-    soloNet: 'BYTOM单机网络',
-    mainNetShort: 'BYTOM主网络',
-    testNetShort: 'BYTOM测试网络',
-    soloNetShort: 'BYTOM单机网络',
+    mainNet: 'Bytom主网络',
+    testNet: 'Bytom测试网络',
+    soloNet: 'Bytom单机网络',
+    mainNetShort: 'Bytom主网络',
+    testNetShort: 'Bytom测试网络',
+    soloNetShort: 'Bytom单机网络',
     copy: '点击复制',
     send: '发送',
     receive: '接收',
@@ -91,7 +98,8 @@ const cn = {
     passwordAgain: '两次密码不一致，请检查后再试。',
     inputAlias: '请输入账户别名',
     inputKey: '请输入秘钥别名',
-    inputPass: '请输入密码'
+    inputPass: '请输入密码',
+    agreeService:'请阅读并同意使用条款。'
   },
   help: {
     title: '帮助',

diff --git a/src/assets/language/en.js b/src/assets/language/en.js
index 9cc5268..2f0e62a 100644 (file)
--- a/src/assets/language/en.js
+++ b/src/assets/language/en.js
@@ -1,10 +1,17 @@
 const en = {
+  home:{
+    title:"Bytom Wallet"
+  },
   welcome: {
     title: 'Welcome to the BYTOM Chrome Wallet',
     use: 'Start',
     terms: 'Terms of Use',
-    confirm: 'Confirm',
-    cancel: 'Cancel'
+    confirm: 'I agree',
+    cancel: 'Cancel',
+    register: 'Register',
+    restore: 'Restore',
+    term1:'I agree with ',
+    term2:'Service Agreement'
   },
   dialog: {
     header: 'Warning',
@@ -40,12 +47,12 @@ const en = {
     tips:'Tips: Click address to copy directly.'
   },
   main: {
-    mainNet: 'BYTOM MainNet',
-    testNet: 'BYTOM TestNet',
-    soloNet: 'BYTOM SoloNet',
-    mainNetShort: 'MainNet',
-    testNetShort: 'TestNet',
-    soloNetShort: 'SoloNet',
+    mainNet: 'Bytom Mainnet',
+    testNet: 'Bytom Testnet',
+    soloNet: 'Bytom Solonet',
+    mainNetShort: 'Mainnet',
+    testNetShort: 'Testnet',
+    soloNetShort: 'Solonet',
     copy: 'Click to copy',
     send: 'Send',
     receive: 'Receive',
@@ -79,20 +86,21 @@ const en = {
   },
   createAccount: {
     title: 'Create Account',
-    accountAlias: 'AccountAlias',
-    keyAlias: 'KeyAlias',
-    keyPassword: 'KeyPassword',
-    confirmPassword: 'ConfirmPassword',
-    create: 'Create',
+    accountAlias: 'Account Alias',
+    keyAlias: 'Key Alias',
+    keyPassword: 'Key Password',
+    confirmPassword: 'Confirm Password',
+    create: 'Create an account',
     select: 'Select network',
     file: 'Backup file',
-    import: 'Import',
+    import: 'Import from backup',
     back: 'Back',
     passwordAgain:
       'The passwords are inconsistent twice. Please check and try again.',
     inputAlias: 'Please enter the account alias.',
     inputKey: 'Please enter the key alias.',
-    inputPass: 'Please enter your password.'
+    inputPass: 'Please enter your password.',
+    agreeService:'Please read and agree the service term.'
   },
   help: {
     title: 'Help',

diff --git a/src/assets/style.css b/src/assets/style.css
index abc746b..4919050 100644 (file)
--- a/src/assets/style.css
+++ b/src/assets/style.css
@@ -50,6 +50,7 @@ select {
 
 a {
   text-decoration: none;
+  cursor: pointer;
 }
 
 #app,
@@ -90,7 +91,7 @@ a {
 
 h1,
 h2 {
-  font-weight: normal;
+  font-weight: 500;
 }
 
 ul {
@@ -111,19 +112,27 @@ hr {
   margin: 10px 0;
 }
 
-@font-face {
-  font-family: 'iconfont';
-  src: url('//at.alicdn.com/t/font_806738_pnniif0zn4q.eot?t=1540652693831'); /* IE9*/
-  src: url('//at.alicdn.com/t/font_806738_pnniif0zn4q.eot?t=1540652693831#iefix')
-      format('embedded-opentype'),
-    /* IE6-IE8 */
-      url('data:application/x-font-woff;charset=utf-8;base64,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')
-      format('woff'),
-    url('//at.alicdn.com/t/font_806738_pnniif0zn4q.ttf?t=1540652693831')
-      format('truetype'),
-    /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-      url('//at.alicdn.com/t/font_806738_pnniif0zn4q.svg?t=1540652693831#iconfont')
-      format('svg'); /* iOS 4.1- */
+/*@font-face {*/
+  /*font-family: 'iconfont';*/
+  /*src: url('//at.alicdn.com/t/font_806738_pnniif0zn4q.eot?t=1540652693831'); !* IE9*!*/
+  /*src: url('//at.alicdn.com/t/font_806738_pnniif0zn4q.eot?t=1540652693831#iefix')*/
+      /*format('embedded-opentype'),*/
+    /*!* IE6-IE8 *!*/
+      /*url('data:application/x-font-woff;charset=utf-8;base64,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')*/
+      /*format('woff'),*/
+    /*url('//at.alicdn.com/t/font_806738_pnniif0zn4q.ttf?t=1540652693831')*/
+      /*format('truetype'),*/
+    /*!* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+      /*url('//at.alicdn.com/t/font_806738_pnniif0zn4q.svg?t=1540652693831#iconfont')*/
+      /*format('svg'); !* iOS 4.1- *!*/
+/*}*/
+@font-face {font-family: "iconfont";
+  src: url('./fonts/iconfont.eot?t=1552960629612'); /* IE9 */
+  src: url('./fonts/iconfont.eot?t=1552960629612#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('./fonts/iconfont.woff?t=1552960629612') format('woff'),
+  url('./fonts/iconfont.ttf?t=1552960629612') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('./fonts/iconfont.svg?t=1552960629612#iconfont') format('svg'); /* iOS 4.1- */
 }
 
 .iconfont {
@@ -135,59 +144,76 @@ hr {
 }
 
 .icon-menu:before {
-  content: '\e612';
+  content: "\e60b";
 }
 
-.icon-import:before {
-  content: '\e606';
+.icon-close:before {
+  content: "\e614";
 }
 
-.icon-erweima:before {
-  content: '\e7dd';
+.icon-back:before {
+  content: "\e613";
+  font-size: 25px;
+  line-height: 55px;
+  margin-left: 20px;
+  cursor: pointer;
 }
 
-.icon-plusbox:before {
-  content: '\ea06';
+.icon--check:before {
+  content: "\e605";
 }
 
-.icon-backup:before {
-  content: '\e623';
+.icon--openeye:before {
+  content: "\e606";
 }
 
-.icon-close:before {
-  content: '\e605';
+.icon--github:before {
+  content: "\e607";
 }
 
-.icon-icon-qihuan:before {
-  content: '\e60d';
+.icon--closeeye:before {
+  content: "\e608";
 }
 
-.icon-settings:before {
-  content: '\e6cb';
+.icon--uncheck:before {
+  content: "\e609";
 }
 
-.icon-help:before {
-  content: '\e603';
+.icon--send:before {
+  content: "\e60a";
 }
 
-.icon-user:before {
-  content: '\e607';
+.icon--refresh:before {
+  content: "\e60d";
 }
-.icon-back:before {
-  content: '\e67d';
-  font-size: 35px;
-  line-height: 60px;
-  margin-left: 15px;
-  cursor: pointer;
+
+.icon--setting:before {
+  content: "\e60e";
 }
 
-.icon-ios-checkmark-circle:before {
-  content: '\e627';
+.icon--support:before {
+  content: "\e60f";
 }
-.icon-arrow-right:before {
-  content: '\e660';
+
+.icon--create:before {
+  content: "\e610";
+}
+
+.icon--wallet:before {
+  content: "\e611";
+}
+
+.icon--backup:before {
+  content: "\e612";
+}
+
+.icon--dropdown:before {
+  content: "\e615";
 }
 
+.icon--receive:before {
+  content: "\e616";
+}
 .color-black {
   color: #010101;
 }
@@ -321,7 +347,7 @@ hr {
   text-align: center;
   margin: 0;
   background: #dddddd;
-  padding: 10px 20px;
+  padding: 12px 20px;
   height: 48px;
   line-height: 24px;
   border-radius: 0.2rem;
@@ -369,7 +395,7 @@ hr {
   cursor: pointer;
 }
 .btn-group {
-  padding: 0px 45px;
+  padding: 0px 20px;
   line-height: 55px;
 }
 
@@ -430,10 +456,15 @@ select {
 }
 .form-item-content {
   position: relative;
-  line-height: 32px;
-  border-bottom: 1px solid #E0E0E0;
   margin-bottom: 5px;
 }
+.form-item-content input{
+  border-bottom: 1px solid #E0E0E0;
+  padding-bottom: 5px;
+}
+.form-item-content input:focus{
+  border-bottom: 1px solid #035BD4;
+}
 
 .center-text{
   text-align: center;

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 41e9ed7..800f508 100644 (file)
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -153,6 +153,9 @@
     padding: 0 0.25em;
     transition: opacity .25s;
   }
+  .selected-color-black{
+    color: #000 !important;
+  }
   .v-select.single .selected-tag {
     background-color: transparent;
     border-color: transparent;
@@ -320,7 +323,7 @@
       <div class="vs__selected-options" ref="selectedOptions">
         <slot v-for="option in valueAsArray" name="selected-option-container"
               :option="(typeof option === 'object')?option:{[label]: option}" :deselect="deselect" :multiple="multiple" :disabled="disabled">
-          <span class="selected-tag" v-bind:key="option.index">
+          <span :class="selectTag" v-bind:key="option.index">
             <slot name="selected-option" v-bind="(typeof option === 'object')?option:{[label]: option}">
               {{ getOptionLabel(option) }}
             </slot>
@@ -699,6 +702,10 @@
       selectOnTab: {
         type: Boolean,
         default: false
+      },
+      colorBlack: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -1095,6 +1102,13 @@
        */
       showClearButton() {
         return !this.multiple && this.clearable && !this.open && this.mutableValue != null
+      },
+
+      selectTag() {
+        return{
+          'selected-tag ': true,
+          'selected-color-black': this.colorBlack
+        }
       }
     },
   }

diff --git a/src/popup.js b/src/popup.js
index a71353e..3112aaa 100644 (file)
--- a/src/popup.js
+++ b/src/popup.js
@@ -49,7 +49,7 @@ const router = new VueRouter(RouterConfig)
 router.beforeEach((to, from, next) => {
   // wallet init
   if (localStorage.login == undefined && to.name == 'home') {
-    next({ name: 'welcome' })
+    next({ name: 'welcome-creation' })
     return
   }
 

diff --git a/src/views/received.vue b/src/views/received.vue
index c25c14f..d41c62d 100644 (file)
--- a/src/views/received.vue
+++ b/src/views/received.vue
@@ -4,7 +4,7 @@
   }
   .header p{
     text-align: center;
-    width: 260px;
+    width: 270px;
     padding-top: 17px;
   }
   .panel{

diff --git a/src/views/sendTransaction/transfer.vue b/src/views/sendTransaction/transfer.vue
index ddb1e5f..ed78384 100644 (file)
--- a/src/views/sendTransaction/transfer.vue
+++ b/src/views/sendTransaction/transfer.vue
@@ -4,7 +4,7 @@
 }
 .header p{
   text-align: center;
-  width: 260px;
+  width: 270px;
   padding-top: 17px;
 }
 .balance {

diff --git a/src/views/sendTransaction/transferConfirm.vue b/src/views/sendTransaction/transferConfirm.vue
index ccb807b..ef7dad4 100644 (file)
--- a/src/views/sendTransaction/transferConfirm.vue
+++ b/src/views/sendTransaction/transferConfirm.vue
@@ -12,7 +12,7 @@
 }
 .header p{
   text-align: center;
-  width: 260px;
+  width: 270px;
   padding-top: 17px;
 }
 

diff --git a/src/views/sideMenu/homeMenu.vue b/src/views/sideMenu/homeMenu.vue
index 717b8e2..ed87a5e 100644 (file)
--- a/src/views/sideMenu/homeMenu.vue
+++ b/src/views/sideMenu/homeMenu.vue
@@ -61,7 +61,7 @@
 <template>
     <div class="bg-sideBar menu-panel warp-chlid">
         <div>
-            <i class="iconfont btn-close" @click="$router.go(-1)">&#xe605;</i>
+            <i class="iconfont btn-close" @click="$router.go(-1)">&#xe614;</i>
             <div class="menu-title">{{$t('menu.title')}}</div>
         </div>
         <div class="menu-content">

diff --git a/src/views/transferDetail.vue b/src/views/transferDetail.vue
index 70c6667..d1b1d63 100644 (file)
--- a/src/views/transferDetail.vue
+++ b/src/views/transferDetail.vue
@@ -4,7 +4,7 @@
   }
   .header p{
     text-align: center;
-    width: 260px;
+    width: 270px;
     padding-top: 17px;
   }
 

diff --git a/src/views/welcome/creation.vue b/src/views/welcome/creation.vue
index 2e7b39b..b83a708 100644 (file)
--- a/src/views/welcome/creation.vue
+++ b/src/views/welcome/creation.vue
@@ -1,33 +1,104 @@
-creation
 <style scoped>
-.content {
-    margin-left: 135px;
+/*.content {*/
+    /*margin-left: 135px;*/
+/*}*/
+/*.content-cn {*/
+    /*margin-left: 85px;*/
+/*}*/
+/*.form-item-label {*/
+    /*width: 135px;*/
+/*}*/
+/*.form-item-label-cn {*/
+    /*width: 85px;*/
+/*}*/
+  .bg-image{
+    height: 420px;
+    width: 360px;
+    background-size: contain;
+    -webkit-clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%);
+    clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%);
+    position: absolute;
+  }
+  .header {
+    position: relative;
+    text-align: center;
+    margin:20px 20px 30px;
+  }
+  .panel{
+    position: relative;
+    padding: 10px;
+  }
+  .container{
+    position: relative;
+  }
+  .form-item{
+    margin: 10px 0;
+  }
+  .btn-group{
+    padding: 0 20px;
+  }
+  .topbar{
+    height: 45px;
+    padding-top: 10px;
+  }
+.topbar .topbar-middle {
+  text-align: center;
 }
-.content-cn {
-    margin-left: 85px;
-}
-.form-item-label {
-    width: 135px;
-}
-.form-item-label-cn {
-    width: 85px;
+
+.topbar img{
+  position: relative;
+  bottom: 23px;
+  right: 65px
 }
+
+  .v-select{
+    height: 28px;
+    width: 160px;
+    background: white;
+    border-radius: 15px;
+    font-size: 14px;
+    margin: auto;
+    padding-left: 17px;
+  }
+
+  .tabs{
+    color: rgba(255,255,255, 0.4);
+    text-align: center;
+  }
+  .tabs a{
+    margin: 0px 20px;
+  }
+  .tabs .active{
+    color: rgba(255,255,255, 1);
+  }
+  .form-checkbox{
+    font-size: 14px;
+    padding: 5px;
+  }
+
 </style>
 
 <template>
     <div class="warp bg-gray">
-        <section class="login-header bg-green">
-            <img src="../../assets/logo.png">
-        </section>
-        <section class="login-content">
-            <div class="title">{{ $t('createAccount.title') }}</div>
-            <div class="form">
-                <div class="form-item">
-                    <label :class="formItemLabel">{{ $t('createAccount.select') }}</label>
-                    <div :class="formItemContent">
-                        <v-select :clearable="false" v-model="selected" style="height: 32px;font: 15;" :options="nets"></v-select>
-                    </div>
-                </div>
+      <div class="bg-image">
+      </div>
+      <div class="topbar">
+        <div v-if="activeTab === 'register'" class="topbar-middle">
+          <v-select  class="v-select" v-bind:colorBlack="true" :clearable="false" v-model="selected" :options="nets"></v-select>
+          <img src="@/assets/img/icon/neticon.svg" alt="">
+        </div>
+      </div>
+      <div class="header">
+        <h1>{{ $t('home.title')}}</h1>
+      </div>
+
+        <section class="container">
+          <div class="tabs">
+            <a v-on:click="activeTab='register'" v-bind:class="[ activeTab === 'register' ? 'active' : '' ]">{{ $t('welcome.register') }}</a>
+            <a v-on:click="activeTab='restore'" v-bind:class="[ activeTab === 'restore' ? 'active' : '' ]">{{ $t('welcome.restore') }}</a>
+          </div>
+          <div  v-if="activeTab === 'register'" >
+            <div class="form panel">
                 <div class="form-item">
                     <label :class="formItemLabel">{{ $t('createAccount.accountAlias') }}</label>
                     <div :class="formItemContent">
@@ -52,11 +123,36 @@ creation
                         <input type="password" v-model="formItem.passwd2">
                     </div>
                 </div>
-                <div class="btn-group">
-                    <div class="btn bg-green" @click="create">{{ $t('createAccount.create') }}</div>
-                    <div class="btn bg-green" @click="$router.push({ name: 'welcome-recovery' })">{{ $t('createAccount.import') }}</div>
+              <div class="form-checkbox">
+                <input type="checkbox" id="checkbox1" v-model="formItem.checked">
+                <label for="checkbox1">
+                  {{ $t('welcome.term1') }}<a class="color-green" @click="$router.push({ name: 'welcome-protocol' })">{{  $t('welcome.term2')}}</a>
+                </label>
+              </div>
+            </div>
+            <div class="btn-group">
+                <div class="btn btn-primary" @click="create">{{ $t('createAccount.create') }}</div>
+            </div>
+          </div>
+          <div v-if="activeTab === 'restore'">
+            <div class="form panel">
+              <div class="form-item">
+                <label class="form-item-label">{{ $t('createAccount.file') }}</label>
+                <div >
+                  <input type="file" @change="tirggerFile($event)">
                 </div>
+              </div>
+              <div class="form-checkbox">
+                <input type="checkbox" id="checkbox2" v-model="restore.checked">
+                <label for="checkbox2">
+                  {{ $t('welcome.term1') }}<a class="color-green" @click="$router.push({ name: 'welcome-protocol' })">{{  $t('welcome.term2')}}</a>
+                </label>
+              </div>
+            </div>
+            <div class="btn-group">
+              <div class="btn btn-primary" @click="recovery">{{ $t('createAccount.import') }}</div>
             </div>
+          </div>
         </section>
     </div>
 </template>
@@ -64,6 +160,7 @@ creation
 <script>
 import account from "../../models/account";
 import { getLanguage } from '@/assets/language'
+import getLang from "../../assets/language/sdk";
 let mainNet = null;
 let testNet = null;
 let soloNet = null;
@@ -77,8 +174,14 @@ export default {
                 accAlias: "",
                 keyAlias: "",
                 passwd1: "",
-                passwd2: ""
-            }
+                passwd2: "",
+                checked: false
+            },
+            restore:{
+                fileTxt:"",
+                checked: false
+            },
+            activeTab: 'register'
         };
     },
     computed: {
@@ -131,6 +234,12 @@ export default {
                 });
                 return;
             }
+            if (!this.formItem.checked) {
+                this.$dialog.show({
+                    body: this.$t('createAccount.agreeService'),
+                });
+                return;
+            }
             let loader = this.$loading.show({
                 container: null,
                 canCancel: true,
@@ -148,6 +257,31 @@ export default {
                 });
             });
         },
+        tirggerFile: function (event) {
+          var reader = new FileReader();
+          reader.onload = e => {
+            this.restore.fileTxt = e.target.result;
+          };
+
+          var file = event.target.files[0];
+          reader.readAsText(file);
+        },
+        recovery: function () {
+          if (!this.restore.checked) {
+            this.$dialog.show({
+              body: this.$t('createAccount.agreeService'),
+            });
+            return;
+          }
+          account.restore(this.restore.fileTxt).then(res => {
+            localStorage.login = true;
+            this.$router.push('/');
+          }).catch(error => {
+            this.$dialog.show({
+              body: getLang(error.message)
+            });
+          });
+        }
     },
     watch: {
         selected: function (value) {

diff --git a/src/views/welcome/protocol.vue b/src/views/welcome/protocol.vue
index cdb0767..df82b70 100644 (file)
--- a/src/views/welcome/protocol.vue
+++ b/src/views/welcome/protocol.vue
@@ -1,32 +1,40 @@
 <style scoped>
 .protocol {
-    height: 385px;
-    /* font-size: 12px; */
+    height: 490px;
+    padding:0;
 }
 .content {
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    max-height: 340px;
-    overflow-y: scroll;
-    font-family: "Avenir", Helvetica, Arial, sans-serif;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  max-height: 380px;
+  overflow-y: scroll;
+  margin: 20px;
 }
 .content::-webkit-scrollbar {
     width: 0 !important;
 }
+  .title{
+    background-image: url("../../assets/img/backgroundHead/protocol.svg");
+    background-size: 320px 80px;
+    height: 40px;
+    width: 280px;
+    padding: 20px;
+    color: white;
+  }
 </style>
 <template>
     <div class="warp bg-gray">
-        <section class="login-header bg-green">
-            <img src="../../assets/logo.png">
-        </section>
-        <section class="login-content protocol">
-            <div class="title" style="font-size: 17px;">{{ $t('protocol.title') }}</div>
+
+        <section class="protocol panel">
+            <div class="title" style="font-size: 17px;">
+              {{ $t('protocol.title') }}
+            </div>
             <div style="font-size: 11px; width: 100%;">
                 <pre class="content">{{ $t('protocol.content') }}</pre>
             </div>
         </section>
-        <section class="welcome-bottom bg-green">
-            <div class="btn btn-primary btn-startup" @click="$router.push({ name: 'welcome-creation' })">{{ $t('welcome.confirm') }}</div>
+        <section class="btn-group">
+            <div class="btn btn-primary btn-startup" @click="$router.go(-1)">{{ $t('welcome.confirm') }}</div>
         </section>
     </div>
 </template>
@@ -38,9 +46,6 @@ export default {
         return {};
     },
     methods: {
-        confirm: function () {
-            this.$emit("next");
-        }
     }
 };
-</script>
\ No newline at end of file
+</script>