diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 179907c..30f140f 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -541,20 +541,37 @@ h1, h2, h3, h4, h5, h6 { } /* ========================================= vant ============================================= */ -.van-field__label { - position: relative; - font-weight: bold; +.van-notice-bar { + font-size: 18px; } -.van-field__label:before { - position: absolute; - left: -8px; + +.van-popup.van-toast { + 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; + padding: 30px; +} +.van-popup.cropPopup { + display: block; + max-width: 400px; + width: 90%; + height: 430px; + top: 30%; + margin: auto; + padding: 0; } .van-tabs { padding: 20px 0 0px; } .van-tabs .van-tabs__wrap { - height: initial; + height: initial !important; } .van-tabs .van-tabs__wrap .van-tabs__nav { padding: 0; @@ -583,13 +600,45 @@ h1, h2, h3, h4, h5, h6 { .van-cell-group { border-radius: 5px; + margin-bottom: 15px; overflow: hidden; } +.van-cell-group .van-cell { + padding: 6px 16px; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} .van-cell-group .van-cell::after { border-bottom: 1px #e3e3e3 solid; -webkit-transform: none; transform: none; } +.van-cell-group .van-cell.longText .van-field__label { + width: 160px; +} +.van-cell-group .van-cell .van-field__label { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + padding: 4px 0; + font-weight: bold; +} +.van-cell-group .van-cell .van-field__label:before { + position: absolute; + left: -8px; +} +.van-cell-group .van-cell .van-field__label i, .van-cell-group .van-cell .van-field__label svg { + color: #5b7b94; + margin-top: 5px; + margin-right: 5px; +} +.van-cell-group .van-cell .van-field__label--top i, .van-cell-group .van-cell .van-field__label--top svg { + color: #5b7b94; + margin-top: 0px; + margin-right: 5px; +} /* ========================================= stage ============================================= */ .content { @@ -597,49 +646,45 @@ h1, h2, h3, h4, h5, h6 { background-color: #b2c4ce; } -.card { - border: none; - margin-bottom: 15px; -} -.card .card-body { - padding: 5px 15px; -} -.card .card-body .item { - position: relative; +.upload-main { display: -webkit-box; display: -ms-flexbox; display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; -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; +.upload-main .upload-img { + width: 100px; + aspect-ratio: 1/1; + border-radius: 50%; + border: 1px #d8d8d8 solid; } -.card .card-body .item .left { - -webkit-box-flex: 0; - -ms-flex: 0 0 auto; - flex: 0 0 auto; - padding: 8px 0; - font-weight: bold; + +.cropper { + height: 300px; + background: #DDD; } -.card .card-body .item .right { - -webkit-box-flex: 1; - -ms-flex: 1 0 0px; - flex: 1 0 0; - color: #666; + +.cropper-section { + margin: 0 auto; + position: fixed; + text-align: center; + top: 60px; + width: 100%; + max-width: 500px; + z-index: 8888; } -.card .card-body .item .right a { - color: #666; +.cropper-section .crop-area { + margin: 5 auto; + width: 100%; } -.card .card-body .item i, .card .card-body .item svg { - color: #839eb6; - margin-right: 6px; +.cropper-section .crop-btn { + background-color: #666; + text-align: center; } /* ========================================= other ============================================= */ diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss index 9da8651..7b2bf2a 100644 --- a/src/assets/sass/layout/_layout.scss +++ b/src/assets/sass/layout/_layout.scss @@ -4,20 +4,32 @@ /* ========================================= vant ============================================= */ -.van-field__label{ - position: relative; - font-weight: bold; - &:before{ - position: absolute; - left:-8px; - } +.van-notice-bar{ + font-size: 18px; } +.van-popup{ + &.van-toast{ + display: flex; + justify-content: center; + align-items: center; + padding: 30px; + } + &.cropPopup{ + display: block; + max-width: 400px; + width: 90%; + height: 430px; + top: 30%; + margin: auto; + padding: 0; + } +} .van-tabs{ padding:20px 0 0px; .van-tabs__wrap{ - height:initial; + height:initial !important; .van-tabs__nav{ padding:0; background-color: transparent; @@ -44,12 +56,42 @@ .van-cell-group{ border-radius: 5px; + margin-bottom: 15px; overflow: hidden; .van-cell{ + padding: 6px 16px; + align-items: center; &::after{ border-bottom:1px #e3e3e3 solid; transform: none; } + &.longText{ + .van-field__label{ + width:160px; + } + } + .van-field__label{ + position: relative; + display: flex; + padding: 4px 0; + font-weight: bold; + &:before{ + position: absolute; + left:-8px; + } + i,svg{ + color: #5b7b94; + margin-top: 5px; + margin-right: 5px; + } + } + .van-field__label--top{ + i,svg{ + color: #5b7b94; + margin-top: 0px; + margin-right: 5px; + } + } } } @@ -60,41 +102,40 @@ 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; - } - } +.upload-main{ + display: flex; + justify-content: center; + align-items: center; + .upload-img{ + width: 100px; + aspect-ratio: 1/1; + border-radius: 50%; + border:1px #d8d8d8 solid; } -} + } + + .cropper { + height: 300px; + background: #DDD; + } + + .cropper-section{ + margin: 0 auto; + position: fixed; + text-align: center; + top: 60px; + width: 100%; + max-width: 500px; + z-index: 8888; + .crop-area{ + margin: 5 auto; + width: 100%; + } + .crop-btn{ + background-color: #666; + text-align: center; + } + } /* ========================================= other ============================================= */ diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 2f6deba..58a7217 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -321,148 +321,81 @@ const handleLogout = () => { > -
-
-
-
-
- 建立日期 -
-
- {{ userInfo.create_time }} -
-
-
-
- 會員編號 -
- -
-
-
- 會員等級 -
-
- {{ userInfo.level_name }} -
-
-
-
- 使用期限 -
-
- {{ overdue }} -
- - -
-
-
- 會員QRcode -
-
-
- 開啟掃描 -
-
-
-
-
- 名片連結 -
-
-
- 複製連結 -
-
-
-
-
- -
-
-
-
- 職稱 -
-
- {{ userInfo.title }} -
-
-
-
- 手機 -
-
- {{ userInfo.phone }} -
-
-
-
市話
-
- {{ userInfo.tel }} -
-
-
-
- Email -
-
- {{ userInfo.email }} -
-
-
-
- 住址 -
-
- {{ userInfo.address }} -
-
-
-
- -
-
-
-
- 授權商務卡片編輯 -
-
- 授權 -
-
-
-
- 代客編輯商務卡片 -
-
- 編輯 -
-
-
-
- 綁定UTel淘金購會員 -
- -
-
-
- 發送名片帶廣告 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -586,7 +518,7 @@ const handleLogout = () => { .my-account { position: relative; width: 100%; - padding: 20px 15px; + padding: 20px 25px; .avatar{ display: flex; justify-content: space-between; diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index bed62b8..1bb11b1 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -22,6 +22,7 @@ const store = useStore() const router = useRouter() const form = ref({addon:[]}) +const activeName = ref(0) const fileList = ref([]); @@ -62,6 +63,7 @@ const validatorTel = (val) => { let userRes = await getUserInfo() if(userRes.code===200){ form.value = userRes.data + console.log(form); }else{ } @@ -177,7 +179,7 @@ const onSubmit = async () => { - + @@ -367,42 +544,5 @@ const onSubmit = async () => { \ 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 () => {