部分更新

lib/home/points_mall_page.dart

@@ -448,8 +448,8 @@ class _PointsMallPage extends State<PointsMallPage>
               borderRadius: BorderRadius.only(topRight: Radius.circular(4)),
               child: Image.asset(
                 "assets/image/icon_hot_right_top.png",
-                width: 36.w,
-                height: 36.h,
+                width: 36,
+                height: 36,
                 fit: BoxFit.cover,
               ),
             ),

lib/mine/vip_card_page.dart

@@ -145,8 +145,8 @@ class _VipCardPage extends State<VipCardPage> {
                   children: [
                     MImage(
                       (vipCard?.storeList?.length ?? 0) > 0 ? vipCard.storeList[0].logo : "",
-                      width: 54.w,
-                      height: 54.h,
+                      width: 54,
+                      height: 54,
                       fit: BoxFit.cover,
                       radius: BorderRadius.circular(4),
                       errorSrc: "assets/image/default_1.png",

lib/mine/vip_detail_page.dart

@@ -192,8 +192,8 @@ class _VipDetailPage extends State<VipDetailPage> {
                       (vipCard?.storeList?.length ?? 0) > 0
                           ? vipCard.storeList[0].logo
                           : "",
-                      width: 40.w,
-                      height: 40.h,
+                      width: 40,
+                      height: 40,
                       radius: BorderRadius.circular(4),
                       fit: BoxFit.cover,
                       errorSrc: "assets/image/default_1.png",

lib/order/exchange_history_page.dart

@@ -334,8 +334,8 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
                   return Image.asset("assets/image/default_1.png",
                       fit: BoxFit.cover);
                 },
-                width: 66.w,
-                height: 66.h,
+                width: 66,
+                height: 66,
                 fit: BoxFit.cover,
               ),
               SizedBox(

lib/order/logistics_information_page.dart

@@ -397,7 +397,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
   }
 
   String tripStatus(String type) {
-    String tripStatus = "assets/image/icon_sign.png";
+    String tripStatus = "●";
     if (type.contains("已签收")) {
       tripStatus = "assets/image/icon_sign.png";
     } else if (type.contains("派送中")) {

lib/order/order_history_page.dart

@@ -473,8 +473,8 @@ class _OrderHistoryList extends State<OrderHistoryList>
               children: [
                 MImage(
                   e.skuImg,
-                  width: 75.w,
-                  height: 75.w,
+                  width: 75,
+                  height: 75,
                   fit: BoxFit.cover,
                   errorSrc: "assets/image/default_1.png",
                   fadeSrc: "assets/image/default_1.png",

lib/retrofit/retrofit_api.dart

@@ -14,11 +14,11 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 part 'retrofit_api.g.dart';
 
-const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-const baseUrl = "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 base_url = "http://192.168.10.236:8766/app/";
-// const baseUrl = "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/";
 
 /// 本地
 
@@ -322,6 +322,6 @@ abstract class ApiService {
 
   ///查询物流轨迹
   @GET("/order/getShippingTrace/{shipperCode}/{logisticCode}")
-  Future<BaseData> shippingTrace(@Path("shipperCode") String shipperCode, @Path("logisticCode") String logisticCode);
-
+  Future<BaseData> shippingTrace(@Path("shipperCode") String shipperCode,
+      @Path("logisticCode") String logisticCode);
 }

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,10 @@ 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 ??= 'https://pos.platform.lotus-wallet.com/app/';
+    baseUrl ??= 'http://192.168.10.236:8766/app/';
+
+
   }
 
   final Dio _dio;

lib/setting/about_page.dart

@@ -52,8 +52,8 @@ class _AboutPage extends State<AboutPage> {
               children: [
                 Image.asset(
                   "assets/image/icon_about_logo.png",
-                  width: 130.w,
-                  height: 130.h,
+                  width: 130,
+                  height: 130,
                 ),
                 Padding(
                   padding: EdgeInsets.only(top: 32.h, bottom: 5.h),

lib/union/union_details_page.dart

@@ -255,8 +255,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
                                             },
                                             child: Image.asset(
                                               "assets/image/icon_union_call.png",
-                                              width: 24.w,
-                                              height: 24.h,
+                                              width: 24,
+                                              height: 24,
                                             ),
                                           )
                                         ],

lib/union/union_page.dart

@@ -22,8 +22,6 @@ import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/icon_text.dart';
 import 'package:huixiang/view_widget/item_title.dart';
-import 'package:huixiang/view_widget/request_permission.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/rendering.dart';
@@ -432,8 +430,8 @@ class _UnionPage extends State<UnionPage>
         children: [
           MImage(
             store.logo,
-            width: 100.h,
-            height: 100.h,
+            width: 100,
+            height: 100,
             fit: BoxFit.cover,
             errorSrc: "assets/image/default_1.png",
             fadeSrc: "assets/image/default_1.png",
@@ -526,8 +524,8 @@ class _UnionPage extends State<UnionPage>
                         padding: EdgeInsets.only(top: 1.h, left: 2, right: 2),
                         child: Image.asset(
                           "assets/image/icon_union_location_black.png",
-                          width: 14.w,
-                          height: 14.w,
+                          width: 14,
+                          height: 14,
                         ),
                       ),
                       Expanded(
@@ -554,7 +552,8 @@ class _UnionPage extends State<UnionPage>
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       IconText(
-                        (store.openStartTime == null && store.openEndTime == null)
+                        (store.openStartTime == null &&
+                                store.openEndTime == null)
                             ? S.of(context).quantian
                             : "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}",
                         textStyle: TextStyle(
@@ -567,8 +566,12 @@ class _UnionPage extends State<UnionPage>
                       Visibility(
                         child: Text(
                           (store.distance ?? 0) > 1000
-                              ? S.of(context).gongli(((store.distance ?? 0) / 1000 * 100) .toInt() / 100.0)
-                              : S.of(context).mi(((store.distance ?? 0) * 100).toInt() / 100.0),
+                              ? S.of(context).gongli(
+                                  ((store.distance ?? 0) / 1000 * 100).toInt() /
+                                      100.0)
+                              : S.of(context).mi(
+                                  ((store.distance ?? 0) * 100).toInt() /
+                                      100.0),
                           style: TextStyle(
                             color: Color(0xFF4C4C4C),
                             fontSize: 12,