Merge branch 'dev' into wr_2023_business

lib/community/community_view/course_banner.dart

@@ -74,7 +74,7 @@ class _CourseBanner extends State<CourseBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程,7门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -110,6 +110,11 @@ class _CourseBanner extends State<CourseBanner> {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
     }
   }

lib/community/headlines/headlines_banner.dart

@@ -71,7 +71,7 @@ class _HeadlinesBanner extends State<HeadlinesBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -107,6 +107,11 @@ class _HeadlinesBanner extends State<HeadlinesBanner> {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
   }
 }

lib/home/home_view/home_banner.dart

@@ -72,7 +72,7 @@ class _HomeBanner extends State<HomeBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7：门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -80,14 +80,12 @@ class _HomeBanner extends State<HomeBanner> {
             arguments: {"goodsId": bannerData.content});
         break;
       case 2:
-        Navigator.of(context)
+        Navigator.of(context).pushNamed('/router/web_page', arguments: {
-            .pushNamed('/router/web_page', arguments: {
           "activityId": bannerData.content,
         });
         break;
       case 3:
-        Navigator.of(context)
+        Navigator.of(context).pushNamed('/router/web_page', arguments: {
-            .pushNamed('/router/web_page', arguments: {
           "articleId": bannerData.content,
         });
         break;
@@ -95,19 +93,25 @@ class _HomeBanner extends State<HomeBanner> {
         String router = bannerData.content;
         // String router = "/router/store_order?{\"id\":\"1512378184161558528\",\"tenant\":\"1188\",\"storeName\":\"农场煮意\"}";
         if (router.contains("?")) {
-          String params = router.substring(router.indexOf("?")+1);
+          String params = router.substring(router.indexOf("?") + 1);
           Map map = jsonDecode(params);
-          Navigator.of(context).pushNamed(router.substring(0,router.indexOf("?")), arguments: map);
+          Navigator.of(context).pushNamed(
+              router.substring(0, router.indexOf("?")),
+              arguments: map);
         } else {
           Navigator.of(context).pushNamed(router);
         }
         break;
       case 5:
-        Navigator.of(context)
+        Navigator.of(context).pushNamed('/router/class_details', arguments: {
-            .pushNamed('/router/class_details', arguments: {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
   }
 }

lib/home/huixiang_view/huixiang_banner.dart

@@ -65,7 +65,7 @@ class _HuiXiangBanner extends State<HuiXiangBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -101,6 +101,11 @@ class _HuiXiangBanner extends State<HuiXiangBanner> {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
   }
 

lib/home/points_mall_view/points_mall_banner.dart

@@ -69,7 +69,7 @@ class _PointMallBanner extends State<PointMallBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7:门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -105,6 +105,11 @@ class _PointMallBanner extends State<PointMallBanner> {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
   }
 

lib/store/shopping/shopping_home/shopping_home_banner.dart

@@ -72,7 +72,7 @@ class _ShoppingHomeBanner extends State<ShoppingHomeBanner> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7:门店跳转）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
       case 1:
@@ -108,6 +108,11 @@ class _ShoppingHomeBanner extends State<ShoppingHomeBanner> {
           "id": bannerData.content,
         });
         break;
+      case 7:
+        String params = bannerData.content.substring(bannerData.content.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).pushNamed(bannerData.content.substring(0,bannerData.content.indexOf("?")), arguments: map);
+        break;
     }
   }
 }

lib/view_widget/activity_poster.dart

@@ -98,20 +98,20 @@ class _ActivityPoster extends State<ActivityPoster> {
     );
   }
 
-  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程）
+  /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章,4:页面跳转,5:课程，7：门店跳转）
   jumpClick(ActivityPos activityPos) async {
     switch (activityPos.jumpType) {
       case 1:
-        Navigator.of(context).pushNamed('/router/integral_store_page',
+        Navigator.of(context).popAndPushNamed('/router/integral_store_page',
             arguments: {"goodsId": widget.activityPos.jumpUrl});
         break;
       case 2:
-        Navigator.of(context).pushNamed('/router/web_page', arguments: {
+        Navigator.of(context).popAndPushNamed('/router/web_page', arguments: {
           "activityId": widget.activityPos.jumpUrl,
         });
         break;
       case 3:
-        Navigator.of(context).pushNamed('/router/web_page', arguments: {
+        Navigator.of(context).popAndPushNamed('/router/web_page', arguments: {
           "articleId": widget.activityPos.jumpUrl,
         });
         break;
@@ -121,16 +121,21 @@ class _ActivityPoster extends State<ActivityPoster> {
         if (router.contains("?")) {
           String params = router.substring(router.indexOf("?")+1);
           Map map = jsonDecode(params);
-          Navigator.of(context).pushNamed(router.substring(0,router.indexOf("?")), arguments: map);
+          Navigator.of(context).popAndPushNamed(router.substring(0,router.indexOf("?")), arguments: map);
         } else {
-          Navigator.of(context).pushNamed(router);
+          Navigator.of(context).popAndPushNamed(router);
         }
         break;
       case 5:
-        Navigator.of(context).pushNamed('/router/class_details', arguments: {
+        Navigator.of(context).popAndPushNamed('/router/class_details', arguments: {
           "id": widget.activityPos.jumpUrl,
         });
         break;
+      case 7:
+        String params = widget.activityPos.jumpUrl.substring(widget.activityPos.jumpUrl.indexOf("?")+1);
+        Map map = jsonDecode(params);
+        Navigator.of(context).popAndPushNamed(widget.activityPos.jumpUrl.substring(0,widget.activityPos.jumpUrl.indexOf("?")), arguments: map);
+      break;
     }
   }
 }