From d374e3c57e2f8d52c0d7e2992a0d7c5906a253a4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-8UQ1PPR\\09158" Date: Mon, 30 Oct 2023 18:06:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=83=E5=93=A1=E8=B3=87=E6=96=99?= =?UTF-8?q?=E9=A0=81=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/assets/css/main.css | 197 ++++++-- src/assets/css/page/index.css | 144 ------ src/assets/images/upload.jpg | Bin 28908 -> 17820 bytes src/assets/sass/base/_global.scss | 8 +- src/assets/sass/components/_btn.scss | 7 +- src/assets/sass/layout/_layout.scss | 106 +++- src/assets/sass/page/index.scss | 109 ---- src/views/Home/index.vue | 92 +++- src/views/Member/index.vue | 709 +++++++++++++-------------- src/views/Member/index.vue.bak | 461 +++++++++++++++++ src/views/Register/index.vue | 339 ++++++------- 12 files changed, 1327 insertions(+), 849 deletions(-) delete mode 100644 src/assets/css/page/index.css delete mode 100644 src/assets/sass/page/index.scss create mode 100644 src/views/Member/index.vue.bak diff --git a/.env.development b/.env.development index b99874a..64a2508 100644 --- a/.env.development +++ b/.env.development @@ -4,9 +4,9 @@ VITE_ENV = development VITE_APP_BASE_URL = https://utel.zltest.com.tw -VITE_APP_LINE_LIFF_ID = 1656907652-p38ddKzQ +VITE_APP_LINE_LIFF_ID = 2000917272-PBWoXdOl -VITE_APP_SEND_URL = https://liff.line.me/1656907652-VJq33Pdg +VITE_APP_SEND_URL = https://liff.line.me/2000917272-PBWoXdOl VITE_APP_API_URL = https://utel.zltest.com.tw/appapi/v1 diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 9f40f9f..179907c 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -1,18 +1,31 @@ @charset "UTF-8"; @import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&family=Raleway:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); -.text-skyBlue { +.text-lightBlue { color: #b2c4ce !important; } -.bg-skyBlue { +.bg-lightBlue { background-color: #b2c4ce !important; } -.bd-skyBlue { +.bd-lightBlue { border-style: solid; border-color: #b2c4ce !important; } +.text-skyBlue { + color: #5b7b94 !important; +} + +.bg-skyBlue { + background-color: #5b7b94 !important; +} + +.bd-skyBlue { + border-style: solid; + border-color: #5b7b94 !important; +} + .text-moBlue { color: #486499 !important; } @@ -39,17 +52,17 @@ border-color: #345068 !important; } -.text-pink { - color: #fdebeb !important; +.text-lightPink { + color: #f1e6e2 !important; } -.bg-pink { - background-color: #fdebeb !important; +.bg-lightPink { + background-color: #f1e6e2 !important; } -.bd-pink { +.bd-lightPink { border-style: solid; - border-color: #fdebeb !important; + border-color: #f1e6e2 !important; } .text-cherry { @@ -298,23 +311,33 @@ h1, h2, h3, h4, h5, h6 { margin: 0; } -.btn-outline-earthGold, .btn-outline-tomatoRed, .btn-outline-limeGreen, .btn-outline-cherry, .btn-outline-pink, .btn-outline-darkBlue, .btn-outline-moBlue, .btn-outline-skyBlue, .btn-earthGold, .btn-tomatoRed, .btn-limeGreen, .btn-cherry, .btn-pink, .btn-darkBlue, .btn-moBlue, .btn-skyBlue { +.btn-outline-earthGold, .btn-outline-tomatoRed, .btn-outline-limeGreen, .btn-outline-cherry, .btn-outline-lightPink, .btn-outline-darkBlue, .btn-outline-moBlue, .btn-outline-skyBlue, .btn-outline-lightBlue, .btn-earthGold, .btn-tomatoRed, .btn-limeGreen, .btn-cherry, .btn-lightPink, .btn-darkBlue, .btn-moBlue, .btn-skyBlue, .btn-lightBlue { border-radius: 3px; } -.limit.btn-outline-earthGold, .limit.btn-outline-tomatoRed, .limit.btn-outline-limeGreen, .limit.btn-outline-cherry, .limit.btn-outline-pink, .limit.btn-outline-darkBlue, .limit.btn-outline-moBlue, .limit.btn-outline-skyBlue, .limit.btn-earthGold, .limit.btn-tomatoRed, .limit.btn-limeGreen, .limit.btn-cherry, .limit.btn-pink, .limit.btn-darkBlue, .limit.btn-moBlue, .limit.btn-skyBlue { +.limit.btn-outline-earthGold, .limit.btn-outline-tomatoRed, .limit.btn-outline-limeGreen, .limit.btn-outline-cherry, .limit.btn-outline-lightPink, .limit.btn-outline-darkBlue, .limit.btn-outline-moBlue, .limit.btn-outline-skyBlue, .limit.btn-outline-lightBlue, .limit.btn-earthGold, .limit.btn-tomatoRed, .limit.btn-limeGreen, .limit.btn-cherry, .limit.btn-lightPink, .limit.btn-darkBlue, .limit.btn-moBlue, .limit.btn-skyBlue, .limit.btn-lightBlue { width: 200px; } -.btn-skyBlue { +.btn-lightBlue { border: 1px solid #b2c4ce !important; color: #fff; background-color: #b2c4ce; } -.btn-skyBlue:hover { +.btn-lightBlue:hover { color: #fff; background-color: #93acba; } +.btn-skyBlue { + border: 1px solid #5b7b94 !important; + color: #fff; + background-color: #5b7b94; +} +.btn-skyBlue:hover { + color: #fff; + background-color: #486174; +} + .btn-moBlue { border: 1px solid #486499 !important; color: #fff; @@ -335,14 +358,14 @@ h1, h2, h3, h4, h5, h6 { background-color: #233646; } -.btn-pink { - border: 1px solid #fdebeb !important; +.btn-lightPink { + border: 1px solid #f1e6e2 !important; color: #fff; - background-color: #fdebeb; + background-color: #f1e6e2; } -.btn-pink:hover { +.btn-lightPink:hover { color: #fff; - background-color: #f8bdbd; + background-color: #e0c8c0; } .btn-cherry { @@ -385,20 +408,33 @@ h1, h2, h3, h4, h5, h6 { background-color: #ab8753; } -.btn-outline-skyBlue { +.btn-outline-lightBlue { border: 1px solid #b2c4ce; color: #b2c4ce; background-color: transparent; + background-color: #fff; +} +.btn-outline-lightBlue:hover { + color: #fff; + background-color: #b2c4ce; +} + +.btn-outline-skyBlue { + border: 1px solid #5b7b94; + color: #5b7b94; + background-color: transparent; + background-color: #fff; } .btn-outline-skyBlue:hover { color: #fff; - background-color: #b2c4ce; + background-color: #5b7b94; } .btn-outline-moBlue { border: 1px solid #486499; color: #486499; background-color: transparent; + background-color: #fff; } .btn-outline-moBlue:hover { color: #fff; @@ -409,26 +445,29 @@ h1, h2, h3, h4, h5, h6 { border: 1px solid #345068; color: #345068; background-color: transparent; + background-color: #fff; } .btn-outline-darkBlue:hover { color: #fff; background-color: #345068; } -.btn-outline-pink { - border: 1px solid #fdebeb; - color: #fdebeb; +.btn-outline-lightPink { + border: 1px solid #f1e6e2; + color: #f1e6e2; background-color: transparent; + background-color: #fff; } -.btn-outline-pink:hover { +.btn-outline-lightPink:hover { color: #fff; - background-color: #fdebeb; + background-color: #f1e6e2; } .btn-outline-cherry { border: 1px solid #E31D64; color: #E31D64; background-color: transparent; + background-color: #fff; } .btn-outline-cherry:hover { color: #fff; @@ -439,6 +478,7 @@ h1, h2, h3, h4, h5, h6 { border: 1px solid #94ac5e; color: #94ac5e; background-color: transparent; + background-color: #fff; } .btn-outline-limeGreen:hover { color: #fff; @@ -449,6 +489,7 @@ h1, h2, h3, h4, h5, h6 { border: 1px solid #f85d5d; color: #f85d5d; background-color: transparent; + background-color: #fff; } .btn-outline-tomatoRed:hover { color: #fff; @@ -459,6 +500,7 @@ h1, h2, h3, h4, h5, h6 { border: 1px solid #BC9F75; color: #BC9F75; background-color: transparent; + background-color: #fff; } .btn-outline-earthGold:hover { color: #fff; @@ -498,10 +540,109 @@ h1, h2, h3, h4, h5, h6 { display: none; } -.home { - background-color: #f1e6e2; +/* ========================================= vant ============================================= */ +.van-field__label { + position: relative; + font-weight: bold; +} +.van-field__label:before { + position: absolute; + left: -8px; +} + +.van-tabs { + padding: 20px 0 0px; +} +.van-tabs .van-tabs__wrap { + height: initial; +} +.van-tabs .van-tabs__wrap .van-tabs__nav { + padding: 0; + background-color: transparent; +} +.van-tabs .van-tabs__wrap .van-tabs__nav .van-tab.van-tab--active .tab_item { + color: #345068; +} +.van-tabs .van-tabs__wrap .van-tabs__nav .van-tab .tab_item { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + color: #5b7b94; +} +.van-tabs .van-tabs__wrap .van-tabs__nav .van-tabs__line { + bottom: 0; + background: #345068; +} + +.van-cell-group { + border-radius: 5px; + overflow: hidden; +} +.van-cell-group .van-cell::after { + border-bottom: 1px #e3e3e3 solid; + -webkit-transform: none; + transform: none; +} + +/* ========================================= stage ============================================= */ +.content { + padding: 15px 0; + background-color: #b2c4ce; +} + +.card { + border: none; + margin-bottom: 15px; +} +.card .card-body { + padding: 5px 15px; +} +.card .card-body .item { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + width: 100%; + font-size: 15px; +} +.card .card-body .item + .item { + border-top: 1px solid #e3e3e3; +} +.card .card-body .item .left { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + padding: 8px 0; + font-weight: bold; +} +.card .card-body .item .right { + -webkit-box-flex: 1; + -ms-flex: 1 0 0px; + flex: 1 0 0; + color: #666; +} +.card .card-body .item .right a { + color: #666; +} +.card .card-body .item i, .card .card-body .item svg { + color: #839eb6; + margin-right: 6px; } +/* ========================================= other ============================================= */ .imgCnt { position: relative; overflow: hidden; @@ -511,8 +652,6 @@ h1, h2, h3, h4, h5, h6 { height: 100%; -o-object-fit: cover; object-fit: cover; - -webkit-transition: all 0.3s; - transition: all 0.3s; } /*! diff --git a/src/assets/css/page/index.css b/src/assets/css/page/index.css deleted file mode 100644 index b48ea9f..0000000 --- a/src/assets/css/page/index.css +++ /dev/null @@ -1,144 +0,0 @@ -.my-account { - position: relative; - width: 100%; - padding: 20px 15px; -} -.my-account .avatar { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; -} -.my-account .avatar .left { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-flex: 1; - -ms-flex: 1 0 0px; - flex: 1 0 0; -} -.my-account .avatar .left .imgCnt { - width: 80px; - height: 80px; - min-width: 80px; - border-radius: 50%; - border: 2px #fff solid; - overflow: hidden; - margin-right: 15px; -} -.my-account .avatar .left .imgCnt img { - width: 100%; - height: 100%; - -o-object-fit: cover; - object-fit: cover; -} -.my-account .avatar .left .info .name { - font-weight: bold; - color: #303a47; -} -.my-account .avatar .left .info .conpany { - margin-top: 5px; -} -.my-account .avatar .right { - -webkit-box-flex: 0; - -ms-flex: 0 0 auto; - flex: 0 0 auto; -} -.my-account .recommend { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - padding: 20px 0 10px; -} -.my-account .recommend .btn { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - width: 30%; - height: 100px; - background-color: #fff; - border-radius: 0; -} -.my-account .recommend .btn .img { - font-size: 35px; - line-height: 45px; - color: #345068; -} -.my-account .recommend .btn .text { - font-size: 16px; - font-weight: bold; - color: #345068; -} - -.content { - padding: 15px; - background-color: #b2c4ce; -} -.content .card { - border: none; - margin-bottom: 15px; -} -.content .card .card-body { - padding: 5px 15px; -} -.content .card .card-body .item { - position: relative; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - width: 100%; - font-size: 15px; -} -.content .card .card-body .item + .item { - border-top: 1px solid #e3e3e3; -} -.content .card .card-body .item .left { - -webkit-box-flex: 0; - -ms-flex: 0 0 auto; - flex: 0 0 auto; - padding: 8px 0; - font-weight: bold; -} -.content .card .card-body .item .right { - -webkit-box-flex: 1; - -ms-flex: 1 0 0px; - flex: 1 0 0; - color: #666; -} -.content .card .card-body .item .right a { - color: #666; -} -.content .card .card-body .item i, .content .card .card-body .item svg { - color: #839eb6; - margin-right: 6px; -} \ No newline at end of file diff --git a/src/assets/images/upload.jpg b/src/assets/images/upload.jpg index 41b7554c59d037e2333e5e419e033e568227fabe..4f83fc773d2cc4917a7502739ea6fb864f1b07fa 100644 GIT binary patch literal 17820 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 literal 28908 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 diff --git a/src/assets/sass/base/_global.scss b/src/assets/sass/base/_global.scss index cc4c57b..3e73285 100644 --- a/src/assets/sass/base/_global.scss +++ b/src/assets/sass/base/_global.scss @@ -16,10 +16,11 @@ $radius: ( //字體顏色 $basicColor: ( - skyBlue:#b2c4ce, + lightBlue:#b2c4ce, + skyBlue:#5b7b94, moBlue:#486499, darkBlue:#345068, - pink:#fdebeb, + lightPink:#f1e6e2, cherry:#E31D64, mintGreen:#f2f8e7, limeGreen:#94ac5e, @@ -31,10 +32,11 @@ $basicColor: ( $textArr: + (lightBlue, map-get($basicColor, lightBlue)), (skyBlue, map-get($basicColor, skyBlue)), (moBlue, map-get($basicColor, moBlue)), (darkBlue, map-get($basicColor, darkBlue)), - (pink, map-get($basicColor, pink)), + (lightPink, map-get($basicColor, lightPink)), (cherry, map-get($basicColor, cherry)), (mintGreen, map-get($basicColor, mintGreen)), (limeGreen, map-get($basicColor, limeGreen)), diff --git a/src/assets/sass/components/_btn.scss b/src/assets/sass/components/_btn.scss index 4b6a4d1..b795b8b 100644 --- a/src/assets/sass/components/_btn.scss +++ b/src/assets/sass/components/_btn.scss @@ -1,8 +1,9 @@ $normalArr: + (lightBlue, #fff, map-get($basicColor, lightBlue), map-get($basicColor, lightBlue)), (skyBlue, #fff, map-get($basicColor, skyBlue), map-get($basicColor, skyBlue)), (moBlue, #fff, map-get($basicColor, moBlue), map-get($basicColor, moBlue)), (darkBlue, #fff, map-get($basicColor, darkBlue), map-get($basicColor, darkBlue)), - (pink, #fff, map-get($basicColor, pink), map-get($basicColor, pink)), + (lightPink, #fff, map-get($basicColor, lightPink), map-get($basicColor, lightPink)), (cherry, #fff, map-get($basicColor, cherry), map-get($basicColor, cherry)), (limeGreen, #fff, map-get($basicColor, limeGreen), map-get($basicColor, limeGreen)), (tomatoRed, #fff, map-get($basicColor, tomatoRed), map-get($basicColor, tomatoRed)), @@ -10,10 +11,11 @@ $normalArr: ; $outlineArr: + (lightBlue, 1px, map-get($basicColor, lightBlue), transparent, map-get($basicColor, lightBlue)), (skyBlue, 1px, map-get($basicColor, skyBlue), transparent, map-get($basicColor, skyBlue)), (moBlue, 1px, map-get($basicColor, moBlue), transparent, map-get($basicColor, moBlue)), (darkBlue, 1px, map-get($basicColor, darkBlue), transparent, map-get($basicColor, darkBlue)), - (pink, 1px, map-get($basicColor, pink), transparent, map-get($basicColor, pink)), + (lightPink, 1px, map-get($basicColor, lightPink), transparent, map-get($basicColor, lightPink)), (cherry, 1px, map-get($basicColor, cherry), transparent, map-get($basicColor, cherry)), (limeGreen, 1px, map-get($basicColor, limeGreen), transparent, map-get($basicColor, limeGreen)), (tomatoRed, 1px, map-get($basicColor, tomatoRed), transparent, map-get($basicColor, tomatoRed)), @@ -32,6 +34,7 @@ $outlineArr: @each $class, $bdWidth, $color, $bgColor, $bdColor in $outlineArr { .btn-outline-#{"" + $class} { @include outlineBtn($bdWidth, $color, $bgColor, $bdColor); + background-color: #fff; } } diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss index b53a477..9da8651 100644 --- a/src/assets/sass/layout/_layout.scss +++ b/src/assets/sass/layout/_layout.scss @@ -2,10 +2,102 @@ display: none; } -.home{ - background-color: #f1e6e2; +/* ========================================= vant ============================================= */ + +.van-field__label{ + position: relative; + font-weight: bold; + &:before{ + position: absolute; + left:-8px; + } +} + + +.van-tabs{ + padding:20px 0 0px; + .van-tabs__wrap{ + height:initial; + .van-tabs__nav{ + padding:0; + background-color: transparent; + .van-tab{ + &.van-tab--active{ + .tab_item{ + color: #345068; + } + } + .tab_item{ + display: flex; + align-items: center; + flex-direction: column; + color: #5b7b94; + } + } + .van-tabs__line{ + bottom:0; + background: #345068; + } + } + } +} + +.van-cell-group{ + border-radius: 5px; + overflow: hidden; + .van-cell{ + &::after{ + border-bottom:1px #e3e3e3 solid; + transform: none; + } + } +} + +/* ========================================= stage ============================================= */ + +.content{ + padding: 15px 0; + background-color: #b2c4ce; } +.card { + border: none; + // border-radius: 0; + margin-bottom: 15px; + .card-body{ + padding: 5px 15px; + .item { + position: relative; + display: flex; + justify-content: space-between; + align-items: center; + width:100%; + font-size: 15px; + &+.item{ + border-top: 1px solid #e3e3e3; + } + .left{ + flex: 0 0 auto; + padding: 8px 0; + font-weight: bold; + } + .right{ + flex: 1 0 0; + color: #666; + a{ + color: #666; + } + } + i,svg{ + color: #839eb6; + margin-right: 6px; + } + } + } +} + +/* ========================================= other ============================================= */ + .imgCnt{ position: relative; overflow: hidden; @@ -13,6 +105,14 @@ width:100%; height:100%; object-fit: cover; - transition: all .3s; } } + + + + + + + + + diff --git a/src/assets/sass/page/index.scss b/src/assets/sass/page/index.scss deleted file mode 100644 index 7f82edb..0000000 --- a/src/assets/sass/page/index.scss +++ /dev/null @@ -1,109 +0,0 @@ -.my-account { - position: relative; - width: 100%; - padding: 20px 15px; - .avatar{ - display: flex; - justify-content: space-between; - align-items: center; - .left{ - display: flex; - align-items: center; - flex: 1 0 0; - .imgCnt{ - width:80px; - height: 80px; - min-width: 80px; - border-radius: 50%; - border:2px #fff solid; - overflow: hidden; - margin-right: 15px; - img{ - width:100%; - height: 100%; - object-fit: cover; - } - } - .info{ - .name{ - font-weight: bold; - color: #303a47; - } - .conpany{ - margin-top: 5px; - } - } - } - .right{ - flex: 0 0 auto; - } - } - .recommend{ - display: flex; - justify-content: space-between; - align-items: center; - padding: 20px 0 10px; - .btn{ - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - width:30%; - height: 100px; - background-color: #fff; - border-radius: 0; - .img{ - font-size: 35px; - line-height: 45px; - color: #345068; - } - .text{ - font-size: 16px; - font-weight: bold; - color: #345068; - } - } - } -} - -.content{ - padding: 15px; - background-color: #b2c4ce; - .card { - border: none; - // border-radius: 0; - margin-bottom: 15px; - .card-body{ - padding: 5px 15px; - .item { - position: relative; - display: flex; - justify-content: space-between; - align-items: center; - width:100%; - font-size: 15px; - &+.item{ - border-top: 1px solid #e3e3e3; - } - .left{ - flex: 0 0 auto; - padding: 8px 0; - font-weight: bold; - } - .right{ - flex: 1 0 0; - color: #666; - a{ - color: #666; - } - } - i,svg{ - color: #839eb6; - margin-right: 6px; - } - } - } - } -} - - diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 38ab636..2f6deba 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -245,11 +245,13 @@ const handleLogout = () => { - diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index 3b58933..bed62b8 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -1,4 +1,4 @@ - - + \ No newline at end of file diff --git a/src/views/Member/index.vue.bak b/src/views/Member/index.vue.bak new file mode 100644 index 0000000..3b58933 --- /dev/null +++ b/src/views/Member/index.vue.bak @@ -0,0 +1,461 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/Register/index.vue b/src/views/Register/index.vue index 8bb3519..a8fc9c5 100644 --- a/src/views/Register/index.vue +++ b/src/views/Register/index.vue @@ -1,153 +1,3 @@ - - + + + + \ No newline at end of file diff --git a/src/views/Register/index.vue b/src/views/Register/index.vue index a8fc9c5..9d94756 100644 --- a/src/views/Register/index.vue +++ b/src/views/Register/index.vue @@ -153,31 +153,37 @@ const onSubmit = async () => { From 7bd696f23c4c9a94f89e2679075439f7248fc0b7 Mon Sep 17 00:00:00 2001 From: bruce68410 Date: Thu, 2 Nov 2023 00:09:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A3=9C=E6=94=BE=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E6=AA=94=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Register/index.vue.bak | 344 +++++++++++++++++++++++++++++++ 1 file changed, 344 insertions(+) create mode 100644 src/views/Register/index.vue.bak diff --git a/src/views/Register/index.vue.bak b/src/views/Register/index.vue.bak new file mode 100644 index 0000000..8bb3519 --- /dev/null +++ b/src/views/Register/index.vue.bak @@ -0,0 +1,344 @@ + + + + +