评测报告分享问题

public/share-orchestra-evaluating/index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="酷乐秀APP，器乐学习的不二选择">
-  <title>酷乐秀</title>
+  <meta name="description" content="管乐团APP，器乐学习的不二选择">
+  <title>管乐团</title>
   <link rel="stylesheet" href="index.css">
   <script src="../helpers/rem-fit.min.js"></script>
   <script src="../helpers/qs.min.js"></script>
@@ -32,7 +32,7 @@
       </div>
     </div>
     <div class="desc">
-      <div class="tit">我用小酷Ai智能评测获得了<span id="score"></span>分！</div>
+      <div class="tit">我用云练习智能评测获得了<span id="score"></span>分！</div>
       <div class="info" id="examSongName"></div>
     </div>
     <div class="fraction" style="display: none;">
@@ -61,11 +61,10 @@
       <div class="app-info">
         <div class="app-title">管乐团云练习</div>
         <div class="app-desc">器乐学习的<span>不二选择</span></div>
-        <div class="app-subtitle">小酷Ai见证你的成长！</div>
+        <div class="app-subtitle">云练习见证你的成长！</div>
       </div>
       <div class="img">
         <img id="qrcode" src="./icons/qrcode.png"/>
-        <img class="logo" src="./icons/logo.png"/>
       </div>
     </div>
   </div>
@@ -92,9 +91,9 @@
     }
 
     window.addEventListener('load', function () {
-      QRCode.toDataURL(location.origin + '/accompany/colexiu-report-share.html?id=' + (parseSearch.id || '') + '&musicId=' + (parseSearch.musicId || '') + '&client=web', { errorCorrectionLevel: 'H', width: 192 }, function (err, val) {
-        console.log(val)
-        document.getElementById('qrcode').setAttribute('src', val)
+      // QRCode.toDataURL(location.origin + '/accompany/colexiu-report-share.html?id=' + (parseSearch.id || '') + '&musicId=' + (parseSearch.musicId || '') + '&client=web', { errorCorrectionLevel: 'H', width: 192 }, function (err, val) {
+        // console.log(val)
+        // document.getElementById('qrcode').setAttribute('src', val)
         html2canvas(document.body)
         .then((canvas) => canvas.toDataURL())
         .then(res => {
@@ -103,7 +102,7 @@
             window.setPng(res)
           }
         })
-      })
+      // })
     })
   </script>
   <!-- <script src="./index.js"></script> -->

src/page-colexiu/evaluat-model/evaluat-audio/index.tsx

@@ -1,6 +1,7 @@
 import { defineComponent } from "vue";
 import styles from "./index.module.less";
 import icons from "./index.json";
+import state from "/src/state";
 
 export default defineComponent({
 	name: "evaluat-audio",
@@ -11,7 +12,7 @@ export default defineComponent({
 				<div class={styles.title}>
 					<img src={icons.title} />
 				</div>
-				<div class={styles.tip}>评测{false ? "音视频" : "音频"}是否上传到云端？</div>
+				<div class={styles.tip}>评测{state.setting.camera && state.setting.saveToAlbum ? "音视频" : "音频"}是否上传到云端？</div>
 				<div class={styles.btns}>
 					<img src={icons.cancel} class={styles.btn} onClick={() => emit("close")} />
 					<img src={icons.confirm} class={styles.btn} onClick={() => emit("close", true)} />

src/page-orchestra/evaluat-model/evaluat-audio/index.tsx

@@ -1,6 +1,7 @@
 import { defineComponent } from "vue";
 import styles from "./index.module.less";
 import icons from "./index.json";
+import state from "/src/state";
 
 export default defineComponent({
 	name: "evaluat-audio",
@@ -11,7 +12,7 @@ export default defineComponent({
 				<div class={styles.title}>
 					<img src={icons.title} />
 				</div>
-				<div class={styles.tip}>评测{false ? "音视频" : "音频"}是否上传到云端？</div>
+				<div class={styles.tip}>评测{state.setting.camera && state.setting.saveToAlbum ? "音视频" : "音频"}是否上传到云端？</div>
 				<div class={styles.btns}>
 					<img src={icons.cancel} class={styles.btn} onClick={() => emit("close")} />
 					<img src={icons.confirm} class={styles.btn} onClick={() => emit("close", true)} />

src/page-orchestra/evaluat-model/evaluat-share/index.tsx

@@ -16,8 +16,8 @@ export default defineComponent({
 		const shareDisabeled = ref(true);
 		const getShareUrl = () => {
 			const data: any = {
-				name: storeData.user?.username || "",
-				subjectName: (storeData.user?.subjectNames || "").split(",")[0] || "",
+				name: storeData.user?.nickname || storeData.user?.realName || "",
+				subjectName: (storeData.user?.subjectName || "").split(",")[0] || "",
 				avatar: encodeURIComponent(storeData.user?.avatar || ""),
 				score: evaluatingData.resultData?.score || 0,
 				examSongName: state.examSongName || "",
@@ -28,6 +28,7 @@ export default defineComponent({
 				data.integrity = evaluatingData.resultData?.integrity;
 			}
 			// src.value = `${location.origin}/accompany/share-evaluating/index.html?${qs.stringify(data)}`;
+			console.log("🚀 ~ data:", data, storeData.user)
 			src.value = `${location.origin}${location.pathname}share-orchestra-evaluating/index.html?${qs.stringify(data)}`;
 		};
 		const shareLoaded = (evt: Event) => {

src/store.ts

@@ -2,11 +2,15 @@ import { reactive } from "vue";
 
 type IUser = {
 	username?: string
+	nickname?: string
+	/** 真实姓名 */
+	realName?: string
     /** 会员结束时间 */
     membershipEndTime?: string
 	tenantId?: number
 	/** 声部名称 */
 	subjectNames?: string
+	subjectName?: string
 	/** 头像 */
 	avatar?: string
 	memberRankSettingId?: number