Commit f3fd57ff authored by 林生雨's avatar 林生雨

Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !13
parents 6f6f2092 222c8019
...@@ -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(
......
...@@ -27,8 +27,6 @@ class PlanCompareDetailPage extends StatefulWidget { ...@@ -27,8 +27,6 @@ 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();
......
...@@ -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 &&
......
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