Merge branch 'beta'

dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.bdee9dea19b20a25cb578c8a215e9d42.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.13ce8e475898fba4b86d.js></script><script type=text/javascript src=./static/js/vendor.715d92365c85ab803f65.js></script><script type=text/javascript src=./static/js/app.2114b80cb00472e7bb15.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.5356c8ba2d7d3c79895ab7ce198f7445.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.13ce8e475898fba4b86d.js></script><script type=text/javascript src=./static/js/vendor.715d92365c85ab803f65.js></script><script type=text/javascript src=./static/js/app.5c3282d929e1d81f90ec.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.e88a32828c71174cbdd2d803968f5b6b.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7e4b52d86fde7f24e41c.js></script><script type=text/javascript src=./static/js/workPage.bc3fd496c595560c729f.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.673db1442131b18b96fcbfafeb12735f.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7e4b52d86fde7f24e41c.js></script><script type=text/javascript src=./static/js/workPage.e2c802eb500064e07fc1.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

src/components/pages/pptEasy/addCourse2.vue

@@ -869,7 +869,7 @@
             ></el-input>
           </span>
         </el-form-item>
-        <el-form-item :label="lang.ssLink" :label-width="formLabelWidth">
+        <el-form-item :label="lang.URL" :label-width="formLabelWidth">
           <span>
             <el-input
               :placeholder="lang.ssEnterLink"
@@ -882,7 +882,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clearLine">{{ lang.ssCancel }}</el-button>
-        <el-button type="primary" @click="isAddOrUpdateLine">{{ lang.ssConfirm }}</el-button>
+        <el-button type="primary" @click="isAddOrUpdateLine">{{ lang.Add }}</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -2013,6 +2013,9 @@ export default {
               }
             }
           }
+          if (this.CourseType[0] && this.CourseType[0].length && this.lang.lang == 'com') {
+            this.CourseType[0] = this.CourseType[0].filter(item => item.id != '34629bcc-d02f-11ec-8c78-005056b86db5');
+          }
           this.courseTypeId = _courseTypeId;
         })
         .catch(err => {

src/components/pages/workPage/components/questionsAndAnswers.vue

@@ -55,7 +55,7 @@
     <!-- 录音转文字 -->
     <iframe
       allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-      src="https://beta.cloud.cocorobo.cn/browser/public/index.html"
+      :src="iframeUrl"
       ref="iframeRef"
       v-show="false"
     ></iframe>
@@ -89,6 +89,17 @@ export default {
 
     };
   },
+  computed: {
+    iframeUrl() {
+      if (this.lang.lang == 'com') {
+        return `https://cloud.cocorobo.com/browser/public/index.html`;
+      }else if(this.lang.lang == 'hk'){
+        return `https://cloud.cocorobo.hk/browser/public/index.html`;
+      }else{
+        return `https://beta.cloud.cocorobo.cn/browser/public/index.html`;
+      }
+    }
+  },
   watch: {
     work: {
       deep: true,

src/lang/cn.json

@@ -2016,7 +2016,8 @@
   "ssPrevQ":"上一题",
   "ssNextQ":"下一题",
   "ssUntitledCourse":"暂未命名",
-  "ssPPtUpProgress":"上传进度(*)"
+  "ssPPtUpProgress":"上传进度(*)",
+  "ssBilibiliVideoSearchKeyword":"请输入关键词"
 
 
 

src/lang/en.json

@@ -921,8 +921,8 @@
   "ssEnterTextT":"Enter Text Title...",
   "ssAddLink":"Add a Link",
   "ssTitle":"Title",
-  "ssEnterLinkT":"Enter link display text",
-  "ssEnterLink":"Enter URL",
+  "ssEnterLinkT":"Enter a title for this link...",
+  "ssEnterLink":"Enter URL...",
   "ssModifyRes":"Modify resources",
   "ssAddRes":"Add resources",
   "ssAddCourseM":"Add course members",
@@ -942,7 +942,7 @@
   "ssEnterQues":"Enter question",
   "ssDelete":"Delete",
   "ssEnterOpt":"Enter option",
-  "ssCreateChoice":"Create Multiple Choice Questions",
+  "ssCreateChoice":"Create Questionnaire",
   "ssUploadWait":"Uploading，please wait",
   "ssIntGen":"Intelligent Generation",
   "ssSmartPaste":"SMART Paste",
@@ -1740,7 +1740,7 @@
   "ssQuestionnaire":"Questionnaire",
   "ssSentence":"Sentence",
   "ssCocoFlow":"cocoFlow",
-  "ssClickAddCover":"Click to add cover",
+  "ssClickAddCover":"Add Cover Image",
   "ssSelectCollab":"Please select collaborators",
   "ssClear":"Clear",
   "ssAddObjMgmt":"Please add objective management",
@@ -1904,7 +1904,7 @@
   "ssPptLoad":"PPT is loading, please wait",
   "ssUploadPptFail":"Failed to upload PPT data",
   "ssCopyToolSucc":"Tool copied successfully",
-  "ssAddH5":"Add H5 Page",
+  "ssAddH5":"Add Web Page",
   "ssUploading":"Uploading...",
   "ssCompleted":"Complete",
   "ssBilibiliVideo":"Bilibili Video",
@@ -2015,5 +2015,6 @@
   "ssPrevQ":"Previous question",
   "ssNextQ":"Next question",
   "ssUntitledCourse":"Untitled Course",
-  "ssPPtUpProgress":"Uploading (*)"
+  "ssPPtUpProgress":"Uploading (*)",
+  "ssBilibiliVideoSearchKeyword":"Please enter a keyword"
 }

src/lang/hk.json

@@ -2015,7 +2015,8 @@
   "ssPrevQ":"上一題",
   "ssNextQ":"下一題",
   "ssUntitledCourse":"暫未命名",
-  "ssPPtUpProgress":"上傳進度(*)"
+  "ssPPtUpProgress":"上傳進度(*)",
+  "ssBilibiliVideoSearchKeyword":"請輸入關鍵詞"