diff --git a/lib/article/hot_article_item.dart b/lib/article/hot_article_item.dart
index 92f78b2f..0f97e27e 100644
--- a/lib/article/hot_article_item.dart
+++ b/lib/article/hot_article_item.dart
@@ -47,7 +47,7 @@ class _HotArticlePage extends State<HotArticlePage> {
       "pageNum": pageNum,
       "pageSize": 10,
       "searchKey": "",
-      "state": 0,
+      "state": 1,
       "type": 2
     }).catchError((onError){
       refreshController.refreshFailed();
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 25568511..f31efd6b 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -364,6 +364,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
+    "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
     "yingyeshijian" : m25,
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart
index e1cf2d7e..856fdbf1 100644
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@@ -364,6 +364,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
+    "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
     "yingyeshijian" : m25,
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart
index d951153d..87359323 100644
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@@ -364,6 +364,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
+    "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"),
     "yingyeshijian" : m25,
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 8683f792..382fc2e2 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -3325,6 +3325,16 @@ class S {
     );
   }
 
+  /// `已领取`
+  String get yilingqu {
+    return Intl.message(
+      '已领取',
+      name: 'yilingqu',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(
diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart
index f92a59cf..615c414c 100644
--- a/lib/home/activity_list_page.dart
+++ b/lib/home/activity_list_page.dart
@@ -74,6 +74,7 @@ class _ActivityListPage extends State<ActivityListPage>
         enablePullDown: true,
         enablePullUp: false,
         header: MyHeader(),
+        physics: BouncingScrollPhysics(),
         footer: CustomFooter(
           builder: (context, mode) {
             return MyFooter(mode);
@@ -81,7 +82,6 @@ class _ActivityListPage extends State<ActivityListPage>
         ),
         onRefresh: queryActivity,
         child: ListView.builder(
-          physics: BouncingScrollPhysics(),
           itemCount: activityList == null ? 0 : activityList.length,
           itemBuilder: (context, position) {
             return InkWell(
@@ -151,6 +151,8 @@ class _ActivityListPage extends State<ActivityListPage>
                   ),
                   Text(
                     activity.viceTitle ?? "",
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                       fontSize: 10,
                       color: Color(0xFF727272),
diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index 66fb34ed..39e2b5e0 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -373,6 +373,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                         S
                             .of(context)
                             .yuan(double.tryParse(goods.worth).toInt()),
+                        overflow: TextOverflow.ellipsis,
                         style: TextStyle(
                           color: Color(0xFF585858),
                           decoration: TextDecoration.lineThrough,
diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart
index 0e66ecbd..63441062 100644
--- a/lib/home/points_mall_page.dart
+++ b/lib/home/points_mall_page.dart
@@ -142,7 +142,9 @@ class _PointsMallPage extends State<PointsMallPage>
       enablePullDown: true,
       enablePullUp: true,
       header: MyHeader(),
+      physics: BouncingScrollPhysics(),
       footer: CustomFooter(
+        loadStyle: LoadStyle.ShowWhenLoading,
         builder: (BuildContext context, LoadStatus mode) {
           return MyFooter(mode);
         },
@@ -151,7 +153,6 @@ class _PointsMallPage extends State<PointsMallPage>
       onRefresh: _refresh,
       onLoading: creditGoods,
       child: SingleChildScrollView(
-        physics: BouncingScrollPhysics(),
         child: Container(
           color: Color(0xFFFAFAFA),
           child: Column(
@@ -179,7 +180,7 @@ class _PointsMallPage extends State<PointsMallPage>
                     //垂直子Widget之间间距
                     mainAxisSpacing: 16,
                     //子Widget宽高比例
-                    childAspectRatio: Platform.isAndroid ? 0.55 : 0.57,
+                    childAspectRatio: Platform.isAndroid ? 0.54 : 0.57,
                   ),
                   itemBuilder: (contetx, index) {
                     return GestureDetector(
@@ -266,7 +267,7 @@ class _PointsMallPage extends State<PointsMallPage>
               ),
               Container(
                 margin:
-                    EdgeInsets.only(left: 12.w, right: 12.w, bottom: 16.h, top: 10.h),
+                    EdgeInsets.only(left: 12.w, right: 12.w, bottom: 10.h, top: 10.h),
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 0d19f381..d948ac54 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -345,6 +345,7 @@
   "lingquchenggong": "领取成功",
   "dianwolingqu": "点我领取",
   "chengweidianpuzhuanshuhuiyuan": "成为店铺专属会员，享专属权益",
+  "yilingqu": "已领取",
 
 
 
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
index 29efbf68..b52cc21a 100644
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@@ -346,6 +346,7 @@
   "lingquchenggong": "领取成功",
   "dianwolingqu": "点我领取",
   "chengweidianpuzhuanshuhuiyuan": "成为店铺专属会员，享专属权益",
+  "yilingqu": "已领取",
 
 
 
diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb
index 0f167dc6..bf8d6506 100644
--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@@ -338,6 +338,7 @@
   "lingquchenggong": "領取成功",
   "dianwolingqu": "點我領取",
   "chengweidianpuzhuanshuhuiyuan": "成為專屬會員，享專屬權益",
+  "yilingqu": "已領取",
 
 
 
diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart
index c80517f7..e3fa6bce 100644
--- a/lib/login/login_page.dart
+++ b/lib/login/login_page.dart
@@ -15,7 +15,7 @@ import 'package:huixiang/generated/l10n.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:dio/dio.dart';
 import 'package:huixiang/view_widget/loading_view.dart';
-// import 'package:photo_view/photo_view.dart';
+import 'package:photo_view/photo_view.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class LoginPage extends StatefulWidget {
@@ -375,11 +375,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                 child: Stack(
                   alignment: Alignment.center,
                   children: [
-                    // PhotoView(
-                    //   imageProvider: AssetImage("assets/image/laoban.png"),
-                    //   initialScale: Platform.isAndroid ? 1.02 : 1.2,
-                    //   basePosition: alignmentProgress,
-                    // ),
+                    PhotoView(
+                      imageProvider: AssetImage("assets/image/laoban.png"),
+                      initialScale: Platform.isAndroid ? 1.02 : 1.2,
+                      basePosition: alignmentProgress,
+                    ),
                     Container(
                       decoration: BoxDecoration(
                         color: Color(0xFF32A060).withAlpha(changeAlpha),
diff --git a/lib/mine/coupons_page.dart b/lib/mine/coupons_page.dart
index 8faa1645..d513beaf 100644
--- a/lib/mine/coupons_page.dart
+++ b/lib/mine/coupons_page.dart
@@ -10,6 +10,8 @@ import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
 import 'package:huixiang/view_widget/new_coupon_widget.dart';
+import 'package:huixiang/view_widget/receive_success.dart';
+import 'package:huixiang/view_widget/selector_store_dialog.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -159,11 +161,18 @@ class _CouponsPage extends State<CouponsPage> {
               child: ListView.builder(
                 itemBuilder: (context, position) {
                   return GestureDetector(
-                    child: NewCouponWidget(coupons[position], (type) {}, () {
+                    child: NewCouponWidget(coupons[position], (type) {
+                      if (type == 1) {
+                        receiveCoupon(coupons[position].id);
+                      } else {
+                        //Navigator.of(context).pushNamed('/router/mine_card')
+                        showStoreSelector(coupons[position].storeList);
+                      }
+                    }, () {
                       setState(() {
                         coupons[position].isEx = !coupons[position].isEx;
                       });
-                    }),
+                    }, type: 0,),
                   );
                 },
                 itemCount: coupons != null ? coupons.length : 0,
@@ -174,4 +183,34 @@ class _CouponsPage extends State<CouponsPage> {
       ),
     );
   }
+
+  receiveCoupon(couponId) async {
+    BaseData baseData = await apiService.receiveCoupon(couponId);
+    if (baseData.isSuccess) {
+      _onRefresh();
+      showAlertDialog();
+    } else {
+      Fluttertoast.showToast(msg: baseData.msg);
+    }
+  }
+
+  showStoreSelector(storeList) {
+    showModalBottomSheet(
+        context: context,
+        backgroundColor: Colors.transparent,
+        builder: (context) {
+          return SelectorStoreWidget(storeList);
+        });
+  }
+
+  showAlertDialog() {
+    //显示对话框
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return ReceiveSuccess();
+      },
+    );
+  }
+
 }
diff --git a/lib/mine/mine_vip_level_page.dart b/lib/mine/mine_vip_level_page.dart
index d14ec67c..847eb2d6 100644
--- a/lib/mine/mine_vip_level_page.dart
+++ b/lib/mine/mine_vip_level_page.dart
@@ -89,34 +89,32 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
         titleSpacing: 2.w,
         leadingWidth: 56.w,
       ),
-      body: Column(
-        children: [
-          AspectRatio(
-            aspectRatio: 1.7,
-            child: Swiper(
-              viewportFraction: 0.95,
-              loop: false,
-              // index: (ranks != null && ranks.isNotEmpty) ? widget.arguments["rankLevel"] - 1 : 0,
-              controller: controller,
-              itemBuilder: (context, position) {
-                // if(ranks == null || ranks.isEmpty) return Container(width: 10, height: 10,);
-                return MineVipView(
-                  position + 1,
-                  curLevel: widget.arguments["rankLevel"],
-                  padding: 6.w,
-                  rank: widget.arguments["points"],
-                  rankMax: ranks[position].rankOrigin,
-                  createTime: ranks[position].createTime,
-                );
-              },
-              itemCount: (ranks != null && ranks.isNotEmpty) ? ranks.length : 0,
+      body: SingleChildScrollView(
+        physics: BouncingScrollPhysics(),
+        child: Column(
+          children: [
+            AspectRatio(
+              aspectRatio: 1.7,
+              child: Swiper(
+                viewportFraction: 0.95,
+                loop: false,
+                // index: (ranks != null && ranks.isNotEmpty) ? widget.arguments["rankLevel"] - 1 : 0,
+                controller: controller,
+                itemBuilder: (context, position) {
+                  // if(ranks == null || ranks.isEmpty) return Container(width: 10, height: 10,);
+                  return MineVipView(
+                    position + 1,
+                    curLevel: widget.arguments["rankLevel"],
+                    padding: 6.w,
+                    rank: widget.arguments["points"],
+                    rankMax: ranks[position].rankOrigin,
+                    createTime: ranks[position].createTime,
+                  );
+                },
+                itemCount: (ranks != null && ranks.isNotEmpty) ? ranks.length : 0,
+              ),
             ),
-          ),
-          Expanded(
-            flex: 1,
-            child: Container(
-              height: double.infinity,
-              width: double.infinity,
+            Container(
               margin: EdgeInsets.fromLTRB(0, 16.h, 0, 0),
               padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h),
               decoration: BoxDecoration(
@@ -143,7 +141,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                   ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Container(
                         width: 6.w,
@@ -154,13 +152,16 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                           color: Color(0xFF32A060),
                         ),
                       ),
-                      Text(
-                        S.of(context).chenggongdengluzhuce,
-                        style: TextStyle(
-                          textBaseline: TextBaseline.alphabetic,
-                          fontSize: 14.sp,
-                          color: Color(0xFF353535),
+                      Expanded(
+                        child: Text(
+                          S.of(context).chenggongdengluzhuce,
+                          style: TextStyle(
+                            textBaseline: TextBaseline.alphabetic,
+                            fontSize: 14.sp,
+                            color: Color(0xFF353535),
+                          ),
                         ),
+                        flex: 1,
                       ),
                     ],
                   ),
@@ -205,12 +206,12 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: ranks != null
                         ? ranks.map((e) {
-                            return levelItem(
-                                e,
-                                ranks.indexOf(e) == 0
-                                    ? 0
-                                    : ranks[ranks.indexOf(e) - 1].rankOrigin);
-                          }).toList()
+                      return levelItem(
+                          e,
+                          ranks.indexOf(e) == 0
+                              ? 0
+                              : ranks[ranks.indexOf(e) - 1].rankOrigin);
+                    }).toList()
                         : [],
                   ),
                   SizedBox(
@@ -282,8 +283,8 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                 ],
               ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart
index c3e10390..b921634f 100644
--- a/lib/mine/mine_wallet_page.dart
+++ b/lib/mine/mine_wallet_page.dart
@@ -55,7 +55,20 @@ class _MineWalletPage extends State<MineWalletPage> {
     loadBillInfo();
   }
 
+  queryUserBalance() async {
+    BaseData baseData = await apiService.queryInfo();
+    if (baseData != null && baseData.isSuccess) {
+      userInfo = UserInfo.fromJson(baseData.data);
+      mBalance = double.tryParse(userInfo.money).toInt();
+      if (mounted) setState(() {});
+        setState(() {});
+    } else {
+      Fluttertoast.showToast(msg: baseData.msg);
+    }
+  }
+
   loadBillInfo() async {
+    queryUserBalance();
     BaseData baseData = await apiService.queryBillInfo({
       "current": current,
       "model": {"category": "", "title": "bill_tenant_balance", "type": ""},
@@ -327,18 +340,23 @@ class _MineWalletPage extends State<MineWalletPage> {
           SizedBox(
             height: 24,
           ),
-          RoundButton(
-            icons: Icon(
-              Icons.refresh,
-              color: Colors.white,
+          InkWell(
+            onTap: () {
+              queryUserBalance();
+            },
+            child: RoundButton(
+              icons: Icon(
+                Icons.refresh,
+                color: Colors.white,
+              ),
+              text: S.of(context).shuaxinyue,
+              textColor: Colors.white,
+              radius: 15,
+              backgroup: Color(0xFF20662A),
+              fontSize: 12,
+              padding: EdgeInsets.fromLTRB(12, 4, 12, 4),
             ),
-            text: S.of(context).shuaxinyue,
-            textColor: Colors.white,
-            radius: 15,
-            backgroup: Color(0xFF20662A),
-            fontSize: 12,
-            padding: EdgeInsets.fromLTRB(12, 4, 12, 4),
-          )
+          ),
         ],
       ),
     );
diff --git a/lib/mine/roll_center_page.dart b/lib/mine/roll_center_page.dart
index ce3461c9..8e9fad55 100644
--- a/lib/mine/roll_center_page.dart
+++ b/lib/mine/roll_center_page.dart
@@ -11,6 +11,7 @@ import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/item_title.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
 import 'package:huixiang/view_widget/new_coupon_widget.dart';
+import 'package:huixiang/view_widget/receive_success.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:huixiang/view_widget/selector_store_dialog.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -151,7 +152,7 @@ class _RollCenterPage extends State<RollCenterPage> {
                         setState(() {
                           coupons[position].isEx = !coupons[position].isEx;
                         });
-                      }),
+                      }, type: 1,),
                     );
                   },
                   itemCount: coupons != null ? coupons.length : 0,
@@ -188,103 +189,7 @@ class _RollCenterPage extends State<RollCenterPage> {
     showDialog(
       context: context,
       builder: (BuildContext context) {
-        return SimpleDialog(
-          titlePadding: EdgeInsets.all(10),
-          backgroundColor: Colors.transparent,
-          elevation: 0,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(Radius.circular(6)),
-          ),
-          children: <Widget>[
-            Stack(
-              alignment: Alignment.topCenter,
-              children: [
-                Container(
-                  margin: EdgeInsets.only(top: 40.h),
-                  decoration: new BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.all(Radius.circular(8))),
-                  width: 218.w,
-                  height: 210.h,
-                  child: Column(
-                    children: [
-                      Padding(
-                        padding: EdgeInsets.only(top: 50.h, bottom: 19.h),
-                        child: Text(
-                          "领取成功",
-                          style: TextStyle(
-                            color: Color(0xff353535),
-                            fontSize: 16.sp,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                      Text(
-                        "您已成功领取优惠劵，请在",
-                        style: TextStyle(
-                          color: Color(0xff353535),
-                          fontSize: 14.sp,
-                        ),
-                      ),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          GestureDetector(
-                            child: Text(
-                              S.of(context).kaquan,
-                              style: TextStyle(
-                                color: Color(0xffFF7A1A),
-                                fontSize: 14.sp,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                            onTap: () {
-                              Navigator.of(context)
-                                  .pushNamed('/router/mine_card');
-                            },
-                          ),
-                          Text(
-                            "中查看",
-                            style: TextStyle(
-                              color: Color(0xff353535),
-                              fontSize: 14.sp,
-                            ),
-                          ),
-                        ],
-                      ),
-                      Padding(
-                        padding: EdgeInsets.only(top: 30.h),
-                        child: RoundButton(
-                          width: 130.w,
-                          height: 34.h,
-                          text: S.of(context).queren,
-                          textColor: Colors.white,
-                          fontSize: 12.sp,
-                          callback: () {
-                            Navigator.of(context).pop();
-                          },
-                          padding: EdgeInsets.only(
-                            top: 2.h,
-                            bottom: 2.h,
-                            left: 8.w,
-                            right: 8.w,
-                          ),
-                          backgroup: Color(0xff32A060),
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-                Image.asset(
-                  "assets/image/icon_order_success.png",
-                  fit: BoxFit.cover,
-                  width: 80.w,
-                  height: 80.h,
-                ),
-              ],
-            )
-          ],
-        );
+        return ReceiveSuccess();
       },
     );
   }
diff --git a/lib/mine/vip_card_page.dart b/lib/mine/vip_card_page.dart
index d2fc69e4..b93e2ef3 100644
--- a/lib/mine/vip_card_page.dart
+++ b/lib/mine/vip_card_page.dart
@@ -93,7 +93,7 @@ class _VipCardPage extends State<VipCardPage> {
     if (storeName.contains("百年川椒")) {
       return "assets/image/icon_vip_bj.png";
     } else if (storeName.contains("海峡姐妹")) {
-      return "assets/image/icon_milk_tea_bg.png.png";
+      return "assets/image/icon_milk_tea_bg.png";
     } else if (storeName.contains("前进麦味")) {
       return "assets/image/icon_bread_bg.png";
     }
diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart
index bb7df833..f0e3b716 100644
--- a/lib/order/order_detail_page.dart
+++ b/lib/order/order_detail_page.dart
@@ -842,8 +842,20 @@ class _OrderDetailPage extends State<OrderDetailPage> {
           .addAll(orderInfo.productList.map((e) => commodityItem(e)).toList());
     }
     widgets.add(SizedBox(height: 20.h));
+
+    if (orderInfo.isTakeOut != 0) { // 配送费
+      widgets.add(discountItem(Color(0xFFFF7A1A), "配送费", "", orderInfo.postFee));
+    }
+
+    if (orderInfo.storeVO != null &&  orderInfo.storeVO.freePostAge != null) { // 配送费
+      widgets.add(discountItem(Color(0xFF32A060), "配送费", "活动减免3元配送费", orderInfo.storeVO.freePostAge));
+    }
+
     if (orderInfo.storeVO != null && orderInfo.storeVO.couponVO != null) {
-      widgets.add(discountItem(Color(0xFF32A060), orderInfo.storeVO.couponVO));
+      // widgets.add(discountItem(Color(0xFF32A060),
+      //     orderInfo.storeVO.couponVO.storeName,
+      //   S.of(context).huodongjianmianpeisongfei(orderInfo.storeVO.couponVO.discountAmount),
+      //     orderInfo.storeVO.couponVO.f));
       // Color(0xFFFF7A1A)
     }
     widgets.add(Container(
@@ -1107,7 +1119,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
     );
   }
 
-  Widget discountItem(Color color, CouponVo couponVo) {
+  Widget discountItem(Color color, textName, condition, amount) {
     return Container(
       margin: EdgeInsets.only(top: 9.h, bottom: 9.h),
       child: Row(
@@ -1123,8 +1135,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
               ),
             ),
             child: Text(
-              couponVo.couponName,
-              // S.of(context).peisongfei,
+              textName,
               style: TextStyle(
                 fontSize: 10.sp,
                 color: color,
@@ -1136,7 +1147,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
           ),
           Expanded(
             child: Text(
-              S.of(context).huodongjianmianpeisongfei(couponVo.discountAmount),
+              condition,
               style: TextStyle(
                 fontSize: 10.sp,
                 color: Color(0xFFA29E9E),
@@ -1145,7 +1156,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
             flex: 1,
           ),
           Text(
-            S.of(context).yuan("-${couponVo.fullAmount}"),
+            S.of(context).yuan("$amount"),
             style: TextStyle(
               fontSize: 12.sp,
               color: color,
@@ -1187,7 +1198,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
             ),
           ),
           Text(
-            orderInfo != null ? orderInfo.finalPayPrice : "",
+            orderInfo != null ? "${(double.tryParse(orderInfo.orderSum) + double.tryParse(orderInfo.postFee))}" : "",
             textAlign: TextAlign.end,
             style: TextStyle(
               fontSize: 30.sp,
diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart
index 08818ff5..cdecd254 100644
--- a/lib/order/order_history_page.dart
+++ b/lib/order/order_history_page.dart
@@ -319,24 +319,18 @@ class _OrderHistoryList extends State<OrderHistoryList>
                   height: 8.h,
                 ),
                 Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  mainAxisAlignment: MainAxisAlignment.start,
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Expanded(
                       child: Container(
                         child: Row(
-                          children: [
-                            Expanded(
-                              flex: 1,
-                              child: Row(
-                                children: goodsItem((orderInfo != null &&
-                                        orderInfo.productList !=
-                                            null)
-                                    ? orderInfo.productList
-                                    : null),
-                              ),
-                            ),
-                          ],
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: goodsItem((orderInfo != null &&
+                                  orderInfo.productList != null)
+                              ? orderInfo.productList
+                              : null),
                         ),
                       ),
                       flex: 1,
@@ -379,8 +373,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                             ),
                             TextSpan(
                               text: (orderInfo != null &&
-                                      orderInfo.productList !=
-                                          null)
+                                      orderInfo.productList != null)
                                   ? "${orderInfo.productList.length}"
                                   : "0",
                               style: TextStyle(
@@ -450,14 +443,15 @@ class _OrderHistoryList extends State<OrderHistoryList>
     );
   }
 
-  String statusText(refundStatus, orderStatus, payStatus, sendStatus, isTakeOut) {
+  String statusText(
+      refundStatus, orderStatus, payStatus, sendStatus, isTakeOut) {
     String statusText = "";
-    if(isTakeOut == 0) {
-      if(payStatus == 0) {
+    if (isTakeOut == 0) {
+      if (payStatus == 0) {
         statusText = S.of(context).daizhifu;
       } else {
         statusText = S.of(context).yizhifu;
-        switch(orderStatus) {
+        switch (orderStatus) {
           case 2:
             statusText = S.of(context).shangjiazhengzaipeican;
             break;
@@ -468,57 +462,63 @@ class _OrderHistoryList extends State<OrderHistoryList>
             statusText = S.of(context).yiwancheng;
             break;
         }
-        if(refundStatus == 1) {
+        if (refundStatus == 1) {
           statusText = S.of(context).yituikuan;
         }
       }
-    } else if(isTakeOut == 1) {
-      if(payStatus == 0) {
+    } else if (isTakeOut == 1) {
+      if (payStatus == 0) {
         statusText = S.of(context).daizhifu;
       } else {
         statusText = S.of(context).yizhifu;
-        switch(sendStatus) {
-          case 1:
-            statusText = S.of(context).zhengzaihujiaoqishou;
-            break;
-          case 2:
-            statusText = S.of(context).quhuozhong;
-            break;
-          case 3:
-            statusText = S.of(context).peisongzhong;
-            break;
-          case 4:
-            statusText = S.of(context).yisongda;
-            switch(orderStatus) {
-              case 4:
-                statusText = S.of(context).yiwancheng;
-                break;
-            }
-            break;
+        if (orderStatus < 4) {
+          switch (sendStatus) {
+            case 1:
+              statusText = S.of(context).zhengzaihujiaoqishou;
+              break;
+            case 2:
+              statusText = S.of(context).quhuozhong;
+              break;
+            case 3:
+              statusText = S.of(context).peisongzhong;
+              break;
+            case 4:
+              statusText = S.of(context).yisongda;
+              break;
+          }
+        } else {
+          switch (orderStatus) {
+            case 4:
+              statusText = S.of(context).yiwancheng;
+              break;
+          }
         }
-        if(refundStatus == 1) {
+        if (refundStatus == 1) {
           statusText = S.of(context).yituikuan;
         }
       }
-    } else if(isTakeOut == 2) {
-      if(payStatus == 0) {
+    } else if (isTakeOut == 2) {
+      if (payStatus == 0) {
         statusText = S.of(context).daizhifu;
       } else {
         statusText = S.of(context).yizhifu;
-        switch(sendStatus) {
-          case 1:
-            statusText = S.of(context).yifahuo;
-            break;
-          case 4:
-            statusText = S.of(context).yisongda;
-            switch(orderStatus) {
-              case 4:
-                statusText = S.of(context).yiwancheng;
-                break;
-            }
-            break;
+        if (orderStatus < 4) {
+          switch (sendStatus) {
+            case 1:
+              statusText = S.of(context).yifahuo;
+              break;
+            case 4:
+              statusText = S.of(context).yisongda;
+              break;
+          }
+        } else {
+          switch (orderStatus) {
+            case 4:
+              statusText = S.of(context).yiwancheng;
+              break;
+          }
         }
-        if(refundStatus == 1) {
+        if (refundStatus == 1) {
           statusText = S.of(context).yituikuan;
         }
       }
@@ -650,8 +650,14 @@ class _OrderHistoryList extends State<OrderHistoryList>
 
   List<Widget> goodsItem(List<ProductList> products) {
     if (products == null) return [];
+    if(products.length > 3) {
+      products = products.sublist(0, 3);
+    }
     return products
-        .map((e) => Column(
+        .map(
+          (e) => Container(
+            margin: EdgeInsets.symmetric(horizontal: 2.w),
+            child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
@@ -667,15 +673,23 @@ class _OrderHistoryList extends State<OrderHistoryList>
                   height: 4.h,
                 ),
                 if (isRemake)
-                  Text(
-                    e.productName,
-                    style: TextStyle(
-                      fontSize: 10.sp,
-                      color: Color(0xFF353535),
+                  Container(
+                    width: 75.w,
+                    child: Text(
+                      e.productName,
+                      maxLines: 1,
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        fontSize: 10.sp,
+                        color: Color(0xFF353535),
+                      ),
                     ),
                   ),
               ],
-            ))
+            ),
+          ),
+        )
         .toList();
   }
 
diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart
index 53b977bf..15a97ff2 100644
--- a/lib/view_widget/new_coupon_widget.dart
+++ b/lib/view_widget/new_coupon_widget.dart
@@ -8,8 +8,9 @@ class NewCouponWidget extends StatelessWidget {
   final Function(int type) callback;
   final GestureTapCallback callbackEx;
   final Coupon coupon;
+  final int type;
 
-  NewCouponWidget(this.coupon, this.callback, this.callbackEx);
+  NewCouponWidget(this.coupon, this.callback, this.callbackEx, {this.type = 1});
 
   @override
   Widget build(BuildContext context) {
@@ -306,35 +307,13 @@ class NewCouponWidget extends StatelessWidget {
   }
 
   Widget rightBtn(context) {
-    if (coupon != null && coupon.status == 0) {
-      return Align(
-        alignment: Alignment.centerRight,
-        child: InkWell(
-          onTap: () {
-            callback(1);
-          },
-          child: Container(
-            padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(10.5)),
-              color: Color(0xFF32A060),
-            ),
-            child: Text(
-              S.of(context).lingqu,
-              style: TextStyle(
-                fontSize: 12.sp,
-                color: Colors.white,
-              ),
-            ),
-          ),
-        ),
-      );
-    } else if (coupon != null && coupon.status == 1) {
-      return Align(
+    if (type == 1) {
+      if (coupon != null && coupon.status == 0) {
+        return Align(
           alignment: Alignment.centerRight,
           child: InkWell(
             onTap: () {
-              callback(2);
+              callback(type);
             },
             child: Container(
               padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
@@ -343,54 +322,98 @@ class NewCouponWidget extends StatelessWidget {
                 color: Color(0xFF32A060),
               ),
               child: Text(
-                S.of(context).qushiyong,
+                S.of(context).lingqu,
                 style: TextStyle(
                   fontSize: 12.sp,
                   color: Colors.white,
                 ),
               ),
             ),
-          ));
-    } else if (coupon != null && coupon.status == 2) {
-      return Align(
-        alignment: Alignment.centerRight,
-        child: Container(
-          padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(10.5)),
-            // border: Border.all(
-            //     width: 1, color: Color(0xFFA0A0A0), style: BorderStyle.solid)
-            color: Color(0xFFA0A0A0),
           ),
-          child: Text(
-            S.of(context).yishiyong,
-            style: TextStyle(
-              fontSize: 12.sp,
-              color: Colors.white,
+        );
+      } else {
+        return Align(
+          alignment: Alignment.centerRight,
+          child: Container(
+            padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(10.5)),
+              color: Colors.grey,
+            ),
+            child: Text(
+              S.of(context).yilingqu,
+              style: TextStyle(
+                fontSize: 12.sp,
+                color: Colors.white,
+              ),
             ),
           ),
-        ),
-      );
+        );
+      }
     } else {
-      return Align(
-        alignment: Alignment.centerRight,
-        child: Container(
-          padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(10.5)),
-            // border: Border.all(
-            //     width: 1, color: Color(0xFFA0A0A0), style: BorderStyle.solid)
-            color: Color(0xFFA0A0A0),
+      if (coupon != null && coupon.status == 1) {
+        return Align(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              onTap: () {
+                callback(type);
+              },
+              child: Container(
+                padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(10.5)),
+                  color: Color(0xFF32A060),
+                ),
+                child: Text(
+                  S.of(context).qushiyong,
+                  style: TextStyle(
+                    fontSize: 12.sp,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            ));
+      } else if (coupon != null && coupon.status == 2) {
+        return Align(
+          alignment: Alignment.centerRight,
+          child: Container(
+            padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(10.5)),
+              // border: Border.all(
+              //     width: 1, color: Color(0xFFA0A0A0), style: BorderStyle.solid)
+              color: Color(0xFFA0A0A0),
+            ),
+            child: Text(
+              S.of(context).yishiyong,
+              style: TextStyle(
+                fontSize: 12.sp,
+                color: Colors.white,
+              ),
+            ),
           ),
-          child: Text(
-            S.of(context).yishixiao,
-            style: TextStyle(
-              fontSize: 12.sp,
-              color: Colors.white,
+        );
+      } else {
+        return Align(
+          alignment: Alignment.centerRight,
+          child: Container(
+            padding: EdgeInsets.fromLTRB(16.w, 2.h, 16.w, 2.h),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(10.5)),
+              // border: Border.all(
+              //     width: 1, color: Color(0xFFA0A0A0), style: BorderStyle.solid)
+              color: Color(0xFFA0A0A0),
+            ),
+            child: Text(
+              S.of(context).yishixiao,
+              style: TextStyle(
+                fontSize: 12.sp,
+                color: Colors.white,
+              ),
             ),
           ),
-        ),
-      );
+        );
+      }
     }
   }
 }
diff --git a/lib/view_widget/receive_success.dart b/lib/view_widget/receive_success.dart
new file mode 100644
index 00000000..8f9309ae
--- /dev/null
+++ b/lib/view_widget/receive_success.dart
@@ -0,0 +1,112 @@
+
+import 'package:flutter/material.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/view_widget/round_button.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+
+class ReceiveSuccess extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SimpleDialog(
+      titlePadding: EdgeInsets.all(10),
+      backgroundColor: Colors.transparent,
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(6)),
+      ),
+      children: <Widget>[
+        Stack(
+          alignment: Alignment.topCenter,
+          children: [
+            Container(
+              margin: EdgeInsets.only(top: 40.h),
+              decoration: new BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.all(Radius.circular(8))),
+              width: 218.w,
+              height: 210.h,
+              child: Column(
+                children: [
+                  Padding(
+                    padding: EdgeInsets.only(top: 50.h, bottom: 19.h),
+                    child: Text(
+                      "领取成功",
+                      style: TextStyle(
+                        color: Color(0xff353535),
+                        fontSize: 16.sp,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  Text(
+                    "您已成功领取优惠劵，请在",
+                    style: TextStyle(
+                      color: Color(0xff353535),
+                      fontSize: 14.sp,
+                    ),
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      GestureDetector(
+                        child: Text(
+                          S.of(context).kaquan,
+                          style: TextStyle(
+                            color: Color(0xffFF7A1A),
+                            fontSize: 14.sp,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        onTap: () {
+                          Navigator.of(context)
+                              .pushNamed('/router/mine_card');
+                        },
+                      ),
+                      Text(
+                        "中查看",
+                        style: TextStyle(
+                          color: Color(0xff353535),
+                          fontSize: 14.sp,
+                        ),
+                      ),
+                    ],
+                  ),
+                  Padding(
+                    padding: EdgeInsets.only(top: 30.h),
+                    child: RoundButton(
+                      width: 130.w,
+                      height: 34.h,
+                      text: S.of(context).queren,
+                      textColor: Colors.white,
+                      fontSize: 12.sp,
+                      callback: () {
+                        Navigator.of(context).pop();
+                      },
+                      padding: EdgeInsets.only(
+                        top: 2.h,
+                        bottom: 2.h,
+                        left: 8.w,
+                        right: 8.w,
+                      ),
+                      backgroup: Color(0xff32A060),
+                    ),
+                  )
+                ],
+              ),
+            ),
+            Image.asset(
+              "assets/image/icon_order_success.png",
+              fit: BoxFit.cover,
+              width: 80.w,
+              height: 80.h,
+            ),
+          ],
+        )
+      ],
+    );
+  }
+
+
+
+}
\ No newline at end of file
diff --git a/lib/view_widget/selector_store_dialog.dart b/lib/view_widget/selector_store_dialog.dart
index 256e0db6..29eee8e0 100644
--- a/lib/view_widget/selector_store_dialog.dart
+++ b/lib/view_widget/selector_store_dialog.dart
@@ -66,7 +66,7 @@ class _SelectorStoreWidget extends State<SelectorStoreWidget> {
             child: ListView.builder(
               physics: BouncingScrollPhysics(),
               itemBuilder: (context, position) {
-                return storeItem(widget.stores[0], position);
+                return storeItem(widget.stores[position], position);
               },
               itemCount: widget.stores != null ? widget.stores.length : 0,
             ),
diff --git a/pubspec.lock b/pubspec.lock
index 96adb895..a92a38d2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,294 +5,294 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "14.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
       name: amap_flutter_base
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   amap_flutter_location:
     dependency: "direct main"
     description:
       name: amap_flutter_location
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.41.2"
   android_intent_plus:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.6.1"
   barcode:
     dependency: transitive
     description:
       name: barcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   barcode_widget:
     dependency: "direct main"
     description:
       name: barcode_widget
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   bubble_tab_indicator:
     dependency: "direct main"
     description:
       name: bubble_tab_indicator
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.6"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.2"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.6"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.10"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.5"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.10"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.3.2"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "7.1.0"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   chewie:
     dependency: "direct main"
     description:
       name: chewie
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.2"
   chewie_audio:
     dependency: transitive
     description:
       name: chewie_audio
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.3"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.7.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
   css_colors:
     dependency: transitive
     description:
       name: css_colors
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.12"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.10"
   event_bus:
     dependency: "direct main"
     description:
       name: event_bus
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.10.11"
   flutter:
@@ -304,21 +304,21 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.3"
   flutter_html:
     dependency: "direct main"
     description:
       name: flutter_html
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
   flutter_layout_grid:
     dependency: transitive
     description:
       name: flutter_layout_grid
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.10.5"
   flutter_localizations:
@@ -330,35 +330,35 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.11"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.0+2"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:
       name: flutter_staggered_grid_view
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.0"
   flutter_svg:
     dependency: transitive
     description:
       name: flutter_svg
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.20.0-nullsafety.3"
   flutter_swiper_null_safety:
     dependency: "direct main"
     description:
       name: flutter_swiper_null_safety
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   flutter_test:
@@ -375,385 +375,392 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.0.7"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
   html:
     dependency: transitive
     description:
       name: html
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.14.0+4"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.2"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
   image_cropper:
     dependency: "direct main"
     description:
       name: image_cropper
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.1"
   image_picker:
     dependency: transitive
     description:
       name: image_picker
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.7+22"
   image_picker_gallery_camera:
     dependency: "direct main"
     description:
       name: image_picker_gallery_camera
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.6"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   import_js_library:
     dependency: transitive
     description:
       name: import_js_library
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.17.0"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.5"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.5.1"
   logger:
     dependency: "direct main"
     description:
       name: logger
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.3"
   package_info:
     dependency: "direct main"
     description:
       name: package_info
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.5.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.1"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.1.0+2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.1.0"
+  photo_view:
+    dependency: "direct main"
+    description:
+      name: photo_view
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.11.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.1"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.8"
   pull_to_refresh:
     dependency: "direct main"
     description:
       name: pull_to_refresh
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   qr:
     dependency: transitive
     description:
       name: qr
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
   retrofit:
     dependency: "direct main"
     description:
       name: retrofit
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.4+1"
   retrofit_generator:
     dependency: "direct dev"
     description:
       name: retrofit_generator
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.1+3"
   rxdart:
     dependency: "direct main"
     description:
       name: rxdart
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.26.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.6"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.9"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.4+1"
   sky_engine:
@@ -765,203 +772,203 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.10+3"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.1"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.2+4"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3+3"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0+2"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.1+3"
   tuple:
     dependency: transitive
     description:
       name: tuple
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   video_player:
     dependency: "direct main"
     description:
       name: video_player
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.4+1"
   wakelock:
     dependency: transitive
     description:
       name: wakelock
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.1+1"
   wakelock_platform_interface:
     dependency: transitive
     description:
       name: wakelock_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0+1"
   wakelock_web:
     dependency: transitive
     description:
       name: wakelock_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0+3"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   webview_flutter:
     dependency: transitive
     description:
       name: webview_flutter
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.7"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.5"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.1.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
 sdks:
diff --git a/pubspec.yaml b/pubspec.yaml
index 0c56ad25..2c608663 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -71,7 +71,7 @@ dependencies:
   cached_network_image: ^2.0.0
 
   flutter_html: ^1.3.0    #2.1.0
-#  photo_view: ^0.11.1
+  photo_view: ^0.11.1
 
   chewie: ^0.12.2
   video_player: ^1.0.1