提示提交

1ee2a287 · IvyXia123 · 2e84d05d · 1ee2a287 · 1ee2a287 · 2e84d05d
Commit 1ee2a287 authored Sep 23, 2019 by IvyXia123
5 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.1c2f8789d7027f059e1e.js></script><script type=text/javascript src=static/js/vendor.5af9774cd57a16d7dc8b.js></script><script type=text/javascript src=static/js/app.c8d3f902cae0be2f741c.js></script></body></html>
\ No newline at end of file
+        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.201486186ff3878077d6.js></script><script type=text/javascript src=static/js/vendor.5af9774cd57a16d7dc8b.js></script><script type=text/javascript src=static/js/app.c8d3f902cae0be2f741c.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/28.757fc6b00d1d244d46d4.js
+++ b/dist/static/js/28.757fc6b00d1d244d46d4.js
--- a/dist/static/js/28.a2fe3a2298d82bbad799.js
+++ b/dist/static/js/28.a2fe3a2298d82bbad799.js
--- a/dist/static/js/manifest.1c2f8789d7027f059e1e.js
+++ b/dist/static/js/manifest.1c2f8789d7027f059e1e.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={68:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"911a2da21de8df19a623",1:"987afbe26565ebb682c9",2:"be0fff7d5fab60faada8",3:"5594a755053eb165da3c",4:"bb98337b5d40e1ae6d54",5:"61b4d837ac5b14c75528",6:"b683dcb862759aa682f1",7:"1e556875e1bf6aa9c6b7",8:"a12c0a2b1ddffb9b39d3",9:"0e8b0d9c6095ddf14112",10:"00d7afa53181bcf56c9a",11:"cecf792661a32a1a0339",12:"380e4552da4c35a2e935",13:"e89ba2e79971dbad8724",14:"efa5df34c15627ff9a9f",15:"c2d24bfdd6c9e9f10470",16:"14995320a1e7474d4093",17:"725fde1924e908cb6b30",18:"56e0be46e4174e2697e8",19:"498058f9c32fcf30551d",20:"54a84b54d5944faf9156",21:"c73c81cf3f823209d553",22:"959e7181712bf43a1ea1",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"909f43c609352a10d705",26:"087acaaccc58e8a3a391",27:"8ee0be7fbb0fb087db54",28:"a2fe3a2298d82bbad799",29:"297903841c39562793f6",30:"9fe2ba4ed3d098c99f64",31:"496a4f1feee35020b28e",32:"9b60bd12f549b0cf9560",33:"cd0550b6a3272be00c97",34:"ac3544e265b8bf6336fc",35:"0a3efc02a8dac2584121",36:"59302d272357b6b9fdab",37:"2ea5b995a647a8f202b8",38:"f709dbdb0c15d6afca61",39:"04b3397e8f6926629967",40:"ff3778361e9c6e46fe3d",41:"0d143bfe82c865a81421",42:"779ead4e4777560ab21f",43:"e94c35882e203938cece",44:"ea020ac40019f7fc209a",45:"8cfbe60b4737e497624f",46:"0ce6b506d90e9c69b0d6",47:"36ebe1613cb961d3b75a",48:"a0f24071ee52a1d66406",49:"4c09a9dff13d7bc1c083",50:"5c01d810d0f9f67026ca",51:"fd9a0b22c96b0e4564fa",52:"0ee7ae890e4fcca895e3",53:"a6010aeebd5fbde2582c",54:"6b792ec4a32901312c88",55:"d39ec287d80caba93846",56:"8845249be04a11188470",57:"d2999bf942fb449f5a2b",58:"761e0bd77767b7a2f1a3",59:"d4d6559296d85e814076",60:"b2347d1f621376484d2a",61:"bacd7e95d517cf538590",62:"c76ad08ef30a62868ec5",63:"557e137c7b8fe2ac6cd8",64:"90674e4ddec138e7a53d",65:"b743a3660298e39b9df2"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={68:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"911a2da21de8df19a623",1:"987afbe26565ebb682c9",2:"be0fff7d5fab60faada8",3:"5594a755053eb165da3c",4:"bb98337b5d40e1ae6d54",5:"61b4d837ac5b14c75528",6:"b683dcb862759aa682f1",7:"1e556875e1bf6aa9c6b7",8:"a12c0a2b1ddffb9b39d3",9:"0e8b0d9c6095ddf14112",10:"00d7afa53181bcf56c9a",11:"cecf792661a32a1a0339",12:"380e4552da4c35a2e935",13:"e89ba2e79971dbad8724",14:"efa5df34c15627ff9a9f",15:"c2d24bfdd6c9e9f10470",16:"14995320a1e7474d4093",17:"725fde1924e908cb6b30",18:"56e0be46e4174e2697e8",19:"498058f9c32fcf30551d",20:"54a84b54d5944faf9156",21:"c73c81cf3f823209d553",22:"959e7181712bf43a1ea1",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"909f43c609352a10d705",26:"087acaaccc58e8a3a391",27:"8ee0be7fbb0fb087db54",28:"757fc6b00d1d244d46d4",29:"297903841c39562793f6",30:"9fe2ba4ed3d098c99f64",31:"496a4f1feee35020b28e",32:"9b60bd12f549b0cf9560",33:"cd0550b6a3272be00c97",34:"ac3544e265b8bf6336fc",35:"0a3efc02a8dac2584121",36:"59302d272357b6b9fdab",37:"2ea5b995a647a8f202b8",38:"f709dbdb0c15d6afca61",39:"04b3397e8f6926629967",40:"ff3778361e9c6e46fe3d",41:"0d143bfe82c865a81421",42:"779ead4e4777560ab21f",43:"e94c35882e203938cece",44:"ea020ac40019f7fc209a",45:"8cfbe60b4737e497624f",46:"0ce6b506d90e9c69b0d6",47:"36ebe1613cb961d3b75a",48:"a0f24071ee52a1d66406",49:"4c09a9dff13d7bc1c083",50:"5c01d810d0f9f67026ca",51:"fd9a0b22c96b0e4564fa",52:"0ee7ae890e4fcca895e3",53:"a6010aeebd5fbde2582c",54:"6b792ec4a32901312c88",55:"d39ec287d80caba93846",56:"8845249be04a11188470",57:"d2999bf942fb449f5a2b",58:"761e0bd77767b7a2f1a3",59:"d4d6559296d85e814076",60:"b2347d1f621376484d2a",61:"bacd7e95d517cf538590",62:"c76ad08ef30a62868ec5",63:"557e137c7b8fe2ac6cd8",64:"90674e4ddec138e7a53d",65:"b743a3660298e39b9df2"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/punchTheClock/index.vue
+++ b/src/components/punchTheClock/index.vue
@@ -11,7 +11,7 @@
    <div class="punch-the-clock-name-bg">
      <div class="punch-the-clock-name-content">
        <!-- 倒计时 -->
-        <div class="punch-the-clock-name-contentText" v-if="!hasEnded">很遗憾，您未在制定时间内完成任务哦</div>
+        <div class="punch-the-clock-name-contentText" v-if="!hasEnded">很遗憾，您未在指定时间内完成任务哦</div>
        <div class="punch-the-clock-name-content-timer" v-if="hasEnded">
          <span>剩余完成时间</span>
          <span class="timer">{{ countDownDay }}</span>
@@ -270,6 +270,7 @@
    methods: {
      /**
       * 打卡数据
+       * @param index
       */
      returnCash(index) {
        let periodsId = this.$route.query.periods_id,
@@ -332,12 +333,17 @@
        if(status !== 1) {
          if(this.hasEnded && this.forthRate !== 100) {
            // 今日和其他课程切换
-            this.modelData = state === 9 ? this.todayData[index] : this.punchCardData[index]
+            if(state == 9) {
+              this.modelData = this.todayData[index]
+            }else {
+              this.modelData = this.punchCardData[index]
+            }
            // 课节
            this.modelData.aName = this.modelData.name.split(' ')[0] + ' ' + this.modelData.name.split(' ')[1];
            // 状态展示
            let getCardGoData = { start_at: this.$route.query.start_at, over_at: this.$route.query.over_at, push_time: this.modelData.push_time, type: type };
            if(status === 2) {
+              // 判断去学习还是去提交
              getCardGoApi(this.modelData.ele_id, this.modelData.id, this.modelData.periods_id, getCardGoData).then(res => {
                this.goWhere = res.go_where;
                let currentTime = this.timerAddLing(new Date().getFullYear()) + '-' + this.timerAddLing(new Date().getMonth() + 1) + '-' + this.timerAddLing(new Date().getDate())
@@ -363,7 +369,7 @@
            Toast("活动已结束，谢谢参与~");
          }
        }else {
-          Toast("请先去开课更改为请耐心等待哦～");
+          Toast("课程还未开始，请耐心等待哦～");
        }
      },
      /**
@@ -436,14 +442,6 @@
          this.$router.push({name:'newLesson', query: query})
        })
      },
-      /**
-       * 积分
-       */
-      getUserIntegral() {
-        getUserIntegralApi().then(res => {
-          this.lastValue = res.last_value;
-        })
-      },
      /**
       * 时间少于10 加 0
       * @param n
@@ -455,12 +453,10 @@
      /**
       * 我的打卡记录封装数据
       * @param arr   { Array }
-       * @param index { index }
       * @returns {[]}
       */
      integrationFn(arr) {
        let secondArr = []
-        console.log(arr)
        for(let key in arr) {
          // 排序
          arr[key].sort((a, b) => { return parseInt(a.type) - parseInt(b.type) });
@@ -476,21 +472,25 @@
            secondArr.push(arr[key][0])
          }
        }
+        // 去重
        let obj = {};
-
        let peon = secondArr.reduce((cur,next) => {
          obj[next.id] ? "" : obj[next.id] = true && cur.push(next);
          return cur;
-        },[]) //设置cur默认类型为数组，并且初始值为空的数组
-        console.log(peon);
+        },[])
        return peon;
      },
      /**
       * 老师二维码
       */
      getTeacher() {
+        // 二维码
        getTeacherApi().then(res => {
          this.qrErWeiMa = res.qr;
+        });
+        // 积分
+        getUserIntegralApi().then(res => {
+          this.lastValue = res.last_value;
        })
      },
      punchClockClick() {
@@ -501,7 +501,6 @@
    mounted() {
      this.returnCash(1);     // 数据
      this.finishUser();     // 已完成人数
-      this.getUserIntegral() // 积分
      this.getTeacher()      // 获取老师
    }
  }