Selaa lähdekoodia

Merge branch 'beta'

lsc 3 viikkoa sitten
vanhempi
commit
19a73d8169

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.97562f661c8c48ce7da817522d078638.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.4536ffbdd075e2e1414f.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.1419b6283639daca3eec676d95fb2ee8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.07cde1b75dda48125523.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/css/app.1419b6283639daca3eec676d95fb2ee8.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/css/app.1419b6283639daca3eec676d95fb2ee8.css.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.07cde1b75dda48125523.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.07cde1b75dda48125523.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 14 - 14
src/components/pptEasyClass/shareDialog.vue

@@ -19,8 +19,8 @@
             </div></template
           >
         </el-input>
-        <!-- <div class="qrcode" ref="qrCodeRef"></div>
-				<el-link class="qrcodeBtn" type="primary" @click="downloadQrCode()">下载二维码</el-link> -->
+        <div class="qrcode" ref="qrCodeRef"></div>
+				<el-link class="qrcodeBtn" type="primary" @click="downloadQrCode()">下载二维码</el-link>
       </div>
       <!-- <span slot="footer" class="shareFooter">
         <el-button @click="close()">{{ lang.ssCancelBtn }}</el-button>
@@ -55,18 +55,18 @@ export default {
   watch: {
     "form.url"(newValue) {
       console.log(newValue)
-      // this.$nextTick(() => {
-      //   this.$refs.qrCodeRef.innerHTML = "";
-      //   if (!newValue) return;
-      //   new QRCode(this.$refs.qrCodeRef, {
-      //     text: `https://beta.cloud.cocorobo.cn/#/?shareCourseId=${this.courseId}`, // 需要转换为二维码的内容
-      //     width: 100,
-      //     height: 100,
-      //     colorDark: "#000000",
-      //     colorLight: "#ffffff",
-      //     correctLevel: QRCode.CorrectLevel.H
-      //   });
-      // });
+      this.$nextTick(() => {
+        this.$refs.qrCodeRef.innerHTML = "";
+        if (!newValue) return;
+        new QRCode(this.$refs.qrCodeRef, {
+          text: `https://beta.cloud.cocorobo.cn/#/?shareCourseId=${this.courseId}`, // 需要转换为二维码的内容
+          width: 100,
+          height: 100,
+          colorDark: "#000000",
+          colorLight: "#ffffff",
+          correctLevel: QRCode.CorrectLevel.H
+        });
+      });
     }
   },
   methods: {

+ 1 - 1
src/lang/cn.json

@@ -906,6 +906,6 @@
   "ssPleaseGenerateLink": "请先生成链接",
   "ssCopyFailed": "复制失败",
   "ssShowResult": "展示结果",
-  "ssHideResult": "隐藏结果",
+  "ssHideResult": "展示结果",
   "ssLongTimeNoOperation": "长时间无操作,将自动退出"
 }

+ 1 - 1
src/lang/en.json

@@ -906,6 +906,6 @@
   "ssPleaseGenerateLink": "Please generate link first",
   "ssCopyFailed": "Copy failed",
   "ssShowResult": "Show Result",
-  "ssHideResult": "Hide Result",
+  "ssHideResult": "Show Result",
   "ssLongTimeNoOperation": "Long time no operation, will be logged out"
 }

+ 1 - 1
src/lang/hk.json

@@ -906,6 +906,6 @@
   "ssPleaseGenerateLink": "請先生成鏈接",
   "ssCopyFailed": "複製失敗",
   "ssShowResult": "展示結果",
-  "ssHideResult": "隱藏結果",
+  "ssHideResult": "展示結果",
   "ssLongTimeNoOperation": "長時間無操作,將自動退出"
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä