fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by baoss
Commit b840ecf6afdf63fdf1f5e6bb82b07f947d33a6f5 2 parents c50c9497 96f2456d

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

Inline Side-by-side
Showing 9 changed files with 17 additions and 37 deletions
<template>
<CubeScroll v-if="dialogEnable" class="third-bind-wrapper">
<div class="bind-dialog">
<p class="bind-title">关联有货UFO账户</p>
<p class="bind-title">为了提供有效服务<br>请关联手机号</p>
<div class="under-row">
<div class="left-row-title">
<span @click="chooseArea">{{code}}</span>
... ... @@ -175,6 +175,7 @@ export default {
line-height: 66px;
font-weight: 500;
margin-bottom: 32px;
text-align: center;
}
.under-row {
... ...
... ... @@ -15,7 +15,7 @@ export default {
},
watch: {
'report': function(newVal) {
console.log(newVal);
// console.log(newVal);
}
},
// activated() {
... ...
... ... @@ -18,7 +18,7 @@
<input class="search-input" type="search" disabled="true" placeholder="搜索商品名称或货号"/>
</div>
<template v-for="(item, index) in channelList.list">
<Swiper :list="item" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'threePicture'"/>
<Swiper :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'threePicture'"/>
<Hot :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'image_list'"/>
<Banner :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'single_image'"/>
<TwoBanner :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'twoPicture'"/>
... ... @@ -203,7 +203,6 @@ export default {
if (this.navTop) {
let scrollY = -y;
if (scrollY >= this.navTop) {
this.isShow = true;
} else {
... ... @@ -289,28 +288,6 @@ export default {
this.reportParams = params;
console.log(this.reportParams);
}
// getReportParams(item, index) {
// let { template_id, template_name } = item;
// let PAGE_URL = window.location.href;
// this.searchParams = {
// F_ID: template_id,
// PAGE_URL,
// F_INDEX: index + 1,
// F_NAME: template_name,
// I_INDEX: '',
// F_URL: '',
// }
// console.log(item);
// console.log(this.searchParams);
// }
// onPullingDown() {
// let params = this.searchParams;
// params.isReset = true;
// this.fetchList(params);
// },
},
components: {
Swiper,
... ... @@ -343,6 +320,7 @@ export default {
width: 100%;
height: 100px;
box-shadow: 0 0 120px 100px #f2f2f2 !important;
z-index: -1;
}
&.fixed-nav {
... ...
... ... @@ -73,7 +73,6 @@ export default {
}
.cube-scroll-content {
// https://blog.csdn.net/qq_24331363/article/details/88026777
// display: block;
}
... ...
<template>
<div class="swiper" v-if="list && list.length > 0">
<div class="swiper-item swiper-item-left">
<LayoutLink :href="list.data[0].url" class="img-link" :report="{PAGE_URL, ...list.data[0].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list.data[0].src" :width="310" :height="402"></ImageFormat>
<LayoutLink :href="list[0].url" class="img-link" :report="{PAGE_URL, ...list[0].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list[0].src" :width="310" :height="402"></ImageFormat>
</LayoutLink>
</div>
<div class="swiper-item swiper-item-right">
<LayoutLink :href="list.data[1].url" class="img-link" :report="{PAGE_URL, ...list.data[1].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list.data[1].src" :width="380" :height="196"></ImageFormat>
<LayoutLink :href="list[1].url" class="img-link" :report="{PAGE_URL, ...list[1].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list[1].src" :width="380" :height="196"></ImageFormat>
</LayoutLink>
<LayoutLink :href="list.data[2].url" class="img-link" :report="{PAGE_URL, ...list.data[2].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list.data[2].src" :width="380" :height="196"></ImageFormat>
<LayoutLink :href="list[2].url" class="img-link" :report="{PAGE_URL, ...list[2].reportParams}">
<ImageFormat :lazy="false" class="item-imge" :src="list[2].src" :width="380" :height="196"></ImageFormat>
</LayoutLink>
</div>
</div>
... ...
... ... @@ -5,7 +5,8 @@
ref="scroll"
:options="options"
@pulling-up="onPullingUp"
:data="newsList.list">
:data="newsList.list"
v-if="newsList.list && newsList.list.length > 0">
<div class="news-content">
<Tab v-if="newsList.tabList.length > 0" :list="newsList.tabList || []"></Tab>
<List v-if="newsList.list && newsList.list.length > 0" :list="newsList.list || []"></List>
... ...
... ... @@ -5,7 +5,8 @@
ref="scroll"
:options="options"
@pulling-up="onPullingUp"
:data="newsList.list">
:data="newsList.list"
v-if="newsList.list && newsList.list.length > 0">
<div class="news-content">
<Title :title="title"></Title>
<List v-if="newsList.list && newsList.list.length > 0" :list="newsList.list || []"></List>
... ...
... ... @@ -48,7 +48,7 @@ export default function() {
},
actions: {
async fetchNewsList({ commit, state }, obj) {
console.log(obj);
// console.log(obj);
let { isResetPage, limit, page, totalPage, type } = obj;
const result = await this.$api.post('/api/ufo/home/newsList', {
page, type: type || '', limit
... ...
... ... @@ -40,7 +40,7 @@ function handleReferUrl(refer) {
}
});
return `${refer.split('?')[0]}${query.length ? '?' : ''}${query.join(',')}`;
return `${refer.split('?')[0]}${query.length ? '?' : ''}${query.join('&')}`;
}
class passportModel extends global.yoho.BaseModel {
... ...