Skip to content

梁建民 / h5

Go to a project
Commit 2f2fe9c9 by 肖康
Options

Merge branch 'XK_H5_PTAG20190910' into Development 

# Conflicts:
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/39.js
#	view/4.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html
parents 3e460b99 3163d964
Expand all
Inline Side-by-side
Showing with 34 additions and 31 deletions
src/App.vue
<template>
<div id="app">
<keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop">
<keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop,brand,brandList">
<router-view class="router-view"></router-view>
</keep-alive>
</div>
......
src/views/aboutUs/index.vue
......@@ -245,7 +245,7 @@
</div>
<div class="section sec6 about-six">
<p>随时了解优惠讯息</p>
<a :href="aboutdata?(aboutdata.url):'/v3/activity/newreg.html?ptag=aboutp'" :target="aboutdata&&aboutdata['window_open']>0?'_blank':'_self'">{{aboutdata?aboutdata.content:''}}</a>
<a :href="aboutdata?(aboutdata.url):'/v3/activity/newreg.html'" :target="aboutdata&&aboutdata['window_open']>0?'_blank':'_self'">{{aboutdata?aboutdata.content:''}}</a>
</div>
</div>
</template>
......
src/views/brand/brandList.vue
......@@ -182,7 +182,7 @@
};
},
toSearch() {
window.location.href = "/v3/search/search_index.html?ptag=lxshop-topnav";
window.location.href = "/v3/search/search_index.html";
}
},
......
src/views/common/GoodsOne.vue
......@@ -3,7 +3,7 @@
<div class="block oneDataGoods" v-for="(itemchild,indexdata) in dataList">
<dl class="mui-row img-box">
<a
:href="isZy?(hostName+'/item/'+itemchild.goods_id+'.html?ptag=selfshop'):(hostName+'/goods_'+itemchild.goods_id+'.html?ptag=lxshop')"
:href="isZy?(hostName+'/item/'+itemchild.goods_id+'.html'):(hostName+'/goods_'+itemchild.goods_id+'.html')"
>
<dt v-lazy-container="{selector:'img'}">
<img
......
src/views/common/Menu.vue
......@@ -7,21 +7,21 @@
<i class="popover-arrow"></i>
<ul class="menu-view">
<li>
<a href="/v3?ptag=selfshop-topnav"><i class="icon iconfont icon-shouye"></i>首页</a></li>
<a href="/v3"><i class="icon iconfont icon-shouye"></i>首页</a></li>
<li>
<a href="/v3/lxshop?ptag=selfshop-topnav"><i class="icon iconfont icon-lianying"></i>联营商城</a>
<a href="/v3/lxshop"><i class="icon iconfont icon-lianying"></i>联营商城</a>
</li>
<li>
<a href="/product"><i class="icon iconfont icon-liexinziying"></i>自营现货</a>
</li>
<li>
<a href="/v3/brand/map?ptag=selfshop-topnav"><i class="icon iconfont icon-pinpai"></i>品牌之家</a>
<a href="/v3/brand/map"><i class="icon iconfont icon-pinpai"></i>品牌之家</a>
</li>
<li class="mui-table-view-cell ">
<a class="zytabgo" href="/v3/joincart?ptag=selfshop-topnav"><i class="icon iconfont icon-gouwuche1"></i>购物车</a>
<a class="zytabgo" href="/v3/joincart"><i class="icon iconfont icon-gouwuche1"></i>购物车</a>
</li>
<li>
<a href="/v3/user?ptag=selfshop-topnav"><i class="icon iconfont icon-huiyuanzhongxin"></i>会员中心</a>
<a href="/v3/user"><i class="icon iconfont icon-huiyuanzhongxin"></i>会员中心</a>
</li>
</ul>
</div>
......
src/views/common/Navigator.vue
......@@ -2,7 +2,7 @@
<div class="navigator">
<ul class="boxsiz">
<li :class="{'curr':(typeVal==1)}">
<a href="/v3?ptag=index-bottomnav">
<a href="/v3">
<i class="iconfont icon-shouye-1"></i>
<p>首页</p>
</a>
......@@ -14,20 +14,20 @@
</a>
</li>
<li :class="{'curr':(typeVal==3)}">
<a href="/h5/view/#/lxshop?ptag=lxshop-bottomnav">
<a href="/h5/view/#/lxshop">
<i class="iconfont icon-lianying"></i>
<p>联营商城</p>
</a>
</li>
<li :class="{'curr':(typeVal==4)}">
<a href="/h5/view/#/joincart?ptag=shopcar-bottomnav">
<a href="/h5/view/#/joincart">
<i class="iconfont icon-gouwuche2"></i>
<p>购物车</p>
<span class="cart boxsiz">{{cartCount>99 ?'99+': cartCount}}</span>
</a>
</li>
<li :class="{'curr':(typeVal==5)}">
<a href="/v3/user?ptag=index-bottomnav">
<a href="/v3/user">
<i class="iconfont icon-huiyuanzhongxin1"></i>
<p>会员中心</p>
</a>
......
src/views/common/Slide.vue
......@@ -2,7 +2,7 @@
<van-swipe :autoplay="3000" indicator-color="#ffffff">
<template v-if="slidedata">
<van-swipe-item v-for="(item, index) in slidedata" :key="index">
<a @click="recordFn(index * 1 +1,item.url)" :href="item.url+'?ptag=index-banner-'+(index * 1 +1)" :target="item.window_open > 0 ?'_blank':'_self'">
<a @click="recordFn(index * 1 +1,item.url)" :href="item.url" :target="item.window_open > 0 ?'_blank':'_self'">
<img :src="item.images" class="slide-pic">
</a>
</van-swipe-item>
......
src/views/common/lyDetail.vue
......@@ -512,8 +512,10 @@ export default {
click_adtag: this.$route.query.adtag || this.$route.query.ptag || "",
click_ptag: util.getCookie("ptag") || ""
};
util.setCookie("ptag","pop-"+window.location.href,1)
if (type == 1) {
//立即购买
try {
sensors.track("brandList", {
click_ptag: this.goodDetail.module_name || "",
......
src/views/common/zyDetail.vue
......@@ -533,6 +533,7 @@ export default {
click_adtag: this.$route.query.adtag || this.$route.query.ptag || "",
click_ptag: util.getCookie("ptag") || ""
};
util.setCookie("ptag","pop-"+window.location.href,1)
if (type == 1) {
//立即购买
try {
......
src/views/home/Index.vue
......@@ -8,10 +8,10 @@
</div>
<div class="login-wrap">
<template v-if="loginCheck">
<a @click="recordFn('member')" href="/v3/user?ptag=index-topnav" class="person-btn"><i></i></a>
<a @click="recordFn('member')" href="/v3/user" class="person-btn"><i></i></a>
</template>
<template v-else>
<a @click="recordFn('login')" href="/v3/login?ptag=index-topnav" class="btn">登录</a>
<a @click="recordFn('login')" href="/v3/login" class="btn">登录</a>
</template>
</div>
<div class="search boxsiz">
......@@ -36,12 +36,12 @@
</van-swipe-item>
</van-swipe>
</div>
<a class="more" href="/news?cat_id=20&ptag=index-dynamic">更多</a>
<a class="more" href="/news?cat_id=20">更多</a>
</div>
<div class="tab-content boxsiz">
<ul class="boxsiz">
<li v-for="(item,index) in index.business_entry">
<a :href="item.url+'?ptag='+ptag+'-path'+(index * 1 +1)" :target="item.window_open > 0 ?'_blank':'_self'" @click="recordFloorFn(ptag+'-path'+(index * 1 +1))">
<a :href="item.url" :target="item.window_open > 0 ?'_blank':'_self'" @click="recordFloorFn(ptag+'-path'+(index * 1 +1))">
<img :src="item.images" alt="">
<p>{{item.title}}</p>
</a>
......@@ -68,7 +68,7 @@
</div>
<ul class="boxsiz list">
<li class="boxsiz" v-for="(v,index) in item.data.tempGoods" :key="index">
<a :href="'/item/'+v.goods_id+'.html?ptag='+ptag+'-floor'+(count * 1 +1)" class="boxsiz" :target="v.window_open > 0 ? '_blank':'_self'" v-lazy-container="{ selector: 'img' }" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a :href="'/item/'+v.goods_id+'.html'" class="boxsiz" :target="v.window_open > 0 ? '_blank':'_self'" v-lazy-container="{ selector: 'img' }" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<!--限时限量-->
<template v-if="v.ac_type == 1">
<img :data-src="v.default_img" :alt="v.supplier_name" data-error="static/images/ziyin.png">
......@@ -130,7 +130,7 @@
<span class="t2">{{item.ad_words}}</span>
</div>
<template v-if="item.link_words">
<a class="r" :href="item.url+'?ptag='+ptag+'-floor'+(count * 1 +1)" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a class="r" :href="item.url" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<span class="va-m">{{item.link_words}}</span>
<i class="lineBlock va-m"></i>
</a>
......@@ -138,7 +138,7 @@
</div>
<ul class="boxsiz list">
<li class="boxsiz" v-for="(v,index) in item.data.brandImages" :key="index">
<a :href="v.url+'?ptag='+ptag+'-floor'+(count * 1 +1)" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a :href="v.url" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<div class="pic">
<img :alt="v.title" v-lazy="v.images">
</div>
......@@ -157,7 +157,7 @@
<span class="t2">{{item.ad_words}}</span>
</div>
<template v-if="item.link_words">
<a class="r" :href="item.url+'?ptag='+ptag+'-floor'+(count * 1 +1)" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a class="r" :href="item.url" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<span class="va-m">{{item.link_words}}</span>
<i class="lineBlock va-m"></i>
</a>
......@@ -165,7 +165,7 @@
</div>
<ul class="list boxsiz">
<li class="boxsiz" v-for="(v,index) in item.data.pointGoods" :key="index">
<a class="boxsiz" :href="'/v3/pointmall'+'?ptag='+ptag+'-floor'+(count * 1 +1)" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a class="boxsiz" :href="/v3/pointmall" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<div class="pic">
<img v-lazy="v.prize_img_url" :alt="v.prize_name">
</div>
......@@ -189,7 +189,7 @@
<span class="t2">{{item.ad_words}}</span>
</div>
<template v-if="item.link_words">
<a class="r" :href="item.url+'?ptag='+ptag+'-floor'+(count * 1 +1)" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a class="r" :href="item.url" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<span class="va-m">{{item.link_words}}</span>
<i class="lineBlock va-m"></i>
</a>
......@@ -197,7 +197,7 @@
</div>
<ul class="list boxsiz">
<li class="boxsiz" v-for="(v,index) in item.data.tempImages" :key="index">
<a class="boxsiz" :href="v.url+'?ptag='+ptag+'-floor'+(count * 1 +1)" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<a class="boxsiz" :href="v.url" :target="v.window_open > 0 ? '_blank':'_self'" @click="recordFloorFn(ptag+'-floor'+(count * 1 +1))">
<img v-lazy="v.images" :alt="v.title">
</a>
</li>
......@@ -212,14 +212,14 @@
<i class="lineBlock"></i>
<span class="t1">资讯中心</span>
</div>
<a class="r" :href="'/news?cat_id=11&ptag='+ptag+'-dynamic'" @click="recordFloorFn(ptag+'-dynamic')">
<a class="r" :href="/news?cat_id=11" @click="recordFloorFn(ptag+'-dynamic')">
<span class="va-m">更多</span>
<i class="lineBlock va-m"></i>
</a>
</div>
<ul class="list boxsiz">
<li class="boxsiz" v-for="item in index.footer_new_article" :key="item.art_id">
<a class="boxsiz" :href="'/article/'+item.art_id+'.html?ptag='+ptag+'-dynamic'" @click="recordFloorFn(ptag+'-dynamic')">
<a class="boxsiz" :href="'/article/'+item.art_id+'.html'" @click="recordFloorFn(ptag+'-dynamic')">
<div class="pic" v-lazy-container="{selector:'img'}">
<img :data-src="item.litpic" title="猎芯网" alt="猎芯网" data-error="static/images/news.png">
</div>
......@@ -312,7 +312,7 @@
},
jump() {
this.recordFn('search');
window.location.href = '/v3/search/search_index.html?ptag=index-topnav';
window.location.href = '/v3/search/search_index.html';
}
},
components: {
......
src/views/lxshop/lxshop.vue
......@@ -164,7 +164,7 @@ export default {
}
},
toSearchp: function() {
window.location.href = "/v3/search/search_index.html?ptag=lxshop-topnav";
window.location.href = "/v3/search/search_index.html";
},
supplierShit: function() {
this.supplierShow = !this.supplierShow;
......
src/views/xianhuo/xianhuo.vue
......@@ -333,7 +333,7 @@ export default {
this.getZyData();
},
toSearch() {
window.location.href = "/v3/search/search_index.html?ptag=lxshop-topnav";
window.location.href = "/v3/search/search_index.html";
},
resetRight() {
this.getZyData();
......
view/10.js
This diff could not be displayed because it is too large.
view/11.js
This diff could not be displayed because it is too large.
view/12.js
This diff could not be displayed because it is too large.
view/13.js
This diff could not be displayed because it is too large.
view/15.js
This diff could not be displayed because it is too large.
view/17.js
This diff could not be displayed because it is too large.
view/18.js
This diff could not be displayed because it is too large.
view/19.js
This diff could not be displayed because it is too large.
view/2.js
This diff could not be displayed because it is too large.
view/20.js
This diff could not be displayed because it is too large.
view/24.js
This diff could not be displayed because it is too large.
view/26.js
This diff could not be displayed because it is too large.
view/3.js
This diff could not be displayed because it is too large.
view/35.js
This diff could not be displayed because it is too large.
view/4.js
This diff could not be displayed because it is too large.
view/5.js
This diff could not be displayed because it is too large.
view/6.js
This diff could not be displayed because it is too large.
view/7.js
This diff could not be displayed because it is too large.
view/8.js
This diff could not be displayed because it is too large.
view/9.js
This diff could not be displayed because it is too large.
view/app.js
This diff could not be displayed because it is too large.
view/index.html
......@@ -27,7 +27,7 @@
<script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js" type="text/javascript" charset="utf-8"></script>
<script src="//szh5static.ichunt.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
<script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/44.js" rel="prefetch"><link href="//szh5static.ichunt.com/45.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
<body class="boxsiz">
<noscript>
<strong>网站出现了一点小问题，正在紧急修复中.......</strong>
......
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 sign in to comment