Merge branch 'remove_uniapp' into dev

# Conflicts: # android/app/build.gradle # assets/image/2x/icon_mine_online_service.png # assets/image/3x/icon_mine_online_service.png # assets/image/icon_mine_online_service.png # lib/main.dart # lib/main_page.dart # lib/mine/coupons_page.dart # lib/mine/manage_address_page.dart # lib/mine/mine_view/mine_item.dart # lib/mine/vip_card_page.dart # lib/order/order_history_page.dart # lib/retrofit/retrofit_api.dart # lib/retrofit/retrofit_api.g.dart # lib/settlement/settlement_view/distribution.dart # lib/union/union_page.dart # pubspec.lock
3 years ago · 0883b06c73
1646 changed files with 1853 additions and 1164 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -143,7 +143,7 @@ android {

            ndk {
                /// 选择要添加的对应.so 库。
-                abiFilters 'armeabi-v7a'
+                abiFilters 'armeabi-v7a','arm64-v8a','x86'
            }
        }
        debug {
@ -155,7 +155,7 @@ android {

            ndk {
                /// 选择要添加的对应.so 库。
-                abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
+                abiFilters 'armeabi-v7a', 'arm64-v8a','x86','x86_64'
            }
        }
    }
--- a/assets/image/2x/activity_hot.png
+++ b/assets/image/2x/activity_hot.png
--- a/assets/image/2x/activity_hot.webp
+++ b/assets/image/2x/activity_hot.webp
--- a/assets/image/2x/activity_q.png
+++ b/assets/image/2x/activity_q.png
--- a/assets/image/2x/activity_q.webp
+++ b/assets/image/2x/activity_q.webp
--- a/assets/image/2x/add.png
+++ b/assets/image/2x/add.png
--- a/assets/image/2x/add.webp
+++ b/assets/image/2x/add.webp
--- a/assets/image/2x/attainment_bj.png
+++ b/assets/image/2x/attainment_bj.png
--- a/assets/image/2x/attainment_bj.webp
+++ b/assets/image/2x/attainment_bj.webp
--- a/assets/image/2x/badge_img.png
+++ b/assets/image/2x/badge_img.png
--- a/assets/image/2x/badge_img.webp
+++ b/assets/image/2x/badge_img.webp
--- a/assets/image/2x/bianhao.png
+++ b/assets/image/2x/bianhao.png
--- a/assets/image/2x/bianhao.webp
+++ b/assets/image/2x/bianhao.webp
--- a/assets/image/2x/bj_badge.png
+++ b/assets/image/2x/bj_badge.png
--- a/assets/image/2x/bj_badge.webp
+++ b/assets/image/2x/bj_badge.webp
--- a/assets/image/2x/browse.png
+++ b/assets/image/2x/browse.png
--- a/assets/image/2x/browse.webp
+++ b/assets/image/2x/browse.webp
--- a/assets/image/2x/by_badge.png
+++ b/assets/image/2x/by_badge.png
--- a/assets/image/2x/by_badge.webp
+++ b/assets/image/2x/by_badge.webp
--- a/assets/image/2x/c_z.png
+++ b/assets/image/2x/c_z.png
--- a/assets/image/2x/c_z.webp
+++ b/assets/image/2x/c_z.webp
--- a/assets/image/2x/cancel.png
+++ b/assets/image/2x/cancel.png
--- a/assets/image/2x/cancel.webp
+++ b/assets/image/2x/cancel.webp
--- a/assets/image/2x/closed_bill.png
+++ b/assets/image/2x/closed_bill.png
--- a/assets/image/2x/closed_bill.webp
+++ b/assets/image/2x/closed_bill.webp
--- a/assets/image/2x/default_1.png
+++ b/assets/image/2x/default_1.png
--- a/assets/image/2x/default_1.webp
+++ b/assets/image/2x/default_1.webp
--- a/assets/image/2x/default_2_1.png
+++ b/assets/image/2x/default_2_1.png
--- a/assets/image/2x/default_2_1.webp
+++ b/assets/image/2x/default_2_1.webp
--- a/assets/image/2x/default_user.png
+++ b/assets/image/2x/default_user.png
--- a/assets/image/2x/default_user.webp
+++ b/assets/image/2x/default_user.webp
--- a/assets/image/2x/default_user1.png
+++ b/assets/image/2x/default_user1.png
--- a/assets/image/2x/default_user1.webp
+++ b/assets/image/2x/default_user1.webp
--- a/assets/image/2x/delete.png
+++ b/assets/image/2x/delete.png
--- a/assets/image/2x/delete.webp
+++ b/assets/image/2x/delete.webp
--- a/assets/image/2x/di_zhi.png
+++ b/assets/image/2x/di_zhi.png
--- a/assets/image/2x/di_zhi.webp
+++ b/assets/image/2x/di_zhi.webp
--- a/assets/image/2x/ding_dan.png
+++ b/assets/image/2x/ding_dan.png
--- a/assets/image/2x/ding_dan.webp
+++ b/assets/image/2x/ding_dan.webp
--- a/assets/image/2x/distribution.png
+++ b/assets/image/2x/distribution.png
--- a/assets/image/2x/distribution.webp
+++ b/assets/image/2x/distribution.webp
--- a/assets/image/2x/dong_tai.png
+++ b/assets/image/2x/dong_tai.png
--- a/assets/image/2x/dong_tai.webp
+++ b/assets/image/2x/dong_tai.webp
--- a/assets/image/2x/dynamic.png
+++ b/assets/image/2x/dynamic.png
--- a/assets/image/2x/dynamic.webp
+++ b/assets/image/2x/dynamic.webp
--- a/assets/image/2x/fen_si.png
+++ b/assets/image/2x/fen_si.png
--- a/assets/image/2x/fen_si.webp
+++ b/assets/image/2x/fen_si.webp
--- a/assets/image/2x/follow.png
+++ b/assets/image/2x/follow.png
--- a/assets/image/2x/follow.webp
+++ b/assets/image/2x/follow.webp
--- a/assets/image/2x/fuka_j.png
+++ b/assets/image/2x/fuka_j.png
--- a/assets/image/2x/fuka_j.webp
+++ b/assets/image/2x/fuka_j.webp
--- a/assets/image/2x/fuka_zj.png
+++ b/assets/image/2x/fuka_zj.png
--- a/assets/image/2x/fuka_zj.webp
+++ b/assets/image/2x/fuka_zj.webp
--- a/assets/image/2x/guan_zhu.png
+++ b/assets/image/2x/guan_zhu.png
--- a/assets/image/2x/guan_zhu.webp
+++ b/assets/image/2x/guan_zhu.webp
--- a/assets/image/2x/hj_badge.png
+++ b/assets/image/2x/hj_badge.png
--- a/assets/image/2x/hj_badge.webp
+++ b/assets/image/2x/hj_badge.webp
--- a/assets/image/2x/home_activity.png
+++ b/assets/image/2x/home_activity.png
--- a/assets/image/2x/home_activity.webp
+++ b/assets/image/2x/home_activity.webp
--- a/assets/image/2x/home_coupon.png
+++ b/assets/image/2x/home_coupon.png
--- a/assets/image/2x/home_coupon.webp
+++ b/assets/image/2x/home_coupon.webp
--- a/assets/image/2x/home_order.png
+++ b/assets/image/2x/home_order.png
--- a/assets/image/2x/home_order.webp
+++ b/assets/image/2x/home_order.webp
--- a/assets/image/2x/home_recharge.png
+++ b/assets/image/2x/home_recharge.png
--- a/assets/image/2x/home_recharge.webp
+++ b/assets/image/2x/home_recharge.webp
--- a/assets/image/2x/ic_coupon_bg.png
+++ b/assets/image/2x/ic_coupon_bg.png
--- a/assets/image/2x/ic_coupon_bg.webp
+++ b/assets/image/2x/ic_coupon_bg.webp
--- a/assets/image/2x/ic_coupon_invalid_bg.png
+++ b/assets/image/2x/ic_coupon_invalid_bg.png
--- a/assets/image/2x/ic_coupon_invalid_bg.webp
+++ b/assets/image/2x/ic_coupon_invalid_bg.webp
--- a/assets/image/2x/ic_splash_bg.png
+++ b/assets/image/2x/ic_splash_bg.png
--- a/assets/image/2x/ic_splash_bg.webp
+++ b/assets/image/2x/ic_splash_bg.webp
--- a/assets/image/2x/icon_about_logo.png
+++ b/assets/image/2x/icon_about_logo.png
--- a/assets/image/2x/icon_about_logo.webp
+++ b/assets/image/2x/icon_about_logo.webp
--- a/assets/image/2x/icon_address_call.png
+++ b/assets/image/2x/icon_address_call.png
--- a/assets/image/2x/icon_address_call.webp
+++ b/assets/image/2x/icon_address_call.webp
--- a/assets/image/2x/icon_address_edit.png
+++ b/assets/image/2x/icon_address_edit.png
--- a/assets/image/2x/icon_address_edit.webp
+++ b/assets/image/2x/icon_address_edit.webp
--- a/assets/image/2x/icon_address_location.png
+++ b/assets/image/2x/icon_address_location.png
--- a/assets/image/2x/icon_address_location.webp
+++ b/assets/image/2x/icon_address_location.webp
--- a/assets/image/2x/icon_address_location_action.png
+++ b/assets/image/2x/icon_address_location_action.png
--- a/assets/image/2x/icon_address_location_action.webp
+++ b/assets/image/2x/icon_address_location_action.webp
--- a/assets/image/2x/icon_alipay.png
+++ b/assets/image/2x/icon_alipay.png
--- a/assets/image/2x/icon_alipay.webp
+++ b/assets/image/2x/icon_alipay.webp
--- a/assets/image/2x/icon_an_crown.png
+++ b/assets/image/2x/icon_an_crown.png
--- a/assets/image/2x/icon_an_crown.webp
+++ b/assets/image/2x/icon_an_crown.webp
--- a/assets/image/2x/icon_bi_n.png
+++ b/assets/image/2x/icon_bi_n.png
--- a/assets/image/2x/icon_bi_n.webp
+++ b/assets/image/2x/icon_bi_n.webp
--- a/assets/image/2x/icon_bi_s.png
+++ b/assets/image/2x/icon_bi_s.png
--- a/assets/image/2x/icon_bi_s.webp
+++ b/assets/image/2x/icon_bi_s.webp
--- a/assets/image/2x/icon_brand_introduction.png
+++ b/assets/image/2x/icon_brand_introduction.png
--- a/assets/image/2x/icon_brand_introduction.webp
+++ b/assets/image/2x/icon_brand_introduction.webp
--- a/assets/image/2x/icon_brand_n.png
+++ b/assets/image/2x/icon_brand_n.png
--- a/assets/image/2x/icon_brand_n.webp
+++ b/assets/image/2x/icon_brand_n.webp
--- a/assets/image/2x/icon_brand_s.png
+++ b/assets/image/2x/icon_brand_s.png
--- a/assets/image/2x/icon_brand_s.webp
+++ b/assets/image/2x/icon_brand_s.webp
--- a/assets/image/2x/icon_bread.png
+++ b/assets/image/2x/icon_bread.png
--- a/assets/image/2x/icon_bread_bg.png
+++ b/assets/image/2x/icon_bread_bg.png
--- a/assets/image/2x/icon_bread_bg.webp
+++ b/assets/image/2x/icon_bread_bg.webp
--- a/assets/image/2x/icon_calendar_today_sharp.png
+++ b/assets/image/2x/icon_calendar_today_sharp.png
--- a/assets/image/2x/icon_calendar_today_sharp.webp
+++ b/assets/image/2x/icon_calendar_today_sharp.webp
--- a/Show More
+++ b/Show More