diff --git a/src/doc/trade.js b/src/doc/trade.js index cab0e45..d4f7e25 100755 --- a/src/doc/trade.js +++ b/src/doc/trade.js @@ -93,7 +93,7 @@ export const TRADE_AFTER_SALES_ITEM = { return pickBy(_detail, { id: 'id', pic: 'pic', - itemName: 'item_name', + itemName: ({ item_name, item_name_2 }) => item_name_2 || item_name, price: ({ total_fee }) => total_fee / 100, num: 'num', // 可售后商品数 diff --git a/src/marketing/pages/item/rate.js b/src/marketing/pages/item/rate.js index 6a1e21a..240dc50 100755 --- a/src/marketing/pages/item/rate.js +++ b/src/marketing/pages/item/rate.js @@ -45,7 +45,7 @@ export default class TradeRate extends Component { item_id: 'item_id', item_spec_desc: 'item_spec_desc', pic_path: 'pic', - title: 'item_name', + title: ({ item_name, item_name_2 }) => item_name_2 || item_name, price: ({ item_fee }) => (+item_fee / 100).toFixed(2), num: 'num', star: 0, diff --git a/src/pages/cart/comps/comp-goodsitem.js b/src/pages/cart/comps/comp-goodsitem.js index 73be482..4cec1eb 100755 --- a/src/pages/cart/comps/comp-goodsitem.js +++ b/src/pages/cart/comps/comp-goodsitem.js @@ -88,7 +88,7 @@ function CompGoodsItem (props) { {/* {info.activity_type == 'package' && 组合商品} */} {info.is_plus_buy && 加价购} - {info.item_name} + {info.item_name_2 || info.item_name} {isShowDeleteIcon && ( // onDelete(info)}> diff --git a/src/pages/cart/comps/comp-goodsitem.scss b/src/pages/cart/comps/comp-goodsitem.scss index 80dabee..39705a7 100755 --- a/src/pages/cart/comps/comp-goodsitem.scss +++ b/src/pages/cart/comps/comp-goodsitem.scss @@ -112,7 +112,8 @@ } .goods-title { @include multi-ellipsis(2); - width: 300px; + // width: 300px; + width: 360px; &__tag { /* prettier-ignore */ border: 1PX solid var(--color-primary); diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index ba6fe87..cb6561b 100755 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -201,7 +201,7 @@ page { .item-btn { // width: 180px; // height: 56px; - padding: 30px 70px 30px 90px; + padding: 20rpx 90rpx 20rpx 50rpx; color: #fff; font-size: 28px; border-radius: 10px; @@ -215,11 +215,16 @@ page { font-size: 22px; line-height: 1; transition: all 0.3s ease-in-out; + position: relative; .icon-my { font-size: 28px; font-weight: bold; margin-left: 16px; } + .jiantou { + height: 50rpx; + width: 100rpx; + } } } } diff --git a/src/pages/index.js b/src/pages/index.js index 76a2772..e958bd3 100755 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -205,9 +205,12 @@ function Home () { // goodsSort: 6, distributor_id: 0 } - const { list: jdList } = await api.item.search({ ...req, tag_id: 1 }) - const { list: newList } = await api.item.search({ ...req, tag_id: 2 }) - const { list: hotList } = await api.item.search({ ...req, tag_id: 3 }) + // const { list: jdList } = await api.item.search({ ...req, tag_id: 1 }) + const { list: newList = [] } = await api.item.search({ ...req, tag_id: 4 }) + const { list: hotList = [] } = await api.item.search({ ...req, tag_id: 3 }) + const { list: BOSTON_List = [] } = await api.item.search({ ...req, tag_id: 5 }) + const { list: ARIZONA_List = [] } = await api.item.search({ ...req, tag_id: 6 }) + const { list: LONDON_List = [] } = await api.item.search({ ...req, tag_id: 7 }) setState((draft) => { draft.recommend = [{ type: 'new', @@ -215,7 +218,7 @@ function Home () { btnTxt: '查看更多', postions: 'left', url: '', - img: 'index/rec/new.png', + img: 'index/rec/new.png?v=1', list: newList.map(item => ({ ...item, price: (item.price / 100) })) }, { type: 'hot', @@ -223,18 +226,53 @@ function Home () { btnTxt: '查看更多', postions: 'left', url: '', - img: 'index/rec/hot.png', + img: 'index/rec/hot.png?v=1', list: hotList.map(item => ({ ...item, price: (item.price / 100) })) }, { - type: 'jd', - text: "ARIZONA", - btnTxt: '经典双扣', + type: 'BOSTON', + text: "BOSTON", + btnTxt: 'BOSTON', postions: 'right', url: '', - img: 'index/rec/jd.png', - list: jdList.map(item => ({ ...item, price: (item.price / 100) })) + img: 'index/rec/Boston.png', + list: BOSTON_List.map(item => ({ ...item, price: (item.price / 100) })) + }, { + type: 'ARIZONA', + img: 'index/rec/Arizona.png', + list: ARIZONA_List.map(item => ({ ...item, price: (item.price / 100) })) + }, { + type: 'LONDON', + img: 'index/rec/London.png', + list: LONDON_List.map(item => ({ ...item, price: (item.price / 100) })) } ] + // bak + // draft.recommend = [{ + // type: 'new', + // text: "新品推荐", + // btnTxt: '查看更多', + // postions: 'left', + // url: '', + // img: 'index/rec/new.png', + // list: newList.map(item => ({ ...item, price: (item.price / 100) })) + // }, { + // type: 'hot', + // text: "热销单品", + // btnTxt: '查看更多', + // postions: 'left', + // url: '', + // img: 'index/rec/hot.png', + // list: hotList.map(item => ({ ...item, price: (item.price / 100) })) + // }, { + // type: 'jd', + // text: "ARIZONA", + // btnTxt: '经典双扣', + // postions: 'right', + // url: '', + // img: 'index/rec/jd.png', + // list: jdList.map(item => ({ ...item, price: (item.price / 100) })) + // } + // ] }) } @@ -364,8 +402,6 @@ function Home () { const deltaY = clientY - startY const deltaX = clientX - startX if (Math.abs(deltaY) < 50) return - - console.log("🚀 ~ deltaY:", deltaY) if (deltaY > 0) { // 下滑操作 setState((draft) => { @@ -534,8 +570,9 @@ function Home () { {!isUpOperation && <> {currentIndex === 0 ? {activeInfo.activity_name} - {activeInfo.end_time * 1000 >= Date.now() && + {activeInfo.end_time * 1000 >= Date.now() && {activeInfo.total_count ? '已报名' : '活动申请'} + } : diff --git a/src/pages/member/item-fav.js b/src/pages/member/item-fav.js index ad7f397..bad8762 100755 --- a/src/pages/member/item-fav.js +++ b/src/pages/member/item-fav.js @@ -105,7 +105,7 @@ export default class ItemFav extends Component { img: 'item_image', fav_id: 'fav_id', item_id: 'item_id', - title: 'item_name', + title: ({ item_name, item_name_2 }) => item_name_2 || item_name, desc: 'brief', item_type: 'item_type', distributor_id: 'distributor_id', diff --git a/src/pages/member/item-fav.scss b/src/pages/member/item-fav.scss index a92faf0..357f240 100755 --- a/src/pages/member/item-fav.scss +++ b/src/pages/member/item-fav.scss @@ -120,9 +120,11 @@ flex: 1; width: 100%; flex-direction: column; + overflow: hidden; &__title { @include text-overflow(); font-size: 22px; + width: 98%; } &__price { display: flex; @@ -130,8 +132,8 @@ font-weight: bold; font-size: 32px; line-height: 1; - margin-top: 16px; - margin-bottom: 36px; + margin-top: 26px; + margin-bottom: 20px; &__symbol { margin-right: 20px; } diff --git a/src/pages/recommend/status.js b/src/pages/recommend/status.js index ea8c020..2d44ead 100644 --- a/src/pages/recommend/status.js +++ b/src/pages/recommend/status.js @@ -125,7 +125,7 @@ export default function status () { await api.user.cancelRegistrationRecord({ activity_id: id }) - navigateTo('/pages/recommend/list') + navigateTo('/pages/index') } return ( diff --git a/src/subpage/pages/trade/comps/new-item.js b/src/subpage/pages/trade/comps/new-item.js index 53690f2..4a46cb3 100755 --- a/src/subpage/pages/trade/comps/new-item.js +++ b/src/subpage/pages/trade/comps/new-item.js @@ -77,7 +77,6 @@ export default class TradeItem extends Component { // 修改地址 clickToEditAddress () { const { choose } = this.props.info - console.log("🚀 ~ TradeItem ~ this.props.info:", this.props.info) return Taro.navigateTo({ url: `/marketing/pages/member/address?isSelected=${choose}` diff --git a/src/subpage/pages/trade/detail.js b/src/subpage/pages/trade/detail.js index 134cdbd..e0bf860 100755 --- a/src/subpage/pages/trade/detail.js +++ b/src/subpage/pages/trade/detail.js @@ -138,7 +138,7 @@ export default class TradeDetail extends Component { delivery_time: 'delivery_time', aftersales_status: 'aftersales_status', pic_path: 'pic', - title: ({ item_name }) => item_name, + title: ({ item_name, item_name_2 }) => item_name_2 || item_name, type: 'type', delivery_status: 'delivery_status', origincountry_name: 'origincountry_name', diff --git a/src/subpage/pages/trade/list.js b/src/subpage/pages/trade/list.js index 96110e2..709b39a 100755 --- a/src/subpage/pages/trade/list.js +++ b/src/subpage/pages/trade/list.js @@ -207,7 +207,7 @@ export default class TradeList extends Component { order_id: 'order_id', item_id: 'item_id', pic_path: 'pic', - title: 'item_name', + title: ({ item_name, item_name_2 }) => item_name_2 || item_name, origincountry_name: 'origincountry_name', origincountry_img_url: 'origincountry_img_url', type: 'type',