Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
mallapp
Commits
5684e268
Commit
5684e268
authored
Sep 22, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9a7c4c01
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
1 deletion
+65
-1
list.vue
pages/kotra/brand/list.vue
+60
-1
brandInformation.vue
pages/kotra/brandInformation.vue
+5
-0
No files found.
pages/kotra/brand/list.vue
View file @
5684e268
...
...
@@ -41,6 +41,22 @@
<u-icon
name=
"filter-o"
color=
"#111"
size=
"42"
></u-icon>
</div>
-->
</view>
<view
class=
"carrierScreen"
>
<view
class=
"statusBox"
v-if=
"msg.IsInChengdu == 1"
@
click=
"changeFirstStoreTest(-1)"
>
已在成都落地
</view>
<view
class=
"statusBox2"
v-if=
"msg.IsInChengdu == -1"
@
click=
"changeFirstStoreTest(1)"
>
已在成都落地
</view>
</view>
<view
class=
"screenBox"
v-if=
"PrizeList.length > 0"
>
<view
v-for=
"(item, index) in PrizeList"
...
...
@@ -61,7 +77,7 @@
</view>
<u-empty
v-if=
"g.length == 0"
text=
"暂无内容"
mode=
"list"
></u-empty>
<view
style=
"height: calc(100% - 1
01
px); padding: 2px 10px"
style=
"height: calc(100% - 1
27
px); padding: 2px 10px"
v-if=
"g.length > 0"
>
<scroll-view
...
...
@@ -154,6 +170,7 @@ export default {
XinFeng
:
-
1
,
BrandClassId
:
0
,
PrizeId
:
0
,
//
IsInChengdu
:
-
1
,
//是否已在成都落地
},
loadText
:
{
loadmore
:
"轻轻上拉,加载更多"
,
...
...
@@ -372,6 +389,12 @@ export default {
this
.
msg
.
pageIndex
=
1
;
this
.
init
();
},
changeFirstStoreTest
(
i
)
{
this
.
msg
.
IsInChengdu
=
i
;
this
.
msg
.
pageIndex
=
1
;
this
.
g
=
[];
this
.
init
();
},
},
};
</
script
>
...
...
@@ -536,4 +559,40 @@ export default {
top
:
0
;
left
:
0
;
}
.carrierScreen
{
height
:
50
rpx
;
margin
:
20
rpx
0
;
display
:
flex
;
padding
:
0
30
rpx
;
}
.statusBox
{
/* width: 150rpx; */
height
:
46
rpx
;
background
:
#1f1f1f
;
border-radius
:
23
rpx
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
color
:
#fff
;
margin-right
:
30
rpx
;
padding
:
0
18
rpx
;
font-size
:
22
rpx
;
font-family
:
PingFang
SC
;
font-weight
:
500
;
}
.statusBox2
{
/* width: 150rpx; */
height
:
46
rpx
;
background
:
#eaeaea
;
border-radius
:
23
rpx
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
color
:
#999999
;
padding
:
0
18
rpx
;
font-size
:
22
rpx
;
font-family
:
PingFang
SC
;
font-weight
:
500
;
}
</
style
>
pages/kotra/brandInformation.vue
View file @
5684e268
...
...
@@ -393,6 +393,7 @@
ShopSize
:
""
,
//店铺开口尺寸
IsShopSize
:
1
,
//店铺开口尺寸(0-否1-有)
OpenShopWish
:
5
,
//开店意愿
IsInChengdu
:
0
,
//是否在成都落地
},
ShopWish
:
1
,
//开店意愿
BrandClassName
:
''
,
...
...
@@ -411,6 +412,7 @@
{
name
:
"排污"
,
field
:
"Sewage"
,},
{
name
:
"空调"
,
field
:
"KongTiao"
,},
{
name
:
"新风"
,
field
:
"XinFeng"
,},
{
name
:
"是否已在成都落地"
,
field
:
"IsInChengdu"
,},
],
BrandClassList
:[],
showTypeStatus
:
false
,
...
...
@@ -463,6 +465,8 @@
this
.
model
.
PaiYan
=
data
.
PaiYan
?
data
.
PaiYan
:
1
;
this
.
model
.
KongTiao
=
data
.
KongTiao
?
data
.
KongTiao
:
1
;
this
.
model
.
XinFeng
=
data
.
XinFeng
?
data
.
XinFeng
:
1
;
this
.
model
.
IsInChengdu
=
data
.
IsInChengdu
?
data
.
IsInChengdu
:
0
;
this
.
model
.
BrandClassId
=
data
.
BrandClassId
?
data
.
BrandClassId
:
''
;
this
.
model
.
RanQiBZ
=
data
.
RanQiBZ
?
data
.
RanQiBZ
:
''
;
this
.
model
.
IsDianLiang
=
data
.
IsDianLiang
?
data
.
IsDianLiang
:
1
;
...
...
@@ -706,6 +710,7 @@
this
.
model
.
PaiYan
=
data
.
PaiYan
;
this
.
model
.
KongTiao
=
data
.
KongTiao
;
this
.
model
.
XinFeng
=
data
.
XinFeng
;
this
.
model
.
IsInChengdu
=
data
.
IsInChengdu
;
this
.
model
.
BrandClassId
=
data
.
BrandClassId
;
this
.
model
.
RanQiBZ
=
data
.
RanQiBZ
;
this
.
model
.
IsDianLiang
=
data
.
IsDianLiang
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment