提交

1e419131 · IvyXia123 · 4c7122de · 1e419131 · 1e419131 · 4c7122de
Commit 1e419131 authored Sep 21, 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.85edad568ad28eb1cdbb.js></script><script type=text/javascript src=static/js/vendor.5af9774cd57a16d7dc8b.js></script><script type=text/javascript src=static/js/app.52c001f8faf9c2d1f473.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.6e421e7d90c89d9a2778.js></script><script type=text/javascript src=static/js/vendor.5af9774cd57a16d7dc8b.js></script><script type=text/javascript src=static/js/app.52c001f8faf9c2d1f473.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/28.1267d1145896da10c5e0.js
+++ b/dist/static/js/28.1267d1145896da10c5e0.js
--- a/dist/static/js/28.eccb96f12f6515e84c4b.js
+++ b/dist/static/js/28.eccb96f12f6515e84c4b.js
--- a/dist/static/js/manifest.85edad568ad28eb1cdbb.js
+++ b/dist/static/js/manifest.85edad568ad28eb1cdbb.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[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(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={68:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;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:"a9817ac0f287bed19f27",1:"db8f2ee01e58fb54fe08",2:"fde299ddf378262bfd5a",3:"9e47ac3f475bc517b2d7",4:"d61e8321cc6581566e82",5:"89f183e40dfe8f5c5f1b",6:"5903a38420a57db205f4",7:"f0d7dc1b118b12372592",8:"ea29c16a3ca17b205ae1",9:"b2dec04b21bca849cbd6",10:"590de6ab6ba2c209a332",11:"0690d0eea2f74de45949",12:"71eefcae7467f3ce1180",13:"c626bf8da9ede0643634",14:"b90c3e41cd7a24d9b389",15:"5c5d88fb5ec26d04de5f",16:"6e43a4de6f6545d61e58",17:"f11dd4f0fc64cbe7f533",18:"f5bd07ad210ce3ac9eb2",19:"cdeb91c501d771282234",20:"5b22648157403717f723",21:"7158c55aed93d37762e1",22:"eaa14ae4546c1bb3c807",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"22e831618bd66856e27d",26:"babb823702b848ad728f",27:"8ee0be7fbb0fb087db54",28:"eccb96f12f6515e84c4b",29:"da4acbdde708ddbf8f6d",30:"c5615725ba88f4867095",31:"496a4f1feee35020b28e",32:"2559035f05e9a3a46f2f",33:"878f5218f2aefb698901",34:"990e75db132893a4cf89",35:"75badc923916cb2468a7",36:"a00c1af74ae22b0d4627",37:"9da1120933b9fd219c59",38:"efd3f13d3ec2ef2f1150",39:"92c9c958af886df761cb",40:"ff3778361e9c6e46fe3d",41:"586e834d1629adc1c0ba",42:"8e40154cf06ec387d937",43:"979d8e834a625c70b55a",44:"c0945a273a703ad0015c",45:"aa8930a43076de0f45d3",46:"629ac5e48cc4495c9a83",47:"8f7cb2383de6183d7d3e",48:"a0f24071ee52a1d66406",49:"cbac7d2480666adc3d62",50:"2a8ca9d1bd716ed37c2e",51:"88c54be9226e52266869",52:"73c099f5daace9561d9a",53:"6203720a199b023ef0a0",54:"6b792ec4a32901312c88",55:"a464b25f551442449920",56:"8845249be04a11188470",57:"1ac4abd38c6519ea6589",58:"19369ad7725909e684dc",59:"85887c56ce5cacb4a36e",60:"7fd436f0072dc84af450",61:"05f88aff250970f5ea26",62:"9a678fbce95456875829",63:"557e137c7b8fe2ac6cd8",64:"e4be81d2cf4d0f5576e5",65:"b743a3660298e39b9df2"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},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,n,b){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r]);for(a&&a(c,n,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=f(f.s=b[i]);return o};var c={},d={68:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;var n=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,b.crossOrigin="anonymous",f.nc&&b.setAttribute("nonce",f.nc),b.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"a9817ac0f287bed19f27",1:"db8f2ee01e58fb54fe08",2:"fde299ddf378262bfd5a",3:"9e47ac3f475bc517b2d7",4:"d61e8321cc6581566e82",5:"89f183e40dfe8f5c5f1b",6:"5903a38420a57db205f4",7:"f0d7dc1b118b12372592",8:"ea29c16a3ca17b205ae1",9:"b2dec04b21bca849cbd6",10:"590de6ab6ba2c209a332",11:"0690d0eea2f74de45949",12:"71eefcae7467f3ce1180",13:"c626bf8da9ede0643634",14:"b90c3e41cd7a24d9b389",15:"5c5d88fb5ec26d04de5f",16:"6e43a4de6f6545d61e58",17:"f11dd4f0fc64cbe7f533",18:"f5bd07ad210ce3ac9eb2",19:"cdeb91c501d771282234",20:"5b22648157403717f723",21:"7158c55aed93d37762e1",22:"eaa14ae4546c1bb3c807",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"22e831618bd66856e27d",26:"babb823702b848ad728f",27:"8ee0be7fbb0fb087db54",28:"1267d1145896da10c5e0",29:"da4acbdde708ddbf8f6d",30:"c5615725ba88f4867095",31:"496a4f1feee35020b28e",32:"2559035f05e9a3a46f2f",33:"878f5218f2aefb698901",34:"990e75db132893a4cf89",35:"75badc923916cb2468a7",36:"a00c1af74ae22b0d4627",37:"9da1120933b9fd219c59",38:"efd3f13d3ec2ef2f1150",39:"92c9c958af886df761cb",40:"ff3778361e9c6e46fe3d",41:"586e834d1629adc1c0ba",42:"8e40154cf06ec387d937",43:"979d8e834a625c70b55a",44:"c0945a273a703ad0015c",45:"aa8930a43076de0f45d3",46:"629ac5e48cc4495c9a83",47:"8f7cb2383de6183d7d3e",48:"a0f24071ee52a1d66406",49:"cbac7d2480666adc3d62",50:"2a8ca9d1bd716ed37c2e",51:"88c54be9226e52266869",52:"73c099f5daace9561d9a",53:"6203720a199b023ef0a0",54:"6b792ec4a32901312c88",55:"a464b25f551442449920",56:"8845249be04a11188470",57:"1ac4abd38c6519ea6589",58:"19369ad7725909e684dc",59:"85887c56ce5cacb4a36e",60:"7fd436f0072dc84af450",61:"05f88aff250970f5ea26",62:"9a678fbce95456875829",63:"557e137c7b8fe2ac6cd8",64:"e4be81d2cf4d0f5576e5",65:"b743a3660298e39b9df2"}[e]+".js";var r=setTimeout(t,12e4);function t(){b.onerror=b.onload=null,clearTimeout(r);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return b.onerror=b.onload=t,n.appendChild(b),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="",f.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
@@ -27,7 +27,7 @@
            <img :src="punchTheClock.dakaFu" alt="">
          </div>
          <div class="speed">
-            <span class="speed-baifen baifenbi">100%</span>
+            <span class="speed-baifen baifenbi" v-if="forthRate + secondRate + thirdRate < 80">100%</span>
            <span class="speed-list speed-list-completed speed-baifen" :style="{ width: forthRate <= 10 ? '10%' : forthRate + '%' }" v-show="forthRate !== 0">{{ forthRate }}%</span>
            <span class="speed-list speed-list-be" :style="{ width: (secondRate + 3) >= 90 ? '91%' : (secondRate + 3) + '%' }"></span>
            <span class="speed-list speed-list-card" :style="{ width: (thirdRate + 3) >= 90 ? '91%' : (thirdRate + 3) + '%' }"></span>
@@ -100,7 +100,7 @@
      </div>
      <!-- tab 导航 -->
      <ul class="punch-the-clock-record-list">
-        <li @click="recordListClick(index)" :class="[ index === recordListIndex ? 'active' : '' ]" v-for="(item, index) in recordList" :key="index" >
+        <li @click="returnCash(index)" :class="[ index === recordListIndex ? 'active' : '' ]" v-for="(item, index) in recordList" :key="index" >
          {{ item.title }} <div class="xian" v-show="index === recordListIndex"></div>
        </li>
      </ul>
@@ -257,7 +257,7 @@
      /**
       * 打卡数据
       */
-      returnCash() {
+      returnCash(index) {
        let periodsId = this.$route.query.periods_id,
            newCash   = { start_at: this.$route.query.start_at, over_at: this.$route.query.over_at }
        getReturnCashApi(periodsId, newCash).then(res => {
@@ -274,7 +274,9 @@
          // 当天卡
          this.todayData = res.today;
          // 默认待开课
-          this.punchCardData = this.integrationFn(res.second, 1)
+          let secode = index === 0 ? res.first : index === 1 ? res.second : index === 2 ? res.third : res.forth
+          this.recordListIndex = index;
+          this.punchCardData = this.integrationFn(secode, index)
        })
      },
      /**
@@ -302,7 +304,7 @@
       * 切换打卡记录
       * @param index
       */
-      recordListClick(index) {
+      /*recordListClick(index) {
        this.recordListIndex = index;
        switch (index) {
          case 0:
@@ -317,7 +319,7 @@
          case 3:
            this.punchCardData = this.integrationFn(this.returnCashData.forth, index);
        }
-      },
+      },*/
      /**
       * 点击打卡记录
       * @param index  { number }
@@ -342,6 +344,7 @@
          }else {
            this.modelData.state =  status === 3 ? '待补卡' : '打卡完成'
          }
+          document.querySelectorAll('.get-stars-btn')[0].style.display = 'block';
          // 提示信息
          this.modelData.tishi = status === 2 ? '提示：学习卡与作业卡需在开课日完成哦，如延期完成，需消耗星星补卡' : status === 3 ? `补卡：消耗20星星补卡1次，当前共有${ this.lastValue }颗星星` : ''
          this.punchClockModel = true;
@@ -382,7 +385,7 @@
              let findIndex = this.punchCardData.findIndex(item => {
                return item.ele_id === dataObj.ele_id
              })
-              this.punchCardData = this.punchCardData.splice(findIndex, 1)
+              this.returnCash(2)
            })
          }
        }
@@ -469,7 +472,7 @@
      }
    },
    mounted() {
-      this.returnCash();     // 数据
+      this.returnCash(1);     // 数据
      this.finishUser();     // 已完成人数
      this.getUserIntegral() // 积分
    }