Skip to content

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

529

parent b42e45ba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 14 deletions
dev/index.html
View file @ d68d2296
...@@ -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.e58cb7afc8cbff294af5.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> }</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.a1206dc87a920caa1ee4.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.ee344f73a2cb70ecd244.js deleted 100644 → 0
View file @ b42e45ba
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/19.f159d478b2cf4224b40e.js 0 → 100644
View file @ d68d2296
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/6.ef4d55f7f57d0d2bb9a9.js 0 → 100644
View file @ d68d2296
This diff is collapsed.
dev/static/js/6.efa411de9cb848e094a7.js deleted 100644 → 0
View file @ b42e45ba
This diff is collapsed.
dev/static/js/manifest.e58cb7afc8cbff294af5.js → dev/static/js/manifest.a1206dc87a920caa1ee4.js
View file @ d68d2296
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);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:"ee344f73a2cb70ecd244",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 o=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,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:"ef4d55f7f57d0d2bb9a9",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:"f159d478b2cf4224b40e",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 @ d68d2296
...@@ -100,7 +100,9 @@ ...@@ -100,7 +100,9 @@
</div> </div>
</div> </div>
<div :class="{orderBox:true,lowIndex:!pt&&orderList.length}" >
</div>
<div :class="{orderBox:true,lowIndex:!pt&&orderList.length}" v-if="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="">
...@@ -124,7 +126,6 @@ ...@@ -124,7 +126,6 @@
<img :src="imgUrl.img_title" alt=""> <img :src="imgUrl.img_title" alt="">
</div> </div>
</div> </div>
</div>
<div class="couponActivity" v-if="couponInfo.money&&orientationchange"> <div class="couponActivity" v-if="couponInfo.money&&orientationchange">
<div class="textBox"> <div class="textBox">
<div> <div>
...@@ -239,7 +240,7 @@ ...@@ -239,7 +240,7 @@
<div @click="liuyiBtn" v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity" class="liuyiBtn"> <div @click="liuyiBtn" v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity" class="liuyiBtn">
<img :src="imgUrl.popup_btn" alt=""> <img :src="imgUrl.popup_btn" alt="">
</div> </div>
<van-popup v-model="liuyucoolie" position="top" :overlay="true"> <van-popup class="liuyudialog" v-model="liuyucoolie" position="top" :overlay="true">
<div class="content"> <div class="content">
<img class="main" :src="imgUrl.popup_img" alt=""> <img class="main" :src="imgUrl.popup_img" alt="">
<div class="textBox"> <div class="textBox">
...@@ -340,10 +341,10 @@ export default { ...@@ -340,10 +341,10 @@ export default {
this.unlook = localStorage.getItem('unlook'); this.unlook = localStorage.getItem('unlook');
if(sessionStorage.getItem('orderShadow')){ if(sessionStorage.getItem('orderShadow')){
this.pt = false this.pt = false
// debugger
}else{ }else{
this.pt = true this.pt = true
} }
// console.log(this.pt) // console.log(this.pt)
// console.log(document.body.clientWidth) // console.log(document.body.clientWidth)
if(document.body.clientWidth>700){ if(document.body.clientWidth>700){
...@@ -353,9 +354,10 @@ export default { ...@@ -353,9 +354,10 @@ export default {
methods: { methods: {
shadowClick(){ shadowClick(){
this.pt=false this.pt=false
sessionStorage.setItem('pt',true); sessionStorage.setItem('orderShadow',true);
}, },
toActivity(){ toActivity(){
this.$sa.quick('trackHeatMap',this.$refs.toActivity)
this.$router.push({ this.$router.push({
name: 'liuyi', name: 'liuyi',
query:{} query:{}
...@@ -363,6 +365,7 @@ export default { ...@@ -363,6 +365,7 @@ export default {
}, },
liuyiBtn(){ liuyiBtn(){
// this.lyshow = true // this.lyshow = true
this.$sa.quick('trackHeatMap',this.$refs.liuyiBtn)
this.$router.push({ this.$router.push({
name: 'liuyi', name: 'liuyi',
query:{} query:{}
...@@ -377,7 +380,7 @@ export default { ...@@ -377,7 +380,7 @@ export default {
out_trade_no:this.orderList[index].out_trade_no out_trade_no:this.orderList[index].out_trade_no
} }
}); });
sessionStorage.setItem('pt',true); sessionStorage.setItem('orderShadow',true);
}, },
onReachBottom(){ onReachBottom(){
}, },
...@@ -466,6 +469,14 @@ export default { ...@@ -466,6 +469,14 @@ export default {
getCouponListApi().then(res =>{ getCouponListApi().then(res =>{
if(res.length){ if(res.length){
this.couponInfo = res[0] this.couponInfo = res[0]
if(this.pt){
// chrome
document.body.scrollTop = 100
// firefox
document.documentElement.scrollTop = 100
// safari
window.pageYOffset = 100
}
} }
// debugger // debugger
// console.log(this.$store.couponShadow) // console.log(this.$store.couponShadow)
...@@ -589,6 +600,7 @@ export default { ...@@ -589,6 +600,7 @@ export default {
let that = this let that = this
let arr = [] let arr = []
res.list.forEach(el => { res.list.forEach(el => {
console.log()
if(el.buy_type==2&&el.status==1){ if(el.buy_type==2&&el.status==1){
if(new Date(el.group_info.deadline.replace(/-/g, '/')).getTime()>=new Date().getTime()){ if(new Date(el.group_info.deadline.replace(/-/g, '/')).getTime()>=new Date().getTime()){
el.goods_desc= JSON.parse(el.goods_desc) el.goods_desc= JSON.parse(el.goods_desc)
...@@ -599,6 +611,7 @@ export default { ...@@ -599,6 +611,7 @@ export default {
} }
} }
}); });
console.log(arr)
this.orderList = arr this.orderList = arr
// console.log(arr) // console.log(arr)
}) })
...@@ -1070,6 +1083,7 @@ export default { ...@@ -1070,6 +1083,7 @@ export default {
position: relative; position: relative;
padding: 0 20 * @toVw 12 * @toVw; padding: 0 20 * @toVw 12 * @toVw;
background: white; background: white;
margin-top: 10* @toVw;
.item:first-child{position: relative;z-index: 2000;background: white; } .item:first-child{position: relative;z-index: 2000;background: white; }
.item{ .item{
box-shadow:1px 2px 7px 0px rgba(255,210,207,1); box-shadow:1px 2px 7px 0px rgba(255,210,207,1);
......
src/components/map/secMap.vue
View file @ d68d2296
...@@ -174,10 +174,7 @@ ...@@ -174,10 +174,7 @@
<div @click="toActivity" ref="toActivity" class="btn">立即参与</div> <div @click="toActivity" ref="toActivity" class="btn">立即参与</div>
</div> </div>
</van-popup> </van-popup>
<div <div @click="liuyiBtn" v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity" ref="liuyiBtn" class="liuyiBtn">
@click="liuyiBtn"
v-if="userCourse.goods_id!=null&&userCourse.goods_id>0&&liuyuActivity"
class="liuyiBtn">
<img :src="imgUrl.popup_btn" alt> <img :src="imgUrl.popup_btn" alt>
</div> </div>
<bottom-tab></bottom-tab> <bottom-tab></bottom-tab>
...@@ -349,12 +346,14 @@ export default { ...@@ -349,12 +346,14 @@ export default {
}, },
methods: { methods: {
toActivity() { toActivity() {
this.$sa.quick('trackHeatMap',this.$refs.toActivity)
this.$router.push({ this.$router.push({
name: "liuyi", name: "liuyi",
query: {} query: {}
}); });
}, },
liuyiBtn() { liuyiBtn() {
this.$sa.quick('trackHeatMap',this.$refs.liuyiBtn)
this.$router.push({ this.$router.push({
name: "liuyi", name: "liuyi",
query: {} query: {}
......
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