Merge branch 'dev_chad_v1.0' of http://gitlab.mofune.cn/OnePoem/OnePoem-App into dev_chad_v1.0

@@ -112,12 +112,6 @@ class MembershipPageState extends BaseState<MembershipPage> with WidgetsBindingO
     );
     );
   }
   }
 
 
-  @override
-  void dispose() {
-    PaymentSdk.instance.dispose();
-    super.dispose();
-  }
-
   Widget buildBuyItem(ProductDetails element) {
   Widget buildBuyItem(ProductDetails element) {
     var style = const TextStyle(color: Colors.white);
     var style = const TextStyle(color: Colors.white);
     var button = Text("购买", style: style).paddingLeftRight(15).paddingTopBottom(8).click(() {
     var button = Text("购买", style: style).paddingLeftRight(15).paddingTopBottom(8).click(() {
@@ -191,4 +185,10 @@ class MembershipPageState extends BaseState<MembershipPage> with WidgetsBindingO
       ),
       ),
     );
     );
   }
   }
+
+  @override
+  void dispose() {
+    PaymentSdk.instance.dispose();
+    super.dispose();
+  }
 }
 }

@@ -32,12 +32,6 @@ class AddressSelectPageState extends State<AddressSelectPage> {
   String apiKey = "AIzaSyDQZsMULyO-UtiSht4_MFi1uHT4BIqasjw";
   String apiKey = "AIzaSyDQZsMULyO-UtiSht4_MFi1uHT4BIqasjw";
   nearby.NearbyPlacesResponse nearbyPlacesResponse = nearby.NearbyPlacesResponse();
   nearby.NearbyPlacesResponse nearbyPlacesResponse = nearby.NearbyPlacesResponse();
 
 
-  @override
-  void dispose() {
-    _controller.dispose();
-    _locationSubscription.cancel();
-    super.dispose();
-  }
 
 
   @override
   @override
   void initState() {
   void initState() {
@@ -207,6 +201,13 @@ class AddressSelectPageState extends State<AddressSelectPage> {
     setState(() {});
     setState(() {});
     buildMarkers();
     buildMarkers();
   }
   }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    _locationSubscription.cancel();
+    super.dispose();
+  }
 }
 }
 
 
 class _AddressItem extends StatelessWidget {
 class _AddressItem extends StatelessWidget {