Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp

lib/main_page.dart

@@ -196,11 +196,11 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
       Map<String, dynamic> params = {};
       switch (pushMap["typed"]) {
         case 1:
-          routeName = "/router/store_detail_page";
+          routeName = "/router/web_page";
           params["articleId"] = pushMap["info"];
           break;
         case 2:
-          routeName = "/router/store_detail_page";
+          routeName = "/router/web_page";
           params["activityId"] = pushMap["info"];
           break;
         case 3:

lib/retrofit/min_api.dart

@@ -21,15 +21,15 @@ import 'data/shoppingCart.dart';
 
 part 'min_api.g.dart';
 
-const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
+// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
-const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
+// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
 
 
 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-// const base_url = "http://192.168.10.236:8765/app/";///费韬
+const base_url = "http://192.168.10.236:8765/app/";///费韬
-// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
+const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 
 // const base_url = "http://192.168.10.142:8765/app/";///詹云久

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'https://pos.api.lotus-wallet.com/app/';
+    baseUrl ??= 'http://192.168.10.236:8765/app/';
   }
 
   final Dio _dio;

lib/retrofit/retrofit_api.dart

@@ -54,14 +54,14 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.159:8766/app/";   ///费韬
 // const baseUrl = "http://192.168.10.159:8766/app/";    ///费韬
@@ -85,9 +85,9 @@ abstract class ApiService {
   }) {
     Map<String, dynamic> headers =
         (token == null || token == "") ? {} : {'token': "Bearer $token"};
-    if (pay) {
+    // if (pay) {
       headers["Environment"] = "app";
-    }
+    // }
     dio.options = BaseOptions(
       connectTimeout: 60000,
       receiveTimeout: 60000,

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
+    baseUrl ??= 'http://192.168.10.236:8766/app/';
   }
 
   final Dio _dio;