Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre

d5f908f5 · chenjundi · de402cc4 · ce36b893 · d5f908f5 · de402cc4
Commit d5f908f5 authored Sep 24, 2019 by chenjundi
7 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.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
+        /* 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.d0b7b5f385cb6204257f.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.dc54906fd15c583fcdd4.js
+++ b/dist/static/js/28.dc54906fd15c583fcdd4.js
--- a/dist/static/js/6.b683dcb862759aa682f1.js
+++ b/dist/static/js/6.b683dcb862759aa682f1.js
--- a/dist/static/js/manifest.201486186ff3878077d6.js
+++ b/dist/static/js/manifest.201486186ff3878077d6.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:"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
+!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:"835bf24d97bbc52741e7",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:"dc54906fd15c583fcdd4",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/map/index.vue
+++ b/src/components/map/index.vue
@@ -19,7 +19,6 @@
          <div class="zhongbian">
            <img style="width: 100%; height: 100%;" :src="zhong" alt="">
          </div>
-
        </div>
      </div>
      <!--竖屏 主题栏-->

--- a/src/components/punchTheClock/index.vue
+++ b/src/components/punchTheClock/index.vue
@@ -10,7 +10,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-content-timer" v-if="hasEnded">
          <span>剩余完成时间</span>
@@ -79,9 +79,9 @@
          </div>
          <div class="punch-card-today-xuexila">学习卡</div>
        </div>
-        <div class="punch-card-today" @click="punchCardClick(index, item.status, item.type1, 9)">
+        <div class="punch-card-today" @click="punchCardClick(index, item.status1, item.type1, 9)">
          <div class="punch-card-today-learning">
-            <img :src="item.status === 1 ? punchTheClock.kaike_chengz : item.status === 2 ? punchTheClock.daiwanChangz : item.status === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
+            <img :src="item.status1 === 1 ? punchTheClock.kaike_chengz : item.status1 === 2 ? punchTheClock.daiwanChangz : item.status1 === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
          </div>
          <div class="punch-card-today-xuexila">成长卡</div>
        </div>
@@ -128,9 +128,9 @@
            <div class="punch-card-today-xuexila">学习卡</div>
          </div>
          <!-- 成长卡 -->
-          <div class="punch-card-today" @click="punchCardClick(index, item.status, item.type1)" v-if="item.type1 == 2">
+          <div class="punch-card-today" @click="punchCardClick(index, item.status1, item.type1)" v-if="item.type1 == 2">
            <div class="punch-card-today-learning">
-              <img :src="item.status === 1 ? punchTheClock.kaike_chengz : item.status === 2 ? punchTheClock.daiwanChangz : item.status === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
+              <img :src="item.status1 === 1 ? punchTheClock.kaike_chengz : item.status1 === 2 ? punchTheClock.daiwanChangz : item.status1 === 3 ? punchTheClock.buka_changz : punchTheClock.wanchengChengz" alt="">
            </div>
            <div class="punch-card-today-xuexila">成长卡</div>
          </div>
@@ -164,11 +164,11 @@
        <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' : '', 'uiyiyi' ]"></span>
+          <span :class="[ status === 2 || status === 3 ? 'small-title' : '', 'uiyiyi' ]"></span>
        </div>
        <div class="title-text">{{ modelData.tishi }}</div>
        <!-- 积分获取规则 -->
-        <div class="get-stars" v-if="modelData.status === 3 && lastValue <= 20">
+        <div class="get-stars" v-if="status === 3 && lastValue <= 20">
          <div class="get-stars-content">
            <div class="get-stars-text">当前星星不足补卡哦，如何获得更多星星？</div>
            <div class="get-stars-text get-stars-text-con">
@@ -183,11 +183,10 @@
          </div>
        </div>
        <!-- 按钮点击 -->
-        <div :class="['get-stars-btn', {'get-stars-btn-clo' : modelData.status === 3 && lastValue <= 20}]" v-if="modelData.status !== 4" @click.stop="modelDataClick(modelData, typeStatus)">
-          {{ modelData.status === 2 ? ( goWhere == 1 ? '去学习' : '去提交' ) : modelData.status === 3 ? '去补卡' : '' }}
+        <div :class="['get-stars-btn', {'get-stars-btn-clo' : status === 3 && lastValue <= 20}]" v-if="status !== 4" @click.stop="modelDataClick(modelData, typeStatus)">
+          {{ status === 2 ? ( goWhere == 1 ? '去学习' : '去提交' ) : status === 3 ? '去补卡' : '' }}
        </div>
      </div>
-
      <!-- 规则 -->
      <div class="punch-the-clock-model-yin punch-the-clock-rule-pad" v-if="ruleShow == 2">
        <div class="x-code">
@@ -231,7 +230,7 @@
  import { punchTheClock }    from "../../util/imgUrl";
  import { Toast }            from "vant";

-  export default 　{
+  export default {
    name: "index",
    data() {
      return {
@@ -250,11 +249,10 @@
        ruleShow: 0,        // 规则展示
        status: 0,          // 状态
        secondRate: 0,      // 待完成率
-        tishi: false,
+        tishi: false,       // 提示信息展示
        thirdRate: 0,       // 待补卡率
        typeStatus: 0,      // type
        forthRate: 0,       // 打卡完成率
-        zongShuLiang: 0,
        punchTheClock: punchTheClock, // 图片
        punchCardData: [],  // 待开课、待完成、待补卡、打卡完成切换
        punchClockModel: false, // 弹框
@@ -378,8 +376,6 @@
       * @param dataObj
       */
      modelDataClick(dataObj, type) {
-        let courseType       = this.$route.query.course_type,
-            parentCategoryId = this.$route.query.parent_category_id;
        let getCardGoData = { start_at: this.$route.query.start_at, over_at: this.$route.query.over_at, push_time: dataObj.push_time, type: type };
        if(dataObj.status === 2) {
          // 点击去学习和去提交
@@ -402,9 +398,6 @@
              document.querySelectorAll('.get-stars-btn')[0].style.display = 'none';
              this.lastValue = this.lastValue - 20
              this.modelData.tishi = `补卡：消耗20星星补卡1次，当前共有${ this.lastValue }颗星星`
-              let findIndex = this.punchCardData.findIndex(item => {
-                return item.ele_id === dataObj.ele_id
-              })
              this.returnCash(2)
            })
          }
@@ -412,6 +405,7 @@
      },
      /**
       * 之前的代码后期需要优化
+       * @param dataObj { Object }
       */
      getLessonDetailFn(dataObj) {
        getLessonDetailApi(dataObj.periods_id, dataObj.id, dataObj.ele_id).then(res=>{
@@ -463,11 +457,14 @@
          if(arr[key].length === 2) {
            // 当数据有两条时
            arr[key][0].type1 = arr[key][1].type;
+            arr[key][0].status1 = arr[key][1].status;
            secondArr.push(arr[key][0])
          }else {
            if(arr[key][0].type == 2) {
              arr[key][0].type1 = arr[key][0].type
+              arr[key][0].status1 = arr[key][0].status
              delete arr[key][0].type
+              delete arr[key][0].status
            }
            secondArr.push(arr[key][0])
          }