20191009-打卡+添加期数id

e80e3542 · IvyXia123 · 465e9148 · e80e3542 · e80e3542 · 465e9148
Commit e80e3542 authored Oct 09, 2019 by IvyXia123
11 changed files
--- a/dist/index.html
+++ b/dist/index.html
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.4fdcfc1636b09c396bfb4d05dd4eb40e.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=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.162b6f951f0e400ad7ce.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.e524f5cccf757e45c672.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.c8aace25a2de459eb4c0.js></script></body></html>
\ No newline at end of file
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.6e1e2d24650b17d55e2dd47a0ef9c07c.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=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.7e5c1bd5a6dacfd13873.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.e524f5cccf757e45c672.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.24d2ec54078ea9df9754.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.4fdcfc1636b09c396bfb4d05dd4eb40e.css
+++ b/dist/static/css/app.4fdcfc1636b09c396bfb4d05dd4eb40e.css
--- a/dist/static/js/6.710dfac41a4f1da60b36.js
+++ b/dist/static/js/6.710dfac41a4f1da60b36.js
--- a/dist/static/js/6.f4abff5e533eaea9df88.js
+++ b/dist/static/js/6.f4abff5e533eaea9df88.js
--- a/dist/static/js/app.c8aace25a2de459eb4c0.js
+++ b/dist/static/js/app.c8aace25a2de459eb4c0.js
--- a/dist/static/js/manifest.162b6f951f0e400ad7ce.js
+++ b/dist/static/js/manifest.162b6f951f0e400ad7ce.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var t,r,o,i=0,u=[];i<a.length;i++)r=a[i],f[r]&&u.push(f[r][0]),f[r]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={68:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=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",b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"4c32bc423a8cfe2d0ff5",1:"e629b0a42ac24031b057",2:"4913a3c7cf59644223f4",3:"16311961e0c59cc998b3",4:"be216735a0b64ab3ce47",5:"393578607b3aebf89ef0",6:"710dfac41a4f1da60b36",7:"80c5e00893b61183ab34",8:"f14a4f1010dca6e5193e",9:"059c7e45f34d8295df7b",10:"829dd34a338a8876260e",11:"d54a8e3a568fd71e91e0",12:"b359078bc3d4851fb6cf",13:"5f261ff92bd308d35b0a",14:"9c5198bb984a34250e40",15:"680770edee21a6988b29",16:"4e2fde87d00b5159c374",17:"a0f73eb864a9fa4e118f",18:"61a1e5b0497e3ee138e4",19:"101925298fb87c158dca",20:"273b093d762342dc13e3",21:"835b8f0010b7d50fae37",22:"de7bba15b55985b31e42",23:"b472f163f760b1c77d7a",24:"549eeb0a889318a34e89",25:"7c99189125c19acc26f4",26:"0bcc8b19f145e79a3ed6",27:"7b328662e6fd4798982b",28:"00652dc08d949721ca64",29:"32e4a5b2a25f88c34451",30:"258cb6c3dd89fd6f6649",31:"77fdc3c527048308b86e",32:"2dff8b9a8317b3ee46df",33:"bea9c27ee77e0d04f95a",34:"30d52b0f77eb30590ac5",35:"a516f2b5d645a4908ce9",36:"5ab5240df93fe15c447e",37:"c801122af386260a690a",38:"c3d87252090be84edabd",39:"886c3383b261524be947",40:"15174c220598ff8dc8d8",41:"3b59527515857f0c374e",42:"e3a5350ac83edeede646",43:"67a88603a7889f50a700",44:"e425309e5d811dee70e5",45:"cddcf5c6789bdadc900b",46:"17ad6a93f9bde83665f9",47:"16567b7ee6b462bae443",48:"59ace6c90fdc04aadaf0",49:"9b89ae75df502b1ea6f0",50:"9ba5d108d438a4ec16d6",51:"197b68e6bc331faa87ce",52:"0656187e0a24fb0d10ce",53:"e722b9b1c8823635085c",54:"027bcbce5d0ff03697fb",55:"eee5e26f247074851331",56:"c1875a7d41d621d3035e",57:"c9895d4f61a09c5a2000",58:"d1e010a5dcc9365a522d",59:"33b8a0527b9c7f40085c",60:"ef0490fcf51d3911e2eb",61:"21145a186bacce42135c",62:"aa7ec3be34fb9f9846b4",63:"380a8bf6726ee063ccaa",64:"17c522e0623f5ccbbcd6",65:"4dbf6e5a2b902078ea89"}[e]+".js";var t=setTimeout(r,12e4);function r(){n.onerror=n.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=r,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="https://static-cdn.changchangenglish.com/new-sing/",b.oe=function(e){throw e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var t,r,o,i=0,u=[];i<c.length;i++)r=c[i],f[r]&&u.push(f[r][0]),f[r]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},f={68:0};function b(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,b),f.l=!0,f.exports}b.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,b){a=f[e]=[c,b]});a[2]=c;var d=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",b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"4c32bc423a8cfe2d0ff5",1:"e629b0a42ac24031b057",2:"4913a3c7cf59644223f4",3:"16311961e0c59cc998b3",4:"be216735a0b64ab3ce47",5:"393578607b3aebf89ef0",6:"f4abff5e533eaea9df88",7:"80c5e00893b61183ab34",8:"f14a4f1010dca6e5193e",9:"059c7e45f34d8295df7b",10:"829dd34a338a8876260e",11:"d54a8e3a568fd71e91e0",12:"b359078bc3d4851fb6cf",13:"5f261ff92bd308d35b0a",14:"9c5198bb984a34250e40",15:"680770edee21a6988b29",16:"4e2fde87d00b5159c374",17:"a0f73eb864a9fa4e118f",18:"61a1e5b0497e3ee138e4",19:"101925298fb87c158dca",20:"273b093d762342dc13e3",21:"835b8f0010b7d50fae37",22:"de7bba15b55985b31e42",23:"b472f163f760b1c77d7a",24:"549eeb0a889318a34e89",25:"7c99189125c19acc26f4",26:"0bcc8b19f145e79a3ed6",27:"7b328662e6fd4798982b",28:"00652dc08d949721ca64",29:"32e4a5b2a25f88c34451",30:"258cb6c3dd89fd6f6649",31:"77fdc3c527048308b86e",32:"2dff8b9a8317b3ee46df",33:"bea9c27ee77e0d04f95a",34:"30d52b0f77eb30590ac5",35:"a516f2b5d645a4908ce9",36:"5ab5240df93fe15c447e",37:"c801122af386260a690a",38:"c3d87252090be84edabd",39:"886c3383b261524be947",40:"15174c220598ff8dc8d8",41:"3b59527515857f0c374e",42:"e3a5350ac83edeede646",43:"67a88603a7889f50a700",44:"e425309e5d811dee70e5",45:"cddcf5c6789bdadc900b",46:"17ad6a93f9bde83665f9",47:"16567b7ee6b462bae443",48:"59ace6c90fdc04aadaf0",49:"9b89ae75df502b1ea6f0",50:"9ba5d108d438a4ec16d6",51:"197b68e6bc331faa87ce",52:"0656187e0a24fb0d10ce",53:"e722b9b1c8823635085c",54:"027bcbce5d0ff03697fb",55:"eee5e26f247074851331",56:"c1875a7d41d621d3035e",57:"c9895d4f61a09c5a2000",58:"d1e010a5dcc9365a522d",59:"33b8a0527b9c7f40085c",60:"ef0490fcf51d3911e2eb",61:"21145a186bacce42135c",62:"aa7ec3be34fb9f9846b4",63:"380a8bf6726ee063ccaa",64:"17c522e0623f5ccbbcd6",65:"4dbf6e5a2b902078ea89"}[e]+".js";var t=setTimeout(r,12e4);function r(){n.onerror=n.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=r,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="https://static-cdn.changchangenglish.com/new-sing/",b.oe=function(e){throw e}}([]);
\ No newline at end of file
--- a/src/assets/punchTheClock/xuexidaka.png
+++ b/src/assets/punchTheClock/xuexidaka.png
--- a/src/assets/punchTheClock/yezi_title.png
+++ b/src/assets/punchTheClock/yezi_title.png
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -355,7 +355,8 @@
       * @param id
       */
      judgeActivity(id) {
-        getJudgeActivityApi().then(res => {
+        console.log(this.periodId)
+        getJudgeActivityApi(id).then(res => {
          this.startAt = res.start_at;
          this.overAt  = res.over_at;
          this.periodId  = res.periods_id;
@@ -797,6 +798,7 @@
            el.className="activit"
          }
        })
+        console.log(this.secActions)
        this.judgeActivity(this.secActions.id)  // 判断活动
        // 加载课程
        // console.log(this.secActions)

--- 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">
        <!-- 倒计时 hasEnded 指是否在规定时间内完成学习 -->
-        <div class="punch-the-clock-name-contentText" v-if="!hasEnded">很遗憾，您未在指定时间内完成任务哦</div>
+        <div class="punch-the-clock-name-contentText" v-if="!hasEnded && forthRate != 100">很遗憾，您未在指定时间内完成任务哦</div>
        <div class="punch-the-clock-name-content-timer" v-if="hasEnded">
          <span>剩余完成时间</span>
          <span class="timer">{{ countDownDay }}</span>

--- a/src/service/api.js
+++ b/src/service/api.js
@@ -403,9 +403,9 @@ export const getNotifyApi = function (periods_id) {
 };

 // 判断活动
-const getJudgeActivityUrl = `${_baseUrl}api/client/judge/activity`
-export const getJudgeActivityApi = function () {
-  return Vue.prototype.$fetch(getJudgeActivityUrl)
+const getJudgeActivityUrl = `${_baseUrl}api/client/judge/activity/`
+export const getJudgeActivityApi = function (periods_id) {
+  return Vue.prototype.$fetch(`${ getJudgeActivityUrl }${ periods_id }`)
 };

 // 打卡数据