今日提交

8846f612 · IvyXia123 · 3f69f60b · 8846f612 · 3f69f60b · 8846f612
Commit 8846f612 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.a26559abe6c63876c0d4.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.9f5b12dc17535ef45735.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.4b21f5edf210969be45e.js
+++ b/dist/static/js/28.4b21f5edf210969be45e.js
--- a/dist/static/js/28.881696ae2c33ad20b094.js
+++ b/dist/static/js/28.881696ae2c33ad20b094.js
--- a/dist/static/js/manifest.a26559abe6c63876c0d4.js
+++ b/dist/static/js/manifest.a26559abe6c63876c0d4.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:"4f2e691e3ce5fdf5a004",2:"a3227a3a7c4dd31977b0",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:"4b21f5edf210969be45e",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:"4f2e691e3ce5fdf5a004",2:"a3227a3a7c4dd31977b0",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:"881696ae2c33ad20b094",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
@@ -5,12 +5,13 @@
    </div>
    <div class="punch-the-clock-name-image">
      奖励名称
-      <div class="yiwancheng">{{ forthRate === 100 ? '已完成' : '进行中' }}</div>
+      <div class="yiwancheng">{{ hasEnded ? forthRate === 100 ? '已完成' : '进行中' : '已结束' }}</div>
    </div>
+    <!-- 倒计时 + 完成率 -->
    <div class="punch-the-clock-name-bg">
      <div class="punch-the-clock-name-content">
        <!-- 倒计时 -->
-        <div class="punch-the-clock-name-content-timer">
+        <div class="punch-the-clock-name-content-timer" v-if="hasEnded">
          <span>剩余完成时间</span>
          <span class="timer">{{ countDownDay }}</span>
          <span>天</span>
@@ -79,7 +80,7 @@
        </div>
        <div class="punch-card-today" @click="punchCardClick(index, item.status, item.type1)">
          <div class="punch-card-today-learning">
-            <img :src="item.status === 0 ? punchTheClock.kaike_chengz : item.status === 1 ? punchTheClock.daiwanChangz : item.status === 2 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
+            <img :src="item.status === 1 ? punchTheClock.kaike_chengz : item.status === 2 ? punchTheClock.daiwanChangz : item.status === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
          </div>
          <div class="punch-card-today-xuexila">成长卡</div>
        </div>
@@ -128,7 +129,7 @@
          <!-- 成长卡 -->
          <div class="punch-card-today" @click="punchCardClick(index, item.status, item.type1)" v-if="item.type1 == 2">
            <div class="punch-card-today-learning">
-              <img :src="item.status === 0 ? punchTheClock.kaike_chengz : item.status === 1 ? punchTheClock.daiwanChangz : item.status === 2 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
+              <img :src="item.status === 1 ? punchTheClock.kaike_chengz : item.status === 2 ? punchTheClock.daiwanChangz : item.status === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
            </div>
            <div class="punch-card-today-xuexila">成长卡</div>
          </div>
@@ -161,7 +162,11 @@
        <div class="title-text title-padd">课时：{{ modelData.sub_title }}</div>
        <div class="title-text">课节：{{ modelData.aName }}</div>
        <div class="title-text">开课日期：{{ modelData.push_time }}</div>
-        <div class="title-text">状态：<span :class="[ modelData.status === 2 || modelData.status === 3 ? 'small-title' : '' ]">{{ modelData.state }}</span></div>
+        <div class="title-text">状态：
+          <span :class="[ modelData.status === 2 || modelData.status === 3 ? 'small-title' : '', 'uiyiyi' ]">
+<!--            {{ modelData.state }}-->
+          </span>
+        </div>
        <div class="title-text">{{ modelData.tishi }}</div>
        <!-- 积分获取规则 -->
        <div class="get-stars" v-if="modelData.status === 3 && lastValue <= 20">
@@ -239,6 +244,7 @@
        countDownminu: 0,   // 倒计时分
        countDownsec: 0,    // 倒计时秒
        goWhere: 0,         // 判断去学习按钮
