diff --git a/common/baseStyle.scss b/common/baseStyle.scss
index 8736c11b751dc3eedfdb7f8c727108f884e41deb..4dfbda40875255523262dd7eac90db1f444cdee6 100644
--- a/common/baseStyle.scss
+++ b/common/baseStyle.scss
@@ -1,6 +1,7 @@
/* #ifdef H5 */
::v-deep {
/* #endif */
+ page,
view,
label
{
@@ -16,17 +17,19 @@
margin: 0;
}
+ page,
view,
label,
swiper-item {
flex-direction: column;
}
+ page,
view,
image,
input,
- scroll-view,
swiper,
+ scroll-view,
swiper-item,
text,
textarea,
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index e2c6ae4115dbb890b4deda905a39cc7cc3b899e4..b1a359d4b7fe8b2cd48bea5c9befc9aa5a57f5b6 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -1106,12 +1106,13 @@
\ No newline at end of file
diff --git a/pages/index/index.scss b/pages/index/index.scss
index 7e1701e4004978de0151d66d0f3f1d256590a9e2..816fa025c5014d87418d26c5a39a88ed63138f3c 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -1,178 +1,184 @@
- .tip{
- flex: 1;
- }
-
- #center-view{
- height: 100vh;
- /* #ifdef H5 */
- height: calc(100vh - 44px);
- /* #endif */
- background-color: #f5f5f5 !important;
- }
-
- /* #ifdef H5 */
- @media screen and (min-device-width:960px){
- .pointer {
- cursor: pointer;
- }
- #page {
- flex-direction: row;
- justify-content: center;
- align-items: center;
- height: 100vh;
- width: 100vw;
- background-color: #2e2e3e;
- min-width:960px;
-
- #left-view,
- #center-view,
- #right-view {
+ // .tip{
+ // flex: 1;
+ // }
+page {
+ height: 100vh;
+ background-color: #2e2e3e;
+ /* #ifdef H5 */
+ @media screen and (min-device-width:960px){
+ padding: 20px;
+ .pointer {
+ cursor: pointer;
+ }
+ }
+ /* #endif */
+ .uni-im-index {
+ // border: 1px solid #FFF;
+ background-color: #ececec;
+ flex: 1;
+ height: 100%;
+ /* #ifdef H5 */
+ @media screen and (min-device-width:960px){
+ border-radius: 20px;
+ }
+ /* #endif */
+ overflow: hidden;
+ flex-direction: row;
+ #left-view {
+ /* #ifdef H5 */
+ & > *{
+ cursor: pointer;
+ margin-top: 36px;
+ }
+ & > *:hover{
+ /* border: 1px solid #fefefe; */
+ box-shadow: 0 0 20px 2px #fefefe;
+ border-radius: 10px;
+ }
+ /* #endif */
+ width:60px;
+ align-items: center;
+ padding-top: 100px;
+ background-color: #ececec;
+ border-radius: 20px 0 0 20px;
+ }
+ #center-view{
+ background-color: #f5f5f5;
+ width: 100%;
+ /* #ifdef H5 */
+ @media screen and (min-device-width:960px){
+ width:300px;
+ }
+ /* #endif */
+ overflow: hidden;
+ #search-bar-box {
+ flex-direction: row;
+ align-items: center;
+ height: 70px;
+ padding:0 10px;
+ #search-bar {
+ flex: 1;
+ }
+ }
+ #conversation-list-box {
+ height: 100%;
+ flex: 1;
+ }
+ #uni-im-contacts-box {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 9;
+ width: 100%;
+ height: 100%;
+ .contacts-pages ::v-deep {
+ .user-list-box {
+ overflow: auto;
+ }
+ .activeMenu {
+ background-color: #f5f5f5 !important;
+ }
+ }
+ }
+ }
+ #right-view {
+ width: 0;
+ flex-grow: 1;
+ background-color: #FFFFFF;
+ #chat-view-box {
+ flex-grow: 1;
+ .header {
+ height: 70px;
+ background-color: #FFFFFF;
+ padding:0 20px;
+ flex-direction: row;
+ justify-content: end;
+ align-items: center;
+ .more{
+ cursor: pointer;
+ }
+ }
+ .content {
+ flex: 1;
+ ::v-deep {
+ #web-pc-chat-title
+ {
+ position: absolute;
+ z-index: 99;
+ top: -45px;
+ left: 15px;
+ }
+ .unread_count {
+ display: none;
+ }
+ .msg-list {
+ .uni-im-list {
+ .uni-im-msg {
+ padding: 0 10px;
+ }
+ }
+ }
+ }
+ }
+
+ .chatInfoBox {
+ z-index: 9;
+ position: absolute;
+ right:0;
+ top: 70px;
+ background-color: rgba(0,0,0,0.2);
+ height: calc(95vh - 70px);
+ align-items: flex-end;
+ width: 100%;
+ .group-info-text {
+ max-width: 250px !important;
+ text-align: left;
+ word-break: break-all;
+ }
+ }
+ }
+ #ccid-is-null-tip {
+ height: 95vh;
+ padding-top: 30vh;
+ align-items: center;
+ background-color: #efefef;
+ .img {
+ width: 130px;
+ margin-bottom: 15px;
+ }
+ .text {
+ color: #999;
+ }
+ }
+ #dynamic-component-box {
+ z-index: 9;
+ width: 100%;
height: 95vh;
- position: relative;
- top: -2vh;
- background-color: #FFFFFF;
- }
-
- #center-view {
- #conversation-list-box .conversation-list{
- max-height: calc(95vh - 70px);
- .conversation-list-item{
- margin: 5px;
- }
- }
- }
- #left-view {
- & > *{
- cursor: pointer;
- margin-top: 36px;
- }
- & > *:hover{
- /* border: 1px solid #fefefe; */
- box-shadow: 0 0 20px 2px #fefefe;
- border-radius: 10px;
- }
- width:60px;
- align-items: center;
- padding-top: 100px;
- background-color: #ececec;
- border-radius: 20px 0 0 20px;
- }
- #center-view{
- width:300px;
- #search-bar-box {
- flex-direction: row;
- align-items: center;
+ background-color: #fff;
+ position: absolute;
+ right: 0;
+ .dynamic-component-title{
+ padding-left: 15px;
height: 70px;
- padding:0 10px;
+ justify-content: center;
+ border: 1px solid #efefef;
}
- #search-bar {
- flex: 1;
- }
- #uni-im-contacts-box {
- z-index: 10;
- height: 95vh;
+ .system-notice-box{
width: 100%;
- position: absolute;
- background-color: #f5f5f5;
- /* pc端隐藏删除好友的按钮,后续改成长按(右键)可见 */
- .delete-btn{
- display: none;
- }
}
- }
-
- #right-view {
- width: calc(100% - 370px);
- border-radius: 0 20px 20px 0;
- overflow: hidden;
- position: relative;
- #chat-view-box {
- #ccid-is-null-tip{
- height: 95vh;
- padding-top: 30vh;
- align-items: center;
- background-color: #efefef;
- .img {
- width: 130px;
- margin-bottom: 15px;
- }
- .text {
- color: #999;
- }
- }
- }
- #chat-header{
- height: 70px;
- padding:0 20px;
- flex-direction: row;
- justify-content: end;
- align-items: center;
- .more{
- cursor: pointer;
- }
- }
- #chat-view {
- max-height:calc(95vh - 70px);
- }
- #chat-view #uni-im-chat{
- #web-pc-chat-title
- {
- position: absolute;
- z-index: 9;
- top: -45px;
- left: 15px;
- }
- .unread_count {
- display: none;
- }
- .msg-list .uni-im-list .uni-im-msg{
- padding:0 10px;
- }
- }
- .chatInfoBox {
- z-index: 999;
- position: absolute;
- right:0;
- top: 70px;
- background-color: rgba(0,0,0,0.2);
- height: calc(95vh - 70px);
- align-items: flex-end;
- width: 100%;
- .group-info-text{
- max-width: 250px !important;
- text-align: left;
- word-break: break-all;
- }
- }
- #dynamic-component-box {
- z-index: 9;
+ .create-group-box .header-box{
width: 100%;
- height: 95vh;
- background-color: #fff;
- position: absolute;
- right: 0;
- .dynamic-component-title{
- padding-left: 15px;
- height: 70px;
- justify-content: center;
- border: 1px solid #efefef;
- }
- .system-notice-box{
- width: 100%;
- }
- .create-group-box .header-box{
+ .uni-searchbar {
width: 100%;
- .uni-searchbar {
- width: 100%;
- }
}
}
- }
- }
-
- #foot {
- position: fixed;
- bottom: 10px;
+ }
+ }
+ }
+ #foot {
+ display: none;
+ position: fixed;
+ bottom: 0;
flex-direction: row;
color: #FFFFFF;
.uni-link:hover{
@@ -192,11 +198,10 @@
}
}
}
- }
- /* #endif */
+}
.windows {
- #center-view #conversation-list-box .conversation-list-item .uni-list-chat__container{
- padding-right: 10px;
- }
- }
\ No newline at end of file
+ #center-view #conversation-list-box .conversation-list-item .uni-list-chat__container {
+ padding-right: 10px;
+ }
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 784c36a0876cf9b943645a33351e5368670e258d..fa4f8f7f037b2f963c42e0b9906288a041d8f599 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -36,7 +36,7 @@
-
+
@@ -69,17 +69,13 @@
-
-
-
-
-
+
+
+
+
+