преди 2 години · eb825b8fef
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,7 +25,11 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.9fbf2447aed02172ced42e96037e33e7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.20ecd6f597994cd5a70c.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.a92d1e47d67e76053f5dc510adb006d4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.a424531df805e70dd514.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.9fbf2447aed02172ced42e96037e33e7.css
+++ b/dist/static/css/app.9fbf2447aed02172ced42e96037e33e7.css
--- a/dist/static/css/app.9fbf2447aed02172ced42e96037e33e7.css.map
+++ b/dist/static/css/app.9fbf2447aed02172ced42e96037e33e7.css.map
--- a/dist/static/css/app.a92d1e47d67e76053f5dc510adb006d4.css
+++ b/dist/static/css/app.a92d1e47d67e76053f5dc510adb006d4.css
--- a/dist/static/css/app.a92d1e47d67e76053f5dc510adb006d4.css.map
+++ b/dist/static/css/app.a92d1e47d67e76053f5dc510adb006d4.css.map
--- a/dist/static/js/app.20ecd6f597994cd5a70c.js.map
+++ b/dist/static/js/app.20ecd6f597994cd5a70c.js.map
--- a/dist/static/js/app.a424531df805e70dd514.js
+++ b/dist/static/js/app.a424531df805e70dd514.js
--- a/dist/static/js/app.a424531df805e70dd514.js.map
+++ b/dist/static/js/app.a424531df805e70dd514.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
--- a/src/components/pages/addCourse.vue
+++ b/src/components/pages/addCourse.vue
--- a/src/components/pages/easy/addCourse.vue
+++ b/src/components/pages/easy/addCourse.vue
--- a/src/components/pages/scourse.vue
+++ b/src/components/pages/scourse.vue
@@ -81,7 +81,8 @@
 
				               <div @click="get(item.courseId)">预览</div>
			
 
				               <!-- 项目进展 -->
			
 
				               <div @click="getA(item.courseId)">进展</div>
			
 
				-              <div @click="jump(item.courseId)">评论</div>
			
 
				+              <!-- <div @click="jump(item.courseId)">评论</div> -->
			
 
				+              <div @click="copyCourse(item.courseId)">复制</div>
			
 
				               <div v-if="(item.userid == userid || role == '1')" @click="deleteCourse(item.courseId)">
			
 
				                 删除
			
 
				               </div>
			
@@ -669,10 +670,14 @@ export default {
 
				         uid: this.userid
			
 
				       }]
			
 
				       this.ajax
			
 
				-        .post(this.$store.state.api + "copyCourse", params)
			
 
				+        .post(this.$store.state.api + "copySCourse", params)
			
 
				         .then((res) => {
			
 
				           this.page = 1
			
 
				-          this.groupA = '0'
			
 
				+          if (this.role == "1") {
			
 
				+            this.groupA = "4";
			
 
				+          } else {
			
 
				+            this.groupA = "0";
			
 
				+          }
			
 
				           this.clear()
			
 
				         })
			
 
				         .catch((err) => {
			
--- a/src/components/pages/student/addCourse.vue
+++ b/src/components/pages/student/addCourse.vue
@@ -7038,9 +7038,27 @@ export default {
 
				         .get(this.$store.state.api + "getCourseTemplateTs", params)
			
 
				         .then((res) => {
			
 
				           this.templateArray = res.data[0];
			
 
				+          this.getTemplateOrg();
			
 
				+          this.$forceUpdate();
			
 
				         })
			
 
				         .catch((err) => {});
			
 
				     },
			
 
				+    getTemplateOrg() {
			
 
				+      let params = {
			
 
				+        oid: this.org,
			
 
				+      };
			
 
				+      this.ajax
			
 
				+        .get(this.$store.state.api + "getCourseTemplateTs", params)
			
 
				+        .then((res) => {
			
 
				+          if (res.data[0].length) {
			
 
				+            let ta = res.data[0]
			
 
				+            let newArr2 = this.templateArray.filter(x => !ta.some(y => y.id === x.id));
			
 
				+            this.templateArray = [...newArr2, ...this.templateArray];
			
 
				+          }
			
 
				+          this.$forceUpdate();
			
 
				+        })
			
 
				+        .catch((err) => { });
			
 
				+    },
			
 
				     clearChoose() {
			
 
				       this.clearArray.splice(this.templateC.id, 1);
			
 
				       this.dialogVisible2 = false;
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue