7.26 1.1.11

ios/Runner/Info.plist

@@ -73,6 +73,8 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>io.flutter.embedded_views_preview</key>
+    <string>YES</string>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>是否允许App访问您的媒体资料库</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>

lib/beans/poi_bean_entity.dart

@@ -0,0 +1,50 @@
+import 'package:bbyyy/generated/json/base/json_convert_content.dart';
+import 'package:bbyyy/generated/json/base/json_field.dart';
+
+class PoiBeanEntity with JsonConvert<PoiBeanEntity> {
+	String status;
+	String info;
+	String infocode;
+	String count;
+	List<PoiBeanPois> pois;
+}
+
+class PoiBeanPois with JsonConvert<PoiBeanPois> {
+	String id;
+	String parent;
+	String childtype;
+	String name;
+	String type;
+	String typecode;
+	String address;
+	String location;
+	String pcode;
+	String pname;
+	String citycode;
+	String cityname;
+	String adcode;
+	String adname;
+	String shopinfo;
+	String gridcode;
+	@JSONField(name: "navi_poiid")
+	String naviPoiid;
+	@JSONField(name: "entr_location")
+	String entrLocation;
+	@JSONField(name: "business_area")
+	String businessArea;
+	String match;
+	String recommend;
+	String timestamp;
+	@JSONField(name: "indoor_map")
+	String indoorMap;
+	@JSONField(name: "groupbuy_num")
+	String groupbuyNum;
+	@JSONField(name: "discount_num")
+	String discountNum;
+	List<PoiBeanPoisPhotos> photos;
+}
+
+class PoiBeanPoisPhotos with JsonConvert<PoiBeanPoisPhotos> {
+	List<dynamic> title;
+	String url;
+}

lib/beans/user_bean_entity.dart

