diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue index 262f276..cad2596 100644 --- a/src/components/merchantManagement/memberInfo.vue +++ b/src/components/merchantManagement/memberInfo.vue @@ -19,7 +19,9 @@ @@ -56,7 +58,7 @@
-
+
详情 编辑 删除 @@ -786,6 +788,7 @@ export default { flex: 1; padding-left: 16px; .addmemeber { + border: 0; padding: 0 12px; height: 32px; line-height: 32px; diff --git a/src/style/index.less b/src/style/index.less index 895d5bc..be48519 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -364,13 +364,13 @@ i { font-size: 6px; } .f10 { - font-size: 10px; + font-size: 10px !important; } .f22 { font-size: 22px; } .f12 { - font-size: 12px; + font-size: 12px !important; } .f14 { font-size: 14px; @@ -617,7 +617,7 @@ i { .logindropdown { // left: 0; // left: calc((100vw - 1200px) / 2 + 1013px) !important; - .loginbox { + .loginbox:not(.backTable) { width: 180px; // height: 114px; overflow: hidden; @@ -668,7 +668,60 @@ i { } } } +.loginbox.backTable { + width: 180px; + // height: 114px; + overflow: hidden; + background-color: #fff; + border-radius: 4px; + text-align: center; + box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4); + padding: 0 16px 16px 16px; + > div { + padding: 16px; + text-align: center; + font-size: 16px; + font-weight: bold; + border-bottom: 1px solid #eee; + } + > a { + > div { + display: flex; + padding: 16px 0; + font-size: 14px; + // font-weight: bold; + justify-content: space-between; + border-bottom: 1px solid #eee; + &:hover { + color: #1890ff; + } + span { + line-height: 18px; + i { + font-size: 18px; + margin-right: 5px; + vertical-align: baseline; + } + } + } + } + button { + width: 130px; + height: 32px; + margin-top: 24px; + border: 1px solid rgba(77, 87, 94, 0.1); + border-radius: 17px; + color: #1890ff; + font-size: 14px; + line-height: 32px; + background-color: #fff; + cursor: pointer; + &:hover{ + border: 1px solid #1890ff; + } + } +} .beforeblock { display: inline-block; vertical-align: middle; diff --git a/src/views/main.vue b/src/views/main.vue index 986dece..53f65f6 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -155,7 +155,7 @@
- +
商家后台 @@ -417,7 +417,7 @@ export default { */ mounted() { this.loginValue = localStorage.getItem('LOGIN_DATA') !== null ? JSON.parse(localStorage.getItem('LOGIN_DATA')) : { tel: '' } - // console.log(this.loginValue); + console.log(this.loginValue) // console.log(document.querySelector(".ant-pagination-options-quick-jumper")); }, // 组件方法 @@ -1070,6 +1070,5 @@ export default { border-color: #ff4400; } } - } diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue index 10ef20f..e749b18 100644 --- a/src/views/merchantBack.vue +++ b/src/views/merchantBack.vue @@ -17,7 +17,7 @@