Merge branch 'master' into dev

# Conflicts:
#	lib/mine/mine_page.dart

lib/generated/intl/messages_en.dart

@@ -131,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
-    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),

lib/generated/intl/messages_zh_CN.dart

@@ -131,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
-    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -131,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
-    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -131,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
-    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),

lib/generated/intl/messages_zh_TW.dart

@@ -131,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
-    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),

lib/union/store_details_page.dart

@@ -228,9 +228,15 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
                   assetUriMatcher(): assetImageRender(),
                   networkSourceMatcher(extension: "svg"):
                       svgNetworkImageRender(),
-                  networkSourceMatcher(): networkImageRender(loadingWidget: () {
+                  networkSourceMatcher(): networkImageRender(
-                    return Container();
+                      loadingWidget: () {
-                  }),
+                        return Container();
+                      },
+                    mapUrl: (url) {
+                        print("objectUrl: $url");
+                        return "$url?imageMogr2/format/webp/blur/1x0/quality/75";
+                    }
+                  ),
                 },
                 customRender: {
                   "video" : (context, parsedChild, attributes, element) {

lib/view_widget/coupon_widget.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/coupon.dart';
+import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:huixiang/view_widget/separator.dart';
 
@@ -70,20 +71,23 @@ class CouponWidget extends StatelessWidget {
                           children: [
                             Container(
                               margin: EdgeInsets.only(left: 20),
-                              child: Image.network(
+                              child: MImage(
-                                (coupon == null ||
+                                  (coupon == null ||
-                                        coupon.couponImg == null ||
+                                      coupon.couponImg == null ||
-                                        coupon.couponImg == "")
+                                      coupon.couponImg == "")
-                                    ? ""
+                                      ? ""
-                                    : coupon.couponImg,
+                                      : coupon.couponImg,
-                                width: 60,
+                              )
-                                height: 60,
+                              // Image.network(
-                                fit: BoxFit.cover,
+
-                                errorBuilder: (context, error, e) {
+                              //   width: 60,
-                                  return Image.asset(
+                              //   height: 60,
-                                      "assets/image/default_1.png");
+                              //   fit: BoxFit.cover,
-                                },
+                              //   errorBuilder: (context, error, e) {
-                              ),
+                              //     return Image.asset(
+                              //         "assets/image/default_1.png");
+                              //   },
+                              // ),
                             ),
                             Expanded(
                               flex: 1,

lib/view_widget/custom_image.dart

@@ -28,7 +28,7 @@ class MImage extends StatelessWidget {
     var clipRRect = ClipRRect(
       borderRadius: radius,
       child: CachedNetworkImage(
-        imageUrl: src,
+        imageUrl: "$src?imageMogr2/format/webp/blur/1x0/quality/75",
         cacheManager: DefaultCacheManager(),
         fadeInDuration: Duration(milliseconds: 300),
         fadeOutDuration: Duration(milliseconds: 300),