@@ -32,6 +32,8 @@ class UserBeanDataData with JsonConvert<UserBeanDataData> {
 	String registerTime;
 	@JSONField(name: "alipay_account")
 	String aliPayAccount;
+	@JSONField(name: "alipay_name")
+	String aliPayName;
 	@JSONField(name: "wx_openid")
 	String wxOpenid;
 	@JSONField(name: "wx_name")

lib/generated/json/base/json_convert_content.dart

@@ -85,6 +85,8 @@ import 'package:bbyyy/beans/vp_pricing_bean_entity.dart';
 import 'package:bbyyy/generated/json/vp_pricing_bean_entity_helper.dart';
 import 'package:bbyyy/beans/goods_bean_entity.dart';
 import 'package:bbyyy/generated/json/goods_bean_entity_helper.dart';
+import 'package:bbyyy/beans/poi_bean_entity.dart';
+import 'package:bbyyy/generated/json/poi_bean_entity_helper.dart';
 import 'package:bbyyy/beans/nsq_type_bean_entity.dart';
 import 'package:bbyyy/generated/json/nsq_type_bean_entity_helper.dart';
 import 'package:bbyyy/beans/w_x_bean_entity.dart';
@@ -283,6 +285,12 @@ class JsonConvert<T> {
 				return goodsBeanDataFromJson(data as GoodsBeanData, json) as T;
 			case GoodsBeanDataData:
 				return goodsBeanDataDataFromJson(data as GoodsBeanDataData, json) as T;
+			case PoiBeanEntity:
+				return poiBeanEntityFromJson(data as PoiBeanEntity, json) as T;
+			case PoiBeanPois:
+				return poiBeanPoisFromJson(data as PoiBeanPois, json) as T;
+			case PoiBeanPoisPhotos:
+				return poiBeanPoisPhotosFromJson(data as PoiBeanPoisPhotos, json) as T;
 			case NsqTypeBeanEntity:
 				return nsqTypeBeanEntityFromJson(data as NsqTypeBeanEntity, json) as T;
 			case WXBeanEntity:
@@ -500,6 +508,12 @@ class JsonConvert<T> {
 				return goodsBeanDataToJson(data as GoodsBeanData);
 			case GoodsBeanDataData:
 				return goodsBeanDataDataToJson(data as GoodsBeanDataData);
+			case PoiBeanEntity:
+				return poiBeanEntityToJson(data as PoiBeanEntity);
+			case PoiBeanPois:
+				return poiBeanPoisToJson(data as PoiBeanPois);
+			case PoiBeanPoisPhotos:
+				return poiBeanPoisPhotosToJson(data as PoiBeanPoisPhotos);
 			case NsqTypeBeanEntity:
 				return nsqTypeBeanEntityToJson(data as NsqTypeBeanEntity);
 			case WXBeanEntity:
@@ -803,6 +817,15 @@ class JsonConvert<T> {
 		if(type == (GoodsBeanDataData).toString()){
 			return GoodsBeanDataData().fromJson(json);
 		}
+		if(type == (PoiBeanEntity).toString()){
+			return PoiBeanEntity().fromJson(json);
+		}
+		if(type == (PoiBeanPois).toString()){
+			return PoiBeanPois().fromJson(json);
+		}
+		if(type == (PoiBeanPoisPhotos).toString()){
+			return PoiBeanPoisPhotos().fromJson(json);
+		}
 		if(type == (NsqTypeBeanEntity).toString()){
 			return NsqTypeBeanEntity().fromJson(json);
 		}
@@ -1127,6 +1150,15 @@ class JsonConvert<T> {
 		if(<GoodsBeanDataData>[] is M){
 			return data.map<GoodsBeanDataData>((e) => GoodsBeanDataData().fromJson(e)).toList() as M;
 		}
+		if(<PoiBeanEntity>[] is M){
+			return data.map<PoiBeanEntity>((e) => PoiBeanEntity().fromJson(e)).toList() as M;
+		}
+		if(<PoiBeanPois>[] is M){
+			return data.map<PoiBeanPois>((e) => PoiBeanPois().fromJson(e)).toList() as M;
+		}
+		if(<PoiBeanPoisPhotos>[] is M){
+			return data.map<PoiBeanPoisPhotos>((e) => PoiBeanPoisPhotos().fromJson(e)).toList() as M;
+		}
 		if(<NsqTypeBeanEntity>[] is M){
 			return data.map<NsqTypeBeanEntity>((e) => NsqTypeBeanEntity().fromJson(e)).toList() as M;
 		}

lib/generated/json/poi_bean_entity_helper.dart

@@ -0,0 +1,160 @@
+import 'package:bbyyy/beans/poi_bean_entity.dart';
+
+poiBeanEntityFromJson(PoiBeanEntity data, Map<String, dynamic> json) {
+	if (json['status'] != null) {
+		data.status = json['status'].toString();
+	}
+	if (json['info'] != null) {
+		data.info = json['info'].toString();
+	}
+	if (json['infocode'] != null) {
+		data.infocode = json['infocode'].toString();
+	}
+	if (json['count'] != null) {
+		data.count = json['count'].toString();
+	}
+	if (json['pois'] != null) {
+		data.pois = (json['pois'] as List).map((v) => PoiBeanPois().fromJson(v)).toList();
+	}
+	return data;
+}
+
+Map<String, dynamic> poiBeanEntityToJson(PoiBeanEntity entity) {
+	final Map<String, dynamic> data = new Map<String, dynamic>();
+	data['status'] = entity.status;
+	data['info'] = entity.info;
+	data['infocode'] = entity.infocode;
+	data['count'] = entity.count;
+	data['pois'] =  entity.pois?.map((v) => v.toJson())?.toList();
+	return data;
+}
+
+poiBeanPoisFromJson(PoiBeanPois data, Map<String, dynamic> json) {
+	if (json['id'] != null) {
+		data.id = json['id'].toString();
+	}
+	if (json['parent'] != null) {
+		data.parent = json['parent'].toString();
+	}
+	if (json['childtype'] != null) {
+		data.childtype = json['childtype'].toString();
+	}
+	if (json['name'] != null) {
+		data.name = json['name'].toString();
+	}
+	if (json['type'] != null) {
+		data.type = json['type'].toString();
+	}
+	if (json['typecode'] != null) {
+		data.typecode = json['typecode'].toString();
+	}
+	if (json['address'] != null) {
+		data.address = json['address'].toString();
+	}
+	if (json['location'] != null) {
+		data.location = json['location'].toString();
+	}
+	if (json['pcode'] != null) {
+		data.pcode = json['pcode'].toString();
+	}
+	if (json['pname'] != null) {
+		data.pname = json['pname'].toString();
+	}
+	if (json['citycode'] != null) {
+		data.citycode = json['citycode'].toString();
+	}
+	if (json['cityname'] != null) {
+		data.cityname = json['cityname'].toString();
+	}
+	if (json['adcode'] != null) {
+		data.adcode = json['adcode'].toString();
+	}
+	if (json['adname'] != null) {
+		data.adname = json['adname'].toString();
+	}
+	if (json['shopinfo'] != null) {
+		data.shopinfo = json['shopinfo'].toString();
+	}
+	if (json['gridcode'] != null) {
+		data.gridcode = json['gridcode'].toString();
+	}
+	if (json['navi_poiid'] != null) {
+		data.naviPoiid = json['navi_poiid'].toString();
+	}
+	if (json['entr_location'] != null) {
+		data.entrLocation = json['entr_location'].toString();
+	}
+	if (json['business_area'] != null) {
+		data.businessArea = json['business_area'].toString();
+	}
+	if (json['match'] != null) {
+		data.match = json['match'].toString();
+	}
+	if (json['recommend'] != null) {
+		data.recommend = json['recommend'].toString();
+	}
+	if (json['timestamp'] != null) {
+		data.timestamp = json['timestamp'].toString();
+	}
+	if (json['indoor_map'] != null) {
+		data.indoorMap = json['indoor_map'].toString();
+	}
+	if (json['groupbuy_num'] != null) {
+		data.groupbuyNum = json['groupbuy_num'].toString();
+	}
+	if (json['discount_num'] != null) {
+		data.discountNum = json['discount_num'].toString();
+	}
+	if (json['photos'] != null) {
+		data.photos = (json['photos'] as List).map((v) => PoiBeanPoisPhotos().fromJson(v)).toList();
+	}
+	return data;
+}
+
+Map<String, dynamic> poiBeanPoisToJson(PoiBeanPois entity) {
+	final Map<String, dynamic> data = new Map<String, dynamic>();
+	data['id'] = entity.id;
+	data['parent'] = entity.parent;
+	data['childtype'] = entity.childtype;
+	data['name'] = entity.name;
+	data['type'] = entity.type;
+	data['typecode'] = entity.typecode;
+	data['address'] = entity.address;
+	data['location'] = entity.location;
+	data['pcode'] = entity.pcode;
+	data['pname'] = entity.pname;
+	data['citycode'] = entity.citycode;
+	data['cityname'] = entity.cityname;
+	data['adcode'] = entity.adcode;
+	data['adname'] = entity.adname;
+	data['shopinfo'] = entity.shopinfo;
+	data['gridcode'] = entity.gridcode;
+	data['navi_poiid'] = entity.naviPoiid;
+	data['entr_location'] = entity.entrLocation;
+	data['business_area'] = entity.businessArea;
+	data['match'] = entity.match;
+	data['recommend'] = entity.recommend;
+	data['timestamp'] = entity.timestamp;
+	data['indoor_map'] = entity.indoorMap;
+	data['groupbuy_num'] = entity.groupbuyNum;
+	data['discount_num'] = entity.discountNum;
+	data['photos'] =  entity.photos?.map((v) => v.toJson())?.toList();
+	return data;
+}
+
+poiBeanPoisPhotosFromJson(PoiBeanPoisPhotos data, Map<String, dynamic> json) {
+	if (json['title'] != null) {
+		data.title = (json['title'] as List).map((v) => v).toList().cast<dynamic>();
+	}
+	if (json['url'] != null) {
+		data.url = json['url'].toString();
+	}
+	return data;
+}
+
+Map<String, dynamic> poiBeanPoisPhotosToJson(PoiBeanPoisPhotos entity) {
+	final Map<String, dynamic> data = new Map<String, dynamic>();
+	data['title'] = entity.title;
+	data['url'] = entity.url;
+	return data;
+}

lib/generated/json/user_bean_entity_helper.dart

@@ -84,6 +84,9 @@ userBeanDataDataFromJson(UserBeanDataData data, Map<String, dynamic> json) {
 	if (json['alipay_account'] != null) {
 		data.aliPayAccount = json['alipay_account'].toString();
 	}
+	if (json['alipay_name'] != null) {
+		data.aliPayName = json['alipay_name'].toString();
+	}
 	if (json['wx_openid'] != null) {
 		data.wxOpenid = json['wx_openid'].toString();
 	}
@@ -111,6 +114,7 @@ Map<String, dynamic> userBeanDataDataToJson(UserBeanDataData entity) {
 	data['picture'] = entity.picture;
 	data['register_time'] = entity.registerTime;
 	data['alipay_account'] = entity.aliPayAccount;
+	data['alipay_name'] = entity.aliPayName;
 	data['wx_openid'] = entity.wxOpenid;
 	data['wx_name'] = entity.wxName;
 	data['wx_picture'] = entity.wxPicture;

lib/my_tools/dims.dart

@@ -73,6 +73,7 @@ var userDims = [
   "last_login",
   "balance",
   "alipay_account",
+  "alipay_name",
   "wx_openid",
   "wx_name",
   "wx_picture"

lib/paegs/map_demo/map_demo_page.dart

@@ -1,5 +1,10 @@
+import 'dart:convert';
+
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:amap_flutter_map/amap_flutter_map.dart';
+import 'package:bbyyy/beans/poi_bean_entity.dart';
+import 'package:bbyyy/my_tools/my_cookie.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 
 class MapDemoPage extends StatefulWidget {
@@ -8,21 +13,74 @@ class MapDemoPage extends StatefulWidget {
 }
 
 class _MapDemoPageState extends State<MapDemoPage> {
-  static final CameraPosition _kInitialPosition = const CameraPosition(
-    target: LatLng(39.909187, 116.397451),
-    zoom: 10.0,
-  );
-  List<Widget> _approvalNumberWidget = List<Widget>();
+  CameraPosition _kInitialPosition;
+  List<Widget> _approvalNumberWidget = [];
+  TextEditingController _controller = TextEditingController();
+  Map<String, Marker> _markers = <String, Marker>{};
+  Widget _poiInfo;
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    _kInitialPosition = CameraPosition(
+      target:
+          LatLng(MyCookie().location.latitude, MyCookie().location.longitude),
+      zoom: 15.0,
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
     final AMapWidget map = AMapWidget(
       initialCameraPosition: _kInitialPosition,
       onMapCreated: onMapCreated,
+      touchPoiEnabled: true,
+      onPoiTouched: _onPoiTouched,
+      myLocationStyleOptions: MyLocationStyleOptions(
+        true,
+        circleFillColor: Colors.lightBlue,
+        circleStrokeColor: Colors.blue,
+        circleStrokeWidth: 1,
+      ),
     );
 
     return Scaffold(
-      body: map,
+      body: Stack(
+        children: [
+          Container(
+            height: MediaQuery.of(context).size.height,
+            width: MediaQuery.of(context).size.width,
+            child: map,
+          ),
+          Container(
+            child: Row(
+              children: [
+                Expanded(
+                    child: TextField(
+                  controller: _controller,
+                )),
+                GestureDetector(
+                    onTap: () {
+                      inquirePOI();
+                    },
+                    child: Container(
+                      color: Colors.blue,
+                      child: Text(
+                        '搜索',
+                        style: TextStyle(color: Colors.white, fontSize: 18),
+                      ),
+                      width: 100,
+                      height: 48,
+                      alignment: Alignment.center,
+                    ))
+              ],
+            ),
+            color: Colors.white,
+            margin: EdgeInsets.only(top: 50),
+          )
+        ],
+      ),
     );
   }
 
@@ -54,4 +112,43 @@ class _MapDemoPageState extends State<MapDemoPage> {
     print('地图审图号（普通地图）: $mapContentApprovalNumber');
     print('地图审图号（卫星地图): $satelliteImageApprovalNumber');
   }
+
+  Widget showPoiInfo(AMapPoi poi) {
+    return Container(
+      alignment: Alignment.center,
+      color: Color(0x8200CCFF),
+      child: Text(
+        '您点击了 ${poi.name}',
+        style: TextStyle(fontWeight: FontWeight.w600),
+      ),
+    );
+  }
+
+  void _onPoiTouched(AMapPoi poi) {
+    setState(() {
+      _poiInfo = showPoiInfo(poi);
+    });
+  }
+
+  void inquirePOI() {
+    Dio()
+        .get(
+            'https://restapi.amap.com/v3/place/text?keywords=${_controller.text.toString()}&city=${MyCookie().location.city}&output=json&offset=50&page=1&key=5dcd9f0ed7d51aefb5b2f73dba1069cb&extensions=all')
+        .then((value) {
+          print('https://restapi.amap.com/v3/place/text?keywords=${_controller.text.toString()}&city=${MyCookie().location.city}&output=json&offset=50&page=1&key=5dcd9f0ed7d51aefb5b2f73dba1069cb&extensions=all');
+      print(value);
+      PoiBeanEntity entity = PoiBeanEntity().fromJson(json.decode(value.toString()));
+      entity.pois.forEach((element) {
+        print(element.name);
+        _markers[element.name] = Marker(
+          position: LatLng(double.parse(element.location.split(',')[0]),double.parse(element.location.split(',')[1])),
+          icon: BitmapDescriptor.fromIconPath('images/地址.png'),
+          infoWindow: InfoWindow(title: element.name),
+          // onTap: (markerId) => _onMarkerTapped(markerId),
+          // onDragEnd: (markerId, endPosition) =>
+          //     _onMarkerDragEnd(markerId, endPosition),
+        );
+      });
+    });
+  }
 }

lib/paegs/mine_page/bind_alipay_page/bind_alipay_page.dart

@@ -121,7 +121,7 @@ class _BindAlipayPageState extends State<BindAlipayPage> {
                           ),
                           Container(
                             child: MyViews()
-                                .myText('当前绑定支付宝账号', MyColors.c333333, 13),
+                                .myText(MyCookie().userBean.aliPayAccount.isNotEmpty&&MyCookie().userBean.aliPayName.isEmpty?'未绑定账号持有人真实姓名':'当前绑定支付宝账号', MyCookie().userBean.aliPayAccount.isNotEmpty&&MyCookie().userBean.aliPayName.isEmpty?MyColors.cFF4233:MyColors.c333333, 13),
                             margin: EdgeInsets.only(top: 11, bottom: 11),
                           ),
                           Container(

lib/paegs/mine_page/bind_alipay_page/set_alipay_page.dart

@@ -13,13 +13,16 @@ class SetAlipayPage extends StatefulWidget {
 
 class _SetAlipayPageState extends State<SetAlipayPage> {
   TextEditingController controller = TextEditingController();
+  TextEditingController name = TextEditingController();
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
-    if(MyCookie().userBean.aliPayAccount!=null&&MyCookie().userBean.aliPayAccount!=''){
+    if (MyCookie().userBean.aliPayAccount != null &&
+        MyCookie().userBean.aliPayAccount != '') {
       controller.text = MyCookie().userBean.aliPayAccount;
+      name.text = MyCookie().userBean.aliPayName;
     }
   }
 
@@ -44,7 +47,7 @@ class _SetAlipayPageState extends State<SetAlipayPage> {
                       color: MyColors.cF7F7F7,
                     ),
                     Container(
-                      child: MyViews().myText('绑定支付宝账号 ', MyColors.c333333, 15),
+                      child: MyViews().myText('支付宝账号 ', MyColors.c333333, 15),
                       margin:
                           EdgeInsets.symmetric(horizontal: 16, vertical: 17),
                     ),
@@ -82,25 +85,77 @@ class _SetAlipayPageState extends State<SetAlipayPage> {
                         onChanged: (t) {},
                       ),
                     ),
-                    GestureDetector(
-                      onTap: () {
-                        if (controller.text.isEmpty) {
-                          showToast('请填写支付宝账号');
-                          return;
-                        }
-                        MyTools().hideKeyboard(context);
-                        saveAlipayNum();
-                      },
-                      behavior: HitTestBehavior.translucent,
-                      child: Container(
-                        decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(22.5),
-                            color: MyColors.cFF4233),
-                        height: 45,
-                        margin:
-                            EdgeInsets.symmetric(horizontal: 63, vertical: 157),
-                        child: MyViews().myText('确定修改', Colors.white, 15),
-                        alignment: Alignment.center,
+                    Container(
+                      child: MyViews().myText('账号持有人姓名', MyColors.c333333, 15),
+                      margin:
+                          EdgeInsets.symmetric(horizontal: 16, vertical: 17),
+                    ),
+                    Container(
+                      decoration: BoxDecoration(
+                        border: Border.all(color: MyColors.cE7E7E7, width: 1),
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      margin: EdgeInsets.symmetric(horizontal: 16),
+                      padding: EdgeInsets.all(12),
+                      child: TextField(
+                        controller: name,
+                        cursorColor: MyColors.cFF4233,
+                        cursorWidth: 1.0,
+                        onTap: () {},
+                        decoration: InputDecoration(
+                          border: InputBorder.none,
+                          disabledBorder: InputBorder.none,
+                          enabledBorder: InputBorder.none,
+                          focusedBorder: InputBorder.none,
+                          isDense: true,
+                          hintText: '请输入支付宝账号',
+                          hintStyle:
+                              TextStyle(color: MyColors.c999999, fontSize: 16),
+                          contentPadding:
+                              const EdgeInsets.fromLTRB(14, 4.5, 8, 4.5),
+                        ),
+                        maxLines: 1,
+                        style: TextStyle(
+                            color: MyColors.c333333,
+                            fontSize: 16,
+                            height: 1.3,
+                            letterSpacing: 0.2),
+                        keyboardType: TextInputType.text,
+                        onChanged: (t) {},
+                      ),
+                    ),
+                    Container(
+                      child: Text(
+                        '*应支付宝官方要求，提现必须提供支付宝账号和真实姓名',
+                        style: TextStyle(color: MyColors.cFF4233, fontSize: 12),
+                      ),
+                      margin: EdgeInsets.only(top: 10, left: 16, right: 16),
+                    ),
+                    Container(
+                      margin:
+                          EdgeInsets.symmetric(horizontal: 63, vertical: 157),
+                      child: GestureDetector(
+                        onTap: () {
+                          if (controller.text.isEmpty) {
+                            showToast('请填写支付宝账号');
+                            return;
+                          }
+                          if (name.text.isEmpty) {
+                            showToast('请填写账号绑定人姓名');
+                            return;
+                          }
+                          MyTools().hideKeyboard(context);
+                          saveAlipayNum();
+                        },
+                        behavior: HitTestBehavior.translucent,
+                        child: Container(
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(22.5),
+                              color: MyColors.cFF4233),
+                          height: 45,
+                          child: MyViews().myText('确定修改', Colors.white, 15),
+                          alignment: Alignment.center,
+                        ),
                       ),
                     )
                   ],
@@ -121,11 +176,13 @@ class _SetAlipayPageState extends State<SetAlipayPage> {
         "name": MyCookie().loginInformation.data.extra.name,
         "picture": MyCookie().loginInformation.data.extra.picture,
         "id": MyCookie().loginInformation.data.extra.id,
-        "alipay_account": controller.text.toString()
+        "alipay_account": controller.text.toString(),
+        "alipay_name": name.text.toString()
       }
     }, (response, hasError) {
       if (!hasError) {
         MyCookie().userBean.aliPayAccount = controller.text.toString();
+        MyCookie().userBean.aliPayName = name.text.toString();
         Navigator.pop(context);
       }
     }, (error) {});

lib/paegs/mine_page/mine_page.dart

@@ -27,7 +27,6 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import 'advertising_page/advertising_page.dart';
 import 'bind_alipay_page/bind_alipay_page.dart';
-import 'bind_alipay_page/set_alipay_page.dart';
 import 'coupon_page/coupon_page.dart';
 import 'my_information_page/my_qr_page.dart';
 
@@ -45,9 +44,7 @@ class _MinePageState extends State<MinePage> {
       setState(() {});
     });
     EventBus().on('appStoreReview', (arg) {
-      setState(() {
-
-      });
+      setState(() {});
     });
     checkIfThereIsAShop();
   }
@@ -89,12 +86,13 @@ class _MinePageState extends State<MinePage> {
                       child: Row(
                         children: [
                           GestureDetector(
-                            onTap:(){
+                            onTap: () {
                               MyTools().toPage(context, MyInformationPage(),
-                                      (then) {
-                                    queryPersonalInformation();
-                                  });
-                            },behavior: HitTestBehavior.translucent,
+                                  (then) {
+                                queryPersonalInformation();
+                              });
+                            },
+                            behavior: HitTestBehavior.translucent,
                             child: Container(
                               margin: EdgeInsets.only(right: 10),
                               decoration: BoxDecoration(
@@ -124,85 +122,96 @@ class _MinePageState extends State<MinePage> {
                           Expanded(
                             child: Container(
                               height: 60,
-                              child: Column(children: [
-                                Row(children: [
-                                  Expanded(
-                                    child: GestureDetector(
-                                      onTap: () {
-                                        MyTools().toPage(
-                                            context, MyInformationPage(),
+                              child: Column(
+                                children: [
+                                  Row(
+                                    children: [
+                                      Expanded(
+                                        child: GestureDetector(
+                                          onTap: () {
+                                            MyTools().toPage(
+                                                context, MyInformationPage(),
                                                 (then) {
                                               queryPersonalInformation();
                                             });
-                                      },
-                                      child: Container(
-                                        margin: EdgeInsets.only(right: 10),
-                                        child: Text(
-                                          MyCookie()
-                                              .loginInformation
-                                              .data
-                                              .extra
-                                              .name,
-                                          style: TextStyle(
-                                              color: Colors.white,
-                                              fontSize: 18),
-                                          maxLines: 1,
-                                          overflow: TextOverflow.ellipsis,
-                                          softWrap: true,
+                                          },
+                                          child: Container(
+                                            margin: EdgeInsets.only(right: 10),
+                                            child: Text(
+                                              MyCookie()
+                                                  .loginInformation
+                                                  .data
+                                                  .extra
+                                                  .name,
+                                              style: TextStyle(
+                                                  color: Colors.white,
+                                                  fontSize: 18),
+                                              maxLines: 1,
+                                              overflow: TextOverflow.ellipsis,
+                                              softWrap: true,
+                                            ),
+                                          ),
                                         ),
                                       ),
-                                    ),
-                                  ),
-                                  Container(
-                                    margin: EdgeInsets.only(left: 20),
-                                    child: MyViews().myText(
-                                        '¥${MyCookie().userBean.balance}',
-                                        Colors.white,
-                                        24),
-                                  ),
-                                ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
-                                Row(children: [
-                                  Text(
-                                    'ID：${MyCookie().getUID()}',
-                                    style: TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 14,
-                                    ),
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                    softWrap: true,
+                                      Container(
+                                        margin: EdgeInsets.only(left: 20),
+                                        child: MyViews().myText(
+                                            '¥${MyCookie().userBean.balance}',
+                                            Colors.white,
+                                            24),
+                                      ),
+                                    ],
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
                                   ),
-                                  GestureDetector(
-                                    onTap: () {
-                                      MyTools().toPage(
-                                          context, MyQRPage(), (then) {});
-                                    },
-                                    behavior: HitTestBehavior.translucent,
-                                    child: Container(
-                                      child: Row(
-                                        children: [
-                                          SvgPicture.asset(
-                                            'images/svg/二维码.svg',
-                                            color: Colors.white,
-                                          ),
-                                          Container(
-                                            width: 20,
-                                          ),
-                                          SvgPicture.asset(
-                                            'images/svg/箭头.svg',
-                                            color: Colors.white,
-                                            height: 12,
-                                            width: 8,
-                                          )
-                                        ],
+                                  Row(
+                                    children: [
+                                      Text(
+                                        'ID：${MyCookie().getUID()}',
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                        ),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                        softWrap: true,
                                       ),
-                                    ),
-                                  )
-                                ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
-                              ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
+                                      GestureDetector(
+                                        onTap: () {
+                                          MyTools().toPage(
+                                              context, MyQRPage(), (then) {});
+                                        },
+                                        behavior: HitTestBehavior.translucent,
+                                        child: Container(
+                                          child: Row(
+                                            children: [
+                                              SvgPicture.asset(
+                                                'images/svg/二维码.svg',
+                                                color: Colors.white,
+                                              ),
+                                              Container(
+                                                width: 20,
+                                              ),
+                                              SvgPicture.asset(
+                                                'images/svg/箭头.svg',
+                                                color: Colors.white,
+                                                height: 12,
+                                                width: 8,
+                                              )
+                                            ],
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                  ),
+                                ],
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
+                              ),
                             ),
                           ),
-
                         ],
                       ),
                     ),
@@ -238,27 +247,28 @@ class _MinePageState extends State<MinePage> {
                               ],
                             ),
                           ),
-                         if(!MyCookie().underReview) GestureDetector(
-                            onTap: () {
-                              MyTools().toPage(context, CouponPage(), (then) {
-                                queryPersonalInformation();
-                              });
-                            },
-                            behavior: HitTestBehavior.translucent,
-                            child: Column(
-                              children: [
-                                SvgPicture.asset('images/svg/优惠券.svg'),
-                                Container(
-                                    margin: EdgeInsets.only(top: 11),
-                                    child: Text(
-                                      '优惠券',
-                                      style: TextStyle(
-                                          color: MyColors.c333333,
-                                          fontSize: 14),
-                                    ))
-                              ],
+                          if (!MyCookie().underReview)
+                            GestureDetector(
+                              onTap: () {
+                                MyTools().toPage(context, CouponPage(), (then) {
+                                  queryPersonalInformation();
+                                });
+                              },
+                              behavior: HitTestBehavior.translucent,
+                              child: Column(
+                                children: [
+                                  SvgPicture.asset('images/svg/优惠券.svg'),
+                                  Container(
+                                      margin: EdgeInsets.only(top: 11),
+                                      child: Text(
+                                        '优惠券',
+                                        style: TextStyle(
+                                            color: MyColors.c333333,
+                                            fontSize: 14),
+                                      ))
+                                ],
+                              ),
                             ),
-                          ),
                           GestureDetector(
                             onTap: () {
                               MyTools().toPage(context, MyGoodsPage(), (then) {
@@ -282,14 +292,18 @@ class _MinePageState extends State<MinePage> {
                           ),
                           GestureDetector(
                             onTap: () {
-                              if (MyCookie().userBean.aliPayAccount.isEmpty &&
-                                  MyCookie().userBean.wxOpenid.isEmpty) {
+                              if (MyCookie().userBean.aliPayAccount.isEmpty ||
+                                  MyCookie().userBean.aliPayName.isEmpty) {
                                 MyTools().toPage(context, BindAlipayPage(),
                                     (then) {
                                   if (MyCookie()
-                                      .userBean
-                                      .aliPayAccount
-                                      .isNotEmpty) {
+                                          .userBean
+                                          .aliPayAccount
+                                          .isNotEmpty &&
+                                      MyCookie()
+                                          .userBean
+                                          .aliPayName
+                                          .isNotEmpty) {
                                     MyTools().toPage(context, WithdrawPage(),
                                         (then) {
                                       queryPersonalInformation();
@@ -330,19 +344,19 @@ class _MinePageState extends State<MinePage> {
                       queryPersonalInformation();
                     });
                   }),
-                  if(showRe)
-                  functionItem('images/svg/推荐人.svg', '推荐人', () {
-                    MyTools().toPage(context, ReferrerPage(), (then) {
-                    });
-                  }),
+                  if (showRe)
+                    functionItem('images/svg/推荐人.svg', '推荐人', () {
+                      MyTools().toPage(context, ReferrerPage(), (then) {});
+                    }),
                   functionItem('images/svg/绑定.svg', '提现账号', () {
                     MyTools().toPage(context, BindAlipayPage(), (then) {
                       queryPersonalInformation();
                     });
                   }),
-                  if(!MyCookie().underReview)functionItem('images/svg/广告.svg', '广告', () {
-                    MyTools().toPage(context, AdvertisingPage(), (then) {});
-                  }),
+                  if (!MyCookie().underReview)
+                    functionItem('images/svg/广告.svg', '广告', () {
+                      MyTools().toPage(context, AdvertisingPage(), (then) {});
+                    }),
                   functionItem('images/svg/处罚.svg', '投诉', () {
                     MyTools().toPage(context, PunishPage(), (then) {
                       queryPersonalInformation();
@@ -477,8 +491,8 @@ class _MinePageState extends State<MinePage> {
     queryPersonalInformation();
   }
 
-
   bool showRe = false;
+
   void checkIfThereIsAShop() {
     MyDio().query({
       "key": "shop_user",
@@ -495,16 +509,16 @@ class _MinePageState extends State<MinePage> {
     }, (response, hasError) {
       if (!hasError) {
         MyShopBeanEntity entity =
-        MyShopBeanEntity().fromJson(json.decode(response.data.toString()));
-        if(entity.data.data==null||entity.data.data.isEmpty||entity.data.data.length==0){
+            MyShopBeanEntity().fromJson(json.decode(response.data.toString()));
+        if (entity.data.data == null ||
+            entity.data.data.isEmpty ||
+            entity.data.data.length == 0) {
           showRe = false;
-        }else{
+        } else {
           showRe = true;
         }
-        setState(() {
-
-        });
+        setState(() {});
       }
-    }, (error) { });
+    }, (error) {});
   }
 }

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.10+1
+version: 1.1.11+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"