update

public/index.html

@@ -24,13 +24,12 @@
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/vconsole.js"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/swiper/swiper-bundle.min.js"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/socket.io.min.js"></script>
-        <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/lib-generate-test-usersig.min.js"></script>
 
 
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
         
-        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk-deps.js?v=4.32.0-alpha.51"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk.js?v=4.32.0-alpha.51"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk-deps.js?v=4.32.1-alpha.51"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk.js?v=4.32.1-alpha.51"></script>
 
         <!-- <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk-deps.js?v=4.0.0-alpha.44"></script>
         <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk.js?v=4.0.0-alpha.44"></script> -->

src/app.vue

@@ -171,11 +171,9 @@ const resize = () => {
 watch(
   () => isshoppingguide.value,
   (val, old) => {
-
     let $minmap = document.querySelector("[xui_min_map]");
     if ($minmap) {
       setTimeout(async () => {
-      
         if (role.value == "leader") {
           return;
         }
@@ -267,8 +265,10 @@ const onClickTagInfo = (el) => {
     });
   } else if (item.type == "link_scene") {
     guideclicktag(item);
-    let sceneFirstView = item.hotContent.sceneFirstView;
-    window.location.href = jumpNewScene(sceneFirstView);
+    setTimeout(() => {
+      let sceneFirstView = item.hotContent.sceneFirstView;
+      window.location.href = jumpNewScene(sceneFirstView);
+    }, 100);
   }
 };
 
@@ -282,8 +282,10 @@ const guideclicktag = (tag) => {
             sid: tag.sid,
           },
         });
+      console.log(tag, "触发--------------");
     }
   }
+  return;
 };
 
 onMounted(async () => {
@@ -379,9 +381,10 @@ onMounted(async () => {
             } catch (error) {}
           } else if (tag.type == "link_scene") {
             guideclicktag(tag);
-            let sceneFirstView = tag.hotContent.sceneFirstView;
-            window.location.href = jumpNewScene(sceneFirstView);
-
+            setTimeout(() => {
+              let sceneFirstView = tag.hotContent.sceneFirstView;
+              window.location.href = jumpNewScene(sceneFirstView);
+            }, 100);
           }
         });
       });