+        hasEnded: true,     // 已完成状态
        lastValue: 0,       // 积分
        modelData: {},      // model数据
        firstRate: 0,       // 待开课率
@@ -257,6 +263,8 @@
        recordListIndex: 1, // 我的打卡记录切换
        returnCashData: {}, // 总数据
        todayData: [],      // 当天卡
+        currentTime: '',
+        dangqianTimer: '',
        recordList: [{ title: '待开课' }, { title: '待完成' }, { title: '待补卡' }, { title: '打卡完成' }]
      }
    },
@@ -270,21 +278,25 @@
        getReturnCashApi(periodsId, newCash).then(res => {
          this.returnCashData = res;
          // 倒计时
+          res.over_time = '2019-9-22 23:59:59'
          let overTimeSplit = res.over_time.split(' ')[0],
              overTimeTimer = overTimeSplit.split('-')[0] + '/' + overTimeSplit.split('-')[1] + '/' + overTimeSplit.split('-')[2] + ' ' + res.over_time.split(' ')[1]
          let overTime = new Date(overTimeTimer).getTime();
          setInterval(() => { this.restTime(overTime) }, 1000);
+          if(overTime < new Date().getTime()) {
+            this.hasEnded = false
+          }
          // 完成率
          this.secondRate = parseInt(res.second_rate);
          this.thirdRate  = parseInt(res.third_rate) === 100 ? 103 : parseInt(res.third_rate);
          this.forthRate  = parseInt(res.forth_rate);
-
          // 当天卡
          this.todayData = this.integrationFn(res.today)
          // 默认待开课
          let secode = index === 0 ? res.first : index === 1 ? res.second : index === 2 ? res.third : res.forth
          this.recordListIndex = index;
          this.punchCardData = this.integrationFn(secode)
+
        })
      },
      /**
@@ -327,10 +339,21 @@
          if(status === 2) {
            getCardGoApi(this.modelData.ele_id, this.modelData.id, this.modelData.periods_id, getCardGoData).then(res => {
              this.goWhere = res.go_where;
-              this.modelData.state = status === 2 ? (res.go_where === 1 ? '待学习（已延期）' : '未提交（已延期）') : ''
+              let currentTime = this.timerAddLing(new Date().getFullYear()) + '-' + this.timerAddLing(new Date().getMonth() + 1) + '-' + this.timerAddLing(new Date().getDate())
+              let da = new Date(currentTime).getTime()
+              let dangqianTimer = new Date(this.modelData.push_time).getTime();
+              if(da == dangqianTimer) {
+                this.modelData.state = res.go_where === 1 ? '待学习' : '未提交'
+              }else {
+                this.modelData.state = res.go_where === 1 ? '待学习（已延期）' : '未提交（已延期）'
+              }
+              // this.modelData.state = status === 2 ? (res.go_where === 1 ? '待学习（已延期）' : '未提交（已延期）') : ''
+              console.log(document.querySelectorAll('.uiyiyi')[0])
+              document.querySelectorAll('.uiyiyi')[0].innerText = this.modelData.state
            })
          }else {
            this.modelData.state =  status === 3 ? '待补卡' : '打卡完成'
+            document.querySelectorAll('.uiyiyi')[0].innerText = this.modelData.state
          }
          if(document.querySelectorAll('.get-stars-btn')[0])
            document.querySelectorAll('.get-stars-btn')[0].style.display = 'block';
@@ -512,7 +535,7 @@
        width: 100%;
        /* 倒计时 */
        .punch-the-clock-name-content-timer {
-          padding: 8 * @toVw 0 15 * @toVw;
+          padding: 8 * @toVw 0 0;
          box-sizing: border-box;
          font-size: 12 * @toVw;
          color: #75290D;
@@ -535,6 +558,7 @@
          width: 288 * @toVw;
          height: 90 * @toVw;
          padding: 41 * @toVw 10 * @toVw 0 13 * @toVw;
+          margin-top: 8 * @toVw;
          position: relative;
          background: #FFE4C1;
          border-radius: 10 * @toVw;