Merge remote-tracking branch 'origin/1.22.0_master' into 1.22.0_master

example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java

@@ -158,9 +158,9 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN
     public Map getSetting() {
         Map map = new HashMap();
         ///测试
-        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
-        map.put("master_id", "22255132");
-        map.put("secret_key", "123456");
+//        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
+//        map.put("master_id", "22255132");
+//        map.put("secret_key", "123456");
 
         ///正式
 //        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
@@ -174,9 +174,9 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN
 
 //    map.put("token", "123465");
 
-//        map.put("domain", "http://api.asmetymj.com/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
-//        map.put("master_id", "32053480");
-//        map.put("secret_key", "123456");
+        map.put("domain", "http://api.quanslm.com/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
+        map.put("master_id", "22655501");
+        map.put("secret_key", "123456");
         return map;
     }
 

lib/pages/orders_page/bloc/order_content_bloc.dart

@@ -64,6 +64,7 @@ class OrderContentBloc extends BlocBase {
       }
       refreshController.refreshCompleted();
       refreshController.resetNoData();
+      refreshController.loadComplete();
     }else{
       refreshController.loadNoData();
     }