@@ -417,7 +420,6 @@ onMounted(async () => {
   // }
   app.Scene.on("ready", () => {
     show.value = true;
-
   });
   app.Scene.on("error", (data) => {
     switch (data.code) {
@@ -442,22 +444,22 @@ onMounted(async () => {
 
     if (browser.getURLParam("roomId")) {
       store.commit("showShoppingguide", true);
-    }else{
-          if (!localStorage.getItem("user_guide")) {
-            Dialog.confirm({
-              showCloseIcon: false,
-              okText: "我知道了",
-              content:
-                "<span style='font-size: 16px; line-height: 1.5;'>開發者已遵守收集、使用最終用戶個人信息有關的所有可適用法律、政策和法規，保護用戶個人信息安全。<span/>",
-              title: "隱私條款：",
-              single: true,
-              func: (state) => {
-                if (state == "ok") {
-                  localStorage.setItem("user_guide", Date.now());
-                }
-              },
-            });
-          }
+    } else {
+      if (!localStorage.getItem("user_guide")) {
+        Dialog.confirm({
+          showCloseIcon: false,
+          okText: "我知道了",
+          content:
+            "<span style='font-size: 16px; line-height: 1.5;'>開發者已遵守收集、使用最終用戶個人信息有關的所有可適用法律、政策和法規，保護用戶個人信息安全。<span/>",
+          title: "隱私條款：",
+          single: true,
+          func: (state) => {
+            if (state == "ok") {
+              localStorage.setItem("user_guide", Date.now());
+            }
+          },
+        });
+      }
     }
 
     app.resource.tags(`${process.env.VUE_APP_RESOURCE_URL}cdf/hot/${browser.getURLParam("m")}/hot.json?rnd=${Math.random()}`);

src/components/RTC/PageRtcLive.vue

@@ -467,6 +467,7 @@ const startFollow = (app) => {
       socket.value.emit("action", { type: "user-init" });
       if (data.user.IsMuted) {
         disableMic.value = true;
+        audioMuted.value = true;
       }
     }
 
@@ -544,7 +545,6 @@ const startFollow = (app) => {
         }
       }
     } else if (data.type == "user-join") {
-      console.log(1111, data);
       setUserJoin(data);
     } else if (data.type == "users-muted") {
       setUserMuted(data);
@@ -562,7 +562,7 @@ const startFollow = (app) => {
       if (role.value == "customer") {
         let item = tags.value.find((item) => item.sid == data.data.sid);
 
-        console.log(item,'itemitemitemitemitemitem');
+        console.log(item, "itemitemitemitemitemitem");
 
         if (item.type == "commodity") {
           store.commit("tag/setTagClickType", {
@@ -574,10 +574,9 @@ const startFollow = (app) => {
             type: "waterfall",
             data: item,
           });
-        }
-        else if (item.type == "link_scene") {
+        } else if (item.type == "link_scene") {
           let sceneFirstView = item.hotContent.sceneFirstView;
-            window.location.href = jumpNewScene(sceneFirstView);
+          window.location.href = jumpNewScene(sceneFirstView);
         }
         // document.querySelector(`[data-tag-id="${data.data.sid}"]`).click();
         // console.log(data.data.sid);

src/components/RTC/Trtccom.vue

@@ -41,6 +41,7 @@ import { ref, computed, watch, defineEmits, defineProps, nextTick } from "vue";
 import Device from "./trtc/Device";
 import { useStore } from "vuex";
 import browser from "@/utils/browser";
+import * as apis from "@/apis/index.js";
 
 const emit = defineEmits(["audioMuted", "videoMuted"]);
 
@@ -56,7 +57,6 @@ const muteVideoLeader = ref(false);
 
 const isJoined = computed(() => store.getters["rtc/isJoined"]);
 const isPublished = computed(() => store.getters["rtc/isPublished"]);
-const userSig = computed(() => store.getters["rtc/userSig"]);
 const videoDeviceId = computed(() => store.getters["rtc/videoDeviceId"]);
 
 const initParamsStates = computed(
@@ -131,6 +131,7 @@ async function createLocalStream() {
     isLeader && localStream.setVideoProfile("480p");
 
     await localStream.initialize();
+    audioMuted.value && localStream.muteAudio();
   } catch (error) {
     console.log(error, "createStream");
   }
@@ -142,11 +143,12 @@ async function handleJoin() {
   }
 
   try {
+    let res = await apis.getSign({ userId: store.getters["rtc/userId"] })
     localClient = TRTC.createClient({
       mode: "rtc",
       sdkAppId: parseInt(store.getters["rtc/sdkAppId"], 10),
       userId: store.getters["rtc/userId"],
-      userSig: userSig.value,
+      userSig: res.data.sign,
       useStringRoomId: true,
     });
     installEventHandlers();

src/components/Tags/goods-list.vue

@@ -57,8 +57,8 @@
               </ul>
             </div>
             <div class="goods-button">
-              <span  v-if="i.saleChannel == 1" class="tipss">僅供線下門店購買</span>
-               <template  v-else>
+              <span v-if="i.saleChannel == 1" class="tipss">僅供線下門店購買</span>
+              <template v-else>
                 <div @click.stop="viewDetail(i)">查看詳情</div>
                 <div @click.stop="addCart(i)">加入購物車</div>
               </template>
@@ -91,9 +91,10 @@ const current = ref(0);
 const viewDetail = (item) => {
   apis.burying_point({ type: 3, productId: item.id });
   browser.openLink(
-  `/pages/item/item?productId=${item.id}`, 
-  `https://m.cdfmembers.com/shop/600667208/item?productId=${item.id}`,
-  `/pages/item/item?productId=${item.id}`);
+    `/pages/item/item?productId=${item.id}`,
+    `https://m.cdfmembers.com/shop/600667208/item?productId=${item.id}`,
+    `/pages/item/item?productId=${item.id}`
+  );
 };
 
 const onClickSku = (item) => {
@@ -117,12 +118,12 @@ const addCart = async (item) => {
     AccessToken: browser.getURLParam("AccessToken"),
     skuId: item.currentSku.id,
     num: item.cartnum,
-    rnd:Math.random()
+    rnd: Math.random(),
   });
 
   Loading.hide();
   if (result.code === 0) {
-    apis.burying_point({ type: 7, productId: item.id});
+    apis.burying_point({ type: 7, productId: item.id });
     return Dialog.toast({ content: `添加成功`, type: "success" });
   } else {
     let callbackUrl = `${window.location.origin}${window.location.pathname}?m=${browser.getURLParam("m")}&${getApp().Camera.getPoseUrlParams()}`;
@@ -368,7 +369,7 @@ onMounted(() => {
               background: var(--editor-main-color);
             }
           }
-          .tipss{
+          .tipss {
             color: #909090;
             display: inline-block;
             margin: 0 auto;

src/store/modules/rtc.js

@@ -1,7 +1,5 @@
 
 
-import { genTestUserSig } from '@/utils/generateTestUserSig';
-// import { apis } from '@/apis';
 
 export default {
     namespaced: true,
@@ -9,10 +7,10 @@ export default {
         return {
             socket: null,
             showdaogou: false,
-            sdkAppId: '1400709402',
+            sdkAppId: 1400709402,
             userId: '',
             roomId: '',
-            secretKey: 'def391b02e6423a6db15eea3d9a0c131f2abac921204246bbe3f36fcea7d111d',
+            secretKey: 'ef391b02e6423a6db15eea3d9a0c131f2abac921204246bbe3f36fcea7d111d',
             userSig: 'eJw1jlELgjAURv-LnkPunXNToZceosB6SPsBwVbelrLpFCH675XW43c*Dpwnq4oyMpOjzrBcgkgBVjMbTcdyxiNgy*61vThHmuUoABRkAvjykDZtoCvNAsbAUaWA8u-R7YttFno-JNPou7LBuH0MQR6t2tp6cz-5sy75zrXV3heH9U8M1HySUCapirnC7PUGl3Ix6g__',
             audioDeviceId: '',
             videoDeviceId: '',
@@ -38,12 +36,7 @@ export default {
         roomId: state => state.roomId,
         secretKey: state => state.secretKey,
         userSig: state => {
-            const { userSig } = genTestUserSig({
-                sdkAppId: parseInt(state.sdkAppId, 10),
-                userId:state.userId,
-                secretKey: state.secretKey,
-            });
-            return userSig
+            return state.userSig
         },
         audioDeviceId: state => state.audioDeviceId,
         videoDeviceId: state => state.videoDeviceId,