Merge branch 'test'

src/utils/requestAct.ts

@@ -50,7 +50,7 @@ service.interceptors.request.use(
 
 
         const newParams = {
         const newParams = {
             token: queryParams?.token || "debug",
             token: queryParams?.token || "debug",
-            micId: queryParams?.uid || 123456,
+            micId: queryParams?.uid || 1,
             lang: queryParams?.lang || 2,
             lang: queryParams?.lang || 2,
             cid: queryParams?.cid || "web_gw",
             cid: queryParams?.cid || "web_gw",
             vest: queryParams?.vest || 0,
             vest: queryParams?.vest || 0,
@@ -74,8 +74,6 @@ service.interceptors.request.use(
 service.interceptors.response.use(
 service.interceptors.response.use(
     (response: AxiosResponse) => {
     (response: AxiosResponse) => {
         const { code, msg } = response.data
         const { code, msg } = response.data
-        console.log(response.data,'response.data?');
-        
         if (code === 1) {
         if (code === 1) {
             return response.data;
             return response.data;
         } else {
         } else {

src/utils/ws/pkSocket.js

-import { usePkStore } from '@/stores/pkStore';
-const pkStore = usePkStore();
-function url_get_params(url_path) {
-  let url = url_path;
-  let theRequest = new Object();
-  if (url.indexOf("?") != -1) {
-    let str = url.substr(url.indexOf("?") + 1);
-    strs = str.split("&");
-    for (let i = 0; i < strs.length; i++) {
-      theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
-    }
-  }
-  return theRequest;
-}
-
-let wsTimer = null;
-let wsReconnect = null;
-let mUrlParam = url_get_params(location.href);
-pkStore.setMurlParam(mUrlParam);
-console.log(mUrlParam, 'mUrlParam');
-
-let ws = null;
-export function WebSocketGo() {
-  /* 測試: ws://47.75.50.13:5300/ws */
-  /* 正式: wss://firefly-cloud-websocket.yabolive.net/ws */
-
-  ws = new WebSocket(
-    `${import.meta.env.VITE_APP_WS_URL}?type=4&uid=` +
-    mUrlParam.uid +
-    "&token=debug" +
-    "&roomid=" +
-    mUrlParam.roomId +
-    "&lang=" +
-    mUrlParam.lang
-  );
-  console.log("建立链接");
-  pkStore.setWsLocation("WS建立连接中...")
-
-  ws.onopen = function () {
-    clearInterval(wsReconnect);
-    clearInterval(wsTimer);
-    wsTimer = setInterval(function () {
-      heartbeat();
-    }, 4500);
-  };
-  ws.onmessage = function (event) {
-    let msg = JSON.parse(event.data);
-    console.log("推流", msg);
-
-    // 存储游戏推流数据
-    if (msg.content) {
-      const parseData = JSON.parse(msg.content);
-      if (parseData.wsdata) {
-        pkStore.setGameData(JSON.parse(msg.content).wsdata);
-      }
-    }
-  };
-  ws.onclose = function (error) {
-    clearInterval(wsReconnect);
-    wsReconnect = setInterval(function () {
-      console.log("断了", error);
-      pkStore.setWsLocation("WS断开连接...")
-      WebSocketGo();
-    }, 3000);
-  };
-  function heartbeat() {
-    if (ws.readyState == WebSocket.OPEN) {
-      pkStore.setWsLocation("WS发送心跳...")
-      var msg = new WsMsg(1000, "ping", 0, mUrlParam.uid);
-      ws.send(JSON.stringify(msg));
-    }
-  }
-  function WsMsg(cid, content, extend, uid) {
-    this.time = new Date().getTime();
-    this.msgid = Math.random().toString(36).slice(-8);
-    this.cid = cid;
-    this.content = content;
-    this.extend = extend;
-    this.uid = uid;
-  }
-}
-
-export function closeWebSocket() {
-  if (ws) {
-    clearInterval(wsTimer);
-    clearInterval(wsReconnect);
-    ws.close();
-    ws = null;
-  }
-}

src/views/activity/recruitment/components/review/index.vue

@@ -93,7 +93,7 @@ watch(() => props.resultLevel, (newVal) => {
         font-family: PingFang SC;
         font-family: PingFang SC;
         font-weight: bold;
         font-weight: bold;
         font-size: 52px;
         font-size: 52px;
-        color: #111;
+        color: #444444;
         padding: 40px 0 34px 0;
         padding: 40px 0 34px 0;
     }
     }
 
 

src/views/activity/recruitment/index.vue

@@ -16,13 +16,6 @@ const getAnchorSignView = async () => {
         type: 0
         type: 0
     });
     });
 
 
-    // 签约状态 0 需要签约页面 1 签约结果页面 
-    if (data.signInfo == 1) {
-        isShowReview.value = true
-    } else {
-        isShowReview.value = false
-    }
-
     // 合作状态
     // 合作状态
     signLevel.value = data.levelInfo;
     signLevel.value = data.levelInfo;
 
 
@@ -31,14 +24,25 @@ const getAnchorSignView = async () => {
 
 
     // 签约平台
     // 签约平台
     platformList.value = data.list;
     platformList.value = data.list;
+
+    // 签约状态 0 需要签约页面 1 签约结果页面 
+    if (data.signInfo == 1) {
+        isShowReview.value = true
+    } else {
+        isShowReview.value = false
+    }
 };
 };
 
 
+const refresh = () => {
+    getAnchorSignView()
+}
+
 onMounted(() => {
 onMounted(() => {
     getAnchorSignView()
     getAnchorSignView()
 })
 })
 </script>
 </script>
 <template>
 <template>
-    <sign v-if="isShowReview === false" :signLevel="signLevel" :platformList="platformList" />
+    <sign v-if="isShowReview === false" :signLevel="signLevel" :platformList="platformList" @refreshView="refresh" />
     <review v-else-if="isShowReview === true" :resultLevel="resultLevel" />
     <review v-else-if="isShowReview === true" :resultLevel="resultLevel" />
 </template>
 </template>
 <style scoped lang="scss"></style>
 <style scoped lang="scss"></style>
\ No newline at end of file