Commit 1da31790 authored by 杜欣's avatar 杜欣

Merge branch 'test' into featrue/duxin

parents d17089a3 7a4a74ac
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zx * @Author: zx
* @Date: 2020-07-03 20:54:59 * @Date: 2020-07-03 20:54:59
* @Last Modified by: zx * @Last Modified by: zx
* @Last Modified time: 2020-07-04 12:20:45 * @Last Modified time: 2020-07-04 14:41:41
*/ */
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter_common/commonModel/live/BaseModel.dart'; import 'package:flutter_common/commonModel/live/BaseModel.dart';
...@@ -13,7 +13,6 @@ import 'package:gm_flutter/commonModel/rx/RxDispose.dart'; ...@@ -13,7 +13,6 @@ import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import 'package:flutter_common/commonModel/toast/NativeToast.dart'; import 'package:flutter_common/commonModel/toast/NativeToast.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart'; import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart'; import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceModelBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/DiscussLowPriceAuthBean.dart';
class DiscussLowPriceModel extends BaseModel { class DiscussLowPriceModel extends BaseModel {
LiveData<Pair<int, DiscussLowPriceModelBean>> popViewLive = LiveData(); LiveData<Pair<int, DiscussLowPriceModelBean>> popViewLive = LiveData();
......
...@@ -11,6 +11,8 @@ import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; ...@@ -11,6 +11,8 @@ import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart'; import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart'; import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart'; import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
import 'package:gm_flutter/main.mark.dart';
class DiscussLowPricePopView { class DiscussLowPricePopView {
static void showPopView(BuildContext content) { static void showPopView(BuildContext content) {
...@@ -38,6 +40,7 @@ class _PopView implements ICenterPicker { ...@@ -38,6 +40,7 @@ class _PopView implements ICenterPicker {
if (data.data.second == null || data.data.first == FAIL) { if (data.data.second == null || data.data.first == FAIL) {
return errorItem(contentWidth, 308.5, () {}); return errorItem(contentWidth, 308.5, () {});
} }
RouterCenterImpl().findMainRouter().buriedEvent("popup_view", {});
return Opacity( return Opacity(
opacity: alp / 255.0, opacity: alp / 255.0,
child: Container( child: Container(
...@@ -57,6 +60,9 @@ class _PopView implements ICenterPicker { ...@@ -57,6 +60,9 @@ class _PopView implements ICenterPicker {
height: 13.5, height: 13.5,
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", {});
dismissCallback(); dismissCallback();
}, },
child: Image.asset( child: Image.asset(
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* @Last Modified time: 2020-07-03 13:47:57 * @Last Modified time: 2020-07-03 13:47:57
*/ */
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart'; import 'package:gm_flutter/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart'; import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart';
...@@ -15,7 +14,11 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart'; ...@@ -15,7 +14,11 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart'; import 'package:gm_flutter/commonModel/bean/Pair.dart';
class PlanCompareDetailPage extends StatefulWidget { class PlanCompareDetailPage extends StatefulWidget {
PlanCompareDetailPage(Map<String, dynamic> params) {} List<int> _planIds;
PlanCompareDetailPage(Map<String, dynamic> params) {
this._planIds = params["planIds"];
}
@override @override
State<StatefulWidget> createState() => PlanCompareDetailPageState(); State<StatefulWidget> createState() => PlanCompareDetailPageState();
...@@ -24,12 +27,10 @@ class PlanCompareDetailPage extends StatefulWidget { ...@@ -24,12 +27,10 @@ class PlanCompareDetailPage extends StatefulWidget {
class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> { class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
PlanCompareDetailModel _model = new PlanCompareDetailModel(); PlanCompareDetailModel _model = new PlanCompareDetailModel();
double screenWidth; double screenWidth;
List<Widget> viewList = new List();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_model.init([1, 2]); _model.init(widget._planIds);
} }
@override @override
...@@ -61,7 +62,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> { ...@@ -61,7 +62,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
if (data.data == FAIL) { if (data.data == FAIL) {
return errorItem(MediaQuery.of(context).size.width, return errorItem(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height, () { MediaQuery.of(context).size.height, () {
_model.init([1, 2]); _model.init(widget._planIds);
}); });
} }
if (data.data == LOADING) { if (data.data == LOADING) {
......
...@@ -27,11 +27,17 @@ class _PlansCompareFeedItemViewState ...@@ -27,11 +27,17 @@ class _PlansCompareFeedItemViewState
@override @override
Widget buildItem(BuildContext context) { Widget buildItem(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.only(left: 15, right: 15), child: getItem()); margin: EdgeInsets.only(left: 15, right: 15),
child: Column(
children: <Widget>[
getItem(),
Divider(height: 0.5, color: Color(0xFF979797))
],
));
} }
getItem() { getItem() {
if (widget.plan.planType == 2) { if (widget.plan.planType == 1) {
return getFirstLevelItem(); return getFirstLevelItem();
} else { } else {
return getSecondLevelItem(); return getSecondLevelItem();
...@@ -62,7 +68,7 @@ class _PlansCompareFeedItemViewState ...@@ -62,7 +68,7 @@ class _PlansCompareFeedItemViewState
Container( Container(
margin: EdgeInsets.only(left: 15, right: 15), margin: EdgeInsets.only(left: 15, right: 15),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(2.0), borderRadius: BorderRadius.circular(4.0),
child: Image.network( child: Image.network(
widget.plan.projectImage, widget.plan.projectImage,
width: 50, width: 50,
...@@ -82,12 +88,18 @@ class _PlansCompareFeedItemViewState ...@@ -82,12 +88,18 @@ class _PlansCompareFeedItemViewState
children: <Widget>[ children: <Widget>[
baseText(widget.plan.name, 14, Color(0xFF282828), baseText(widget.plan.name, 14, Color(0xFF282828),
bold: true), bold: true),
Row(children: <Widget>[ Text.rich(TextSpan(children: [
baseText("好评率 ", 11, Color(0xFF282828)), TextSpan(
baseText( text: "好评率 ",
widget.plan.positiveRate, 14, Color(0xFFFF5963), style: TextStyle(
bold: true) fontSize: 11, color: Color(0xFF282828))),
]), TextSpan(
text: widget.plan.positiveRate,
style: TextStyle(
fontSize: 14,
color: Color(0xFFFF5963),
fontWeight: FontWeight.w500))
])),
], ],
), ),
), ),
......
...@@ -98,13 +98,24 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -98,13 +98,24 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () => onClickCompare(), onTap: () => onClickCompare(),
child: Container( child: Container(
margin: EdgeInsets.only(left: 15, right: 15, top: 7.5, bottom: 7.5), color: Colors.white,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Divider(height: 0.5, color: Color(0xFF979797)),
Container(
margin: EdgeInsets.only(
left: 15, right: 15, top: 7.5, bottom: 7.5),
width: double.maxFinite, width: double.maxFinite,
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: _compareColor, borderRadius: BorderRadius.circular(20)), color: _compareColor,
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center, alignment: Alignment.center,
child: baseText("对比", 14, Colors.white, bold: true), child: baseText("对比", 14, Colors.white, bold: true),
)
],
),
)) ))
]); ]);
} }
...@@ -112,9 +123,13 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -112,9 +123,13 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
onClickCompare() { onClickCompare() {
if (_compareColor == Color(0xFFCCCCCC)) return; if (_compareColor == Color(0xFFCCCCCC)) return;
setState(() { setState(() {
RouterCenterImpl() RouterCenterImpl().findMainRouter().jumpPage(
.findMainRouter() context,
.jumpPage(context, "pageName", {"ids": _setCompare}, false); widget._planType == 1
? "level_one_plan_compare_detail"
: "level_two_plan_compare_deatil",
{"planIds": _setCompare.toList()},
false);
}); });
} }
......
...@@ -47,7 +47,6 @@ class PlanModel extends BaseModel { ...@@ -47,7 +47,6 @@ class PlanModel extends BaseModel {
ClueApiImpl.getInstance() ClueApiImpl.getInstance()
.getPlan(DioUtil.getInstance().getDio()) .getPlan(DioUtil.getInstance().getDio())
.listen((event) { .listen((event) {
print("ERROR12 ${event.error}");
if (event.error == 0) { if (event.error == 0) {
projectData = event.data.tags; projectData = event.data.tags;
sortList = event.data.orders; sortList = event.data.orders;
......
...@@ -66,7 +66,7 @@ abstract class ClueApi { ...@@ -66,7 +66,7 @@ abstract class ClueApi {
@Query("doctor_id") String doctorId, @Query("doctor_id") String doctorId,
); );
@Get("api/janus/plans/agree_phone_authorize") @Post("api/janus/plans/agree_phone_authorize")
DiscussLowPriceAuthBean givePhoneAuth( DiscussLowPriceAuthBean givePhoneAuth(
@Query("lead_phone_request_id") int leadPhoneRequestId); @Query("lead_phone_request_id") int leadPhoneRequestId);
......
...@@ -211,7 +211,7 @@ class ClueApiImpl { ...@@ -211,7 +211,7 @@ class ClueApiImpl {
Stream<DiscussLowPriceAuthBean> givePhoneAuth( Stream<DiscussLowPriceAuthBean> givePhoneAuth(
Dio _dio, int leadPhoneRequestId) { Dio _dio, int leadPhoneRequestId) {
return Stream.fromFuture( return Stream.fromFuture(
get(_dio, 'api/janus/plans/agree_phone_authorize', data: { post(_dio, 'api/janus/plans/agree_phone_authorize', data: {
'lead_phone_request_id': leadPhoneRequestId, 'lead_phone_request_id': leadPhoneRequestId,
})).flatMap((value) { })).flatMap((value) {
if (value != null && if (value != null &&
......
...@@ -31,7 +31,7 @@ class JumpManager { ...@@ -31,7 +31,7 @@ class JumpManager {
"_gtid=3123e178b91a11eaa2d87e40d376ac134112; sessionid=pq9wf8equ4h26ia3yspzmquqn2rjs6mx; _gm_token=4091a81593419225"); "_gtid=3123e178b91a11eaa2d87e40d376ac134112; sessionid=pq9wf8equ4h26ia3yspzmquqn2rjs6mx; _gm_token=4091a81593419225");
JumpUtil.jumpToPageRight(context, initMap(params)[pageNameWrap]); JumpUtil.jumpToPageRight(context, initMap(params)[pageNameWrap]);
} else { } else {
FlutterBoost.singleton.open(pageName, urlParams: params); FlutterBoost.singleton.open(pageNameWrap, urlParams: params);
} }
} }
...@@ -39,18 +39,22 @@ class JumpManager { ...@@ -39,18 +39,22 @@ class JumpManager {
return { return {
"flutter://level_one_plan_detail": "flutter://level_one_plan_detail":
RouterCenterImpl().findClueRouter().getLevelOnePage(params), RouterCenterImpl().findClueRouter().getLevelOnePage(params),
"flutter://level_two_plan_deatil":
RouterCenterImpl().findClueRouter().getLevelTwoPage(params),
"flutter://level_one_plan_instruction": "flutter://level_one_plan_instruction":
RouterCenterImpl().findClueRouter().getProjectDetailsPage(params), RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
"flutter://level_one_plan_compare": "flutter://level_one_plan_compare":
RouterCenterImpl().findClueRouter().getPlansCompareFeed(params), RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
"flutter://level_two_plan_compare":
RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
"flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(), "flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(),
"flutter://favor_plan": "flutter://favor_plan":
RouterCenterImpl().findClueRouter().getTopPage(params), RouterCenterImpl().findClueRouter().getTopPage(params),
"flutter://hot_plan": "flutter://hot_plan":
RouterCenterImpl().findClueRouter().getTopPage(params), RouterCenterImpl().findClueRouter().getTopPage(params),
'level_one_plan_compare_detail': 'flutter://level_one_plan_compare_detail':
RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params), RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
'level_two_plan_compare_deatil': 'flutter://level_two_plan_compare_deatil':
RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params), RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
}; };
} }
......
...@@ -26,23 +26,24 @@ class TestState extends BaseState<TestPage> { ...@@ -26,23 +26,24 @@ class TestState extends BaseState<TestPage> {
JumpUtil.jumpToPageRight(context, NetProxyPage()); JumpUtil.jumpToPageRight(context, NetProxyPage());
})); }));
list.add(listItem("一级列表页", () { list.add(listItem("一级列表页", () {
// JumpUtil.jumpToPageRight(
// context, RouterCenterImpl().findClueRouter().getLevelOnePage({"planId":137}));
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, "clueLevelOne", {"planId": 137}, false); .jumpPage(context, "level_one_plan_detail", {"planId": 137}, false);
})); }));
list.add(listItem("二级列表页", () { list.add(listItem("二级列表页", () {
JumpUtil.jumpToPageRight( RouterCenterImpl()
context, RouterCenterImpl().findClueRouter().getLevelTwoPage({})); .findMainRouter()
.jumpPage(context, "level_two_plan_deatil", {"planId": 137}, false);
})); }));
list.add(listItem("方案页面", () { list.add(listItem("方案页面", () {
JumpUtil.jumpToPageRight( RouterCenterImpl()
context, RouterCenterImpl().findClueRouter().getPlanPage()); .findMainRouter()
.jumpPage(context, "plan_home", {"planId": 137}, false);
})); }));
list.add(listItem("对比详情页", () { list.add(listItem("对比详情页", () {
JumpUtil.jumpToPageRight(context, RouterCenterImpl()
RouterCenterImpl().findClueRouter().getPlanCompareDetailPage({})); .findMainRouter()
.jumpPage(context, "level_one_plan_compare_detail", {"planId": 137}, false);
})); }));
list.add(listItem("项目说明", () { list.add(listItem("项目说明", () {
JumpUtil.jumpToPageRight( JumpUtil.jumpToPageRight(
......
...@@ -19,8 +19,8 @@ const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io"; ...@@ -19,8 +19,8 @@ const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io";
*/ */
//const String APP_HOST_DEBUG = "http://backend.paas-merchant.envs"; //const String APP_HOST_DEBUG = "http://backend.paas-merchant.envs";
//const String APP_HOST_DEBUG = "http://doctor.paas-merchant.env"; //const String APP_HOST_DEBUG = "http://doctor.paas-merchant.env";
const String APP_HOST_DEBUG = "https://x6cgr5y5-gengmei.mock.coding.io"; //const String APP_HOST_DEBUG = "https://x6cgr5y5-gengmei.mock.coding.io";
//const String APP_HOST_DEBUG = "http://backend.paas-merchant.env"; const String APP_HOST_DEBUG = "http://backend.paas-merchant.env";
//const String APP_HOST_DEBUG = "http://janus.paas-merchant.env"; //const String APP_HOST_DEBUG = "http://janus.paas-merchant.env";
/** /**
......
...@@ -91,7 +91,7 @@ class MyApp extends State<MyAppWidget> { ...@@ -91,7 +91,7 @@ class MyApp extends State<MyAppWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
WindowUtil.setBarStatus(false); WindowUtil.setBarStatus(true);
return MaterialApp( return MaterialApp(
theme: ThemeData( theme: ThemeData(
primaryColor: Colors.white, primaryColor: Colors.white,
......
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