首頁 探索 說明
登入
CocoRoboLabs
/
pbl_inviteLogin
3
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl_inviteLogin

SanHQin 3 周之前
父節點
3fec5a2623 34abf0d9ec
當前提交
ed35940c99
共有 11 個文件被更改，包括 18 次插入 和 7 次删除
統一視圖 顯示文件統計
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.css
  3. 0 0
      dist/static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.css.map
  4. 1 0
      dist/static/css/app.9a7499024000c3f3fe80dc9b81d473a5.css
  5. 1 0
      dist/static/css/app.9a7499024000c3f3fe80dc9b81d473a5.css.map
  6. 0 0
      dist/static/js/app.ad6998400a5cfbcad74a.js
  7. 0 0
      dist/static/js/app.ad6998400a5cfbcad74a.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 5 3
      src/components/pages/inviteLogin/inviteLogin.vue
  10. 1 1
      src/components/pages/inviteLoginST/inviteLogin.vue
  11. 5 3
      src/components/pages/inviteLoginSZ/inviteLogin.vue

+ 4 - 0
dist/index.html
查看文件 

@@ -32,7 +32,11 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.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.8f06678bae73713256f1.js></script><script type=text/javascript src=./static/js/app.74906cb47491a0b794c5.js></script></body></html><script>function stopSafari() {
 
     }</style><link href=./static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.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.8f06678bae73713256f1.js></script><script type=text/javascript src=./static/js/app.74906cb47491a0b794c5.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.9a7499024000c3f3fe80dc9b81d473a5.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.8f06678bae73713256f1.js></script><script type=text/javascript src=./static/js/app.ad6998400a5cfbcad74a.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> 34abf0d9ecf76ee8c28d650544da13c425bb9de9
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

文件差異過大導致無法顯示
+ 1 - 0
dist/static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.0ad7ad2e17fc8b36aaeb6e1ed35ad49d.css.map


文件差異過大導致無法顯示
+ 1 - 0
dist/static/css/app.9a7499024000c3f3fe80dc9b81d473a5.css


文件差異過大導致無法顯示
+ 1 - 0
dist/static/css/app.9a7499024000c3f3fe80dc9b81d473a5.css.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.ad6998400a5cfbcad74a.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.ad6998400a5cfbcad74a.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 5 - 3
src/components/pages/inviteLogin/inviteLogin.vue
查看文件 

@@ -70,7 +70,8 @@ export default {
 
                     if (res.data.length && res.data[0].length) {
 
                     if (res.data.length && res.data[0].length) {
 
                         this.res = res.data[0][0]
 
                         this.res = res.data[0][0]
 
                         this.courseId = res.data[0][0].courseId
 
                         this.courseId = res.data[0][0].courseId
 
-                        this.getClass(res.data[0][0].classid)
 
+												let oid = res.data[0][0].organizeid;
 
+                        this.getClass(res.data[0][0].classid,oid)
 
                     } else {
 
                     } else {
 
                         this.$message.error("不存在此随机码")
 
                         this.$message.error("不存在此随机码")
 
                     }
 
                     }
 
@@ -79,12 +80,13 @@ export default {
 
                     console.error(err);
 
                     console.error(err);
 
                 });
 
                 });
 
         },
 
         },
 
-        getClass(classId) {
 
+        getClass(classId,oid) {
 
             let params = {
 
             let params = {
 
                 cid: classId,
 
                 cid: classId,
 
+								oid: oid,
 
             };
 
             };
 
             this.ajax
 
             this.ajax
 
-                .get(this.$store.state.api + "selectSnameByCid", params)
 
+                .get(this.$store.state.api + "selectSnameByCidAndOid", params)
 
                 .then((res) => {
 
                 .then((res) => {
 
                     this.classJuri = res.data[0];
 
                     this.classJuri = res.data[0];
 
                     this.steps = 2
 
                     this.steps = 2

+ 1 - 1
src/components/pages/inviteLoginST/inviteLogin.vue
查看文件 

@@ -77,7 +77,7 @@ export default {
 
     this.$router.push({
 
     this.$router.push({
 
       name:"inviteLoginSZ",
 
       name:"inviteLoginSZ",
 
       query:{
 
       query:{
 
-        code:this.code,
 
+        code:"16ace517-b5c7-4168-a9bb-a9e0035df840",
 
       }
 
       }
 
     })
 
     })
 
     setInterval(() => {
 
     setInterval(() => {

+ 5 - 3
src/components/pages/inviteLoginSZ/inviteLogin.vue
查看文件 

@@ -129,7 +129,8 @@ export default {
 
                   if (res.data.length && res.data[0].length) {
 
                   if (res.data.length && res.data[0].length) {
 
                       this.res = res.data[0][0]
 
                       this.res = res.data[0][0]
 
                       this.courseId = res.data[0][0].courseId
 
                       this.courseId = res.data[0][0].courseId
 
-                      this.getClass(res.data[0][0].classid)
 
+											let oid = res.data[0][0].organizeid;
 
+                      this.getClass(res.data[0][0].classid,oid)
 
                   } else {
 
                   } else {
 
                     this.setErrMsg("不存在此识别码")
 
                     this.setErrMsg("不存在此识别码")
 
                       // this.$message.error("不存在此随机码")
 
                       // this.$message.error("不存在此随机码")
 
@@ -139,12 +140,13 @@ export default {
 
                   console.error(err);
 
                   console.error(err);
 
               });
 
               });
 
       },
 
       },
 
-      getClass(classId) {
 
+      getClass(classId,oid) {
 
           let params = {
 
           let params = {
 
               cid: classId,
 
               cid: classId,
 
+							oid: oid,
 
           };
 
           };
 
           this.ajax
 
           this.ajax
 
-              .get(this.$store.state.api + "selectSnameByCid", params)
 
+              .get(this.$store.state.api + "selectSnameByCidAndOid", params)
 
               .then((res) => {
 
               .then((res) => {
 
                   this.classJuri = res.data[0];
 
                   this.classJuri = res.data[0];
 
                   this.steps = 2
 
                   this.steps = 2

部分文件因文件數量過多而無法顯示