Merge branch 'feat/zl' into 'develop'

save

See merge request !68

src/components/IM/diagnosis-live.vue

@@ -128,7 +128,7 @@ export default {
       memberList: [],
       tid: "", // 群id
       diagnoseLogId: "", //问诊id
-      isMuted: false,
+      isMuted: true,
       liveInfoSave: {},
       userTrtcEntryStatus:'',
       doctorTrtcEntryStatus:''
@@ -316,6 +316,7 @@ export default {
           .then(() => {
             Promise.all([this.rtc.join()]).then((res) => {
               this.ispending();
+              this.muteLocalAudio();
               let t = setTimeout(() => {
                 closeLoading(this);
                 this.muteLocalAudio();

src/components/common/consultation.vue

@@ -77,7 +77,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .consultationlist {
   padding: 25px 40px 25px 40px;
   width: 488px;

src/components/common/diagnoseAdvice.vue

@@ -136,7 +136,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
   .diagnoseAdvice-wrap{
     position: absolute;
     top: 125px;

src/views/layout/slidebar.vue

@@ -31,10 +31,8 @@
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import { setTimeout } from "timers";
-import { isNotEmptyUtils } from "../../utils/utils";
 import { getInnerLoginUrl } from "../../utils";
+const BUILD_ENV = process.env.BUILD_ENV;
 let vm = null;
 export default {
   props: {
@@ -82,7 +80,8 @@ export default {
             isSuper:false,
             userID: userId
           };
-          this.$store.dispatch( 'socket/initSocket',{url: 'https://test1-sockets.yunqueyi.com',userId: userId})
+          const u = this.getSocketUrl(BUILD_ENV);
+          this.$store.dispatch( 'socket/initSocket',{url: u,userId: userId})
           vueMenuDtos.map( item => {
             if(item.index.indexOf('administrators') > -1){
               // 超级管理员
@@ -126,6 +125,27 @@ export default {
       if (navList.indexOf(path) == -1) {
         this.$router.push(`/${navList[0]}`);
       }
+    },
+    getSocketUrl (env){
+      let url = '';
+      switch(env) {
+        case 'development':
+          url ='https://dev-sockets.yunqueyi.com';
+          break;
+        case 'test':
+           url ='https://test1-sockets.yunqueyi.com';
+          break;
+        case 'uat':
+          url ='https://uat-sso-sockets.yunqueyi.com';
+          break;
+        case 'pro':
+          url ='https://sso-sockets.yunqueyi.com';
+          break;
+        default:
+          url ='https://dev-sockets.yunqueyi.com';
+          break;
+      }
+      return url
     }
   }
 };