Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/index.html

Merge remote-tracking branch 'origin/master'
# Conflicts: # dist/index.html
571f205d · wangwei · 46ad04aa · 1b0b9f58 · 571f205d · 571f205d
Commit 571f205d authored Jan 16, 2019 by wangwei
55 changed files
--- a/dev/index.html
+++ b/dev/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></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.9ec998b3aa5748887222.js></script><script type=text/javascript src=static/js/vendor.d5ec60b9d860e29298b7.js></script><script type=text/javascript src=static/js/app.803a58294909a6b7e742.js></script></body></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></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.c03348ef618677097628.js></script><script type=text/javascript src=static/js/vendor.d5ec60b9d860e29298b7.js></script><script type=text/javascript src=static/js/app.7270358fdb9eb52a30be.js></script></body></html>
\ No newline at end of file
--- a/dev/static/img/noLessonIcon.c7ce3b3.png
+++ b/dev/static/img/noLessonIcon.c7ce3b3.png
--- a/dev/static/img/noLessonText.c537fc0.png
+++ b/dev/static/img/noLessonText.c537fc0.png
--- a/dev/static/js/0.394f65d8b8403aff5643.js
+++ b/dev/static/js/0.394f65d8b8403aff5643.js
--- a/dev/static/js/0.394f65d8b8403aff5643.js.map
+++ b/dev/static/js/0.394f65d8b8403aff5643.js.map
--- a/dev/static/js/10.442b2c7a5e673806634f.js
+++ b/dev/static/js/10.442b2c7a5e673806634f.js
--- a/dev/static/js/10.442b2c7a5e673806634f.js.map
+++ b/dev/static/js/10.442b2c7a5e673806634f.js.map
--- a/dev/static/js/11.b793d438b0adc9bc82c3.js
+++ b/dev/static/js/11.b793d438b0adc9bc82c3.js
--- a/dev/static/js/11.b793d438b0adc9bc82c3.js.map
+++ b/dev/static/js/11.b793d438b0adc9bc82c3.js.map
--- a/dev/static/js/3.8dbfdf029d83b0531604.js
+++ b/dev/static/js/3.8dbfdf029d83b0531604.js
--- a/dev/static/js/3.8dbfdf029d83b0531604.js.map
+++ b/dev/static/js/3.8dbfdf029d83b0531604.js.map
--- a/dev/static/js/7.1cc1ed96d802725e130d.js
+++ b/dev/static/js/7.1cc1ed96d802725e130d.js
--- a/dev/static/js/7.1cc1ed96d802725e130d.js.map
+++ b/dev/static/js/7.1cc1ed96d802725e130d.js.map
--- a/dev/static/js/8.96a9cc5fef85f57879ce.js
+++ b/dev/static/js/8.96a9cc5fef85f57879ce.js
--- a/dev/static/js/8.96a9cc5fef85f57879ce.js.map
+++ b/dev/static/js/8.96a9cc5fef85f57879ce.js.map
--- a/dev/static/js/9.dc2292fbd48b88932f60.js
+++ b/dev/static/js/9.dc2292fbd48b88932f60.js
--- a/dev/static/js/9.dc2292fbd48b88932f60.js.map
+++ b/dev/static/js/9.dc2292fbd48b88932f60.js.map
--- a/dev/static/js/app.7270358fdb9eb52a30be.js
+++ b/dev/static/js/app.7270358fdb9eb52a30be.js
--- a/dev/static/js/app.7270358fdb9eb52a30be.js.map
+++ b/dev/static/js/app.7270358fdb9eb52a30be.js.map
--- a/dev/static/js/manifest.c03348ef618677097628.js
+++ b/dev/static/js/manifest.c03348ef618677097628.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,i,u,b=0,d=[];b<r.length;b++)i=r[b],c[i]&&d.push(c[i][0]),c[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);d.length;)d.shift()();if(a)for(b=0;b<a.length;b++)u=t(t.s=a[b]);return u};var r={},c={24:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,t.nc&&a.setAttribute("nonce",t.nc),a.src=t.p+"static/js/"+e+"."+{0:"394f65d8b8403aff5643",1:"8c920e524a091982e80b",2:"741b7da34c2ab294b031",3:"8dbfdf029d83b0531604",4:"c5537a80e205b276d8e8",5:"ea24aa88e89fc5b026f2",6:"c1487a7b7c6f931a80c0",7:"1cc1ed96d802725e130d",8:"96a9cc5fef85f57879ce",9:"dc2292fbd48b88932f60",10:"442b2c7a5e673806634f",11:"b793d438b0adc9bc82c3",12:"28b85c92c625c573957b",13:"a800e876c1cf8bc83609",14:"7acf8ccfc7d318f9a557",15:"87908c870e0ce86d9431",16:"493370f2f8b8a4701126",17:"4bf19144b871f45614e7",18:"e515029453d38eb72112",19:"7b3af3eaa2edb35c6a78",20:"248a9e710fe7b7466afc",21:"8c50a4516111623ee839"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.c03348ef618677097628.js.map
\ No newline at end of file
--- a/dev/static/js/manifest.c03348ef618677097628.js.map
+++ b/dev/static/js/manifest.c03348ef618677097628.js.map
--- a/dist/static/css/app.ae7282d2cb582ff3425c630ed5c2cfb3.css
+++ b/dist/static/css/app.ae7282d2cb582ff3425c630ed5c2cfb3.css
--- a/dist/static/css/app.ae7282d2cb582ff3425c630ed5c2cfb3.css.map
+++ b/dist/static/css/app.ae7282d2cb582ff3425c630ed5c2cfb3.css.map
--- a/dist/static/img/noLessonIcon.c7ce3b3.png
+++ b/dist/static/img/noLessonIcon.c7ce3b3.png
--- a/dist/static/img/noLessonText.c537fc0.png
+++ b/dist/static/img/noLessonText.c537fc0.png
--- a/dist/static/js/0.bc3077275b644f6f8039.js
+++ b/dist/static/js/0.bc3077275b644f6f8039.js
--- a/dist/static/js/0.bc3077275b644f6f8039.js.map
+++ b/dist/static/js/0.bc3077275b644f6f8039.js.map
--- a/dist/static/js/10.6563ef4db84033e12082.js
+++ b/dist/static/js/10.6563ef4db84033e12082.js
+webpackJsonp([10],{eZU3:function(t,i,n){"use strict";Object.defineProperty(i,"__esModule",{value:!0});var s=n("CCn6"),e=n("owV8"),a=n.n(e),r={name:"index",data:function(){return{inviteListTitle:a.a,inviteList:[]}},filters:{formatDate:function(t){return t?t.split(" ")[0]:""}},mounted:function(){this.getInviteList()},methods:{getInviteList:function(){var t=this,i=this.$route.query.shopId;Object(s.k)({page:1,limit:100},i).then(function(i){t.inviteList=i.list,console.log("inviteList",i.list)})}}},c={render:function(){var t=this,i=t.$createElement,n=t._self._c||i;return n("div",{staticClass:"activity"},[n("div",[n("div",{staticClass:"inviteContainer"},[n("img",{staticClass:"invite-title",attrs:{src:t.inviteListTitle}}),t._v(" "),t._m(0),t._v(" "),n("ul",{staticClass:"p-list"},t._l(t.inviteList,function(i){return n("li",[n("div",{staticClass:"flex-start no-margin"},[n("img",{attrs:{src:i.avatar}}),t._v(" "),n("span",[t._v(t._s(i.nickname))])]),t._v(" "),n("span",{staticClass:"no-margin"},[t._v(t._s(t._f("formatDate")(i.pay_at)))])])}))])])])},staticRenderFns:[function(){var t=this.$createElement,i=this._self._c||t;return i("div",{staticClass:"flex-bt i-title"},[i("span",[this._v("受邀好友")]),this._v(" "),i("span",[this._v("购买时间")])])}]};var l=n("VU/8")(r,c,!1,function(t){n("u197"),n("iN/g")},"data-v-ad7cf3cc",null);i.default=l.exports},"iN/g":function(t,i){},owV8:function(t,i,n){t.exports=n.p+"static/img/invite_list_title.7338e46.png"},u197:function(t,i){}});
+//# sourceMappingURL=10.6563ef4db84033e12082.js.map
\ No newline at end of file
--- a/dist/static/js/10.6563ef4db84033e12082.js.map
+++ b/dist/static/js/10.6563ef4db84033e12082.js.map
--- a/dist/static/js/11.34f588a6620a0bebdeba.js
+++ b/dist/static/js/11.34f588a6620a0bebdeba.js
--- a/dist/static/js/11.34f588a6620a0bebdeba.js.map
+++ b/dist/static/js/11.34f588a6620a0bebdeba.js.map
--- a/dist/static/js/4.ae5fe0abc8931b2fc61e.js
+++ b/dist/static/js/4.ae5fe0abc8931b2fc61e.js
--- a/dist/static/js/4.ae5fe0abc8931b2fc61e.js.map
+++ b/dist/static/js/4.ae5fe0abc8931b2fc61e.js.map
--- a/dist/static/js/6.29003242336f2a7ef5d1.js
+++ b/dist/static/js/6.29003242336f2a7ef5d1.js
--- a/dist/static/js/6.29003242336f2a7ef5d1.js.map
+++ b/dist/static/js/6.29003242336f2a7ef5d1.js.map
--- a/dist/static/js/7.b7c0de6c5f8596248893.js
+++ b/dist/static/js/7.b7c0de6c5f8596248893.js
--- a/dist/static/js/7.b7c0de6c5f8596248893.js.map
+++ b/dist/static/js/7.b7c0de6c5f8596248893.js.map
--- a/dist/static/js/8.b8bf9bb835a1e68052d5.js
+++ b/dist/static/js/8.b8bf9bb835a1e68052d5.js
--- a/dist/static/js/8.b8bf9bb835a1e68052d5.js.map
+++ b/dist/static/js/8.b8bf9bb835a1e68052d5.js.map
--- a/dist/static/js/9.73413961b6b55d45296a.js
+++ b/dist/static/js/9.73413961b6b55d45296a.js
--- a/dist/static/js/9.73413961b6b55d45296a.js.map
+++ b/dist/static/js/9.73413961b6b55d45296a.js.map
--- a/dist/static/js/app.8c95212b1a64bad95bed.js
+++ b/dist/static/js/app.8c95212b1a64bad95bed.js
--- a/dist/static/js/app.8c95212b1a64bad95bed.js.map
+++ b/dist/static/js/app.8c95212b1a64bad95bed.js.map
--- a/dist/static/js/manifest.04b0c8fb3afb919c8b4a.js
+++ b/dist/static/js/manifest.04b0c8fb3afb919c8b4a.js
--- a/dist/static/js/manifest.04b0c8fb3afb919c8b4a.js.map
+++ b/dist/static/js/manifest.04b0c8fb3afb919c8b4a.js.map
--- a/src/assets/changeOld.png
+++ b/src/assets/changeOld.png
--- a/src/assets/goMap.png
+++ b/src/assets/goMap.png
--- a/src/assets/listen.png
+++ b/src/assets/listen.png
--- a/src/assets/more.png
+++ b/src/assets/more.png
--- a/src/assets/newLesson.png
+++ b/src/assets/newLesson.png
--- a/src/assets/noLessonIcon.png
+++ b/src/assets/noLessonIcon.png
--- a/src/assets/noLessonText.png
+++ b/src/assets/noLessonText.png
--- a/src/assets/record.png
+++ b/src/assets/record.png
--- a/src/components/index.vue
+++ b/src/components/index.vue
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -315,7 +315,6 @@
        // 神策埋点 开始课程
        this.$sa.track('StartCourse',{
          elementID:this.thisLesson.id.toString(),
          dayModule:this.thisLesson.domTitle.slice(0,9),
          weekName:this.thisLesson.domTitle.slice(10,this.thisLesson.domTitle.length),
          elementName:this.thisLesson.domTitle.slice(0,9) + '-'+ this.thisLesson.domTitle.slice(10,this.thisLesson.domTitle.length),