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

lib/home/welfare_exchange.dart

@@ -227,6 +227,7 @@ class _WelfareExchange extends State<WelfareExchange> {
                   length: gooodsCategorys == null ? 0 : gooodsCategorys.length,
                   child: Container(
                     color: Colors.white,
+                    alignment: Alignment.centerLeft,
                     child: TabBar(
                       isScrollable: true,
                       //可滚动

lib/home/welfare_page.dart

@@ -367,7 +367,7 @@ class _WelfarePage extends State<WelfarePage> {
                     color: cop.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D),
                   ),
                 ):Text(
-                  "有效期至 ${cop?.publishEndTime ?? ""}",
+                  "有效期至 ${cop?.useEndTime ?? ""}",
                   maxLines:1,
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(

lib/retrofit/min_api.dart

@@ -39,7 +39,7 @@ part 'min_api.g.dart';
 
 // const base_url = "http://192.168.10.37:8765/app/";
 
-const localBaseUrl = "http://192.168.10.236:8765/app/";///本地
+const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 
 

lib/retrofit/retrofit_api.dart

@@ -71,7 +71,7 @@ part 'retrofit_api.g.dart';
 
 // const base_url = "http://192.168.10.132:8766/app/";///詹云久
 
-const localBaseUrl = "http://192.168.10.236:8766/app/";///本地
+const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 
 @RestApi(baseUrl: localBaseUrl)

lib/setting/setting_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/main.dart';
+import 'package:huixiang/utils/ImgCachePath.dart';
 import 'package:huixiang/utils/event_type.dart';
 import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
@@ -234,6 +235,7 @@ class _SettingPage extends State<SettingPage> {
       });
       sharedPreferences.setStringList("miniAppid", []);
     }
+    AppUtils.deleteDirectory(Directory(ImgCachePath.instance.path));
 
     cacheTotal = "0B";
     setState(() {});

lib/store/shop__details_page.dart

@@ -849,6 +849,7 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
                   miNiDetail?.imgs != null ? miNiDetail.imgs[position]:"",
                   fit: BoxFit.fill,
                   radius: BorderRadius.zero,
+                  noCompress: true,
                   errorSrc: "assets/image/default_2_1.webp",
                   fadeSrc: "assets/image/default_2_1.webp",
                 );

lib/view_widget/custom_image.dart

@@ -75,7 +75,7 @@ class MImage extends StatelessWidget {
             cachedNetworkImage = Image(
               image: ResizeImage(NetworkToFileImage(
                 url: imageUrl,
-                file: fileFromDocsDir("resize"+src.replaceAll("https:", "")
+                file: fileFromDocsDir("resize"+(noCompress?"noCompress":"")+src.replaceAll("https:", "")
                     .replaceAll("http:", "")
                     .replaceAll("pos.upload.gznl.top", "")
                     .replaceAll("/", "")),

lib/view_widget/new_coupon_widget.dart

@@ -124,7 +124,7 @@ class NewCouponWidget extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          "${coupon?.publishStartTime ??""} ~",
+                          "${coupon?.useStartTime ??""} ~",
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(
@@ -135,7 +135,7 @@ class NewCouponWidget extends StatelessWidget {
                         ),
                         SizedBox(height: 5,),
                         Text(
-                          "${coupon?.publishEndTime ?? ""}",
+                          "${coupon?.useEndTime ?? ""}",
                           maxLines:1,
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(