729

391d6580 · chenyishuai@singsingenglish.com · e2302c6d · 89eca29d · 391d6580 · 391d6580
Commit 391d6580 authored Jul 29, 2019 by chenyishuai@singsingenglish.com
43 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
 'use strict';
 const merge = require('webpack-merge');
 const prodEnv = require('./prod.env');
-const ip = 'http://10.1.22.249:8085/'
+// const ip = 'http://10.1.23.212:8085/'
-// const ip = 'http://192.168.31.185:8085/'
+const ip = 'http://192.168.0.111:8085/'
 module.exports = merge(prodEnv, {
  NODE_ENV: '"development"',
  API_URL: `"${ip}"`,

--- a/config/index.js
+++ b/config/index.js
@@ -20,8 +20,8 @@ module.exports = {
      }
    },
    // Various Dev Server settings
-    host: '10.1.22.249', // can be overwritten by process.env.HOST
+    // host: '10.1.23.212', // can be overwritten by process.env.HOST
-    // host: '192.168.31.185', // can be overwritten by process.env.HOST
+    host: '192.168.0.111', // can be overwritten by process.env.HOST
    // host: 'localhost', // can be overwritten by process.env.HOST
    port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: false,

--- 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.13b055a7fb3d451052ce.js></script><script type=text/javascript src=static/js/vendor.f35ede72f5c3508f6b05.js></script><script type=text/javascript src=static/js/app.bd23c5c0734e995a53bf.js></script></body></html>
+        /* 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.bfba8cfe3abc80459324.js></script><script type=text/javascript src=static/js/vendor.f35ede72f5c3508f6b05.js></script><script type=text/javascript src=static/js/app.04c615a913e40c6ef41e.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/1.1ca231c7b99d253294ad.js
+++ b/dev/static/js/1.1ca231c7b99d253294ad.js
--- a/dev/static/js/1.ce466f9e61b92a03cbf3.js
+++ b/dev/static/js/1.ce466f9e61b92a03cbf3.js
--- a/dev/static/js/12.208be69c4aa8775f9d5e.js
+++ b/dev/static/js/12.208be69c4aa8775f9d5e.js
--- a/dev/static/js/12.66b58613840ef56a1dff.js
+++ b/dev/static/js/12.66b58613840ef56a1dff.js
--- a/dev/static/js/17.4718cc4b2f37bded30f7.js
+++ b/dev/static/js/17.4718cc4b2f37bded30f7.js
--- a/dev/static/js/19.70b214eeedab460922e8.js
+++ b/dev/static/js/19.70b214eeedab460922e8.js
--- a/dev/static/js/24.5e23bee633309e0a9b01.js
+++ b/dev/static/js/24.5e23bee633309e0a9b01.js
--- a/dev/static/js/24.f9c16a0b84cc57acd5c7.js
+++ b/dev/static/js/24.f9c16a0b84cc57acd5c7.js
--- a/dev/static/js/30.ba76fc48e625d89b4cf6.js
+++ b/dev/static/js/30.ba76fc48e625d89b4cf6.js
--- a/dev/static/js/app.bd23c5c0734e995a53bf.js
+++ b/dev/static/js/app.bd23c5c0734e995a53bf.js
--- a/dev/static/js/manifest.13b055a7fb3d451052ce.js
+++ b/dev/static/js/manifest.13b055a7fb3d451052ce.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={54:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"1aad2168fb530f5aa4a7",1:"1ca231c7b99d253294ad",2:"5c59114175b6cd23c39c",3:"58a01dba059857bfcdc0",4:"dfaade6e76c72d90bc8a",5:"09f8b0432a075f20bb33",6:"ac4c2c6f7b9b2dad8305",7:"5a275aa794d6e86574f4",8:"34a9cd9e0d1747cc2ab7",9:"0f4f82403c714de438b1",10:"fbf0f59deabc41738ede",11:"f1d7cbde04399d9f2277",12:"66b58613840ef56a1dff",13:"d0b765e5919b7a17ef45",14:"19f6c34cf3104d684dc3",15:"1cf0b49eac5dc0730caf",16:"3f7fae1e2e8431ac04a2",17:"4718cc4b2f37bded30f7",18:"b5bcfabc88d8c13e73e5",19:"70b214eeedab460922e8",20:"2f684fdd3c89f5915cc0",21:"d9ca60c85b1e838b6593",22:"f053a165552dfc527084",23:"85889905f55a37fff1a9",24:"f9c16a0b84cc57acd5c7",25:"83236f710f52b0bdf28b",26:"cac9b037048fa94ea20b",27:"213a045d7380e781ae34",28:"e3cf675448715902d8cf",29:"e798dca3389dfabacb95",30:"ba76fc48e625d89b4cf6",31:"3bbb6fac9f9c58f2a9b3",32:"8d880791c1091468c62b",33:"ee7d4b4ee5cd0ed69326",34:"acbbc3488acfb4c9558b",35:"175d0588e86db3bacbf0",36:"28eb70d85f3c286f360b",37:"fbc16d51d34a46444b95",38:"f47bd6208cd3620264b2",39:"47648c0a69bff502bc23",40:"3052ee99d645c9e5b07c",41:"3763cabba7e127ba6d54",42:"2cd134b76e0094560be2",43:"3e9a35c195fda147f986",44:"ab85e08303d146b6f1e8",45:"aeffffc1121277483f8b",46:"a1ad03c67486d7e0e0d0",47:"2253034d0a312a08431a",48:"0ad5e74f1a79b31a5300",49:"b225bc31a8164d9c7573",50:"7d29cb58dce92109023b",51:"c7755e0990a0e5906f95"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={54:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"1aad2168fb530f5aa4a7",1:"ce466f9e61b92a03cbf3",2:"5c59114175b6cd23c39c",3:"58a01dba059857bfcdc0",4:"dfaade6e76c72d90bc8a",5:"09f8b0432a075f20bb33",6:"ac4c2c6f7b9b2dad8305",7:"5a275aa794d6e86574f4",8:"34a9cd9e0d1747cc2ab7",9:"0f4f82403c714de438b1",10:"fbf0f59deabc41738ede",11:"f1d7cbde04399d9f2277",12:"208be69c4aa8775f9d5e",13:"d0b765e5919b7a17ef45",14:"19f6c34cf3104d684dc3",15:"1cf0b49eac5dc0730caf",16:"3f7fae1e2e8431ac04a2",17:"507c37add009eb0fffb9",18:"b5bcfabc88d8c13e73e5",19:"c28562505382b38755b4",20:"2f684fdd3c89f5915cc0",21:"d9ca60c85b1e838b6593",22:"f053a165552dfc527084",23:"85889905f55a37fff1a9",24:"5e23bee633309e0a9b01",25:"83236f710f52b0bdf28b",26:"cac9b037048fa94ea20b",27:"213a045d7380e781ae34",28:"e3cf675448715902d8cf",29:"e798dca3389dfabacb95",30:"01677bba1efacce30086",31:"3bbb6fac9f9c58f2a9b3",32:"8d880791c1091468c62b",33:"ee7d4b4ee5cd0ed69326",34:"acbbc3488acfb4c9558b",35:"175d0588e86db3bacbf0",36:"28eb70d85f3c286f360b",37:"fbc16d51d34a46444b95",38:"f47bd6208cd3620264b2",39:"47648c0a69bff502bc23",40:"3052ee99d645c9e5b07c",41:"3763cabba7e127ba6d54",42:"2cd134b76e0094560be2",43:"3e9a35c195fda147f986",44:"ab85e08303d146b6f1e8",45:"aeffffc1121277483f8b",46:"a1ad03c67486d7e0e0d0",47:"2253034d0a312a08431a",48:"0ad5e74f1a79b31a5300",49:"b225bc31a8164d9c7573",50:"7d29cb58dce92109023b",51:"c7755e0990a0e5906f95"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/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>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.9903ec665d6066e73941815eecbf7d72.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.c21614b510e2249de22a.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.d643fec0c3f67e2f10e5.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.9817065a9bce90d5cb5e.js></script></body></html>
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.73afd3406c2828abf83c800c0afb0be2.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.5e1401bfa163a336c3b3.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.d643fec0c3f67e2f10e5.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.7e2e2018be241324aa9e.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.9903ec665d6066e73941815eecbf7d72.css
+++ b/dist/static/css/app.9903ec665d6066e73941815eecbf7d72.css
--- a/dist/static/js/1.19700d060d9465553ccb.js
+++ b/dist/static/js/1.19700d060d9465553ccb.js
--- a/dist/static/js/1.c79525988b9e8c6d7dcf.js
+++ b/dist/static/js/1.c79525988b9e8c6d7dcf.js
--- a/dist/static/js/13.c1ad7613fb1606bc3d15.js
+++ b/dist/static/js/13.c1ad7613fb1606bc3d15.js
--- a/dist/static/js/14.c68e8d0271ce155c1c87.js
+++ b/dist/static/js/14.c68e8d0271ce155c1c87.js
--- a/dist/static/js/12.ccd0609304fb78770fbd.js
+++ b/dist/static/js/12.ccd0609304fb78770fbd.js
--- a/dist/static/js/17.0ef3be28d1fafead6791.js
+++ b/dist/static/js/17.0ef3be28d1fafead6791.js
--- a/dist/static/js/18.ee38d5616775e50cf862.js
+++ b/dist/static/js/18.ee38d5616775e50cf862.js
--- a/dist/static/js/18.55b81953faa3cb93fdb0.js
+++ b/dist/static/js/18.55b81953faa3cb93fdb0.js
--- a/dist/static/js/20.fddcfa4cae704ffbea79.js
+++ b/dist/static/js/20.fddcfa4cae704ffbea79.js
--- a/dist/static/js/28.d0abbece1cdf32260a55.js
+++ b/dist/static/js/28.d0abbece1cdf32260a55.js
-webpackJsonp([28],{"0HIH":function(t,s){},GSYK:function(t,s,a){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=a("hU5a"),e=a.n(i),n=a("uC32"),r=a.n(n),c=a("Jmy5"),l=(a("CCn6"),a("t4cQ")),u=a.n(l),o={name:"starResultV2",data:function(){return{img_pass:u.a,pullup:!0,rankBg:e.a,starNum:"",userDetail:{},loading:!0,finished:!1,star_inner:r.a,starList:[],page:1,offset:30,starPage:c.i,starInfo:{},addressObj:!1}},components:{},methods:{initPage:function(){this.starInfo=this.$route.query.starInfo}},mounted:function(){this.initPage()}},f={render:function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"page"},[3003==t.starInfo.code&&t.starInfo.activity_result&&21==t.starInfo.activity_result.result?a("div",{staticClass:"result"},[a("div",{staticClass:"float"},[t._v("结果公示")]),t._v(" "),t._m(0)]):t._e(),t._v(" "),3003==t.starInfo.code&&t.starInfo.activity_result&&22==t.starInfo.activity_result.result?a("div",{staticClass:"result fal"},[a("div",{staticClass:"float"},[t._v("结果公示")]),t._v(" "),t._m(1)]):t._e()])},staticRenderFns:[function(){var t=this.$createElement,s=this._self._c||t;return s("div",[s("h2",[this._v("恭喜全勤活动审核通过")]),this._v(" "),s("p",[this._v("您将获得唱唱启蒙英语“全勤奖学金”")])])},function(){var t=this.$createElement,s=this._self._c||t;return s("div",[s("div",{staticClass:"fal_title"},[this._v("很抱歉全勤活动挑战失败")]),this._v(" "),s("div",{staticClass:"fal_tip"},[this._v("学习没有终点，任何时候都是一个起点")])])}]};var _=a("VU/8")(o,f,!1,function(t){a("0HIH"),a("w5QH")},"data-v-1b5a9b3a",null);s.default=_.exports},t4cQ:function(t,s,a){t.exports=a.p+"static/img/img_pass@2x.96468a6.png"},w5QH:function(t,s){}});
+webpackJsonp([27],{"0HIH":function(t,s){},GSYK:function(t,s,a){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=a("hU5a"),e=a.n(i),n=a("uC32"),r=a.n(n),c=a("Jmy5"),l=(a("CCn6"),a("t4cQ")),u=a.n(l),o={name:"starResultV2",data:function(){return{img_pass:u.a,pullup:!0,rankBg:e.a,starNum:"",userDetail:{},loading:!0,finished:!1,star_inner:r.a,starList:[],page:1,offset:30,starPage:c.i,starInfo:{},addressObj:!1}},components:{},methods:{initPage:function(){this.starInfo=this.$route.query.starInfo}},mounted:function(){this.initPage()}},f={render:function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"page"},[3003==t.starInfo.code&&t.starInfo.activity_result&&21==t.starInfo.activity_result.result?a("div",{staticClass:"result"},[a("div",{staticClass:"float"},[t._v("结果公示")]),t._v(" "),t._m(0)]):t._e(),t._v(" "),3003==t.starInfo.code&&t.starInfo.activity_result&&22==t.starInfo.activity_result.result?a("div",{staticClass:"result fal"},[a("div",{staticClass:"float"},[t._v("结果公示")]),t._v(" "),t._m(1)]):t._e()])},staticRenderFns:[function(){var t=this.$createElement,s=this._self._c||t;return s("div",[s("h2",[this._v("恭喜全勤活动审核通过")]),this._v(" "),s("p",[this._v("您将获得唱唱启蒙英语“全勤奖学金”")])])},function(){var t=this.$createElement,s=this._self._c||t;return s("div",[s("div",{staticClass:"fal_title"},[this._v("很抱歉全勤活动挑战失败")]),this._v(" "),s("div",{staticClass:"fal_tip"},[this._v("学习没有终点，任何时候都是一个起点")])])}]};var _=a("VU/8")(o,f,!1,function(t){a("0HIH"),a("w5QH")},"data-v-1b5a9b3a",null);s.default=_.exports},t4cQ:function(t,s,a){t.exports=a.p+"static/img/img_pass@2x.96468a6.png"},w5QH:function(t,s){}});
\ No newline at end of file
--- a/dist/static/js/27.609a3e7d018fc3c3879c.js
+++ b/dist/static/js/27.609a3e7d018fc3c3879c.js
--- a/dist/static/js/29.ef962ac149b6a5372c0d.js
+++ b/dist/static/js/29.ef962ac149b6a5372c0d.js
--- a/dist/static/js/29.6ea0491b4e0e1637995d.js
+++ b/dist/static/js/29.6ea0491b4e0e1637995d.js
--- a/dist/static/js/30.74fc93c3ba3ea77efbc1.js
+++ b/dist/static/js/30.74fc93c3ba3ea77efbc1.js
--- a/dist/static/js/30.76a919ebb239652bd750.js
+++ b/dist/static/js/30.76a919ebb239652bd750.js
--- a/dist/static/js/app.7e2e2018be241324aa9e.js
+++ b/dist/static/js/app.7e2e2018be241324aa9e.js
--- a/dist/static/js/app.9817065a9bce90d5cb5e.js
+++ b/dist/static/js/app.9817065a9bce90d5cb5e.js
--- a/dist/static/js/manifest.c21614b510e2249de22a.js
+++ b/dist/static/js/manifest.c21614b510e2249de22a.js
--- a/index.html
+++ b/index.html
@@ -33,7 +33,6 @@
    <!-- built files will be auto injected -->
    <script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
    <!-- <script src="https://cdn.bootcss.com/html2canvas/0.5.0-alpha2/html2canvas.min.js"></script> -->
-    <!-- <script src="static/vconsole/vconsole.min.js"></script> -->
    <script>
    </script>
  </body>

--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "new_singsing_h5",
  "version": "1.0.0",
  "description": "A Vue.js project",
-  "author": "wangwei <wangwei1>",
+  "author": "chenyishuai <chenyishuai>",
  "private": true,
  "scripts": {
    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",

--- a/src/components/buy/passShop.vue
+++ b/src/components/buy/passShop.vue
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -247,6 +247,7 @@
        </div>
        <div @click="toActivity" ref="toActivity" class="btn toActivity">立即参与</div>
      </div>
    </van-popup>
    <audio-page ref="audioPage" v-if="showObj.audio.length>0"  sc="1" v-show="showObj.show" :showObj="showObj"/>
    <bottom-tab ref="bottomTab"></bottom-tab>

--- a/src/components/indexPage/bbda.vue
+++ b/src/components/indexPage/bbda.vue
--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
@@ -1914,6 +1914,7 @@ export default {
 </style>
 <style>
 .van-image-preview__image{
-  max-height: 150%;
+  /* max-height: 150%; */
+  /* bottom: none; */
 }
 </style>
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,6 @@ import 'mint-ui/lib/style.css'
 import scroll from "./base/scroll/scroll"
 import { Popup, Lazyload, Button, Dialog, Toast } from 'vant';
-// import Vant from 'vant';
 Vue.config.productionTip = false;
 Vue.prototype.$sa = sa;
 Vue.prototype.$sa.init({
@@ -26,9 +25,7 @@ Vue.prototype.$sa.init({
  is_track_single_page: true
 });
 Vue.prototype.$sa.quick('autoTrack')
-// Vue.use(MintUI);
 Vue.use(VueClipboard);
-// Vue.use(Vant);
 Vue.use(Popup).use(Lazyload).use(Button).use(Dialog).use(Toast);
 Vue.component('scroll', scroll);
 // const errorHandler = (error, vm)=>{

--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -15,7 +15,7 @@ axios.interceptors.request.use(
  config => {
    // 获取token
    // process.env.versionTime
-    let versiontime = '07251500'
+    let versiontime = '07291200'
    const token = localStorage.getItem('cc_token');
    // 设置参数格式
    if (!config.headers['Content-Type']) {