添加链接统一逻辑

src/components/select-courseware-member/index.tsx

@@ -4,6 +4,7 @@ import popBox from './select_courseware_box.png';
 import popClose from './selce_courseware_close.png';
 import icon_btn from './select_btn.png';
 import { postMessage } from '@/helpers/native-message';
+import { getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'SelectCoursewarePop',
@@ -47,11 +48,7 @@ export default defineComponent({
                 postMessage({
                   api: 'openWebView',
                   content: {
-                    url: `${
-                      location.origin.includes('localhost')
-                        ? 'https://test.lexiaoya.cn'
-                        : location.origin
-                    }/classroom-app/#/member-center`,
+                    url: `${getHttpOrigin()}/classroom-app/#/member-center`,
                     orientation: 1
                   }
                 });

src/helpers/utils.ts

@@ -34,6 +34,10 @@ export function vaildPPTUrl() {
   return returnUrl;
 }
 
+export const getHttpOrigin = () => {
+	return window.location.origin
+}
+
 export const browser = () => {
   // https://blog.csdn.net/qq_19309473/article/details/124138954
   const u = navigator.userAgent;

src/views/adapay/pay-define/index.tsx

@@ -1,5 +1,5 @@
 import request from '@/helpers/request';
-import { browser, getUrlCode, moneyFormat } from '@/helpers/utils';
+import { browser, getHttpOrigin, getUrlCode, moneyFormat } from '@/helpers/utils';
 import { goAliAuth, goWechatAuth } from '@/state';
 import numeral from 'numeral';
 import { Button, Cell, CellGroup, Icon, showToast } from 'vant';
@@ -122,13 +122,13 @@ export default defineComponent({
           function (data: any) {
             if ('9000' == data.resultCode) {
               window.location.replace(
-                location.origin +
+                getHttpOrigin() +
                   '/classroom-app/#/payment-result?orderNo=' +
                   state.orderNo
               );
             } else {
               window.location.replace(
-                location.origin +
+                getHttpOrigin() +
                   '/classroom-app/#/payment-result?orderNo=' +
                   state.orderNo
               );
@@ -162,7 +162,7 @@ export default defineComponent({
             res.err_msg == 'get_brand_wcpay_request:fail'
           ) {
             window.location.replace(
-              location.origin +
+              getHttpOrigin() +
                 '/classroom-app/#/payment-result?orderNo=' +
                 state.orderNo
             );
@@ -171,7 +171,7 @@ export default defineComponent({
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
             // alert('支付成功')
             window.location.replace(
-              location.origin +
+              getHttpOrigin() +
                 '/classroom-app/#/payment-result?orderNo=' +
                 state.orderNo
             );

src/views/adapay/pay-result/index.tsx

@@ -1,5 +1,5 @@
 import request from '@/helpers/request';
-import { browser, getUrlCode, moneyFormat } from '@/helpers/utils';
+import { browser, getHttpOrigin, getUrlCode, moneyFormat } from '@/helpers/utils';
 import { goAliAuth, goWechatAuth } from '@/state';
 import {
   Cell,
@@ -104,7 +104,7 @@ export default defineComponent({
         console.log(e);
         // 接口报错也跳转到支付回调页
         window.location.replace(
-          location.origin +
+          getHttpOrigin() +
             '/classroom-app/#/payment-result?orderNo=' +
             state.orderNo
         );
@@ -130,13 +130,13 @@ export default defineComponent({
           function (data: any) {
             if ('9000' == data.resultCode) {
               window.location.replace(
-                location.origin +
+                getHttpOrigin() +
                   '/classroom-app/#/payment-result?orderNo=' +
                   state.orderNo
               );
             } else {
               window.location.replace(
-                location.origin +
+                getHttpOrigin() +
                   '/classroom-app/#/payment-result?orderNo=' +
                   state.orderNo
               );
@@ -216,7 +216,7 @@ export default defineComponent({
             res.err_msg == 'get_brand_wcpay_request:fail'
           ) {
             window.location.replace(
-              location.origin +
+              getHttpOrigin() +
                 '/classroom-app/#/payment-result?orderNo=' +
                 state.orderNo
             );
@@ -225,7 +225,7 @@ export default defineComponent({
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
             // alert('支付成功')
             window.location.replace(
-              location.origin +
+              getHttpOrigin() +
                 '/classroom-app/#/payment-result?orderNo=' +
                 state.orderNo
             );

src/views/co-ai/baseIndex.tsx

@@ -8,32 +8,20 @@ import {
 } from 'vue';
 import styles from './baseIndex.module.less';
 import icon_back from './image/icon_back.svg';
-import {
-  Button,
-  Space,
-  Tab,
-  Tabs,
-  showConfirmDialog,
-  Image,
-  Loading
-} from 'vant';
+import { Loading } from 'vant';
 import {
   api_lessonCoursewareFavoriteRemove,
   api_lessonCoursewareFavoriteSave
 } from '../courseware-list/api';
 import { NImage } from 'naive-ui';
-import { state } from '@/state';
-import TheFavorite from '@/components/the-favorite';
 import { useRouter } from 'vue-router';
 import { postMessage } from '@/helpers/native-message';
 import MEmpty from '@/components/m-empty';
 import MSearch from '@/components/m-search';
 import { api_musicSheetCategoriesPage, api_musicTagTree } from './api';
 import queryString from 'query-string';
-import { useRect } from '@vant/use';
-import { nextTick } from 'process';
 import iconDefaultCo from './image/icon-default-co.png';
-import { browser } from '@/helpers/utils';
+import { browser, getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'baseIndex-list',
@@ -165,7 +153,7 @@ export default defineComponent({
         name: item.name
       });
       const url =
-        location.origin + location.pathname + '#/co-ai-detail?' + query;
+        getHttpOrigin() + location.pathname + '#/co-ai-detail?' + query;
       console.log('🚀 ~ url:', url);
       postMessage({
         api: 'openWebView',

src/views/co-ai/index.tsx

@@ -53,7 +53,8 @@ import {
   sortMusical,
   getInstrumentName,
   vaildMusicScoreUrl,
-  trackToCode
+  trackToCode,
+  getHttpOrigin
 } from '@/helpers/utils';
 import { audioPlayType } from '@/helpers/constant';
 
@@ -348,11 +349,11 @@ export default defineComponent({
           : data.showMusicImg === 'staff'
           ? 'staff'
           : 'staff';
-      
+
       // pdf
       const musicSheetType = details?.musicSheetType;
       let musicPdfUrl = ''
-      
+
       if(musicSheetType === "SINGLE" || data.selectMusicInstrumentIndex === 999) {
         if( data.showMusicImg === "first") {
           musicPdfUrl = details.firstPdfUrl
@@ -379,20 +380,17 @@ export default defineComponent({
       data.musicPdfUrl = musicPdfUrl
       if(musicPdfUrl) {
         // data.iframeSrc = `/pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
-        data.iframeSrc = `${location.origin}${location.pathname}pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
+        data.iframeSrc = `${getHttpOrigin()}${location.pathname}pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
       } else {
 
-        // const origin = /(localhost|192)/.test(location.host)
-        // ? 'https://test.lexiaoya.cn'
-        // : location.origin;
-        // data.iframeSrc = `${origin}/instrument/?id=${details.id}&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${data.selectMusicInstrumentIndex}&musicRenderType=${musicRenderType}`;
+
         data.iframeSrc = `${vaildMusicScoreUrl()}/instrument/?id=${
           details?.id
         }&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${
           data.selectMusicInstrumentIndex
         }&musicRenderType=${musicRenderType}&zoom=0.6`;
       }
-      
+
 
       console.log('地址', data.iframeSrc);
     };
@@ -638,7 +636,7 @@ export default defineComponent({
         .filter((item: any) => item.canselect);
       //.sort((a: any, b: any) => a.sortId - b.sortId);
       data.trackList = arr;
-      
+
       // 是否显示总谱
       const selectMusic = data.musics[data.musicIndex];
       if (selectMusic) {
@@ -1012,7 +1010,7 @@ export default defineComponent({
                           src={data.iframeSrc}
                         ></iframe>
                       ) : ''}
-                      
+
                     </>
                   </div>
                 ) : (
@@ -1186,7 +1184,7 @@ export default defineComponent({
                 postMessage({
                   api: 'openWebView',
                   content: {
-                    url: `${location.origin}${location.pathname}#/member-center`,
+                    url: `${getHttpOrigin()}${location.pathname}#/member-center`,
                     orientation: 1
                   }
                 });
@@ -1207,7 +1205,7 @@ export default defineComponent({
                 postMessage({
                   api: 'openWebView',
                   content: {
-                    url: `${location.origin}${location.pathname}#/member-center`,
+                    url: `${getHttpOrigin()}${location.pathname}#/member-center`,
                     orientation: 1
                   }
                 });

src/views/collection-record/component/item.tsx

@@ -20,6 +20,7 @@ import {
 } from '../api';
 import { postMessage } from '@/helpers/native-message';
 import { state } from '@/state';
+import { getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'collection-record-item',
@@ -44,7 +45,7 @@ export default defineComponent({
 
     const handleOpenDetail = () => {
       if (props.item?.orderNo) {
-        const url = `${location.origin}${
+        const url = `${getHttpOrigin()}${
           location.pathname
         }#/collection-record-detail?orderNo=${props.item?.orderNo}${
           props.item.isRefund
@@ -109,7 +110,7 @@ export default defineComponent({
       if (res?.code === 200) {
         const paymentConfig = res.data.paymentConfig;
         const url =
-          location.origin +
+          getHttpOrigin() +
           location.pathname +
           '#/order-detail?orderNo=' +
           paymentConfig.orderNo +

src/views/courseware-list/component/book/index.tsx

@@ -16,7 +16,7 @@ import { listenerMessage, postMessage } from '@/helpers/native-message';
 import { showToast } from 'vant';
 import queryString from 'query-string';
 import { state } from '@/state';
-import { browser } from '@/helpers/utils';
+import { browser, getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'the-book',
@@ -280,7 +280,7 @@ export default defineComponent({
         if (browser().isApp) {
           const query = queryString.stringify(params);
           const url =
-            location.origin + location.pathname + '#/courseware-play?' + query;
+            getHttpOrigin() + location.pathname + '#/courseware-play?' + query;
           console.log('🚀 ~ url:', url);
           postMessage({
             api: 'openWebView',

src/views/courseware-play/component/musicScore.tsx

@@ -6,7 +6,7 @@ import { listenerMessage, postMessage } from '@/helpers/native-message';
 import { Loading, Popup, Skeleton } from 'vant';
 import { usePageVisibility } from '@vant/use';
 import { useRoute } from 'vue-router';
-import { browser, vaildMusicScoreUrl } from '@/helpers/utils';
+import { browser, getHttpOrigin, vaildMusicScoreUrl } from '@/helpers/utils';
 import { storage } from '@/helpers/storage';
 import { ACCESS_TOKEN } from '@/store/mutation-types';
 import TheVip from '@/components/the-vip';
@@ -199,7 +199,7 @@ export default defineComponent({
                 postMessage({
                   api: 'openWebView',
                   content: {
-                    url: `${location.origin}${location.pathname}#/member-center`,
+                    url: `${getHttpOrigin()}${location.pathname}#/member-center`,
                     orientation: 1
                   }
                 });

src/views/courseware-play/component/tempo-item/index.tsx

@@ -4,6 +4,7 @@ import qs from 'query-string';
 import { storage } from '@/helpers/storage';
 import { ACCESS_TOKEN } from '@/store/mutation-types';
 import { Skeleton } from 'vant';
+import { getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'tempo-item',
@@ -56,7 +57,7 @@ export default defineComponent({
     );
 
     const Authorization = storage.get(ACCESS_TOKEN);
-    const src = `${location.origin}/classroom-app/#/tempo-practice?dataJson=${props.dataJson}&Authorization=${Authorization}&modeType=courseware`;
+    const src = `${getHttpOrigin()}/classroom-app/#/tempo-practice?dataJson=${props.dataJson}&Authorization=${Authorization}&modeType=courseware`;
     return () => (
       <div class={styles.tempoItem}>
         <iframe

src/views/courseware-play/component/tools/pen.tsx

@@ -3,6 +3,7 @@ import html2canvas from 'html2canvas'
 import { closeToast, Icon, showFailToast, showLoadingToast, showSuccessToast } from 'vant'
 import { defineComponent, toRefs, ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
 import styles from './pen.module.less'
+import { getHttpOrigin } from '@/helpers/utils'
 
 export default defineComponent({
   name: 'pen',
@@ -19,9 +20,7 @@ export default defineComponent({
   setup(props) {
     const { show } = toRefs(props)
     const firstRender = ref(true)
-    const src = /(localhost|192)/.test(location.host)
-      ? 'https://test.lexiaoya.cn/whiteboard-noCollab'
-      : `${location.origin}/whiteboard-noCollab`
+    const src = `${getHttpOrigin()}/whiteboard-noCollab`
 
     const exportImg = (event: MessageEvent) => {
       const data = event.data

src/views/courseware-play/index.tsx

@@ -52,6 +52,7 @@ import {
   api_courseScheduleStudentPage
 } from './api';
 import ChapterCourse from './component/chapter-course';
+import { getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'CoursewarePlay',
@@ -1137,9 +1138,7 @@ export default defineComponent({
         api: 'openWebView',
         content: {
           url: `${
-            location.origin.includes('localhost')
-              ? 'https://test.lexiaoya.cn'
-              : location.origin
+            getHttpOrigin()
           }/classroom-app/#/member-center`,
           orientation: 1
         }

src/views/creation/index-share.tsx

@@ -26,7 +26,7 @@ import audioLabel from './share-model/images/audioLabel.png';
 import videoLabel from './share-model/images/videoLabel.png';
 import musicBg from './share-model/images/music-bg.png';
 import playImg from './images/play.png';
-import { browser, getGradeCh, getSecondRPM, vaildMusicScoreUrl } from '@/helpers/utils';
+import { browser, getGradeCh, getHttpOrigin, getSecondRPM, vaildMusicScoreUrl } from '@/helpers/utils';
 import { onBeforeRouteUpdate, useRoute, useRouter, onBeforeRouteLeave } from 'vue-router';
 import {
   postMessage
@@ -314,7 +314,7 @@ export default defineComponent({
         shareCall(str)
         setTimeout(() => {
           if(Date.now() - t < 3500){
-            window.location.href = location.origin + '/classroom-app/#/transfer'
+            window.location.href = getHttpOrigin() + '/classroom-app/#/transfer'
           }
         }, 3000)
       }

src/views/creation/share-model/index.tsx

@@ -28,6 +28,7 @@ import musicBg from './images/music-bg.png';
 import QRCode from 'qrcode';
 import { promisefiyPostMessage, postMessage } from '@/helpers/native-message';
 import html2canvas from 'html2canvas';
+import { getHttpOrigin } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'sahre-model',
@@ -178,7 +179,7 @@ export default defineComponent({
     onMounted(() => {
       const canvas = canvasRef.value;
       state.url =
-        location.origin +
+        getHttpOrigin() +
         location.pathname +
         '#/shareCreation?id=' +
         props.musicDetail.id;

src/views/hot-music-more/index.tsx

@@ -677,7 +677,7 @@ export default defineComponent({
           </List>
         </div>
 
-        
+
 
         <Teleport to={'body'}>
           <div class={[styles.searchBodySection]}>
@@ -831,13 +831,6 @@ export default defineComponent({
           <TheVip
             onClose={val => {
               if (val) {
-                // postMessage({
-                //   api: 'openWebView',
-                //   content: {
-                //     url: `${location.origin}${location.pathname}#/member-center`,
-                //     orientation: 1
-                //   }
-                // });
                 router.push('/member-center');
               }
               state.showVip = false;

src/views/hot-music-more/music-detail/index.tsx

@@ -21,6 +21,7 @@ import fixedActive from '../images/staff/fixed-active.png'
 import { Button, NoticeBar, Popover, showLoadingToast, showToast } from 'vant';
 import { state } from '@/state';
 import {
+  getHttpOrigin,
   getInstrumentName,
   sortMusical,
   vaildMusicScoreUrl
@@ -463,7 +464,7 @@ export default defineComponent({
       data.musicPdfUrl = musicPdfUrl;
       if (musicPdfUrl) {
         // data.iframeSrc = `/pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
-        data.iframeSrc = `${location.origin}${
+        data.iframeSrc = `${getHttpOrigin()}${
           location.pathname
         }pdf/web/viewer.html?file=${encodeURIComponent(
           data.musicPdfUrl
@@ -603,7 +604,7 @@ export default defineComponent({
             )}
           </div>
 
-          
+
           <div class={[styles.container, styles.downContainer]}  ref={downRef}>
             <div
               class={[styles['right-musicName'], styles.downloadMusicName]}
@@ -665,8 +666,8 @@ export default defineComponent({
               </div>
           </div>
         </div>
-        
-        
+
+
         <div class={styles.btnGroup}>
           <div class={styles.operation}>
             {isEnsemble.value && (

src/views/pre-register-active/index.tsx

@@ -13,7 +13,7 @@ import {
 import { useRoute, useRouter } from 'vue-router';
 import threeMan from './images/update/three-man.png'
 import OWxTip from '@/components/m-wx-tip';
-import { browser, getUrlCode } from '@/helpers/utils';
+import { browser, getHttpOrigin, getUrlCode } from '@/helpers/utils';
 import qs from 'query-string';
 import request from '@/helpers/request';
 import { goWechatAuth } from '@/state';
@@ -351,7 +351,7 @@ export default defineComponent({
       console.log(code, 'code')
       if (!code) {
         const newUrl =
-          window.location.origin +
+          getHttpOrigin() +
           window.location.pathname +
           '#' +
           route.path +

src/views/student-register/index-apply.tsx

@@ -37,7 +37,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useStudentRegisterStore } from '@/store/modules/student-register-store';
 import request from '@/helpers/request';
 import requestStudent from './request';
-import { browser, checkPhone, getUrlCode, moneyFormat } from '@/helpers/utils';
+import { browser, checkPhone, getHttpOrigin, getUrlCode, moneyFormat } from '@/helpers/utils';
 import deepClone from '@/helpers/deep-clone';
 import OWxTip from '@/components/m-wx-tip';
 import MDialog from '@/components/m-dialog';
@@ -1080,10 +1080,10 @@ export default defineComponent({
       // return;
       if (val.payCode === 'payResult') {
         window.location.href =
-          window.location.origin + '/classroom-app/#/payResult?' + params;
+          getHttpOrigin() + '/classroom-app/#/payResult?' + params;
       } else {
         state.qrCodeUrl =
-          window.location.origin + '/classroom-app/#/payDefine?' + params;
+          getHttpOrigin() + '/classroom-app/#/payDefine?' + params;
         state.showQrcode = true;
         state.paymentStatus = false;
 
@@ -1205,7 +1205,7 @@ export default defineComponent({
       const code = getUrlCode();
       if (!code) {
         const newUrl =
-          window.location.origin +
+          getHttpOrigin() +
           window.location.pathname +
           '#' +
           route.path +

src/views/student-register/index.tsx

@@ -39,7 +39,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useStudentRegisterStore } from '@/store/modules/student-register-store';
 import request from '@/helpers/request';
 import requestStudent from './request';
-import { browser, checkPhone, getUrlCode, moneyFormat } from '@/helpers/utils';
+import { browser, checkPhone, getHttpOrigin, getUrlCode, moneyFormat } from '@/helpers/utils';
 import deepClone from '@/helpers/deep-clone';
 import OWxTip from '@/components/m-wx-tip';
 import MDialog from '@/components/m-dialog';
@@ -1117,10 +1117,10 @@ export default defineComponent({
       // return;
       if (val.payCode === 'payResult') {
         window.location.href =
-          window.location.origin + '/classroom-app/#/payResult?' + params;
+          getHttpOrigin() + '/classroom-app/#/payResult?' + params;
       } else {
         state.qrCodeUrl =
-          window.location.origin + '/classroom-app/#/payDefine?' + params;
+          getHttpOrigin() + '/classroom-app/#/payDefine?' + params;
         state.showQrcode = true;
         state.paymentStatus = false;
 
@@ -1281,7 +1281,7 @@ export default defineComponent({
       const code = getUrlCode();
       if (!code) {
         const newUrl =
-          window.location.origin +
+          getHttpOrigin() +
           window.location.pathname +
           '#' +
           route.path +

src/views/student-register/order-detail.tsx

@@ -19,7 +19,7 @@ import Payment from '@/views/adapay/payment';
 import { useRoute, useRouter } from 'vue-router';
 import request from '@/helpers/request';
 import { state as baseState } from '@/state';
-import { browser, moneyFormat } from '@/helpers/utils';
+import { browser, getHttpOrigin, moneyFormat } from '@/helpers/utils';
 import OProtocol from '@/components/m-protocol';
 import OPopup from '@/components/m-popup';
 import UserAuth from './component/user-auth';
@@ -149,10 +149,10 @@ export default defineComponent({
       });
       if (val.payCode === 'payResult') {
         window.location.href =
-          window.location.origin + '/classroom-app/#/payResult?' + params;
+          getHttpOrigin() + '/classroom-app/#/payResult?' + params;
       } else {
         state.qrCodeUrl =
-          window.location.origin + '/classroom-app/#/payDefine?' + params;
+          getHttpOrigin() + '/classroom-app/#/payDefine?' + params;
         state.showQrcode = true;
         state.paymentStatus = false;
 

src/views/student-register/register-modal/index.tsx

@@ -27,7 +27,7 @@ import MProtocol from '@/components/m-protocol';
 import { state as baseState, setLogin } from '@/state';
 import qs from 'query-string';
 import MImgCode from '@/components/m-img-code';
-import { browser, checkPhone, moneyFormat } from '@/helpers/utils';
+import { browser, checkPhone, getHttpOrigin, moneyFormat } from '@/helpers/utils';
 import request from '@/helpers/request';
 import { useStudentRegisterStore } from '@/store/modules/student-register-store';
 import { setLoginInit, state } from '@/state';
@@ -548,10 +548,10 @@ export default defineComponent({
       // return;
       if (val.payCode === 'payResult') {
         window.location.href =
-          window.location.origin + '/classroom-app/#/payResult?' + params;
+          getHttpOrigin() + '/classroom-app/#/payResult?' + params;
       } else {
         state.qrCodeUrl =
-          window.location.origin + '/classroom-app/#/payDefine?' + params;
+          getHttpOrigin() + '/classroom-app/#/payDefine?' + params;
         state.showQrcode = true;
         state.paymentStatus = false;
 

src/views/tenantAllData/index.tsx

@@ -42,6 +42,7 @@ import html2canvas from 'html2canvas';
 import MWxTip from '@/components/m-wx-tip';
 import deepClone from '@/helpers/deep-clone';
 import { number } from 'echarts';
+import { getHttpOrigin } from '@/helpers/utils';
 export default defineComponent({
   name: 'tenant-apply-data',
   setup() {
@@ -680,7 +681,7 @@ export default defineComponent({
                       <div
                         onClick={() => {
                           forms.urlItem = item;
-                          forms.url = `${location.origin}/classroom-app/#/tenantDataShool?id=${item.schoolId}&name=${item.schoolName}`;
+                          forms.url = `${getHttpOrigin()}/classroom-app/#/tenantDataShool?id=${item.schoolId}&name=${item.schoolName}`;
 
                           nextTick(() => {
                             downImg();