Skip to content

G
gm_flutter
Commit 33c53ac4 authored by 朱璇's avatar 朱璇
Browse files
Options

conflict fix

parents 6d481654 197b47af
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 29 deletions
lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart
View file @ 33c53ac4
......@@ -51,13 +51,16 @@ class _PopView implements ICenterPicker {
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", phobosData());
return Opacity(
opacity: alp / 255.0,
child: Container(
color: Colors.red,
width: contentWidth,
height: _model.popViewLive.data.second.title.length > 13
? 357.5
: 305.5,
? 367.5
: 310.5,
child: Stack(
alignment: AlignmentDirectional.topCenter,
children: <Widget>[
......@@ -68,8 +71,8 @@ class _PopView implements ICenterPicker {
Positioned(
top: 62.5,
right: 20,
width: 13.5,
height: 13.5,
width: 15,
height: 14,
child: GestureDetector(
onTap: () {
dismissCallback();
......@@ -83,7 +86,7 @@ class _PopView implements ICenterPicker {
decoration: BoxDecoration(boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 3.0),
offset: Offset(0.0, 1.0),
blurRadius: 15.0,
spreadRadius: 1.0)
], shape: BoxShape.circle),
......@@ -110,7 +113,7 @@ class _PopView implements ICenterPicker {
return Container(
width: contentWidth,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(7),
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Container(
......@@ -152,8 +155,9 @@ class _PopView implements ICenterPicker {
alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 25),
child: baseText(
_model.popViewLive.data.second.title, 18, Color(0xff464646),
bold: true, textAlign: TextAlign.center)),
"${_model.popViewLive.data.second.title}", 18, Color(0xff464646),
bold: true, textAlign: TextAlign.center,
maxLines: 2)),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(7),
......
lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedItemView.dart
View file @ 33c53ac4
......@@ -68,7 +68,7 @@ class _PlansCompareFeedItemViewState
child: ClipRRect(
borderRadius: BorderRadius.circular(4.0),
child: CachedNetworkImage(
imageUrl: widget.plan.projectImage,
imageUrl: widget.plan.projectImage ?? "",
width: 50,
height: 50,
fit: BoxFit.cover,
......@@ -113,8 +113,8 @@ class _PlansCompareFeedItemViewState
children: <Widget>[
baseText('￥${widget.plan.minPrice}-${widget.plan.maxPrice}',
13, Color(0xFFFF5963)),
baseText("销量${NumPlanUtil.getSale(widget.plan.salesCount)}",
11, Color(0xFF666666))
baseText(
"销量${widget.plan.salesCount}", 11, Color(0xFF666666))
],
)
],
......
lib/ClueModel/page/levelOne/LevelOneItem.dart
View file @ 33c53ac4
......@@ -16,7 +16,7 @@ class LevelOneItem extends StatelessWidget {
final Cards cards;
VoidCallback lowPrice;
VoidCallback ask;
VoidCallback compare;
Function(int planId) compare;
Function(int planId) gotoPlan;
int position;
String tabName;
......@@ -342,9 +342,12 @@ class LevelOneItem extends StatelessWidget {
Positioned(
left: 0,
top: 15,
child: Container(
width: 210,
child: baseText(cards.plan.planName, 15, Color(0xff282828),
bold: true),
),
),
Positioned(
right: 0,
top: 15,
......@@ -359,7 +362,8 @@ class LevelOneItem extends StatelessWidget {
)
: baseText("¥", 12, Color(0xffFF5963)),
baseText(price, price == "暂无报价" ? 13 : 15,
price == "暂无报价" ? Color(0xff999999) : Color(0xffFF5963))
price == "暂无报价" ? Color(0xff999999) : Color(0xffFF5963),
bold: price != "暂无报价")
],
),
),
......@@ -463,7 +467,9 @@ class LevelOneItem extends StatelessWidget {
child: baseText("去比较", 13, Color(0xff282828), bold: true),
)
],
).gestureDetector(compare);
).gestureDetector(() {
compare(cards.plan.plan_id);
});
}
Widget DiaryItem(BuildContext context) {
......
lib/ClueModel/page/levelOne/LevelOneList.dart
View file @ 33c53ac4
......@@ -157,7 +157,7 @@ class LevelOneListState extends State<LevelOneList>
..show(context);
}
},
compare: () {
compare: (int planId) {
var data2 = _model.data[index];
if (data2.cardType == "doctor") {
buried_on_click_button(index, "compare", "doctor",
......@@ -172,15 +172,15 @@ class LevelOneListState extends State<LevelOneList>
Map<String, dynamic> map = {
"business_id": "${widget.planId}",
"planId": widget.planId,
"planType": widget.index == 0 ? 1 : 2
"planId": planId,
"planType": 2
};
RouterCenterImpl().findMainRouter().jumpPage(
context,
widget.index == 0
? "level_one_plan_compare"
: "level_two_plan_compare",
map,
{"planId": planId, "planType": 2},
false);
},
tabName: _model.tab_type,
......
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 33c53ac4
......@@ -329,7 +329,7 @@ class LevelOneState extends BaseState<LevelOnePage>
right: 15,
bottom: 8,
child: baseText(
"销量${NumPlanUtil.getSale(_model.planoverItem.salesCount)}",
"销量${_model.planoverItem.salesCount}",
11,
Color(0xff666666)),
)
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ 33c53ac4
......@@ -88,8 +88,9 @@ class PlanItem extends StatelessWidget {
borderRadius: BorderRadius.circular(2),
color: Color(0xffF0F9F7)),
alignment: Alignment.center,
child:
baseText("??", 11, Color(0xff3FB5AF), bold: true),
child: baseText(
"${plans.operation_type}", 11, Color(0xff3FB5AF),
bold: true),
),
)
],
......@@ -116,7 +117,7 @@ class PlanItem extends StatelessWidget {
Positioned(
bottom: 14,
right: 10,
child: baseText("销量${NumPlanUtil.getSale(plans.salesCount)}",
child: baseText("销量${plans.salesCount}",
11, Color(0xff282828)),
),
Positioned(
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ 33c53ac4
......@@ -64,7 +64,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
@override
void initState() {
print("LSY PLAN INIT ");
// DioUtil.getInstance().setProxy("172.30.9.128");
DioUtil.getInstance().setProxy("172.30.9.128");
_model.init(needCache: true);
super.initState();
planBarView =
......@@ -497,9 +497,8 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 1.0), //阴影xy轴偏移量
blurRadius: 1.0, //阴影模糊程度
spreadRadius: 1.0 //阴影扩散程度
blurRadius: 0.5,
spreadRadius: 0.5
)
],
color: Colors.white,
......
lib/ClueModel/server/entity/PlanFeedBean.dart
View file @ 33c53ac4
......@@ -102,6 +102,7 @@ class Plans {
String minPrice;
String maxPrice;
String projectImage;
String operation_type;
Plans(
{this.id,
......@@ -119,6 +120,7 @@ class Plans {
cardType = json['card_type'];
name = json['name'];
positiveRate = json['positive_rate'];
operation_type = json['operation_type'];
salesCount = json['sales_count'];
baseAttrs = json['base_attrs'].cast<String>();
minPrice =
......@@ -132,6 +134,7 @@ class Plans {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['card_type'] = this.cardType;
data['operation_type'] = this.operation_type;
data['name'] = this.name;
data['positive_rate'] = this.positiveRate;
data['sales_count'] = this.salesCount;
......
lib/commonModel/base/BaseComponent.dart
View file @ 33c53ac4
......@@ -432,9 +432,8 @@ Widget baseTabBar(
boxShadow: [
BoxShadow(
color: Colors.black12,
offset: Offset(0.0, 1.0), //阴影xy轴偏移量
blurRadius: 1.0, //阴影模糊程度
spreadRadius: 1.0 //阴影扩散程度
blurRadius: 0.5,
spreadRadius: 0.5
)
],
),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment