磨耳朵

8b0e7ce4 · wangwei · 74c5462e · 8b0e7ce4 · 8b0e7ce4 · 8b0e7ce4
Commit 8b0e7ce4 authored Dec 20, 2018 by wangwei
9 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -4,4 +4,4 @@
        hm.src = "https://hm.baidu.com/hm.js?3d48322170d471164729cba5dfa4195f";
        var s = document.getElementsByTagName("script")[0];
        s.parentNode.insertBefore(hm, s);
-      })();</script><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.806b1a9f41a7fba3fadd.js></script><script type=text/javascript src=static/js/vendor.4cd27f7178c561192f9c.js></script><script type=text/javascript src=static/js/app.59b2c28d8fff1bc8011e.js></script></body></html>
\ No newline at end of file
+      })();</script><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.72a8eeba4c837569e2d8.js></script><script type=text/javascript src=static/js/vendor.4cd27f7178c561192f9c.js></script><script type=text/javascript src=static/js/app.d5461d6fe89708bb4059.js></script></body></html>
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,4 +7,4 @@
      s.parentNode.insertBefore(hm, s);
    })();</script><style>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.2f4bf5c6f540ee54a7528d614e90c63c.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.4ea914002b08cea5d20e.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.a74a4cfb6c4b7bd58721.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.cdbbd99203926e33a78a.js></script></body></html>
\ No newline at end of file
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.e81896de1c7974fd5d3b75321f59941c.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.1ba3feabc8cb69687d14.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.a74a4cfb6c4b7bd58721.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.8bd3c2e4b7501c0f3003.js></script></body></html>
\ No newline at end of file
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
    "js-md5": "^0.7.3",
    "mint-ui": "^2.2.13",
    "qrcodejs2": "0.0.2",
+    "sa-sdk-javascript": "^1.12.5",
    "vue": "^2.5.2",
    "vue-aplayer": "^1.6.1",
    "vue-awesome-swiper": "^3.1.3",

--- a/src/assets/changeOld.png
+++ b/src/assets/changeOld.png
--- a/src/assets/record.png
+++ b/src/assets/record.png
--- a/src/components/collection/audio.vue
+++ b/src/components/collection/audio.vue
@@ -2,7 +2,7 @@
  <div class="audio-page">
    <div class="content" v-if="showObj.audio">
      <img :src="closeUrl" class="colse-btn" @click="showObj.show=false">
-      <audio ref="audio" @durationchange="canPlay" @play="playing()" :src="showObj.audio[showObj.audioIndex].url"></audio>
+      <audio ref="audio" id="audioTag" @durationchange="canPlay" @play="playing()" :src="showObj.audio[showObj.audioIndex].url"></audio>
      <div class="hp-left">
        <div class="hp-top">
          <div class="image-block" @click="imgPop=true">
@@ -37,7 +37,7 @@
      </div>
      <div class="btn-group">
        <i class="playImage toBig" @click="imgPop=true"></i>
-        <i class="playImage list" @click="popupVisible=!popupVisible"></i>
+        <i class="playImage list" @click="showObj.show=false"></i>
        <i class="playImage last" @click="lastOne()"></i>
        <i class="playImage play" v-if="!playFlag" @click="onPlay"></i>
        <i class="playImage stop" v-if="playFlag" @click="onStop"></i>
@@ -108,6 +108,7 @@
    methods:{
      // 改变收藏状态
      changeCollect(){
+        console.log(this.showObj)
        if(this.hasCollect){
          delUserCollectApi(this.hasCollect).then(res=>{
            this.hasCollect = false;
@@ -115,12 +116,11 @@
            this.checkCollect()
          })
        }else{
-          let lessonDetail = JSON.parse(localStorage.getItem('lessonDetail'));
          let json = {
-            category_id:lessonDetail.id,
+            category_id:this.showObj.audio[this.showObj.audioIndex].category_id,
            type:1,
            title:this.showObj.audio[this.showObj.audioIndex].title,
-            sub_title:'来自于 '+lessonDetail.title,
+            sub_title:'来自于 '+this.showObj.audio[this.showObj.audioIndex].sub_title,
            url:this.showObj.audio[this.showObj.audioIndex].url,
            cover:this.showObj.audio[this.showObj.audioIndex].cover
          };
@@ -141,8 +141,6 @@
      },
      // 播放音频
      onPlay(){
-        this.$refs.audio.loop = false
-        this.$refs.audio.load();
        this.$refs.audio.play();
      },
      lastOne(){

--- a/src/components/collection/index.vue
+++ b/src/components/collection/index.vue
@@ -27,7 +27,7 @@
      </ul>
    </div>
    <foot-page/>
-    <audio-page v-if="showObj.audio.length>0" v-show="showObj.show" :showObj="showObj"/>
+    <audio-page ref="audioPage" v-if="showObj.audio.length>0" v-show="showObj.show" :showObj="showObj"/>
  </div>
 </template>


--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -116,7 +116,7 @@
    },
    methods:{
      toOld(){
-        window.location.href = 'https://wechat.singsingenglish.com'
+        window.location.href = 'https://appanqlfkth3717.h5.xiaoeknow.com/content_page/eyJ0eXBlIjozLCJyZXNvdXJjZV90eXBlIjoiIiwicmVzb3VyY2VfaWQiOiIiLCJwcm9kdWN0X2lkIjoicF81YjE0YjdjMjdjNDZiX2Rvd0xicDc1IiwiYXBwX2lkIjoiYXBwYU5RTGZrdEgzNzE3In0?state=2f12ab00cbc58f98cdc8193c8151437f_Sc7T3q'
      },
      toBannerUrl(data){
        window.location.href = data

--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
@@ -450,6 +450,7 @@
        &:after{
          content: '';
          display: block;
+
          clear: both;
        }
        .left-time{