Merge branch 'dev-202107012' into release

src/utils/constants.js

@@ -269,14 +269,14 @@ export const ALL_TAB_LIST = [
     label: '待匹配',
     active: '2'
   },
-  {
-    label: '稍后跟进',
-    active: '101'
-  },
   {
     label: '已匹配',
     active: '102'
   },
+  {
+    label: '稍后跟进',
+    active: '101'
+  },
   {
     label: '待分诊',
     active: '22'

src/utils/env-config.js

@@ -10,6 +10,7 @@ export const envConfig = {
     // baseUrl: 'https://test1-sc.yunqueyi.com',
     // baseUrl:   'https://uat-sc.yunqueyi.com',
 
+
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",

src/views/IM/diagnosis-admin/diagnosis-live.vue

@@ -17,7 +17,7 @@
           class="icon"
           @click="taggleM"
         />
-        <div class="out" @click="leave">退出</div>
+        <div class="close" @click="overFn">结束会话</div>
       </div>
     </div>
     <div class="main">
@@ -87,7 +87,9 @@
         </div>
       </div>
     </div>
-    <div class="close" @click="overFn">结束会话</div>
+
+
+    <div class="out" @click="leave">退出</div>
     <alert ref="alert"></alert>
   </div>
 </template>
@@ -620,26 +622,28 @@ export default {
     .top-right {
       margin: 15px 25px 0 0;
       display: flex;
+      align-items: center;
+      justify-content: center;
       .icon {
         width: 32px;
         height: 32px;
         border-radius: 50%;
         cursor: pointer;
       }
-      .out {
-        width: 102px;
-        height: 32px;
-        border-radius: 2px;
-        border: 1px solid #ffffff;
-        font-size: 14px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #ffffff;
-        text-align: center;
-        line-height: 32px;
-        margin-left: 20px;
-        cursor: pointer;
-      }
+
+        .close {
+          width: 102px;
+          height: 32px;
+          background: #ff4d4f;
+          border-radius: 2px;
+          font-size: 14px;
+          color: #ffffff;
+          line-height: 32px;
+          text-align: center;
+           margin-left: 20px;
+          cursor: pointer;
+        }
+
     }
   }
   .main {
@@ -735,17 +739,22 @@ export default {
       }
     }
   }
-  .close {
-    width: 102px;
-    height: 32px;
-    background: #ff4d4f;
-    border-radius: 2px;
-    font-size: 14px;
-    color: #ffffff;
-    line-height: 32px;
-    text-align: center;
-    margin: 15px auto 6%;
-    cursor: pointer;
-  }
+
+
+        .out {
+        width: 102px;
+        height: 32px;
+        border-radius: 2px;
+        border: 1px solid #ffffff;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        text-align: center;
+        line-height: 32px;
+
+        cursor: pointer;
+        margin: 15px auto 6%;
+      }
 }
 </style>