Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
xianyu-ufo-app-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
Tao
5 years ago
Commit
fc146bbc36b822407da37cb5799daab5a62ee896
2 parents
20745809
e39b33bc
modify channel style
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
54 deletions
apps/pages/category/category.vue
apps/pages/order/buyer-ask-order.vue
apps/store/category/index.js
apps/pages/category/category.vue
View file @
fc146bb
...
...
@@ -21,22 +21,21 @@
<Scroll>
<div v-for="(itemSub, index) in categorySubList" :key="index">
<CategoryTitle>{{itemSub.name}}</CategoryTitle>
<div class="category-sub-root">
<div
<div class="category-sub-root" :class="'sub-type-' + itemSub.type">
<div class="item-div"
v-for="(item, index) in itemSub.sub"
:key="index"
:data-id="item.id"
:class="item.className">
:data-id="item.id">
<LayoutLink :href="item.url">
<div
:class="item.type ? 'item-imge-div-brand' : 'item-imge-div'
" @click="goProductList(item,index, itemSub)">
<div
class="item-imge-div
" @click="goProductList(item,index, itemSub)">
<ImgSize
class="item-imge"
:src="item.image"
:width="144"
:height="144"
/>
<p v-if="!item.type" class="item-title">{{item.name}}</p>
</div>
<p class="item-title">{{item.name}}</p>
</LayoutLink>
</div>
</div>
...
...
@@ -226,8 +225,6 @@ export default {
flex-flow: row wrap;
align-content: flex-start;
padding-bottom: 20px;
margin-left: 5%;
margin-right: 5%;
}
.sub-title {
...
...
@@ -237,67 +234,58 @@ export default {
}
.item-div {
display: flex
;
position: relative
;
flex: 0 0 33%;
height: 195px;
justify-content: center;
padding: 20px 0;
}
.item-div-brand {
.item-imge-div {
width: 100%;
height: 130px;
display: flex;
flex: 0 0 33%;
height: 140px;
align-items: center;
justify-content: center;
position: relative;
}
.item-div-brand-right {
display: flex;
flex: 0 0 33%;
height: 140px;
justify-content: center;
border-right: 1px solid #EEEEEE;
}
.sub-type-brand {
padding-top: 40px;
.item-div-brand-bottom {
display: flex;
flex: 0 0 33%;
height: 140px;
justify-content: center;
border-bottom: 1px solid #EEEEEE;
.item-div {
padding: 15px;
border-bottom: 1px solid #eee;
border-right: 1px solid #eee;
box-sizing: border-box;
}
.item-div-brand-right-bottom {
display: flex;
flex: 0 0 33%;
height: 140px;
justify-content: center;
border-right: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
.item-div:nth-child(3n) {
border-right: 0;
}
.item-imge-div {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
padding: 10px;
height: 110px;
overflow: hidden;
}
.item-imge-div-brand {
height: 100%;
.item-title {
display: none;
}
&:after {
content: "";
width: 100%;
display: flex;
justify-content: center;
align-items: center;
padding-top: 10px;
padding-bottom: 10px;
height: 2PX;
background-color: #fff;
position: relative;
top: -1PX;
}
}
.item-imge {
object-fit: contain;
height: 80%;
width: 100%;
max-width: 100%;
max-height: 100%;
}
.item-title {
...
...
apps/pages/order/buyer-ask-order.vue
View file @
fc146bb
...
...
@@ -311,6 +311,7 @@ export default {
}, 500, {leading: false, trailing: true}),
publishProduct() {
this.buyerPublish({price: this.inputPrice, storage_id: this.storageId, address_id: this.addressInfo.address_id, time_limit_id: this.chooseDayId}).then(() => {
this.payOrder();
});
...
...
@@ -327,11 +328,25 @@ export default {
payOrder() {
let vm = this;
this.$store.dispatch('reportYas', {
params: {
appop: 'UFO_WTBUY_ORD',
param: {
ORDER_NUM: get(this.publishresult, 'orderCode', ''),
PRD_STORAGEID: this.storageId,
PRD_SIZE: get(this.originProductData, 'sizeName', ''),
PRICE: this.inputPrice,
FORNT_AMOUNT: get(this.publishresult, 'depositAmount', '')
}
}
});
this.$createOrderPayType({
price: get(this.publishresult, 'depositAmount', ''),
desc: '定金',
orderCode: get(this.publishresult, 'orderCode', ''),
extra: JSON.stringify({
reportType: 'qiugou_buy',
type: 'buy',
back: {
name: 'ProductDetail',
...
...
@@ -640,7 +655,9 @@ export default {
padding: 0 40px 40px;
background-color: white;
}
</style>
<style lang="scss">
.cube-picker-panel {
height: 273px;
text-align: center;
...
...
apps/store/category/index.js
View file @
fc146bb
...
...
@@ -36,7 +36,6 @@ export default function() {
if
(
val
&&
val
.
sub
){
val
.
index
=
index
;
val
.
sub
.
forEach
(
item
=>
{
item
.
className
=
'item-div'
if
(
item
.
linkType
===
'h5'
){
item
.
isShow
=
true
;
item
.
url
=
item
.
link
;
...
...
@@ -87,17 +86,14 @@ export default function() {
let
url
=
`
$
{
hostUrl
}?
$
{
params
}
`
let
right
=
index
%
3
!==
2
?
'-right'
:
''
;
let
bottom
=
isShowBottomBordor
?
'-bottom'
:
''
;
let
className
=
'item-div-brand'
+
right
+
bottom
;
let
subItem
=
{
id
:
val
.
id
,
name
:
val
.
brand_name
,
image
:
val
.
brand_logo
,
type
:
1
,
//表示 品牌
linkType
:
'brand'
,
link
:
val
.
id
,
url
:
url
,
isShow
:
false
,
className
,
}
sub
.
push
(
subItem
);
...
...
@@ -106,6 +102,7 @@ export default function() {
let
category
=
[{
id
:
'0'
,
image
:
''
,
type
:
'brand'
,
linkType
:
'brand'
,
name
:
'全部品牌'
,
sub
:
sub
,
...
...
Please
register
or
login
to post a comment