Commit dea0f03d authored by chenyishuai's avatar chenyishuai

4.25

parent 1323ad6b
...@@ -4,11 +4,11 @@ const prodEnv = require('./prod.env'); ...@@ -4,11 +4,11 @@ const prodEnv = require('./prod.env');
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
API_URL: '"http://192.168.31.185:8085/"', API_URL: '"http://192.168.0.109:8085/"',
MAX_FILESIZE:'1024*1024*10', MAX_FILESIZE:'1024*1024*10',
IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"', IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
BUY_URL:'"http://wechat-test.changchangenglish.com/#/buyDetail?"', BUY_URL:'"http://wechat-test.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://192.168.31.185:8085/#/"', AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://192.168.0.109:8085/#/"',
REDIRECT_URL:'"http://192.168.31.185:8085/"', REDIRECT_URL:'"http://192.168.0.109:8085/"',
}); });
...@@ -18,8 +18,8 @@ module.exports = { ...@@ -18,8 +18,8 @@ module.exports = {
} }
}, },
// Various Dev Server settings // Various Dev Server settings
// host: '192.168.31.242', // can be overwritten by process.env.HOST host: '192.168.0.109', // can be overwritten by process.env.HOST
host: '192.168.31.185', // can be overwritten by process.env.HOST // host: '192.168.31.185', // can be overwritten by process.env.HOST
// host: 'localhost', // 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 port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
}</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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.ee85fe5286f054ecabb9.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.fae443c3734f5fbcd12a.js></script></body></html> }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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.79ddfbeee6949910e3a8.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.518ac06969533b5ff378.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([20],{"5iK7":function(n,t,e){n.exports=e.p+"static/img/no.415cb0b.png"},CpNa:function(n,t,e){var a=e("jcJe");"string"==typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);e("rjj0")("93ba84f6",a,!1,{})},jcJe:function(n,t,e){(n.exports=e("FZ+f")(!0)).push([n.i,"\n.fl-r[data-v-55b47e52] {\n float: right;\n}\n.main-block[data-v-55b47e52] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n content: '';\n display: block;\n clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n width: 5px;\n height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n background-color: #999;\n border-radius: 10px;\n height: 10px;\n min-height: 10px;\n}\n.noWechat-page[data-v-55b47e52] {\n text-align: center;\n font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n font-size: 8vw;\n margin-bottom: 2.66666667vw;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/h5/wechat/src/components/noWechat.vue"],names:[],mappings:";AACA;EACE,aAAa;CACd;AACD;EACE,YAAY;EACZ,kBAAkB;EAClB,aAAa;CACd;AACD;EACE,YAAY;EACZ,eAAe;EACf,YAAY;CACb;AACD;EACE,oBAAoB;CACrB;AACD;EACE,WAAW;EACX,YAAY;CACb;AACD;EACE,uBAAuB;EACvB,oBAAoB;EACpB,aAAa;EACb,iBAAiB;CAClB;AACD;EACE,mBAAmB;EACnB,gBAAgB;CACjB;AACD;EACE,WAAW;CACZ;AACD;EACE,wBAAwB;CACzB;AACD;EACE,eAAe;EACf,4BAA4B;CAC7B",file:"noWechat.vue",sourcesContent:["\n.fl-r[data-v-55b47e52] {\n float: right;\n}\n.main-block[data-v-55b47e52] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n content: '';\n display: block;\n clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n width: 5px;\n height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n background-color: #999;\n border-radius: 10px;\n height: 10px;\n min-height: 10px;\n}\n.noWechat-page[data-v-55b47e52] {\n text-align: center;\n font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n font-size: 8vw;\n margin-bottom: 2.66666667vw;\n}\n"],sourceRoot:""}])},nmbt:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=e("5iK7"),i=e.n(a),o={name:"noWechat",data:function(){return{noUrl:i.a}}},r=function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"noWechat-page"},[t("img",{attrs:{src:this.noUrl}}),this._v(" "),this._m(0)])};r._withStripped=!0;var A={render:r,staticRenderFns:[function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"text-block"},[t("div",{staticClass:"title"},[this._v("\n 请在微信中打开链接\n ")]),this._v("\n 您可以复制链接后,粘贴到微信任意对话框,\n "),t("br"),this._v("\n 或发送给微信中的任意好友,\n "),t("br"),this._v("\n 点击链接即可查看哦~\n ")])}]},c=A;var s=!1;var b=e("VU/8")(o,c,!1,function(n){s||e("CpNa")},"data-v-55b47e52",null);b.options.__file="src/components/noWechat.vue";t.default=b.exports}}); webpackJsonp([20],{"5iK7":function(n,t,e){n.exports=e.p+"static/img/no.415cb0b.png"},CpNa:function(n,t,e){var a=e("jcJe");"string"==typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);e("rjj0")("93ba84f6",a,!1,{})},jcJe:function(n,t,e){(n.exports=e("FZ+f")(!0)).push([n.i,"\n.fl-r[data-v-55b47e52] {\n float: right;\n}\n.main-block[data-v-55b47e52] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n content: '';\n display: block;\n clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n width: 5px;\n height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n background-color: #999;\n border-radius: 10px;\n height: 10px;\n min-height: 10px;\n}\n.noWechat-page[data-v-55b47e52] {\n text-align: center;\n font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n font-size: 8vw;\n margin-bottom: 2.66666667vw;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/wechat/src/components/noWechat.vue"],names:[],mappings:";AACA;EACE,aAAa;CACd;AACD;EACE,YAAY;EACZ,kBAAkB;EAClB,aAAa;CACd;AACD;EACE,YAAY;EACZ,eAAe;EACf,YAAY;CACb;AACD;EACE,oBAAoB;CACrB;AACD;EACE,WAAW;EACX,YAAY;CACb;AACD;EACE,uBAAuB;EACvB,oBAAoB;EACpB,aAAa;EACb,iBAAiB;CAClB;AACD;EACE,mBAAmB;EACnB,gBAAgB;CACjB;AACD;EACE,WAAW;CACZ;AACD;EACE,wBAAwB;CACzB;AACD;EACE,eAAe;EACf,4BAA4B;CAC7B",file:"noWechat.vue",sourcesContent:["\n.fl-r[data-v-55b47e52] {\n float: right;\n}\n.main-block[data-v-55b47e52] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n content: '';\n display: block;\n clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n width: 5px;\n height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n background-color: #999;\n border-radius: 10px;\n height: 10px;\n min-height: 10px;\n}\n.noWechat-page[data-v-55b47e52] {\n text-align: center;\n font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n font-size: 8vw;\n margin-bottom: 2.66666667vw;\n}\n"],sourceRoot:""}])},nmbt:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=e("5iK7"),i=e.n(a),o={name:"noWechat",data:function(){return{noUrl:i.a}}},r=function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"noWechat-page"},[t("img",{attrs:{src:this.noUrl}}),this._v(" "),this._m(0)])};r._withStripped=!0;var A={render:r,staticRenderFns:[function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"text-block"},[t("div",{staticClass:"title"},[this._v("\n 请在微信中打开链接\n ")]),this._v("\n 您可以复制链接后,粘贴到微信任意对话框,\n "),t("br"),this._v("\n 或发送给微信中的任意好友,\n "),t("br"),this._v("\n 点击链接即可查看哦~\n ")])}]},c=A;var s=!1;var b=e("VU/8")(o,c,!1,function(n){s||e("CpNa")},"data-v-55b47e52",null);b.options.__file="src/components/noWechat.vue";t.default=b.exports}});
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([24],{OBPd:function(e,t,n){(e.exports=n("FZ+f")(!0)).push([e.i,"\n.author[data-v-1bb02e1b] {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -webkit-box-orient: vertical;\n -webkit-box-direction: normal;\n -ms-flex-flow: column nowrap;\n flex-flow: column nowrap;\n -webkit-box-pack: center;\n -ms-flex-pack: center;\n justify-content: center;\n -webkit-box-align: center;\n -ms-flex-align: center;\n align-items: center;\n height: 100vh;\n font-size: 1.8rem;\n}\n.author > .img[data-v-1bb02e1b] {\n width: 50vw;\n height: 50vw;\n background-size: 100% 100%;\n}\n.author .reload[data-v-1bb02e1b] {\n font-size: 1.2rem;\n color: #199be0;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/wechat/src/components/author.vue"],names:[],mappings:";AACA;EACE,qBAAqB;EACrB,qBAAqB;EACrB,cAAc;EACd,6BAA6B;EAC7B,8BAA8B;MAC1B,6BAA6B;UACzB,yBAAyB;EACjC,yBAAyB;MACrB,sBAAsB;UAClB,wBAAwB;EAChC,0BAA0B;MACtB,uBAAuB;UACnB,oBAAoB;EAC5B,cAAc;EACd,kBAAkB;CACnB;AACD;EACE,YAAY;EACZ,aAAa;EACb,2BAA2B;CAC5B;AACD;EACE,kBAAkB;EAClB,eAAe;CAChB",file:"author.vue",sourcesContent:["\n.author[data-v-1bb02e1b] {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -webkit-box-orient: vertical;\n -webkit-box-direction: normal;\n -ms-flex-flow: column nowrap;\n flex-flow: column nowrap;\n -webkit-box-pack: center;\n -ms-flex-pack: center;\n justify-content: center;\n -webkit-box-align: center;\n -ms-flex-align: center;\n align-items: center;\n height: 100vh;\n font-size: 1.8rem;\n}\n.author > .img[data-v-1bb02e1b] {\n width: 50vw;\n height: 50vw;\n background-size: 100% 100%;\n}\n.author .reload[data-v-1bb02e1b] {\n font-size: 1.2rem;\n color: #199be0;\n}\n"],sourceRoot:""}])},TSGa:function(e,t,n){var o=n("OBPd");"string"==typeof o&&(o=[[e.i,o,""]]),o.locals&&(e.exports=o.locals);n("rjj0")("fbc9f3da",o,!1,{})},VAx7:function(e,t,n){e.exports=n.p+"static/img/authorLoading.39aaada.png"},"sA+T":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n("VAx7"),a=n.n(o),r={name:"author",data:function(){return{loadingUrl:a.a}},created:function(){this.$route.query&&this.$route.query.retUrl?localStorage.setItem("retUrl",this.$route.query.retUrl):localStorage.setItem("retUrl",""),this.$route.query&&this.$route.query.is_new_user_url?window.location.href="https://wechat-test.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com":(localStorage.setItem("retUrl",""),window.location.href="https://wechat-test.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com&is_new_user_url=1")},methods:{onPageReload:function(){this.$sa.track("buttonClick",{tabTitle:"授权",moduleTitle:"授权",buttonType:"重新授权",buttonName:"重新授权"}),window.location.reload()}}},i=function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"author"},[t("div",{staticClass:"img",style:{backgroundImage:"url("+this.loadingUrl+")"}}),this._v(" "),t("p",[this._v("正在加载中......")]),this._v(" "),t("p",{staticClass:"reload",attrs:{click:this.onPageReload}},[this._v("点击重新加载")])])};i._withStripped=!0;var s={render:i,staticRenderFns:[]},l=s;var c=!1;var A=n("VU/8")(r,l,!1,function(e){c||n("TSGa")},"data-v-1bb02e1b",null);A.options.__file="src/components/author.vue";t.default=A.exports}});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -283,12 +283,9 @@ ...@@ -283,12 +283,9 @@
}, },
initPage(){ initPage(){
getUserWatchApi().then(res=>{
this.watchDetail = res;
this.$store.dispatch('setWatchDetail',this.watchDetail)
})
getUserWatchApi().then(res=>{ getUserWatchApi().then(res=>{
this.watchDetail = res; this.watchDetail = res;
this.$store.dispatch('setWatchDetail',this.watchDetail)
let URL = process.env.API_URL+'#/shareGoods?userID='+ JSON.parse(localStorage.getItem('userDesc')).user_id; let URL = process.env.API_URL+'#/shareGoods?userID='+ JSON.parse(localStorage.getItem('userDesc')).user_id;
this.onShare(URL); this.onShare(URL);
this.lesson = JSON.parse(localStorage.getItem('lessonDetail')); this.lesson = JSON.parse(localStorage.getItem('lessonDetail'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment