Merge branch 'zx/gmFlutter' into 'test'

弹窗接口

See merge request !16

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -15,14 +15,19 @@ import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/main.mark.dart';
 
 class DiscussLowPricePopView {
-  static void showPopView(BuildContext content) {
+  static void showPopView(
+      BuildContext content, String planId, String hospitalId, String doctorId) {
     BaseCenterPicker()
-      ..setPicker(_PopView())
+      ..setPicker(_PopView(planId, hospitalId, doctorId))
       ..show(content);
   }
 }
 
 class _PopView implements ICenterPicker {
+  String planId;
+  String hospitalId;
+  String doctorId;
+  _PopView(this.planId, this.hospitalId, this.doctorId);
   VoidCallback dismissCallback;
   double contentWidth;
   DiscussLowPriceModel _model = new DiscussLowPriceModel();
@@ -178,6 +183,6 @@ class _PopView implements ICenterPicker {
   @override
   void initState(VoidCallback dismissCall, BuildContext context) {
     this.dismissCallback = dismissCall;
-    _model.fetchPopviewData('1', '2', '3');
+    _model.fetchPopviewData(this.planId, this.hospitalId, this.doctorId);
   }
 }

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart

@@ -20,7 +20,7 @@ class PlanCompareDetailModel extends BaseModel {
 
   RxDispose rxDispose = RxDispose();
 
-  void init(List<int> planIds) {
+  void init(String planIds) {
     ClueApiImpl.getInstance()
         .getPlanCompareDetail(DioUtil.getInstance().getDio(), planIds)
         .listen((event) {

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -12,12 +12,14 @@ import 'package:gm_flutter/ClueModel/view/FiveStarView.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
+import 'dart:convert';
 
 class PlanCompareDetailPage extends StatefulWidget {
-  List<int> _planIds;
+  String _planIds;
 
   PlanCompareDetailPage(Map<String, dynamic> params) {
-    this._planIds = params["planIds"];
+    String planIds = json.encode(params["planIds"]);
+    this._planIds = planIds;
   }
 
   @override

lib/ClueModel/server/api/ClueApi.dart

@@ -33,7 +33,7 @@ abstract class ClueApi {
       @Query("tab_type") String tab_type, @Query("page") int page);
 
   @Get("api/janus/plans/plan_compare")
-  PlanCompareDetail getPlanCompareDetail(@Query("plan_ids") List<int> planIds);
+  PlanCompareDetail getPlanCompareDetail(@Query("plan_ids") String planIds);
 
   @Get("api/janus/plans/options")
   PlanBean getPlan();
@@ -59,7 +59,7 @@ abstract class ClueApi {
   @Get("api/janus/plans/rank")
   PlanBarBean getPlanBar(@Query("rank_type") String rank_type);
 
-  @Get("api/janus/plans/plan_phone_authorize")
+  @Post("api/janus/plans/plan_phone_authorize")
   DiscussLowPriceModelBean getPopviewData(
     @Query("plan_id") String planId,
     @Query("hospital_id") String hospitalId,

lib/ClueModel/server/api/ClueApi.serv.dart

@@ -89,7 +89,7 @@ class ClueApiImpl {
     });
   }
 
-  Stream<PlanCompareDetail> getPlanCompareDetail(Dio _dio, List<int> planIds) {
+  Stream<PlanCompareDetail> getPlanCompareDetail(Dio _dio, String planIds) {
     return Stream.fromFuture(get(_dio, 'api/janus/plans/plan_compare', data: {
       'plan_ids': planIds,
     })).flatMap((value) {
@@ -192,7 +192,7 @@ class ClueApiImpl {
   Stream<DiscussLowPriceModelBean> getPopviewData(
       Dio _dio, String planId, String hospitalId, String doctorId) {
     return Stream.fromFuture(
-        get(_dio, 'api/janus/plans/plan_phone_authorize', data: {
+        post(_dio, 'api/janus/plans/plan_phone_authorize', data: {
       'plan_id': planId,
       'hospital_id': hospitalId,
       'doctor_id': doctorId,

lib/MainRouter/page/test/TestPage.dart

@@ -68,7 +68,7 @@ class TestState extends BaseState<TestPage> {
           RouterCenterImpl().findClueRouter().getTopPage({"rank_type": "0"}));
     }));
     list.add(listItem("弹窗", () {
-      DiscussLowPricePopView.showPopView(context);
+      DiscussLowPricePopView.showPopView(context, "1", "", "112");
     }));
     return list;
   }