Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
gm_flutter
Project
Project
Details
Activity
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
林生雨
gm_flutter
Commits
e1275790
Commit
e1275790
authored
Jul 09, 2020
by
林生雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
w
parent
d5f93445
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
14 deletions
+31
-14
LevelOneItem.dart
lib/ClueModel/page/levelOne/LevelOneItem.dart
+19
-5
FilterView.dart
lib/ClueModel/page/plan/FilterView.dart
+1
-1
PlanModel.dart
lib/ClueModel/page/plan/PlanModel.dart
+2
-2
PlanPage.dart
lib/ClueModel/page/plan/PlanPage.dart
+0
-3
LevelOneFeedList.dart
lib/ClueModel/server/entity/LevelOneFeedList.dart
+3
-0
MainManager.dart
lib/MainRouter/manager/MainManager.dart
+6
-3
No files found.
lib/ClueModel/page/levelOne/LevelOneItem.dart
View file @
e1275790
...
@@ -236,6 +236,16 @@ class LevelOneItem extends StatelessWidget {
...
@@ -236,6 +236,16 @@ class LevelOneItem extends StatelessWidget {
if
(
cards
.
plan
==
null
&&
isDebug
)
{
if
(
cards
.
plan
==
null
&&
isDebug
)
{
throw
new
Exception
();
throw
new
Exception
();
}
}
String
price
;
if
(
cards
.
plan
.
minPrice
.
empty
()
&&
cards
.
plan
.
maxPrice
.
empty
())
{
price
=
"暂无报价"
;
}
else
if
(
cards
.
plan
.
minPrice
.
empty
()
&&
!
cards
.
plan
.
maxPrice
.
empty
())
{
price
=
"
${cards.plan.maxPrice}
"
;
}
else
if
(!
cards
.
plan
.
minPrice
.
empty
()
&&
cards
.
plan
.
maxPrice
.
empty
())
{
price
=
"
${cards.plan.minPrice}
"
;
}
else
{
price
=
"
${cards.plan.minPrice}
-
${cards.plan.maxPrice}
"
;
}
return
Container
(
return
Container
(
height:
118
,
height:
118
,
margin:
EdgeInsets
.
only
(
left:
15
,
right:
15
),
margin:
EdgeInsets
.
only
(
left:
15
,
right:
15
),
...
@@ -254,8 +264,14 @@ class LevelOneItem extends StatelessWidget {
...
@@ -254,8 +264,14 @@ class LevelOneItem extends StatelessWidget {
mainAxisSize:
MainAxisSize
.
min
,
mainAxisSize:
MainAxisSize
.
min
,
crossAxisAlignment:
CrossAxisAlignment
.
end
,
crossAxisAlignment:
CrossAxisAlignment
.
end
,
children:
<
Widget
>[
children:
<
Widget
>[
baseText
(
"¥"
,
12
,
Color
(
0xffFF5963
)),
price
==
"暂无报价"
baseText
(
cards
.
plan
.
maxPrice
,
15
,
Color
(
0xffFF5963
))
?
Container
(
width:
0
,
height:
0
,
)
:
baseText
(
"¥"
,
12
,
Color
(
0xffFF5963
)),
baseText
(
price
,
price
==
"暂无报价"
?
13
:
15
,
price
==
"暂无报价"
?
Color
(
0xff999999
)
:
Color
(
0xffFF5963
))
],
],
),
),
),
),
...
@@ -274,9 +290,7 @@ class LevelOneItem extends StatelessWidget {
...
@@ -274,9 +290,7 @@ class LevelOneItem extends StatelessWidget {
top:
40
,
top:
40
,
right:
0
,
right:
0
,
child:
baseText
(
child:
baseText
(
"指导价:¥
${cards.plan.minPrice}
-
${cards.plan.maxPrice}
"
,
"指导价:
${cards.plan.guide_price}
"
,
11
,
Color
(
0xff666666
)),
11
,
Color
(
0xff666666
)),
),
),
Positioned
(
Positioned
(
left:
0
,
left:
0
,
...
...
lib/ClueModel/page/plan/FilterView.dart
View file @
e1275790
...
@@ -29,7 +29,7 @@ class FilterView extends StatelessWidget {
...
@@ -29,7 +29,7 @@ class FilterView extends StatelessWidget {
width:
MediaQuery
.
of
(
context
).
size
.
width
,
width:
MediaQuery
.
of
(
context
).
size
.
width
,
child:
PlanProgressBar
(
child:
PlanProgressBar
(
0
,
0
,
50
00
,
196
00
,
0
,
0
,
20010
,
20010
,
call
,
call
,
...
...
lib/ClueModel/page/plan/PlanModel.dart
View file @
e1275790
...
@@ -43,8 +43,8 @@ class PlanModel extends BaseModel {
...
@@ -43,8 +43,8 @@ class PlanModel extends BaseModel {
String
tag_id
=
"0"
;
String
tag_id
=
"0"
;
String
order_by
=
""
;
String
order_by
=
""
;
String
current_city_id
=
""
;
String
current_city_id
=
""
;
String
min_price
=
""
;
String
min_price
=
"
0
"
;
String
max_price
=
""
;
String
max_price
=
"
100000000
"
;
String
rank_type
=
""
;
String
rank_type
=
""
;
List
<
String
>
normalData
=
[
"全部项目"
,
"智能筛选"
,
"筛选"
];
List
<
String
>
normalData
=
[
"全部项目"
,
"智能筛选"
,
"筛选"
];
...
...
lib/ClueModel/page/plan/PlanPage.dart
View file @
e1275790
...
@@ -243,9 +243,6 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
...
@@ -243,9 +243,6 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
);
);
},
},
),
),
baseSliverBack
((){
Navigator
.
pop
(
context
);
}),
],
],
),
),
);
);
...
...
lib/ClueModel/server/entity/LevelOneFeedList.dart
View file @
e1275790
...
@@ -129,6 +129,7 @@ class Plan {
...
@@ -129,6 +129,7 @@ class Plan {
String
projectImage
;
String
projectImage
;
String
consultType
;
String
consultType
;
String
messageUrl
;
String
messageUrl
;
String
guide_price
;
Plan
(
Plan
(
{
this
.
planName
,
{
this
.
planName
,
...
@@ -147,6 +148,7 @@ class Plan {
...
@@ -147,6 +148,7 @@ class Plan {
minPrice
=
json
[
'min_price'
];
minPrice
=
json
[
'min_price'
];
maxPrice
=
json
[
'max_price'
];
maxPrice
=
json
[
'max_price'
];
positiveRate
=
json
[
'positive_rate'
];
positiveRate
=
json
[
'positive_rate'
];
guide_price
=
json
[
'guide_price'
];
salesCount
=
json
[
'sales_count'
];
salesCount
=
json
[
'sales_count'
];
if
(
json
[
'base_attrs'
]
!=
null
)
{
if
(
json
[
'base_attrs'
]
!=
null
)
{
baseAttrs
=
new
List
<
BaseAttrs
>();
baseAttrs
=
new
List
<
BaseAttrs
>();
...
@@ -163,6 +165,7 @@ class Plan {
...
@@ -163,6 +165,7 @@ class Plan {
final
Map
<
String
,
dynamic
>
data
=
new
Map
<
String
,
dynamic
>();
final
Map
<
String
,
dynamic
>
data
=
new
Map
<
String
,
dynamic
>();
data
[
'plan_name'
]
=
this
.
planName
;
data
[
'plan_name'
]
=
this
.
planName
;
data
[
'min_price'
]
=
this
.
minPrice
;
data
[
'min_price'
]
=
this
.
minPrice
;
data
[
'guide_price'
]
=
this
.
guide_price
;
data
[
'max_price'
]
=
this
.
maxPrice
;
data
[
'max_price'
]
=
this
.
maxPrice
;
data
[
'plan_id'
]
=
this
.
plan_id
;
data
[
'plan_id'
]
=
this
.
plan_id
;
data
[
'positive_rate'
]
=
this
.
positiveRate
;
data
[
'positive_rate'
]
=
this
.
positiveRate
;
...
...
lib/MainRouter/manager/MainManager.dart
View file @
e1275790
...
@@ -71,8 +71,7 @@ class MainManager {
...
@@ -71,8 +71,7 @@ class MainManager {
innerSetData
(
map
,
USER_ID
);
innerSetData
(
map
,
USER_ID
);
innerSetData
(
map
,
USER_AGENT
);
innerSetData
(
map
,
USER_AGENT
);
innerSetData
(
map
,
BASE_URL
);
// innerSetData(map, BASE_URL);
DioUtil
.
setDefOptions
(
baseUrl:
"
${map[BASE_URL]}
/"
,
agent:
map
[
USER_AGENT
]);
// if (map[COOKIE] == null) {
// if (map[COOKIE] == null) {
// CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
// CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
// "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
// "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
...
@@ -88,7 +87,11 @@ class MainManager {
...
@@ -88,7 +87,11 @@ class MainManager {
print
(
print
(
"LSY QQWWEERRTTYY
${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}
"
"LSY QQWWEERRTTYY
${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}
"
"
${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}
"
);
"
${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}
"
);
DioUtil
.
getInstance
().
changeOpt
();
if
(
map
[
BASE_URL
]
!=
null
)
{
DioUtil
.
setDefOptions
(
baseUrl:
"
${map[BASE_URL]}
/"
,
agent:
map
[
USER_AGENT
]);
DioUtil
.
getInstance
().
changeOpt
();
}
// SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
// SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
}
}
...
...
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