Skip to content

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

529

parent 08b7cbb5
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 21 deletions
dev/index.html
View file @ 69411dc9
...@@ -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.a33637a3392be2fde512aa6031b6e4df.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.d18b06445e919dccfa62.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.2c2323b9c57064009e04.js></script></body></html> }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.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.44add8457918264be6b1.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.f78bebe7c61fc4c48778.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/19.5a62a749b9ba8977df27.js deleted 100644 → 0
View file @ 08b7cbb5
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/19.81eb88d0a5f9f3acd67a.js 0 → 100644
View file @ 69411dc9
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/app.2c2323b9c57064009e04.js → dev/static/js/app.f78bebe7c61fc4c48778.js
View file @ 69411dc9
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.d18b06445e919dccfa62.js → dev/static/js/manifest.44add8457918264be6b1.js
View file @ 69411dc9
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(a&&a(c,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var c={},f={37:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"bb97801dcd4586f9eed7",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"5a62a749b9ba8977df27",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(a&&a(c,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var c={},f={37:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"efa411de9cb848e094a7",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"81eb88d0a5f9f3acd67a",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/index.vue
View file @ 69411dc9
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</div> </div>
</div> </div>
<div class="orderBox" v-if="orderList&&orderList.length" > <div :class="{orderBox:true,lowIndex:pt&&!orderList.length}" class="orderBox" v-if="orderList&&orderList.length" >
<div class="item groupItem" ref="groupItem" v-for="(data,index) in orderList" :key="index" @click="goDetail(index)"> <div class="item groupItem" ref="groupItem" v-for="(data,index) in orderList" :key="index" @click="goDetail(index)">
<div class="top"> <div class="top">
<img :src="data.goods_desc.img[0].url" alt=""> <img :src="data.goods_desc.img[0].url" alt="">
...@@ -343,17 +343,6 @@ export default { ...@@ -343,17 +343,6 @@ export default {
if(document.body.clientWidth>700){ if(document.body.clientWidth>700){
that.orientationchange=true that.orientationchange=true
} }
// window.addEventListener('orientationchange',function(){
// setTimeout(function(){
// let width = document.documentElement.clientWidth
// let height = document.documentElement.clientHeight
// if(width>height){
// that.orientationchange=true
// }else{
// that.orientationchange=false
// }
// },300)
// },false);
}, },
methods: { methods: {
toActivity(){ toActivity(){
...@@ -464,9 +453,9 @@ export default { ...@@ -464,9 +453,9 @@ export default {
// 无老师带用户 // 无老师带用户
if(!res.periods_list){ if(!res.periods_list){
// 优惠券 // 优惠券
getAutomationCouponApi().then(res =>{ getCouponListApi().then(res =>{
if(res.coupon_list.length){ if(res.length){
this.couponInfo = res.coupon_list[0] this.couponInfo = res[0]
} }
// debugger // debugger
// console.log(this.$store.couponShadow) // console.log(this.$store.couponShadow)
...@@ -1101,6 +1090,9 @@ export default { ...@@ -1101,6 +1090,9 @@ export default {
position: absolute;z-index: 2000;top: -94* @toVw;left: 70* @toVw;} position: absolute;z-index: 2000;top: -94* @toVw;left: 70* @toVw;}
.shadow{position: fixed;bottom: 0;top: 0;left: 0;top: 0;background: black;opacity: 0.6;width: 100%;z-index: 1999;} .shadow{position: fixed;bottom: 0;top: 0;left: 0;top: 0;background: black;opacity: 0.6;width: 100%;z-index: 1999;}
} }
.lowIndex{
.item:first-child{position: relative;z-index: 10;background: white; }
}
.lesson-block { .lesson-block {
padding-bottom: 20 * @toVw; padding-bottom: 20 * @toVw;
.goods-block { .goods-block {
......
src/components/map/secMap.vue
View file @ 69411dc9
...@@ -177,8 +177,7 @@ ...@@ -177,8 +177,7 @@
<div <div
@click="liuyiBtn" @click="liuyiBtn"
v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity" v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity"
class="liuyiBtn" class="liuyiBtn">
>
<img :src="imgUrl.popup_btn" alt> <img :src="imgUrl.popup_btn" alt>
</div> </div>
<bottom-tab></bottom-tab> <bottom-tab></bottom-tab>
...@@ -194,7 +193,8 @@ import { ...@@ -194,7 +193,8 @@ import {
getAutomationApi, getAutomationApi,
getAutomationCouponApi, getAutomationCouponApi,
payApi, payApi,
getGoodsDetailApi getGoodsDetailApi,
getCouponListApi
} from "../../service/api"; } from "../../service/api";
import star_act from "../../assets/newLesson/star_act.png"; import star_act from "../../assets/newLesson/star_act.png";
import star_def from "../../assets/newLesson/star_def.png"; import star_def from "../../assets/newLesson/star_def.png";
......
src/main.js
View file @ 69411dc9
...@@ -35,6 +35,15 @@ Vue.component('scroll', scroll); ...@@ -35,6 +35,15 @@ Vue.component('scroll', scroll);
// if(process.env.NODE_ENV != 'production'){ // if(process.env.NODE_ENV != 'production'){
// var vConsole = new VConsole(); // var vConsole = new VConsole();
// } // }
router.beforeEach((to, from, next) => {
// chrome
document.body.scrollTop = 0
// firefox
document.documentElement.scrollTop = 0
// safari
window.pageYOffset = 0
next()
})
new Vue({ new Vue({
el: '#app', el: '#app',
router, router,
......
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