gemercheung 2 years ago
parent
commit
d61ec2f62e

+ 53 - 52
src/assets/iconfont/demo.css

@@ -1,15 +1,19 @@
 /* Logo 字体 */
 @font-face {
-  font-family: "iconfont logo";
+  font-family: 'iconfont logo';
   src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix')
+      format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834')
+      format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834')
+      format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont')
+      format('svg');
 }
 
 .logo {
-  font-family: "iconfont logo";
+  font-family: 'iconfont logo';
   font-size: 160px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
@@ -48,7 +52,6 @@
   color: #666;
 }
 
-
 #tabs .active {
   border-bottom-color: #f00;
   color: #222;
@@ -215,35 +218,35 @@
   margin: 1em 0;
 }
 
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
+.markdown > p,
+.markdown > blockquote,
+.markdown > .highlight,
+.markdown > ol,
+.markdown > ul {
   width: 80%;
 }
 
-.markdown ul>li {
+.markdown ul > li {
   list-style: circle;
 }
 
-.markdown>ul li,
-.markdown blockquote ul>li {
+.markdown > ul li,
+.markdown blockquote ul > li {
   margin-left: 20px;
   padding-left: 4px;
 }
 
-.markdown>ul li p,
-.markdown>ol li p {
+.markdown > ul li p,
+.markdown > ol li p {
   margin: 0.6em 0;
 }
 
-.markdown ol>li {
+.markdown ol > li {
   list-style: decimal;
 }
 
-.markdown>ol li,
-.markdown blockquote ol>li {
+.markdown > ol li,
+.markdown blockquote ol > li {
   margin-left: 20px;
   padding-left: 4px;
 }
@@ -260,7 +263,7 @@
   font-weight: 600;
 }
 
-.markdown>table {
+.markdown > table {
   border-collapse: collapse;
   border-spacing: 0px;
   empty-cells: show;
@@ -269,21 +272,21 @@
   margin-bottom: 24px;
 }
 
-.markdown>table th {
+.markdown > table th {
   white-space: nowrap;
   color: #333;
   font-weight: 600;
 }
 
-.markdown>table th,
-.markdown>table td {
+.markdown > table th,
+.markdown > table td {
   border: 1px solid #e9e9e9;
   padding: 8px 16px;
   text-align: left;
 }
 
-.markdown>table th {
-  background: #F7F7F7;
+.markdown > table th {
+  background: #f7f7f7;
 }
 
 .markdown blockquote {
@@ -318,12 +321,11 @@
   display: inline-block;
 }
 
-.markdown>br,
-.markdown>p>br {
+.markdown > br,
+.markdown > p > br {
   clear: both;
 }
 
-
 .hljs {
   display: block;
   background: white;
@@ -399,8 +401,8 @@ https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javasc
  * Based on dabblet (http://dabblet.com)
  * @author Lea Verou
  */
-code[class*="language-"],
-pre[class*="language-"] {
+code[class*='language-'],
+pre[class*='language-'] {
   color: black;
   background: none;
   text-shadow: 0 1px white;
@@ -422,46 +424,45 @@ pre[class*="language-"] {
   hyphens: none;
 }
 
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
+pre[class*='language-']::-moz-selection,
+pre[class*='language-'] ::-moz-selection,
+code[class*='language-']::-moz-selection,
+code[class*='language-'] ::-moz-selection {
   text-shadow: none;
   background: #b3d4fc;
 }
 
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
+pre[class*='language-']::selection,
+pre[class*='language-'] ::selection,
+code[class*='language-']::selection,
+code[class*='language-'] ::selection {
   text-shadow: none;
   background: #b3d4fc;
 }
 
 @media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
+  code[class*='language-'],
+  pre[class*='language-'] {
     text-shadow: none;
   }
 }
 
 /* Code blocks */
-pre[class*="language-"] {
+pre[class*='language-'] {
   padding: 1em;
-  margin: .5em 0;
+  margin: 0.5em 0;
   overflow: auto;
 }
 
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
+:not(pre) > code[class*='language-'],
+pre[class*='language-'] {
   background: #f5f2f0;
 }
 
 /* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
+:not(pre) > code[class*='language-'] {
+  padding: 0.1em;
+  border-radius: 0.3em;
   white-space: normal;
 }
 
@@ -477,7 +478,7 @@ pre[class*="language-"] {
 }
 
 .namespace {
-  opacity: .7;
+  opacity: 0.7;
 }
 
 .token.property,
@@ -505,7 +506,7 @@ pre[class*="language-"] {
 .language-css .token.string,
 .style .token.string {
   color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
+  background: hsla(0, 0%, 100%, 0.5);
 }
 
 .token.atrule,
@@ -516,7 +517,7 @@ pre[class*="language-"] {
 
 .token.function,
 .token.class-name {
-  color: #DD4A68;
+  color: #dd4a68;
 }
 
 .token.regex,

+ 37 - 38
src/assets/iconfont/iconfont.css

@@ -1,13 +1,13 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3676870 */
+  font-family: 'iconfont'; /* Project id 3676870 */
   src: url('iconfont.woff2?t=1664433387288') format('woff2'),
-       url('iconfont.woff?t=1664433387288') format('woff'),
-       url('iconfont.ttf?t=1664433387288') format('truetype'),
-       url('iconfont.svg?t=1664433387288#iconfont') format('svg');
+    url('iconfont.woff?t=1664433387288') format('woff'),
+    url('iconfont.ttf?t=1664433387288') format('truetype'),
+    url('iconfont.svg?t=1664433387288#iconfont') format('svg');
 }
 
 .iconfont {
-  font-family: "iconfont" !important;
+  font-family: 'iconfont' !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
@@ -15,130 +15,129 @@
 }
 
 .icon-brushes:before {
-  content: "\e704";
+  content: '\e704';
 }
 
 .icon-pop-up_screen_off:before {
-  content: "\e710";
+  content: '\e710';
 }
 
 .icon-pop-up_screen_on:before {
-  content: "\e712";
+  content: '\e712';
 }
 
 .icon-arrow:before {
-  content: "\e703";
+  content: '\e703';
 }
 
 .icon-arrows:before {
-  content: "\e705";
+  content: '\e705';
 }
 
 .icon-chat_on:before {
-  content: "\e706";
+  content: '\e706';
 }
 
 .icon-exit:before {
-  content: "\e707";
+  content: '\e707';
 }
 
 .icon-cross:before {
-  content: "\e708";
+  content: '\e708';
 }
 
 .icon-chat_off:before {
-  content: "\e709";
+  content: '\e709';
 }
 
 .icon-guided:before {
-  content: "\e70a";
+  content: '\e70a';
 }
 
 .icon-members:before {
-  content: "\e70b";
+  content: '\e70b';
 }
 
 .icon-list:before {
-  content: "\e70c";
+  content: '\e70c';
 }
 
 .icon-mic_off:before {
-  content: "\e70d";
+  content: '\e70d';
 }
 
 .icon-mic_on:before {
-  content: "\e70e";
+  content: '\e70e';
 }
 
 .icon-invitation:before {
-  content: "\e70f";
+  content: '\e70f';
 }
 
 .icon-revocation:before {
-  content: "\e711";
+  content: '\e711';
 }
 
 .icon-show:before {
-  content: "\e713";
+  content: '\e713';
 }
 
 .icon-Checkbox-off:before {
-  content: "\e702";
+  content: '\e702';
 }
 
 .icon-works_delete:before {
-  content: "\e6fd";
+  content: '\e6fd';
 }
 
 .icon-Checkbox-on:before {
-  content: "\e6fc";
+  content: '\e6fc';
 }
 
 .icon-works_cancel:before {
-  content: "\e6fe";
+  content: '\e6fe';
 }
 
 .icon-toast_green:before {
-  content: "\e6ff";
+  content: '\e6ff';
 }
 
 .icon-toast_red:before {
-  content: "\e700";
+  content: '\e700';
 }
 
 .icon-toast_yellow:before {
-  content: "\e701";
+  content: '\e701';
 }
 
 .icon-material_preview_upload_collect:before {
-  content: "\e6f4";
+  content: '\e6f4';
 }
 
 .icon-pop-ups_shut-down:before {
-  content: "\e6f5";
+  content: '\e6f5';
 }
 
 .icon-works_add:before {
-  content: "\e6f6";
+  content: '\e6f6';
 }
 
 .icon-works_search:before {
-  content: "\e6f7";
+  content: '\e6f7';
 }
 
 .icon-top:before {
-  content: "\e6f8";
+  content: '\e6f8';
 }
 
 .icon-works_share:before {
-  content: "\e6f9";
+  content: '\e6f9';
 }
 
 .icon-works_look:before {
-  content: "\e6fa";
+  content: '\e6fa';
 }
 
 .icon-works_editor:before {
-  content: "\e6fb";
+  content: '\e6fb';
 }
-

File diff suppressed because it is too large
+ 68 - 1
src/assets/iconfont/iconfont.js


+ 1 - 1
src/env/index.ts

@@ -16,4 +16,4 @@ export const token = params.token
 
 export const mainURL = import.meta.env.VITE_MAIN_URL
 
-export const liveStreamURL = import.meta.env.VITE_LIVE_STEAM_URL
+export const liveStreamURL = import.meta.env.VITE_LIVE_STEAM_URL

+ 4 - 3
src/store/room.ts

@@ -30,6 +30,7 @@ export interface ShareLinkType {
   lang?: string
   avatar?: string
   userId?: string
+  isTour?: string
 }
 
 export const createRoom = (room: Partial<Room>): Room => {
@@ -55,8 +56,8 @@ export const useRoomStore = defineStore('room', {
   getters: {
     getNums:
       () =>
-        <T extends Pick<Room, 'scenes'>>(room: T) =>
-          room.scenes.map(scene => scene.num),
+      <T extends Pick<Room, 'scenes'>>(room: T) =>
+        room.scenes.map(scene => scene.num),
     getShareUrl: () => (param: ShareLinkType) => {
       const search = new URLSearchParams()
       search.set('m', `${param.num}`)
@@ -66,7 +67,7 @@ export const useRoomStore = defineStore('room', {
       param.avatar && search.set('avatar', param.avatar)
       param.lang && search.set('set', param.lang)
       param.userId && search.set('vruserId', `user_${param.userId}`)
-      search.set('isTour', '0')
+      param.isTour && search.set('isTour', `${param.isTour}`)
       return liveStreamURL + '?' + search.toString()
     },
     filter: state => (keyowrd: string) =>

+ 2 - 3
src/style.css

@@ -26,7 +26,7 @@
   height: 100%;
 }
 
-.content-layout { 
+.content-layout {
   width: 100%;
   max-width: 1460px;
   margin: 0 auto;
@@ -38,7 +38,6 @@ body .ant-modal-confirm .ant-modal-body {
   padding: 26px;
 }
 
-
 body .ant-dropdown {
   min-width: auto !important;
-}
+}

+ 1 - 1
src/views/room/edit-room/index.vue

@@ -190,7 +190,7 @@ export default defineComponent({
 
 .info {
   flex: 1;
-
+  min-width: 500px;
   h4 {
     font-size: 18px;
     color: #333;

+ 4 - 2
src/views/room/list.vue

@@ -114,7 +114,8 @@ const shareRoom = async (room: Room) => {
       const link = roomStore.getShareUrl({
         roomId: room.id,
         num: m,
-        role: 'customer'
+        role: 'customer',
+        isTour: '1'
       })
       await copyText(link)
       message.success('链接复制成功')
@@ -154,7 +155,8 @@ const webSyncRoom = async (room: Room) => {
     role: 'leader',
     name: scenes.roomHostName,
     avatar: encodeURIComponent(user.avatar) || '',
-    userId: '1'
+    userId: '1',
+    isTour: '0'
   })
   console.log('带看link', link)
   window.open(link, '_blank')