Merge pull request 'gdpaoup' (#109) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/109
This commit was merged in pull request #109.
This commit is contained in:
gyh
2020-08-04 14:38:17 +08:00
14 changed files with 93 additions and 68 deletions

View File

@@ -21,7 +21,7 @@
<scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box">
<!-- <indexad style="width:690rpx"></indexad> -->
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
<view class="list">
<view>
<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -309,6 +309,7 @@
type,
id
}) {
console.log(type,id);
if (type == 0) return false;
// type 1 商品详情页, 2 店铺详情页
const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';