Skip to content

H
h5-base
Commit 163eb721 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

新首页

parent 946673d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 21 deletions
dev/index.html
View file @ 163eb721
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
} }
*{ *{
-webkit-overflow-scrolling: touch -webkit-overflow-scrolling: touch
}</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.67a5fd9cfcaeae04308a.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.7a18d439db6653b5a102.js></script></body></html> }</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.8b69b57194d303ed1543.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.90b98a69857d5a217b0d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/0.3c24f2d37af983900d94.js 0 → 100644
View file @ 163eb721
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/0.6345878d70cf1087c567.js deleted 100644 → 0
View file @ 946673d6
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/7.4cf4dd4158b2b0b4b1e1.js 0 → 100644
View file @ 163eb721
This diff is collapsed.
dev/static/js/7.598f9a5ed5cb721d26c1.js deleted 100644 → 0
View file @ 946673d6
This diff is collapsed.
dev/static/js/manifest.67a5fd9cfcaeae04308a.js → dev/static/js/manifest.8b69b57194d303ed1543.js
View file @ 163eb721
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=r(r.s=o[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"6345878d70cf1087c567",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"1893d4e9348d036a5f64",7:"598f9a5ed5cb721d26c1",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"07b553dc61841e537338",20:"9731a2dc3422d0c6fd89",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=r(r.s=o[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"3c24f2d37af983900d94",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"1893d4e9348d036a5f64",7:"4cf4dd4158b2b0b4b1e1",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"07b553dc61841e537338",20:"9731a2dc3422d0c6fd89",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/index.vue
View file @ 163eb721
<template> <template>
<div class="index"> <div class="index">
<div class="banner-block"> <div class="banner-block">
<div class="unBanner" v-if="!userCourse.start_periods_id"> <div class="unBanner" v-if="userCourse.start_periods_id<0">
<img class="bgimg" :src="imgUrl.indexBanener1" alt=""> <img class="bgimg" :src="imgUrl.indexBanener1" alt="">
<div class="content"> <div class="content">
<div class="title"> <div class="title">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
<div class="date" @click="toShop()"> <div class="date" @click="toShop()">
<p style="font-size:12px;">原价：{{bannerData.original_price}}元</p> <p style="font-size:12px;">原价：{{bannerData.original_price}}元</p>
<p style="font-size:20px;">限时{{bannerData.current_price}}元领取</p> <p style="font-size:18px;">限时{{bannerData.current_price}}元领取</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<div class="btn" @click="toPreview"> <div class="btn" @click="toPreview">
<img :src="imgUrl.nindexBtn3"> <img :src="imgUrl.nindexBtn3">
</div> </div>
<div class="btn" v-if="!userCourse.start_periods_id" @click="toBaby($event)"> <div class="btn" v-if="userCourse.start_periods_id<0" @click="toBaby($event)">
<img :src="imgUrl.nindexBtn2"> <img :src="imgUrl.nindexBtn2">
</div> </div>
<div class="btn" v-if="userCourse.start_periods_id>-1" @click="toCollection"> <div class="btn" v-if="userCourse.start_periods_id>-1" @click="toCollection">
...@@ -134,7 +134,9 @@ export default { ...@@ -134,7 +134,9 @@ export default {
medList:[], medList:[],
qmList:[], qmList:[],
mxxyList:[], mxxyList:[],
userCourse:{}, userCourse:{
start_periods_id:'-1'
},
bannerData:{ bannerData:{
qr:"", qr:"",
start_at:'', start_at:'',
...@@ -148,7 +150,7 @@ export default { ...@@ -148,7 +150,7 @@ export default {
}, },
}; };
}, },
created() { mounted() {
// console.log(this.imgUrl) // console.log(this.imgUrl)
this.initPage(); this.initPage();
}, },
...@@ -192,9 +194,16 @@ export default { ...@@ -192,9 +194,16 @@ export default {
initPage() { initPage() {
this.getBannerListApi() this.getBannerListApi()
getCourseInfoApi().then(res =>{ getCourseInfoApi().then(res =>{
localStorage.setItem('userCourse','');
console.log(res) console.log(res)
// debugger
// debugger
if(res.goods_id){ if(res.goods_id){
this.getBannerListApi() this.getBannerListApi()
this.userCourse = Object.assign({},res)
this.userCourse.start_periods_id='-1'
localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
this.bannerData = res
}else{ }else{
if(res.is_start_active==1){ if(res.is_start_active==1){
if(res.teacher_qr){ if(res.teacher_qr){
...@@ -209,6 +218,7 @@ export default { ...@@ -209,6 +218,7 @@ export default {
// } // }
this.userCourse = Object.assign({},res) this.userCourse = Object.assign({},res)
localStorage.setItem('userCourse',JSON.stringify(this.userCourse)); localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
// debugger
if(!sessionStorage.getItem('frist')){ if(!sessionStorage.getItem('frist')){
sessionStorage.setItem('frist',true) sessionStorage.setItem('frist',true)
this.$router.push({ this.$router.push({
...@@ -219,8 +229,6 @@ export default { ...@@ -219,8 +229,6 @@ export default {
} }
}); });
} }
}else{
this.bannerData = res
} }
} }
// console.log(res) // console.log(res)
......
src/components/public/bottomTab.vue
View file @ 163eb721
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</div> </div>
首页 首页
</div> </div>
<div v-if="userCourse.start_periods_id>-1" :class="{actived:$route.name === 'map'}" @click="toUrl('map')"> <div v-if="userCourse2.start_periods_id>-1" :class="{actived:$route.name === 'map'}" @click="toUrl('map')">
<div class="map img"> <div class="map img">
<img :src="imgurl.indexBottom" alt> <img :src="imgurl.indexBottom" alt>
</div> </div>
...@@ -28,13 +28,15 @@ export default { ...@@ -28,13 +28,15 @@ export default {
data() { data() {
return { return {
imgurl: IndexImage, imgurl: IndexImage,
userCourse:{} userCourse2:{
start_periods_id:-1,
}
}; };
}, },
created() { mounted() {
let userCourse = JSON.parse(localStorage.getItem("userCourse")); let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
this.userCourse = userCourse this.userCourse2 = userCourse2
// debugger console.log(this.userCourse2)
}, },
methods: { methods: {
toUrl(data) { toUrl(data) {
...@@ -50,8 +52,8 @@ export default { ...@@ -50,8 +52,8 @@ export default {
this.$router.push({ this.$router.push({
name: "map", name: "map",
query: { query: {
periods_id: this.userCourse.start_periods_id, periods_id: this.userCourse2.start_periods_id,
course_type: this.userCourse.start_periods_course_type course_type: this.userCourse2.start_periods_course_type
} }
}); });
} else { } else {
......
src/service/index.js
View file @ 163eb721
...@@ -42,7 +42,6 @@ axios.interceptors.request.use( ...@@ -42,7 +42,6 @@ axios.interceptors.request.use(
json.sing = "singsingenglish21000"; json.sing = "singsingenglish21000";
if(process.env.NODE_ENV === 'development' ){ if(process.env.NODE_ENV === 'development' ){
config.params.special_token="changchangenglish"; config.params.special_token="changchangenglish";
// config.params.special_token="uncle.cyan.cyan";
} }
config.params.param_token = md5(JSON.stringify(json)); config.params.param_token = md5(JSON.stringify(json));
}else if(config.url !== '/api/admin/login'){ }else if(config.url !== '/api/admin/login'){
...@@ -64,7 +63,6 @@ axios.interceptors.request.use( ...@@ -64,7 +63,6 @@ axios.interceptors.request.use(
json2.sing = "singsingenglish21000"; json2.sing = "singsingenglish21000";
if(process.env.NODE_ENV === 'development' ){ if(process.env.NODE_ENV === 'development' ){
config.data.special_token="changchangenglish"; config.data.special_token="changchangenglish";
// config.data.special_token="uncle.cyan.cyan";
} }
config.data.param_token = md5(JSON.stringify(json2)); config.data.param_token = md5(JSON.stringify(json2));
} }
......
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