718

7282a59b · chenyishuai@singsingenglish.com · b373d72c · 7282a59b · 7282a59b · b373d72c
Commit 7282a59b authored Jul 18, 2019 by chenyishuai@singsingenglish.com
15 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.6d1485aaa13efec59629.js></script><script type=text/javascript src=static/js/vendor.86cdf707c760a9063004.js></script><script type=text/javascript src=static/js/app.29b6a187c145ab481c77.js></script></body></html>
\ No newline at end of file
+        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.0273453bedc40e640040.js></script><script type=text/javascript src=static/js/vendor.86cdf707c760a9063004.js></script><script type=text/javascript src=static/js/app.281d22e10c1119610022.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/1.681a1f604457440058e4.js
+++ b/dev/static/js/1.681a1f604457440058e4.js
--- a/dev/static/js/1.cdeae819af4c1f933a91.js
+++ b/dev/static/js/1.cdeae819af4c1f933a91.js
--- a/dev/static/js/5.33e748e90b0c560003d8.js
+++ b/dev/static/js/5.33e748e90b0c560003d8.js
--- a/dev/static/js/5.bc205bd0bfd16334ece0.js
+++ b/dev/static/js/5.bc205bd0bfd16334ece0.js
--- a/dev/static/js/app.281d22e10c1119610022.js
+++ b/dev/static/js/app.281d22e10c1119610022.js
--- a/dev/static/js/app.29b6a187c145ab481c77.js
+++ b/dev/static/js/app.29b6a187c145ab481c77.js
--- a/dev/static/js/manifest.6d1485aaa13efec59629.js
+++ b/dev/static/js/manifest.6d1485aaa13efec59629.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var a={},d={52:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"73c582a895d0a677ee4c",1:"cdeae819af4c1f933a91",2:"60ad16347a55b2828aaf",3:"b01d8303a343a188eef7",4:"dc6c7a5c57a4168ebfcd",5:"bc205bd0bfd16334ece0",6:"fd2048a132ac01c66f31",7:"660f5bdb4edd1edd55e7",8:"246c15970a33fcd2340a",9:"566fa20841acf546ebc0",10:"adbac4f8ecfca5372f98",11:"5ac6a531d2146fec6b2c",12:"5431d4abdf076fd48dc6",13:"7ed678425e44945ce745",14:"4559bb8bd2da436a3ccc",15:"2fd47e7098746126dd51",16:"e8b8fcc9fc62eae64aa2",17:"5acc332aae4a308d71ca",18:"29f05e573484644e060c",19:"3ed4f1f73cfcf27710c3",20:"de34326007c3cdc57f22",21:"76940178c9e4e01f512e",22:"63e1f714af326c0a9bcc",23:"cec5061721042431a6c0",24:"1cdbc6c7100258c26ff2",25:"d2f8bb35bf5209954d8f",26:"43eed8364ecef04590e9",27:"de979c212136daf772dc",28:"e8fa66475d1e1c1c3171",29:"578f1fef4f9d847ec8b1",30:"0ea1fd78fa42dd3a2c12",31:"c44f74d8095ba9e25e36",32:"694b0e152fb12db8269e",33:"f0856d7cc64d81213172",34:"2fa40589944c44a2eb07",35:"c22d714aed7faf6d9343",36:"f4d72bb60b163e7ef715",37:"5012ca41e831c1c176b0",38:"720de91a7cf10e3e3433",39:"66651d565a5dd3283804",40:"9f8ea2b13920eaeadfdb",41:"2a295886cae89b21b058",42:"b30b6ad88d137abd92e7",43:"e2654995557db9d4a9ce",44:"4123556f50856bd9e118",45:"901787a1116554737bd8",46:"9dcba50e768c736dfbd3",47:"6e40a75e3773b80dadf1",48:"d16d56cb114a7d7b001f",49:"49bc64a0b028e33c7dc0"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var a={},d={52:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"73c582a895d0a677ee4c",1:"681a1f604457440058e4",2:"60ad16347a55b2828aaf",3:"b01d8303a343a188eef7",4:"dc6c7a5c57a4168ebfcd",5:"33e748e90b0c560003d8",6:"fd2048a132ac01c66f31",7:"660f5bdb4edd1edd55e7",8:"246c15970a33fcd2340a",9:"566fa20841acf546ebc0",10:"adbac4f8ecfca5372f98",11:"5ac6a531d2146fec6b2c",12:"5431d4abdf076fd48dc6",13:"7ed678425e44945ce745",14:"4559bb8bd2da436a3ccc",15:"2fd47e7098746126dd51",16:"e8b8fcc9fc62eae64aa2",17:"5acc332aae4a308d71ca",18:"29f05e573484644e060c",19:"3ed4f1f73cfcf27710c3",20:"de34326007c3cdc57f22",21:"76940178c9e4e01f512e",22:"63e1f714af326c0a9bcc",23:"cec5061721042431a6c0",24:"1cdbc6c7100258c26ff2",25:"d2f8bb35bf5209954d8f",26:"43eed8364ecef04590e9",27:"de979c212136daf772dc",28:"e8fa66475d1e1c1c3171",29:"578f1fef4f9d847ec8b1",30:"0ea1fd78fa42dd3a2c12",31:"c44f74d8095ba9e25e36",32:"694b0e152fb12db8269e",33:"f0856d7cc64d81213172",34:"2fa40589944c44a2eb07",35:"c22d714aed7faf6d9343",36:"f4d72bb60b163e7ef715",37:"5012ca41e831c1c176b0",38:"720de91a7cf10e3e3433",39:"66651d565a5dd3283804",40:"9f8ea2b13920eaeadfdb",41:"2a295886cae89b21b058",42:"b30b6ad88d137abd92e7",43:"e2654995557db9d4a9ce",44:"4123556f50856bd9e118",45:"901787a1116554737bd8",46:"9dcba50e768c736dfbd3",47:"6e40a75e3773b80dadf1",48:"d16d56cb114a7d7b001f",49:"49bc64a0b028e33c7dc0"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/newLesson/index.vue
+++ b/src/components/newLesson/index.vue
@@ -104,7 +104,6 @@ export default {
  },
  beforeDestroy(){
    clearInterval(this.saveTime)
-    // console.log(99)
  },
  methods: {
    enableShare: function(option) {
@@ -425,6 +424,7 @@ export default {
          localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
        });
      },30000)
+      this.$store.dispatch('setTimeout',this.saveTime)
    },
    initPage() {
      Toast.loading({

--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
@@ -90,8 +90,7 @@ import {
  getwechatParam,
  getUserWatchApi,
  getShortApi,
-  subUserLessonApi,
-  getCountTimeApi
+  subUserLessonApi
 } from "../../service/api";
 import share_code_bg from "../../assets/newLesson/share-code-bg.png";
 import share_tips from "../../assets/Bitmap@2x.png";
@@ -116,7 +115,9 @@ export default {
      domTitle: "",
      imgPoint: good,
      minute: "",
-      percent: 0
+      percent: 0,
+      saveTime:'',
+      lastTime:''
    };
  },
  props: ["contentData"],
@@ -128,6 +129,12 @@ export default {
    });
    this.initPage();
  },
+  beforeDestroy(){
+    console.log(Date.parse(new Date())-this.lastTime);
+    this.lesson.nowTime += Date.parse(new Date())-this.lastTime
+    localStorage.setItem("lessonDetail", JSON.stringify(this.lesson));
+    console.log(this.lesson.nowTime);
+  },
  methods: {
    showShare() {
      this.shareVisible = true;
@@ -168,6 +175,9 @@ export default {
      this.lesson = JSON.parse(localStorage.getItem("lessonDetail"));
      this.lesson.domTitle = this.lesson.domTitle.substring(0, 9);
      console.log(this.watchDetail, 170);
+      console.log(this.lesson);
+      this.lastTime = Date.parse(new Date());
+      clearInterval(this.$store.state.timeout)
      this.userDetail = JSON.parse(localStorage.getItem("userDesc"));
        this.minute = ( this.watchDetail.stay_time / 60).toFixed();
        // this.minute = (600/60).toFixed()
@@ -194,12 +204,14 @@ export default {
          this.imgPoint = perfect;
        }
        Toast.clear();
+        let query = JSON.parse(sessionStorage.getItem("classQuery"));
        let obj = {
          user_id: this.userDetail.user_id,
          minute: this.minute,
          percent: this.percent,
          title: this.lesson.title,
-          domTitle: this.lesson.domTitle
+          domTitle: this.lesson.domTitle,
+          category_id: query.category_id
        };
        let URL =
          process.env.API_URL +

--- a/src/components/newLesson/shareGoods.vue
+++ b/src/components/newLesson/shareGoods.vue
@@ -128,7 +128,7 @@ export default {
        salesID: this.objInfo.user_id
      });
      this.nickname = JSON.parse(localStorage.getItem("userDesc")).nickname;
-      getOtherUserWatchApi(this.objInfo.user_id).then(res => {
+      getOtherUserWatchApi(this.objInfo.user_id,{category_id:this.objInfo.category_id}).then(res => {
        res.user_info.avatar = res.user_info.avatar.replace(
          "http://",
          "https://"

--- a/src/service/api.js
+++ b/src/service/api.js
@@ -216,8 +216,8 @@ export const delUserCollectApi = function (id) {

 // 获取他人看课统计
 const getOtherUserWatchUrl = `/api/client/user/watch/report/`;
-export const getOtherUserWatchApi = function (id) {
-  return Vue.prototype.$fetch(getOtherUserWatchUrl + id)
+export const getOtherUserWatchApi = function (id,json) {
+  return Vue.prototype.$fetch(getOtherUserWatchUrl + id,json)
 };

 // 获取分享商品

--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -16,5 +16,8 @@ export default{
  },
  setLookStatus({commit},data){
    commit('isLookStatus',data)
-  }
+  },
+  setTimeout({commit},data){
+    commit('isTimeout',data)
+  },
 }
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -12,7 +12,8 @@ export default new vuex.Store({
    watchDetail:{},
    classQuery:{},
    couponShadow:false,
-    lookStatus:0
+    lookStatus:0,
+    timeout:''
  },
  mutations,
  actions

--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -25,5 +25,8 @@ const mutations={
  isLookStatus(state,data){
    state.lookStatus=data;
  },
+  isTimeout(state,data){
+    state.timeout=data;
+  },
 };
 export default mutations;