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
f3fd57ff
Commit
f3fd57ff
authored
Jul 06, 2020
by
林生雨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zx/gmFlutter' into 'test'
Zx/gm flutter See merge request
!13
parents
6f6f2092
222c8019
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
DiscussLowPriceModel.dart
lib/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart
+1
-2
DiscussLowPricePopView.dart
...lueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart
+6
-0
PlanCompareDetailPage.dart
...ueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
+0
-2
ClueApi.dart
lib/ClueModel/server/api/ClueApi.dart
+1
-1
ClueApi.serv.dart
lib/ClueModel/server/api/ClueApi.serv.dart
+1
-1
No files found.
lib/ClueModel/page/DiscussLowPrice/DiscussLowPriceModel.dart
View file @
f3fd57ff
...
...
@@ -2,7 +2,7 @@
* @Author: zx
* @Date: 2020-07-03 20:54:59
* @Last Modified by: zx
* @Last Modified time: 2020-07-04 1
2:20:45
* @Last Modified time: 2020-07-04 1
4:41:41
*/
import
'package:dio/dio.dart'
;
import
'package:flutter_common/commonModel/live/BaseModel.dart'
;
...
...
@@ -13,7 +13,6 @@ import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
import
'package:flutter_common/commonModel/toast/NativeToast.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/DiscussLowPriceAuthBean.dart'
;
class
DiscussLowPriceModel
extends
BaseModel
{
LiveData
<
Pair
<
int
,
DiscussLowPriceModelBean
>>
popViewLive
=
LiveData
();
...
...
lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart
View file @
f3fd57ff
...
...
@@ -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/commonModel/bean/Pair.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
{
static
void
showPopView
(
BuildContext
content
)
{
...
...
@@ -38,6 +40,7 @@ class _PopView implements ICenterPicker {
if
(
data
.
data
.
second
==
null
||
data
.
data
.
first
==
FAIL
)
{
return
errorItem
(
contentWidth
,
308.5
,
()
{});
}
RouterCenterImpl
().
findMainRouter
().
buriedEvent
(
"popup_view"
,
{});
return
Opacity
(
opacity:
alp
/
255.0
,
child:
Container
(
...
...
@@ -57,6 +60,9 @@ class _PopView implements ICenterPicker {
height:
13.5
,
child:
GestureDetector
(
onTap:
()
{
RouterCenterImpl
()
.
findMainRouter
()
.
buriedEvent
(
"popup_view"
,
{});
dismissCallback
();
},
child:
Image
.
asset
(
...
...
lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
View file @
f3fd57ff
...
...
@@ -27,8 +27,6 @@ class PlanCompareDetailPage extends StatefulWidget {
class
PlanCompareDetailPageState
extends
BaseState
<
PlanCompareDetailPage
>
{
PlanCompareDetailModel
_model
=
new
PlanCompareDetailModel
();
double
screenWidth
;
List
<
Widget
>
viewList
=
new
List
();
@override
void
initState
()
{
super
.
initState
();
...
...
lib/ClueModel/server/api/ClueApi.dart
View file @
f3fd57ff
...
...
@@ -66,7 +66,7 @@ abstract class ClueApi {
@Query
(
"doctor_id"
)
String
doctorId
,
);
@
Ge
t
(
"api/janus/plans/agree_phone_authorize"
)
@
Pos
t
(
"api/janus/plans/agree_phone_authorize"
)
DiscussLowPriceAuthBean
givePhoneAuth
(
@Query
(
"lead_phone_request_id"
)
int
leadPhoneRequestId
);
...
...
lib/ClueModel/server/api/ClueApi.serv.dart
View file @
f3fd57ff
...
...
@@ -211,7 +211,7 @@ class ClueApiImpl {
Stream
<
DiscussLowPriceAuthBean
>
givePhoneAuth
(
Dio
_dio
,
int
leadPhoneRequestId
)
{
return
Stream
.
fromFuture
(
ge
t
(
_dio
,
'api/janus/plans/agree_phone_authorize'
,
data:
{
pos
t
(
_dio
,
'api/janus/plans/agree_phone_authorize'
,
data:
{
'lead_phone_request_id'
:
leadPhoneRequestId
,
})).
flatMap
((
value
)
{
if
(
value
!=
null
&&
...
...
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