Authored by yyq

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

... ... @@ -45,7 +45,7 @@ export default {
<style lang="scss" scoped>
.icon_size {
font-size: 24px;
font-size: 28px;
}
.icon_color {
... ...
... ... @@ -28,7 +28,7 @@
v-for="(item, index) in itemSub.sub"
:key="index"
:data-id="item.id"
ref="index">
:ref="index">
<LayoutLink :href="item.url" >
<div class="item-imge-div" @click="goProductList(item,index, itemSub)">
<ImgSize
... ... @@ -76,13 +76,15 @@ export default {
}
};
},
mounted() {
Promise.all([this.fetchBrandList({}),this.fetchCategoryParentList()]).then(()=> {
this.reportYas(0);
})
},
async activated(){
await this.fetchCategoryParentList();
await this.fetchBrandList({});
this.reportYas(0);
},
// activated(){
// this.reportYas(0);
// },
methods: {
...mapActions(['fetchCategoryParentList', 'selectCategoryParent', 'fetchBrandList', 'fetchCategorySubList']),
onScrollEndHandler({y}) {
... ... @@ -95,8 +97,8 @@ export default {
this.categorySubList.forEach((item) => {
let subItemList = item.sub;
subItemList.forEach((val, index) => {
let eleTop = this.$refs.index[index].offsetTop;
let eleHeight = this.$refs.index[index].offsetHeight;
let eleTop = this.$refs[index][0].offsetTop;
let eleHeight = this.$refs[index][0].offsetHeight;
// console.log(eleHeight+'item'+scrollY)
let firstHeight = 0;
if(scrollY > eleHeight){
... ... @@ -316,7 +318,7 @@ export default {
}
.item-title {
font-family: 'SFProText-Regular';
font-family: 'PingFang-SC-Regular';
font-size: 22px;
color: #000000;
text-align: center;
... ...
<template>
<LayoutApp class="yohoufo-channel-page" :show-back="true" :hide-header="hideHeader" :title="title">
<!-- <div class="fixed-nav scroll-nav-wrap" :class="{'hidden': !isShow}" v-if="navList.length">
<div class="fixed-nav scroll-nav-wrap" :class="{'hidden': !isShow}" v-if="navList.length">
<ScrollNav :list="navList" :current="active" @transfer="getIndex"></ScrollNav>
</div> -->
</div>
<LayoutScroll
ref="scroll"
class="channel-scroll"
... ... @@ -22,7 +22,8 @@
<TwoBanner :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'twoPicture'"/>
</template>
</div>
<div ref="scrollNav" :class="['scroll-nav-wrap',isShow?'fixed':'']" v-if="navList.length">
<!-- <div ref="scrollNav" :class="['scroll-nav-wrap',isShow?'fixed':'']" v-if="navList.length"> -->
<div ref="scrollNav" class="scroll-nav-wrap" v-if="navList.length">
<ScrollNav :list="navList" :current="active" @transfer="getIndex"></ScrollNav>
</div>
<div class="list-wrap" :style="listStyle">
... ... @@ -125,7 +126,7 @@ export default {
listStyle() {
return {
minHeight: this.total + 'px',
marginTop: this.isShow? this.navHeight +'px' : 0
// marginTop: this.isShow? this.navHeight +'px' : 0
};
}
},
... ... @@ -407,11 +408,14 @@ export default {
.fixed {
width: 100%;
position: fixed!important;
top: 90px;
z-index: 10;
background-color: #fefefe;
overflow: hidden;
position: fixed!important;
top: 90px;
z-index: 10;
background-color: #fefefe;
overflow: hidden;
&:after {
display: none;
}
}
.scroll-nav-wrap {
position: relative;
... ...
... ... @@ -62,14 +62,13 @@ export default {
<style lang="scss" scoped>
.hot {
margin: 40px 0;
margin: 60px 0 40px 0;
ul {
overflow: hidden;
li {
width: 25%;
float: left;
text-align: center;
margin-top: 20px;
.hot-image {
width: 100px;
height: 100px;
... ...
... ... @@ -78,7 +78,7 @@ export default {
}
.assets-record-code-txt {
width: 100%;
font-family: PingFang-SC-Regular;
font-family: 'PingFang-SC-Regular';
font-size: 28px;
color: #000000;
overflow: hidden;
... ... @@ -87,7 +87,7 @@ export default {
}
.assets-record-time-txt {
font-family: SFProText-Regular;
font-family: 'SFProText-Regular';
font-size: 24px;
color: #999999;
margin-top: 12px;
... ... @@ -99,7 +99,7 @@ export default {
@include num
}
.assets-record-income-tip-txt {
font-family: PingFang-SC-Regular;
font-family: 'PingFang-SC-Regular';
font-size: 20px;
color: #D0021B;
}
... ...
... ... @@ -14,7 +14,7 @@
<order></order>
</div>
<div v-else-if="key === 'sale'" class="bg-top">
<tab-item :data="value" noLine titleBold titleSmall numStyle='color: #999; fontSize: 12px'></tab-item>
<tab-item :data="value" noLine titleBold titleSmall numStyle='color: #999;'></tab-item>
</div>
<bind v-else-if="key === 'bindAccount'" :data="value"></bind>
<tab-item v-else :data="value"></tab-item>
... ...
... ... @@ -10,8 +10,7 @@
<!--商品信息-->
<div class="productDetail">
<div class="productImageWrapper">
<ImageFormat class="image" :lazy="lazy" :src="originProductData.image" :width="136"
:height="180"></ImageFormat>
<ImageFormat :lazy="lazy" :src="originProductData.image" :width="400" :height="400"></ImageFormat>
</div>
<div class="productPrice">
<span class="size">{{sizeInfo}}</span>
... ... @@ -493,22 +492,27 @@ export default {
.productDetail {
display: flex;
flex-direction: row;
width: calc(100% - 40 * 2px);
width: calc(100%);
height: 120*2px;
margin-left: 20*2px;
align-items: center;
margin-top: 5*2px;
background-color: white;
}
.productImageWrapper {
width: 120*2px;
height: 120*2px;
width: 240px;
height: 240px;
background-color: white;
display: flex;
display: inline-block;
justify-content: center;
align-items: center;
overflow: hidden;
img {
width: 100%;
height: 100%;
display: block;
}
}
.productImage {
... ... @@ -570,6 +574,10 @@ export default {
flex-direction: row;
align-items: center;
background-color: #f5f5f5;
/deep/ input::-webkit-input-placeholder {
padding: 0.2rem 0;
}
}
.inputViewIcon {
... ... @@ -685,11 +693,8 @@ export default {
}
.agree-wrapper {
height: 60px;
background-color: white;
border-top: 1px solid #eee;
padding: 0 40px;
line-height: 60px;
}
.submit-btn {
... ...
... ... @@ -336,7 +336,6 @@ export default {
}
.product-info {
height: 260px;
display: flex;
}
... ...
... ... @@ -58,7 +58,7 @@ export default {
font-size: 24px;
color: #999;
height: 76px;
background-color: white;
background-color: #fff;
padding: 0 40px;
line-height: 76px;
}
... ...
... ... @@ -27,10 +27,6 @@ export default {
<style lang="scss" scoped>
.product-wrapper {
height: 180px;
}
.good-image {
width: 180px;
height: 180px;
... ... @@ -38,6 +34,7 @@ export default {
overflow: hidden;
img {
width: 100%;
height: 100%;
display: block;
}
}
... ...
... ... @@ -45,7 +45,7 @@ export default {
<style lang="scss" scoped>
.icon_size {
font-size: 24px;
font-size: 28px;
}
.icon_color {
... ...
... ... @@ -220,6 +220,13 @@ export default {
price: parseFloat(price || '').toFixed(2),
desc: '金额',
extra: JSON.stringify({
forward: {
name: pageBackName,
params: {
owner,
code: orderCode,
},
},
back: {
name: pageBackName,
params: {
... ... @@ -237,17 +244,23 @@ export default {
// 是否是求购
const isAskForBuy = status === 7;
const routeParam = {
name: isDetail ? 'buyOrderDetail' : 'OrderList',
params: isDetail
? {
owner,
code: orderCode, // 改为新订单号
}
: this.$route.params,
};
this.$createOrderPayType({
orderCode,
price: parseFloat(bidDepositInfo.depositAmount).toFixed(2),
desc: '支付定金',
extra: JSON.stringify({
forward: {
name: 'OrderList',
params: {
owner: 'buy',
},
},
forward: routeParam,
back: routeParam,
reportType: isAskForBuy ? 'qiugou_buy' : 'buy',
}),
}).show();
... ... @@ -316,6 +329,15 @@ export default {
price: price,
orderCode,
});
const routeParam = {
name: isDetail ? 'buyOrderDetail' : 'OrderList',
params: isDetail
? {
owner: this.$route.params.owner,
code: bidData.orderCode, // 改为新订单号
}
: this.$route.params,
};
if (isOk) {
// 重新支付保证金
... ... @@ -324,15 +346,8 @@ export default {
price: parseFloat(bidData.depositAmount),
desc: '支付定金',
extra: JSON.stringify({
forward: {
name: isDetail ? 'buyOrderDetail' : 'OrderList',
params: isDetail
? {
owner: this.$route.params.owner,
code: bidData.orderCode, // 改为新订单号
}
: this.$route.params,
},
forward: routeParam,
back: routeParam,
reportType: 'buy',
}),
}).show();
... ...
... ... @@ -85,6 +85,10 @@ export default {
name: pageBackName,
params: { code: orderCode, owner },
},
back: {
name: pageBackName,
params: { code: orderCode, owner },
},
type: 'sell',
reportType: 'sell',
}),
... ...
... ... @@ -233,7 +233,12 @@ export default {
}
.content-wrapper {
width: 100%;
flex: 1 0 0;
position: absolute;
height: 100%;
overflow: auto;
-webkit-overflow-scrolling: touch;
.footer-wrapper {
display: flex;
... ... @@ -249,12 +254,9 @@ export default {
}
.order-list-scroll-wrap {
width: 100%;
padding-top: 100px;
margin-top: 100px;
box-sizing: border-box;
position: absolute;
top: 0;
bottom: 0;
position: relative;
.list-wrapper {
li {
... ...
... ... @@ -5,7 +5,7 @@ $size-font: "PingFang SC", "HiraginoSansGB-W3", "SanFranciscoText-Regular", Helv
[type="button"] {
box-sizing: border-box;
padding: 0;
border-radius: 40px;
border-radius: 500px;
line-height: 80px;
font-size: 32px;
color: #333;
... ...
... ... @@ -52,19 +52,14 @@
<img class="ref-img" v-lazy="prdDetailTip"/>
</div>
<img class="ref-img" v-lazy="prdDetailImage" />
<img class="ref-img" v-lazy="prdDetailImage" />
<div class="recommend" v-if="recommend"><h2>相关推荐</h2>
<product-list ref="recommendList" :list="recommend" priceKey="price" :yas-params="recommendYasParams"/>
</div>
</LayoutScroll>
<div class="footer">
<div class="fav">
<div class="icon-fav" @click="_toggleFav">
<i class="iconfont" :class="[isFav ? 'icon-star-fill': 'icon-star-outline']" />
</div>
收藏
</div>
<div class="fav" @click="_toggleFav"><i class="iconfont" :class="[isFav ? 'icon-star-fill': 'icon-star-outline']" /><span>收藏</span></div>
<cube-button class="sell" @click="sell">出售</cube-button>
<cube-button class="buy active" @click="buy">购买</cube-button>
</div>
... ... @@ -725,11 +720,6 @@ export default {
transition: opacity 300ms linear;
}
.icon-fav {
box-shadow: none;
background: none;
}
.slide {
height: 520px;
... ... @@ -755,6 +745,7 @@ export default {
margin: 0 5px;
background: rgba(0, 0, 0, 0.15);
border-radius: 50%;
&.active {
transform-origin: 50% 50%;
transform: scale(1.5);
... ... @@ -935,16 +926,27 @@ export default {
@include cube-ufo-btn;
button {
height: 80px;
}
.fav {
margin-right: auto;
text-align: center;
width: 3em;
width: 48px;
color: #888;
font-size: 22px;
line-height: 0;
.icon-star-fill,
.icon-star-outline {
font-size: 42px;
font-size: 48px;
line-height: 48px;
}
span {
display: inline-block;
font-size: 22px;
line-height: 32px;
}
.icon-star-outline {
... ...
@font-face {font-family: "iconfont";
src: url('iconfont.eot?t=1571636060228'); /* IE9 */
src: url('iconfont.eot?t=1571636060228#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('iconfont.woff?t=1571636060228') format('woff'),
url('iconfont.ttf?t=1571636060228') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('iconfont.svg?t=1571636060228#iconfont') format('svg'); /* iOS 4.1- */
src: url('iconfont.eot?t=1571904785304'); /* IE9 */
src: url('iconfont.eot?t=1571904785304#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('iconfont.woff?t=1571904785304') format('woff'),
url('iconfont.ttf?t=1571904785304') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('iconfont.svg?t=1571904785304#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
... ...
... ... @@ -113,10 +113,10 @@ Created by iconfont
<glyph glyph-name="express" unicode="&#59363;" d="M190.41848853 115.66648853000004h-73.728a42.14328853 42.14328853 0 0 0-42.09777706 42.1432896v136.98844374a42.14328853 42.14328853 0 1 0 84.28657706 0v-94.8451552h24.71253334a136.9884448 136.9884448 0 0 0 266.6040896 0h175.85493333a136.9884448 136.9884448 0 0 0 266.60408853 0h35.27111147v155.648l-81.60142293 77.09582186a42.14328853 42.14328853 0 0 0-9.19324374 12.6520896l-72.9088 154.91982187h-57.5260448a42.32533333 42.32533333 0 0 0-10.55857813 1.36533333v-233.15342186a42.14328853 42.14328853 0 1 0-84.28657707 0V663.48373333H158.87928853v-31.63022186a42.14328853 42.14328853 0 1 0-84.28657706 0v73.728c0 23.30168853 18.8416 42.1888 42.14328853 42.1888H653.99466667c23.30168853 0 42.14328853-18.88711147 42.14328853-42.1432896v-22.39146667a42.32533333 42.32533333 0 0 0 10.55857813 1.31982293h84.28657814c16.29297813 0 31.17511147-9.4208 38.1383104-24.21191146l80.82773333-171.8499552 89.01973333-84.10453334c8.46506667-7.9644448 13.19822187-19.0236448 13.19822294-30.62897813v-215.95022187a42.14328853 42.14328853 0 0 0-42.09777814-42.1432896h-84.24106666a136.9884448 136.9884448 0 0 0-252.9507552 0h-189.50826667a136.9884448 136.9884448 0 0 0-252.95075627 0z m126.47537814 0a52.6563552 52.6563552 0 1 1 0 105.35822294 52.6563552 52.6563552 0 0 1 0-105.35822294z m442.45902186 0a52.6563552 52.6563552 0 1 1 0 105.35822294 52.6563552 52.6563552 0 0 1 0-105.35822294zM43.008 558.12551147h84.24106667a31.58471147 31.58471147 0 1 0 0-63.21493334H42.96248853a31.58471147 31.58471147 0 0 0 0 63.26044374z m21.02613333-105.35822294h63.2604448a31.58471147 31.58471147 0 1 0 0-63.21493333h-63.2604448a31.58471147 31.58471147 0 0 0 0 63.2604448z" horiz-adv-x="1024" />
<glyph glyph-name="-star-fill" unicode="&#59365;" d="M512 95.06133299999999l-217.258667-91.434666a46.08 46.08 0 0 0-63.829333 46.506666l20.352 233.088-154.154667 176.426667a46.08 46.08 0 0 0 24.362667 75.264l229.376 52.778667 121.685333 200.874666a46.08 46.08 0 0 0 78.933334 0l121.642666-200.874666 229.418667-52.778667a46.08 46.08 0 0 0 24.362667-75.264l-154.197334-176.426667 20.394667-233.088a46.08 46.08 0 0 0-63.829333-46.506666L512 95.06133299999999z" horiz-adv-x="1024" />
<glyph glyph-name="-star-fill" unicode="&#59365;" d="M512 33.91867221999996l-247.19208334-104.0323311a52.4288 52.4288 0 0 0-72.62359666 52.9142511l23.15605333 265.20234666-175.39375445 200.73434112a52.4288 52.4288 0 0 0 27.71930112 85.63370667l260.97891555 60.05039445 138.45086778 228.5507311a52.4288 52.4288 0 0 0 89.80859334 0l138.40232221-228.5507311 261.02746112-60.05039445a52.4288 52.4288 0 0 0 27.71930112-85.63370667l-175.44230002-200.73434112 23.2045989-265.20234666a52.4288 52.4288 0 0 0-72.62359666-52.9142511L512 33.91867221999996z" horiz-adv-x="1024" />
<glyph glyph-name="-star-outline" unicode="&#59364;" d="M813.176074-123.40823799999998a58.191768 58.191768 0 0 1 80.606375 58.73058l-25.755245 294.353359 194.726897 222.799037a58.191768 58.191768 0 0 1-30.766203 95.046554l-289.71957 66.651127L588.598956 867.845422a58.191768 58.191768 0 0 1-99.626462 0L335.303122 614.172419 45.637433 547.521292a58.191768 58.191768 0 0 1-30.766203-95.046554l194.673016-222.799037-25.701365-294.353359a58.191768 58.191768 0 0 1 74.625555-60.885831l5.926939 2.155251L538.812665-7.940684000000033l274.363409-115.467554zM538.812665 86.83646399999998l-263.748799-110.99541 24.785382 283.3077L112.611847 473.326788l278.24286 63.957064L538.812665 781.527633l147.904077-244.1899 278.24286-63.957063-187.18352-214.178035 24.785383-283.307699L538.812665 86.83646399999998z" horiz-adv-x="1077" />
<glyph glyph-name="-star-outline" unicode="&#59364;" d="M794.35256938-91.69522311000003a54.5547825 54.5547825 0 0 1 75.56847656 55.05991873l-24.14554219 275.95627407 182.55646594 208.87409719a54.5547825 54.5547825 0 0 1-28.84331531 89.10614437l-271.61209688 62.48543156L583.81152125 837.60508313a54.5547825 54.5547825 0 0 1-93.39980813-2e-8L346.34667687 599.78664281 74.78509344 537.30121125a54.5547825 54.5547825 0 0 1-28.84331532-89.10614437l182.5059525-208.87409719-24.09502968-275.95627407a54.5547825 54.5547825 0 0 1 69.96145781-57.08046656l5.55650531 2.02054781L537.13687344 16.555608750000033l257.21569594-108.25083188zM537.13687344 105.40918499999998l-247.26449907-104.05819688 23.23629564 265.60096875L137.57360656 467.74386375l260.85268125 59.9597475L537.13687344 756.68215594l138.66007218-228.92803125 260.85268125-59.95974656-175.48455-200.79190782 23.23629657-265.60096781L537.13687344 105.40918499999998z" horiz-adv-x="1077" />
... ...
... ... @@ -15,22 +15,25 @@ export default function() {
},
mutations: {
addCategoryParentList(state, {data}) {
let categoryParent = [];
let brand = {
id:'-1',
name: '品牌',
image: '',
linkType: '',
index: 0,
isSelect: true,
}
state.categoryParent.push(brand);
id: '-1',
name: '品牌',
image: '',
linkType: '',
index: 0,
isSelect: true,
};
categoryParent.push(brand);
if (data && data.length) {
data.forEach((val, index) => {
val.isSelect = false;
val.index = index + 1;
state.categoryParent.push(val);
});
data.forEach((val, index) => {
val.isSelect = false;
val.index = index + 1;
categoryParent.push(val);
});
}
state.categoryParent = categoryParent;
},
... ...
import * as Types from './types';
import cookie from 'yoho-cookie';
import { merge } from 'lodash';
import { initBaseLogs } from 'utils/init-client';
export default function(mergeState = {}) {
return {
... ... @@ -198,6 +199,7 @@ export default function(mergeState = {}) {
try {
// console.log(appop)
// console.log(param)
initBaseLogs();
setTimeout(() => {
if (window._yas && window._yas.sendAppLogs) {
param = param || {};
... ... @@ -241,7 +243,7 @@ export default function(mergeState = {}) {
isEnabled = resp.data === '1';
}
commit(Types.UPDATE_SYSTEM_CONFIG_QIUGOU, { enabled: isEnabled});
commit(Types.UPDATE_SYSTEM_CONFIG_QIUGOU, { enabled: isEnabled });
}
return isEnabled;
... ...
... ... @@ -42,40 +42,54 @@ function getUdid() {
return cookie.get('udid') || '';
}
window.appBaseLogs = {
status: [
{
ca: '',
lo: '',
cy: 'CN',
av: '',
udid: getUdid(),
ln: '',
ab: '',
function getUid() {
return (cookie.get('_UID') || '').split('::')[1] || '';
}
window.indx = 1;
function initBaseLogs() {
window.appBaseLogs = {
status: [
{
ca: '',
lo: '',
cy: 'CN',
av: '',
udid: getUdid(),
ln: '',
ab: '',
sid: '',
net: '',
la: ''
}
],
device: {
res: '',
ifa: '',
mac: '',
osv: '',
ifv: '',
ps: '',
os: xianyu.isiOS ? 'ios' : 'android',
ak: 'yoho_xianyu_' + (xianyu.isiOS ? 'ios' : 'android'),
sv: '',
ch: '',
dm: '',
tdid: '',
afp: '',
udid: getUdid()
},
events: [{
sid: '',
net: '',
la: ''
}
],
device: {
res: '',
ifa: '',
mac: '',
osv: '',
ifv: '',
ps: '',
os: xianyu.isiOS ? 'iOS' : 'android',
ak: 'yoho_xianyu_' + (xianyu.isiOS ? 'iOS' : 'android'),
sv: '',
ch: '',
dm: '',
tdid: '',
afp: '',
udid: getUdid()
},
events: [{}]
};
uid: getUid()
}]
};
}
initBaseLogs();
export {
initClient
initClient,
initBaseLogs
};
... ...