Merge branch 'v5.2.0.4+' into v5.2.1+

@@ -283,10 +283,10 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> {
                         Utils.showToast('请输入店铺名称');
                         Utils.showToast('请输入店铺名称');
                         return;
                         return;
                       }
                       }
-                      if (storeAddress == '点击设置您的地址') {
-                        Utils.showToast('请设置您的地址');
-                        return;
-                      }
+                      // if (storeAddress == '点击设置您的地址') {
+                      //   Utils.showToast('请设置您的地址');
+                      //   return;
+                      // }
                       if (phoneC.text.trim().length == 0) {
                       if (phoneC.text.trim().length == 0) {
                         Utils.showToast('请输入联系电话');
                         Utils.showToast('请输入联系电话');
                         return;
                         return;
@@ -303,15 +303,18 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> {
                           .requestFocus(FocusNode()); //点击空白处隐藏键盘
                           .requestFocus(FocusNode()); //点击空白处隐藏键盘
                       Map<String, String> params = {
                       Map<String, String> params = {
                         'sellername': nameC.text,
                         'sellername': nameC.text,
-                        'map_address': storeAddress,
                         'phone': phoneC.text,
                         'phone': phoneC.text,
                         'rname': personC.text,
                         'rname': personC.text,
                         'pro_code': proCode,
                         'pro_code': proCode,
                         'city_code': cityCode,
                         'city_code': cityCode,
                         'dis_code': disCode,
                         'dis_code': disCode,
-                        'lat': lat.toString(),
-                        'long': lng.toString()
                       };
                       };
+                      if (storeAddress != '点击设置您的地址') {
+                        //填写了地址
+                        params['map_address'] = storeAddress;
+                        params['lat'] = lat.toString();
+                        params['long'] = lng.toString();
+                      }
                       bool success = await collectStoreProvider
                       bool success = await collectStoreProvider
                           .setSellerCollect(context, params);
                           .setSellerCollect(context, params);
                       if (success) {
                       if (success) {