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

lib/home/points_mall_view/points_goods_view.dart

@@ -23,7 +23,7 @@ class _PointGoods extends State<PointGoods> {
   String pointPrice(Goods goods) {
     if (goods == null) return "";
     if (goods?.oneBean != null && goods?.oneBean != "0") {
-      return "${goods?.oneBean}集换卡";
+      return "${goods?.oneBean}印章";
     }
     if (goods?.onePrice != null && goods?.onePrice != "0") {
       return S.of(context).jifen_(goods?.onePrice);

lib/home/welfare_exchange.dart

@@ -570,7 +570,7 @@ class _WelfareExchange extends State<WelfareExchange>
   String pointPrice(Goods goods) {
     if (goods == null) return "";
     if(goods?.oneBean!=null && goods?.oneBean!="0"){
-      return "${goods?.oneBean}集换卡";
+      return "${goods?.oneBean}印章";
     } else if (goods?.onePrice != null && goods?.onePrice != "0") {
       return S.of(context).jifen_(goods?.onePrice);
     } else if ((goods?.onePrice == null || goods?.onePrice == "0") &&

lib/home/welfare_page.dart

@@ -916,7 +916,7 @@ class _WelfarePage extends State<WelfarePage> {
     if(goodsPrice == null)
       return "";
     if(goodsPrice?.oneBean!=null && goodsPrice?.oneBean!="0"){
-      return "${goodsPrice?.oneBean}集换卡";
+      return "${goodsPrice?.oneBean}印章";
     } else if(goodsPrice?.onePrice!=null && goodsPrice?.onePrice!="0"){
       return S.of(context).jifen_(goodsPrice?.onePrice);
     }else if((goodsPrice?.onePrice == null || goodsPrice?.onePrice == "0") && ((goodsPrice?.price != null  && goodsPrice?.price != "0")  || (goodsPrice?.money != null  && goodsPrice?.money != "0.00"))){

lib/integral/integral_detailed_page.dart

@@ -182,7 +182,7 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
                                 fontSize: 48.sp),
                           ),
                           Text(
-                            widget.arguments["titleType"] == 1 ? "我的集卡券" : S.of(context).wodejifenzhi,
+                            widget.arguments["titleType"] == 1 ? "我的印章" : S.of(context).wodejifenzhi,
                             style: TextStyle(
                                 color: Color(0xFFF2F2F2),
                                 fontSize: 12.sp,

lib/integral_store/integral_store_details_page.dart

@@ -88,7 +88,7 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
     if(goods == null)
       return "";
     if(goods?.oneBean!=null && goods?.oneBean!="0"){
-      return "${goods?.oneBean}集换卡";
+      return "${goods?.oneBean}印章";
     }else if(goods?.onePrice!=null && goods?.onePrice!="0"){
       return S.of(context).jifen_(goods?.onePrice);
     }else if((goods?.onePrice == null || goods?.onePrice == "0") && ((goods?.price != null  && goods?.price != "0")  || (goods?.money != null  && goods?.money != "0.00"))){
@@ -175,7 +175,7 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
               if(payType > 0){
                 toExchangeOrder();
               }else{
-                SmartDialog.showToast(pointPrice().contains("集换卡")?"您的集换卡数量不足!" : "您的积分不足!", alignment: Alignment.center);
+                SmartDialog.showToast(pointPrice().contains("印章")?"您的印章数量不足!" : "您的积分不足!", alignment: Alignment.center);
                 return;
               }
             },
@@ -194,7 +194,7 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
               child: Text(
                 (payType > 0)
                     ? "立即兑换"
-                    : pointPrice().contains("集换卡")?"您的集换卡数量不足" :S.of(context).jifenbuzu,
+                    : pointPrice().contains("印章")?"您的印章数量不足" :S.of(context).jifenbuzu,
                 // "兑换功能暂未开放",
                 style: TextStyle(
                   fontSize: 16.sp,

lib/mine/mine_view/mine_navbar.dart

@@ -246,7 +246,7 @@ class _MineNavbar extends State<MineNavbar> {
                   },
                   child: mineBottomItem(
                     widget?.userInfo?.happyBean?? "0",
-                    S.of(context).jihuanka,
+                    "印章",
                   ),
                 ),
               ),

lib/order/exchange_order_page.dart

@@ -680,7 +680,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  payableAmount().contains(S.of(context).jihuanka)? "现金抵扣集换卡":"现金抵扣积分",
+                                  payableAmount().contains(S.of(context).jihuanka)? "现金抵扣印章":"现金抵扣积分",
                                   style: TextStyle(
                                       fontSize: 14,
                                       color: Color(0xFF353535),
@@ -1070,14 +1070,14 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
   String payableAmount() {
     if (widget.arguments["payType"] == 0) return "";
     if (widget.arguments["payType"] == 1) {
-      return "${(double.parse(widget.arguments["oneBean"] ?? "0") * buyNum).toInt()}集换卡";
+      return "${(double.parse(widget.arguments["oneBean"] ?? "0") * buyNum).toInt()}印章";
     } else if (widget.arguments["payType"] == 2) {
       return "${(double.parse(widget.arguments["onePrice"]) * buyNum).toInt()}积分";
     } else if (widget.arguments["payType"] == 3) {
       return "${(double.parse(widget.arguments["price"]) * buyNum).toInt()}积分" + " + ${AppUtils.calculateDouble(double.tryParse(widget.arguments["money"]) * buyNum) ?? 0}元";
     } else if (widget.arguments["payType"] == 4) {
       if ((widget.arguments["oneBean"] ?? "0") != "0") {
-        return "${AppUtils.calculateDouble(double.parse(widget.arguments["oneBean"] ?? "0") * buyNum)}集换卡";
+        return "${AppUtils.calculateDouble(double.parse(widget.arguments["oneBean"] ?? "0") * buyNum)}印章";
       } else if (widget.arguments["onePrice"] != "0") {
         return "${AppUtils.calculateDouble(double.parse(widget.arguments["onePrice"]) * buyNum)}积分";
       } else if ((widget.arguments["price"] != null || widget.arguments["price"] != "0") && (widget.arguments["money"] != null || widget.arguments["money"] != "0.00")) {
@@ -1093,7 +1093,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
   String handleNeedPay() {
     if (widget.arguments["payType"] == 0) return "";
     if (widget.arguments["payType"] == 1) {
-      return "${(double.parse(widget.arguments["oneBean"]) * buyNum).toInt()}集换卡";
+      return "${(double.parse(widget.arguments["oneBean"]) * buyNum).toInt()}印章";
     }
     if (widget.arguments["payType"] == 2) {
       return S.of(context).jifen_(

lib/order/exchange_order_success_page.dart

@@ -112,7 +112,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
                   child: Column(
                     children: [
                       Text(
-                        "可用集换卡",
+                        "可用印章",
                         style: TextStyle(
                           color: Color(0xFF727272),
                           fontSize: 14.sp,