dist

e7ee4862 · IvyXia123 · 2dd54636 · 2c7438d3 · e7ee4862 · e7ee4862
Commit e7ee4862 authored Sep 18, 2019 by IvyXia123
63 changed files
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -17,6 +17,7 @@ module.exports = {
  },
  output: {
    path: config.build.assetsRoot,
+    crossOriginLoading: "anonymous",
    filename: '[name].js',
    publicPath: process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'testing'
      ? config.build.assetsPublicPath

--- a/dist/index.html
+++ b/dist/index.html
+<<<<<<< HEAD
 <!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.4ec38cfde517aba06b3fdc00914fab3e.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.6684bfcd310dd4c14e23.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.2a119e1fa4193f8d323b.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.e6dcf9851ead7d2a6ee3.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><script>// setSize();
+    //   addEventListener('resize',setSize);
+    //   function setSize() {
+    //       document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
+    //   }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
+        -webkit-overflow-scrolling: touch
+      }
+      .wrapper {
+          height: 100vh;
+          overflow: hidden;
+          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.dea2512c6efc3ca4ac7c.js></script><script type=text/javascript src=static/js/vendor.0c8bc24167292824b3ef.js></script><script type=text/javascript src=static/js/app.9fa00ef5bcbae748c71f.js></script></body></html>
+>>>>>>> 2c7438d36786905e1d1b95b272b97474fbf4ec0f
--- a/dist/static/img/yinyin.bd0dd3e.png
+++ b/dist/static/img/yinyin.bd0dd3e.png
--- a/dist/static/js/1.e49cf37075c0032f50d1.js
+++ b/dist/static/js/1.e49cf37075c0032f50d1.js
--- a/dist/static/js/10.31de19ccddfe7eace610.js
+++ b/dist/static/js/10.31de19ccddfe7eace610.js
--- a/dist/static/js/11.4c3e07777367d5e13d2d.js
+++ b/dist/static/js/11.4c3e07777367d5e13d2d.js
--- a/dist/static/js/12.4769584f83e0e74f26dc.js
+++ b/dist/static/js/12.4769584f83e0e74f26dc.js
--- a/dist/static/js/13.d8fdb75b936db52450b8.js
+++ b/dist/static/js/13.d8fdb75b936db52450b8.js
--- a/dist/static/js/14.1d60dd833e3a1ee4e62a.js
+++ b/dist/static/js/14.1d60dd833e3a1ee4e62a.js
--- a/dist/static/js/15.4c369bf14931f3fa31b9.js
+++ b/dist/static/js/15.4c369bf14931f3fa31b9.js
--- a/dist/static/js/16.189d2e815aa77218bf6e.js
+++ b/dist/static/js/16.189d2e815aa77218bf6e.js
--- a/dist/static/js/17.c8521060bae355ce1387.js
+++ b/dist/static/js/17.c8521060bae355ce1387.js
--- a/dist/static/js/18.45d4ffeae0af209b35d3.js
+++ b/dist/static/js/18.45d4ffeae0af209b35d3.js
--- a/dist/static/js/19.2ac99b25e144d3c6d296.js
+++ b/dist/static/js/19.2ac99b25e144d3c6d296.js
--- a/dist/static/js/2.6840c4cad2eca1cdd75f.js
+++ b/dist/static/js/2.6840c4cad2eca1cdd75f.js
--- a/dist/static/js/20.1afc5c36498c620a4af2.js
+++ b/dist/static/js/20.1afc5c36498c620a4af2.js
--- a/dist/static/js/21.5fe922a7cf96008afb0f.js
+++ b/dist/static/js/21.5fe922a7cf96008afb0f.js
--- a/dist/static/js/22.c6302d8327db470d9dc2.js
+++ b/dist/static/js/22.c6302d8327db470d9dc2.js
--- a/dist/static/js/24.84b76a216d9a49e9ede0.js
+++ b/dist/static/js/24.84b76a216d9a49e9ede0.js
--- a/dist/static/js/26.4acfa15d948d2c963078.js
+++ b/dist/static/js/26.4acfa15d948d2c963078.js
--- a/dist/static/js/27.2caf0f756175d523c290.js
+++ b/dist/static/js/27.2caf0f756175d523c290.js
--- a/dist/static/js/29.19e3f6ab457b7d9722b5.js
+++ b/dist/static/js/29.19e3f6ab457b7d9722b5.js
--- a/dist/static/js/3.73e15f341b42e091988b.js
+++ b/dist/static/js/3.73e15f341b42e091988b.js
--- a/dist/static/js/31.60c510e8ffa2bd3cecf7.js
+++ b/dist/static/js/31.60c510e8ffa2bd3cecf7.js
--- a/dist/static/js/32.e18360cf9cb5526231af.js
+++ b/dist/static/js/32.e18360cf9cb5526231af.js
--- a/dist/static/js/33.3d58597434a35ec469ee.js
+++ b/dist/static/js/33.3d58597434a35ec469ee.js
--- a/dist/static/js/34.f014f5356d02dd2480ad.js
+++ b/dist/static/js/34.f014f5356d02dd2480ad.js
--- a/dist/static/js/35.72a698eed38dff173c00.js
+++ b/dist/static/js/35.72a698eed38dff173c00.js
--- a/dist/static/js/36.f3f650d30472bc92ac4c.js
+++ b/dist/static/js/36.f3f650d30472bc92ac4c.js
--- a/dist/static/js/37.f4bd76c683abd0bec82f.js
+++ b/dist/static/js/37.f4bd76c683abd0bec82f.js
--- a/dist/static/js/38.9a7489f09753bf4e33b0.js
+++ b/dist/static/js/38.9a7489f09753bf4e33b0.js
--- a/dist/static/js/4.ac8e38bde1bd4346105b.js
+++ b/dist/static/js/4.ac8e38bde1bd4346105b.js
--- a/dist/static/js/40.48d25e008690c7676fae.js
+++ b/dist/static/js/40.48d25e008690c7676fae.js
--- a/dist/static/js/41.ef7d4c7f9720a90cda36.js
+++ b/dist/static/js/41.ef7d4c7f9720a90cda36.js
--- a/dist/static/js/42.c6941be19a17cef87185.js
+++ b/dist/static/js/42.c6941be19a17cef87185.js
--- a/dist/static/js/43.086a244eaf0e260cf8a2.js
+++ b/dist/static/js/43.086a244eaf0e260cf8a2.js
--- a/dist/static/js/44.7cf32670fd1ce804ca69.js
+++ b/dist/static/js/44.7cf32670fd1ce804ca69.js
--- a/dist/static/js/45.49d1a6aa9e75159e12b3.js
+++ b/dist/static/js/45.49d1a6aa9e75159e12b3.js
--- a/dist/static/js/46.76910ff0728349690ef3.js
+++ b/dist/static/js/46.76910ff0728349690ef3.js
--- a/dist/static/js/48.d992342a49830ee8cf9b.js
+++ b/dist/static/js/48.d992342a49830ee8cf9b.js
--- a/dist/static/js/49.fdeb5f135a1caa9c3069.js
+++ b/dist/static/js/49.fdeb5f135a1caa9c3069.js
--- a/dist/static/js/5.a74d0eadd1fbadd6e08c.js
+++ b/dist/static/js/5.a74d0eadd1fbadd6e08c.js
--- a/dist/static/js/50.4c448a88118b1507c36c.js
+++ b/dist/static/js/50.4c448a88118b1507c36c.js
--- a/dist/static/js/51.366869bc4751b1253de5.js
+++ b/dist/static/js/51.366869bc4751b1253de5.js
--- a/dist/static/js/52.cdc91566d87c0845bd0e.js
+++ b/dist/static/js/52.cdc91566d87c0845bd0e.js
--- a/dist/static/js/54.6003118e675ddcb83d0f.js
+++ b/dist/static/js/54.6003118e675ddcb83d0f.js
+webpackJsonp([54],{"6IIy":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i,s=t("bOdI"),a=t.n(s),r=(t("y+mr"),t("3JdW")),l=t.n(r),o=(t("f1Vh"),t("ZQVe")),c=t.n(o),p=(t("q/am"),t("4VPn")),d=t.n(p),u=t("CCn6"),h=t("/Bxx"),f=t.n(h),g={name:"shareConfig",components:(i={},a()(i,d.a.name,d.a),a()(i,c.a.name,c.a),a()(i,l.a.name,l.a),i),data:function(){return{desc:"赠你1元领取价值398元课程特权，和我一起快乐启蒙英语吧",shareUrl:f.a,title:"我家宝宝正在【唱唱启蒙英语】挑战童谣，已坚持1天",link:window.location.href.split("#")[0],shareVisible:!1}},methods:{enableShare:function(n){Object(u.Y)({api_list:"onMenuShareAppMessage,onMenuShareTimeline",url:window.location.href.split("#")[0]}).then(function(e){wx.config({debug:!1,appId:e.appId,timestamp:parseInt(e.timestamp),nonceStr:e.nonceStr,signature:e.signature,jsApiList:e.jsApiList}),wx.ready(function(){wx.onMenuShareTimeline({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}}),wx.onMenuShareAppMessage({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}})})})},sharePage:function(){this.enableShare({product_title:this.title,desc:this.desc,shareIcon:"https://cdn.singsingenglish.com/logo/logo.jpg",shareUrl:this.link}),this.shareVisible=!0}}},m=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[t("mt-popup",{staticClass:"refer-share",staticStyle:{background:"transparent"},attrs:{position:"top"},model:{value:n.shareVisible,callback:function(e){n.shareVisible=e},expression:"shareVisible"}},[t("img",{staticStyle:{width:"80vw"},attrs:{src:n.shareUrl}})]),n._v(" "),t("div",{staticStyle:{padding:"10px"}},[t("mt-field",{attrs:{label:"分享标题",type:"textarea",placeholder:"请输入分享标题",rows:"4"},model:{value:n.title,callback:function(e){n.title=e},expression:"title"}}),n._v(" "),t("mt-field",{attrs:{label:"分享链接",type:"textarea",placeholder:"请输入分享链接",rows:"4"},model:{value:n.link,callback:function(e){n.link=e},expression:"link"}}),n._v(" "),t("mt-field",{attrs:{label:"分享描述",type:"textarea",placeholder:"请输入分享描述",rows:"4"},model:{value:n.desc,callback:function(e){n.desc=e},expression:"desc"}}),n._v(" "),t("div",{staticStyle:{width:"calc(100vw - 20px)",margin:"0"}},[t("mt-button",{attrs:{type:"primary",size:"large"},on:{click:function(e){n.sharePage()}}},[n._v("分享")])],1)],1)],1)};m._withStripped=!0;var v={render:m,staticRenderFns:[]},b=v;var x=!1;var w=t("VU/8")(g,b,!1,function(n){x||t("oiC4")},"data-v-fe968cbe",null);w.options.__file="src/components/shareConfig.vue";e.default=w.exports},oiC4:function(n,e,t){var i=t("xc6X");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("64f549e4",i,!1,{})},xc6X:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n","",{version:3,sources:[],names:[],mappings:"",file:"shareConfig.vue",sourceRoot:""}])}});
\ No newline at end of file
--- a/dist/static/js/56.ee0a9f789f3d8d371fca.js
+++ b/dist/static/js/56.ee0a9f789f3d8d371fca.js
--- a/dist/static/js/57.338c08c07da4297fe3fb.js
+++ b/dist/static/js/57.338c08c07da4297fe3fb.js
--- a/dist/static/js/58.aaf88ad820a8dd2005a0.js
+++ b/dist/static/js/58.aaf88ad820a8dd2005a0.js
--- a/dist/static/js/59.42bcb2d18dd19eef7cbe.js
+++ b/dist/static/js/59.42bcb2d18dd19eef7cbe.js
--- a/dist/static/js/6.04fac63853b694be5a86.js
+++ b/dist/static/js/6.04fac63853b694be5a86.js
--- a/dist/static/js/60.0b30f59f6ff3ed2b1e2a.js
+++ b/dist/static/js/60.0b30f59f6ff3ed2b1e2a.js
--- a/dist/static/js/61.070767158318289a72c9.js
+++ b/dist/static/js/61.070767158318289a72c9.js
--- a/dist/static/js/63.2e66ad7f956cbf0c7c4f.js
+++ b/dist/static/js/63.2e66ad7f956cbf0c7c4f.js
+webpackJsonp([63],{"+N17":function(e,n,t){(e.exports=t("FZ+f")(!0)).push([e.i,"","",{version:3,sources:[],names:[],mappings:"",file:"navShare.vue",sourceRoot:""}])},oB2U:function(e,n,t){var o=t("+N17");"string"==typeof o&&(o=[[e.i,o,""]]),o.locals&&(e.exports=o.locals);t("rjj0")("15ac934c",o,!1,{})},w9jd:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var o=t("CCn6"),r={name:"navShare",mounted:function(){var e=this;Object(o.I)().then(function(n){e.shopId=n.id,e.$router.push({name:"buyDetail",query:{invite_code:e.$route.query.invite_code,shopId:e.shopId}})})},data:function(){return{}}},s=function(){var e=this.$createElement;return(this._self._c||e)("div",{staticClass:"nofinish-block"})};s._withStripped=!0;var a={render:s,staticRenderFns:[]},i=a;var c=!1;var u=t("VU/8")(r,i,!1,function(e){c||t("oB2U")},"data-v-18aa337a",null);u.options.__file="src/components/newLesson/navShare.vue";n.default=u.exports}});
\ No newline at end of file
--- a/dist/static/js/7.1c17b3c713f1a19e22e0.js
+++ b/dist/static/js/7.1c17b3c713f1a19e22e0.js
--- a/dist/static/js/8.4e74ba83c13e9e32f71a.js
+++ b/dist/static/js/8.4e74ba83c13e9e32f71a.js
--- a/dist/static/js/9.a680dc5f0f106f32d8d9.js
+++ b/dist/static/js/9.a680dc5f0f106f32d8d9.js
--- a/dist/static/js/app.9fa00ef5bcbae748c71f.js
+++ b/dist/static/js/app.9fa00ef5bcbae748c71f.js
--- a/dist/static/js/manifest.dea2512c6efc3ca4ac7c.js
+++ b/dist/static/js/manifest.dea2512c6efc3ca4ac7c.js
--- a/dist/static/js/vendor-async.9dce082d8d57ba795d07.js
+++ b/dist/static/js/vendor-async.9dce082d8d57ba795d07.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
    "build-test": "node build/build-test.js"
  },
  "dependencies": {
+    "@elastic/apm-rum": "^4.4.4",
    "axios": "^0.18.0",
    "better-scroll": "^1.15.2",
    "canvas2image": "^1.0.5",

--- a/src/main.js
+++ b/src/main.js
@@ -11,11 +11,22 @@ import sa from 'sa-sdk-javascript';
 import 'mint-ui/lib/style.css'
 import scroll from "./base/scroll/scroll"
 import { Popup, Lazyload, Button, Dialog, Toast } from 'vant';
+
 import * as fundebug from 'fundebug-javascript';
 import fundebugVue from 'fundebug-vue';
 fundebug.apikey = '4d414770c72b034dfa896048206a72258ede4e4ad5f9c6c4320d19b7f91a567e';
 fundebugVue(fundebug, Vue);

+// import { init as initApm } from '@elastic/apm-rum'
+// var apm = initApm({
+//   // 设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）
+//   serviceName: 'ccqm',
+//   // 设置定制 APM Server URL（默认值：http://localhost:8200）
+//   serverUrl: 'http://apm.ops.changchangenglish.com/',
+//   // 设置服务版本（源地图功能要求）
+//   serviceVersion: ''
+// })
+
 Vue.config.productionTip = false;
 //神策埋点
 Vue.prototype.$sa = sa;