conflict

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -42,16 +42,6 @@ class _PopView implements ICenterPicker {
           if (data.data.first == LOADING) {
             return loadingItem();
           }
-//          if(data.data.first==EMPTY||data.data.first==FAIL){
-//            return Container(
-//              decoration: BoxDecoration(
-//                borderRadius: BorderRadius.circular(7),
-//                color: Colors.white,
-//              ),
-//              width: contentWidth,
-//              height: 308.5,
-//            );
-//          }
           if (data.data.second == null || data.data.first == FAIL) {
             return errorItem(contentWidth, 308.5, () {});
           }
@@ -171,6 +161,7 @@ class _PopView implements ICenterPicker {
 //            ),
             child: Image.asset(
               "assets/discuss_loe_price_auth.png",
+              fit: BoxFit.cover,
             ),
           ).gestureDetector(() {
             // 一键授权
@@ -193,8 +184,6 @@ class _PopView implements ICenterPicker {
   @override
   void initState(VoidCallback dismissCall, BuildContext context) {
     this.dismissCallback = dismissCall;
-    _model.fetchPopviewData(this.planId, this.hospitalId, this.doctorId,(){
-      dismissCallback();
-    });
+    _model.fetchPopviewData(this.planId, this.hospitalId, this.doctorId);
   }
 }

lib/MainRouter/page/test/TestPage.dart

@@ -78,7 +78,7 @@ class TestState extends BaseState<TestPage> {
   @override
   Widget buildItem(BuildContext context) {
     CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
-        "_gtid=3123e178b91a11eaa2d87e40d376ac134112; sessionid=pq9wf8equ4h26ia3yspzmquqn2rjs6mx; _gm_token=4091a81593419225");
+        "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
     return Scaffold(
       appBar: baseAppBar(
           title: "测试页面",