diff --git a/android/app/build.gradle b/android/app/build.gradle index 46e2d7b2..aa38b250 100644 --- 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' } } } diff --git a/assets/image/2x/activity_hot.png b/assets/image/2x/activity_hot.png deleted file mode 100644 index 99d96f82..00000000 Binary files a/assets/image/2x/activity_hot.png and /dev/null differ diff --git a/assets/image/2x/activity_hot.webp b/assets/image/2x/activity_hot.webp new file mode 100644 index 00000000..a85130e0 Binary files /dev/null and b/assets/image/2x/activity_hot.webp differ diff --git a/assets/image/2x/activity_q.png b/assets/image/2x/activity_q.png deleted file mode 100644 index 3b30e5d3..00000000 Binary files a/assets/image/2x/activity_q.png and /dev/null differ diff --git a/assets/image/2x/activity_q.webp b/assets/image/2x/activity_q.webp new file mode 100644 index 00000000..3449361f Binary files /dev/null and b/assets/image/2x/activity_q.webp differ diff --git a/assets/image/2x/add.png b/assets/image/2x/add.png deleted file mode 100644 index 5c8f203b..00000000 Binary files a/assets/image/2x/add.png and /dev/null differ diff --git a/assets/image/2x/add.webp b/assets/image/2x/add.webp new file mode 100644 index 00000000..4b9cd6b9 Binary files /dev/null and b/assets/image/2x/add.webp differ diff --git a/assets/image/2x/attainment_bj.png b/assets/image/2x/attainment_bj.png deleted file mode 100644 index bfbd8007..00000000 Binary files a/assets/image/2x/attainment_bj.png and /dev/null differ diff --git a/assets/image/2x/attainment_bj.webp b/assets/image/2x/attainment_bj.webp new file mode 100644 index 00000000..e864f1f1 Binary files /dev/null and b/assets/image/2x/attainment_bj.webp differ diff --git a/assets/image/2x/badge_img.png b/assets/image/2x/badge_img.png deleted file mode 100644 index a7aafcb4..00000000 Binary files a/assets/image/2x/badge_img.png and /dev/null differ diff --git a/assets/image/2x/badge_img.webp b/assets/image/2x/badge_img.webp new file mode 100644 index 00000000..849fe585 Binary files /dev/null and b/assets/image/2x/badge_img.webp differ diff --git a/assets/image/2x/bianhao.png b/assets/image/2x/bianhao.png deleted file mode 100644 index ea6ad1b2..00000000 Binary files a/assets/image/2x/bianhao.png and /dev/null differ diff --git a/assets/image/2x/bianhao.webp b/assets/image/2x/bianhao.webp new file mode 100644 index 00000000..1f6d0a0f Binary files /dev/null and b/assets/image/2x/bianhao.webp differ diff --git a/assets/image/2x/bj_badge.png b/assets/image/2x/bj_badge.png deleted file mode 100644 index 81f31315..00000000 Binary files a/assets/image/2x/bj_badge.png and /dev/null differ diff --git a/assets/image/2x/bj_badge.webp b/assets/image/2x/bj_badge.webp new file mode 100644 index 00000000..d82cd965 Binary files /dev/null and b/assets/image/2x/bj_badge.webp differ diff --git a/assets/image/2x/browse.png b/assets/image/2x/browse.png deleted file mode 100644 index 26b5ca48..00000000 Binary files a/assets/image/2x/browse.png and /dev/null differ diff --git a/assets/image/2x/browse.webp b/assets/image/2x/browse.webp new file mode 100644 index 00000000..a993bbdc Binary files /dev/null and b/assets/image/2x/browse.webp differ diff --git a/assets/image/2x/by_badge.png b/assets/image/2x/by_badge.png deleted file mode 100644 index 0002b4c7..00000000 Binary files a/assets/image/2x/by_badge.png and /dev/null differ diff --git a/assets/image/2x/by_badge.webp b/assets/image/2x/by_badge.webp new file mode 100644 index 00000000..8bcf8bba Binary files /dev/null and b/assets/image/2x/by_badge.webp differ diff --git a/assets/image/2x/c_z.png b/assets/image/2x/c_z.png deleted file mode 100644 index 547e82d4..00000000 Binary files a/assets/image/2x/c_z.png and /dev/null differ diff --git a/assets/image/2x/c_z.webp b/assets/image/2x/c_z.webp new file mode 100644 index 00000000..ea1056ff Binary files /dev/null and b/assets/image/2x/c_z.webp differ diff --git a/assets/image/2x/cancel.png b/assets/image/2x/cancel.png deleted file mode 100644 index e3c8fab5..00000000 Binary files a/assets/image/2x/cancel.png and /dev/null differ diff --git a/assets/image/2x/cancel.webp b/assets/image/2x/cancel.webp new file mode 100644 index 00000000..11e194cc Binary files /dev/null and b/assets/image/2x/cancel.webp differ diff --git a/assets/image/2x/closed_bill.png b/assets/image/2x/closed_bill.png deleted file mode 100644 index 42799000..00000000 Binary files a/assets/image/2x/closed_bill.png and /dev/null differ diff --git a/assets/image/2x/closed_bill.webp b/assets/image/2x/closed_bill.webp new file mode 100644 index 00000000..968c0d2a Binary files /dev/null and b/assets/image/2x/closed_bill.webp differ diff --git a/assets/image/2x/default_1.png b/assets/image/2x/default_1.png deleted file mode 100644 index fcae70d1..00000000 Binary files a/assets/image/2x/default_1.png and /dev/null differ diff --git a/assets/image/2x/default_1.webp b/assets/image/2x/default_1.webp new file mode 100644 index 00000000..80446407 Binary files /dev/null and b/assets/image/2x/default_1.webp differ diff --git a/assets/image/2x/default_2_1.png b/assets/image/2x/default_2_1.png deleted file mode 100644 index 6c02da7b..00000000 Binary files a/assets/image/2x/default_2_1.png and /dev/null differ diff --git a/assets/image/2x/default_2_1.webp b/assets/image/2x/default_2_1.webp new file mode 100644 index 00000000..a02ace8c Binary files /dev/null and b/assets/image/2x/default_2_1.webp differ diff --git a/assets/image/2x/default_user.png b/assets/image/2x/default_user.png deleted file mode 100644 index 02a0b174..00000000 Binary files a/assets/image/2x/default_user.png and /dev/null differ diff --git a/assets/image/2x/default_user.webp b/assets/image/2x/default_user.webp new file mode 100644 index 00000000..ea543a67 Binary files /dev/null and b/assets/image/2x/default_user.webp differ diff --git a/assets/image/2x/default_user1.png b/assets/image/2x/default_user1.png deleted file mode 100644 index fb561b6b..00000000 Binary files a/assets/image/2x/default_user1.png and /dev/null differ diff --git a/assets/image/2x/default_user1.webp b/assets/image/2x/default_user1.webp new file mode 100644 index 00000000..6762c2d5 Binary files /dev/null and b/assets/image/2x/default_user1.webp differ diff --git a/assets/image/2x/delete.png b/assets/image/2x/delete.png deleted file mode 100644 index e42f31b0..00000000 Binary files a/assets/image/2x/delete.png and /dev/null differ diff --git a/assets/image/2x/delete.webp b/assets/image/2x/delete.webp new file mode 100644 index 00000000..8c7de586 Binary files /dev/null and b/assets/image/2x/delete.webp differ diff --git a/assets/image/2x/di_zhi.png b/assets/image/2x/di_zhi.png deleted file mode 100644 index 723f79c8..00000000 Binary files a/assets/image/2x/di_zhi.png and /dev/null differ diff --git a/assets/image/2x/di_zhi.webp b/assets/image/2x/di_zhi.webp new file mode 100644 index 00000000..c493be87 Binary files /dev/null and b/assets/image/2x/di_zhi.webp differ diff --git a/assets/image/2x/ding_dan.png b/assets/image/2x/ding_dan.png deleted file mode 100644 index da1a9bc6..00000000 Binary files a/assets/image/2x/ding_dan.png and /dev/null differ diff --git a/assets/image/2x/ding_dan.webp b/assets/image/2x/ding_dan.webp new file mode 100644 index 00000000..ba3bd839 Binary files /dev/null and b/assets/image/2x/ding_dan.webp differ diff --git a/assets/image/2x/distribution.png b/assets/image/2x/distribution.png deleted file mode 100644 index f81a0b33..00000000 Binary files a/assets/image/2x/distribution.png and /dev/null differ diff --git a/assets/image/2x/distribution.webp b/assets/image/2x/distribution.webp new file mode 100644 index 00000000..468191bc Binary files /dev/null and b/assets/image/2x/distribution.webp differ diff --git a/assets/image/2x/dong_tai.png b/assets/image/2x/dong_tai.png deleted file mode 100644 index e264afcf..00000000 Binary files a/assets/image/2x/dong_tai.png and /dev/null differ diff --git a/assets/image/2x/dong_tai.webp b/assets/image/2x/dong_tai.webp new file mode 100644 index 00000000..38a8b049 Binary files /dev/null and b/assets/image/2x/dong_tai.webp differ diff --git a/assets/image/2x/dynamic.png b/assets/image/2x/dynamic.png deleted file mode 100644 index ce532f0d..00000000 Binary files a/assets/image/2x/dynamic.png and /dev/null differ diff --git a/assets/image/2x/dynamic.webp b/assets/image/2x/dynamic.webp new file mode 100644 index 00000000..bf5f380c Binary files /dev/null and b/assets/image/2x/dynamic.webp differ diff --git a/assets/image/2x/fen_si.png b/assets/image/2x/fen_si.png deleted file mode 100644 index 76aec509..00000000 Binary files a/assets/image/2x/fen_si.png and /dev/null differ diff --git a/assets/image/2x/fen_si.webp b/assets/image/2x/fen_si.webp new file mode 100644 index 00000000..4a84996a Binary files /dev/null and b/assets/image/2x/fen_si.webp differ diff --git a/assets/image/2x/follow.png b/assets/image/2x/follow.png deleted file mode 100644 index c3a41e33..00000000 Binary files a/assets/image/2x/follow.png and /dev/null differ diff --git a/assets/image/2x/follow.webp b/assets/image/2x/follow.webp new file mode 100644 index 00000000..599bd284 Binary files /dev/null and b/assets/image/2x/follow.webp differ diff --git a/assets/image/2x/fuka_j.png b/assets/image/2x/fuka_j.png deleted file mode 100644 index 4e795416..00000000 Binary files a/assets/image/2x/fuka_j.png and /dev/null differ diff --git a/assets/image/2x/fuka_j.webp b/assets/image/2x/fuka_j.webp new file mode 100644 index 00000000..ce681b57 Binary files /dev/null and b/assets/image/2x/fuka_j.webp differ diff --git a/assets/image/2x/fuka_zj.png b/assets/image/2x/fuka_zj.png deleted file mode 100644 index e4834cc7..00000000 Binary files a/assets/image/2x/fuka_zj.png and /dev/null differ diff --git a/assets/image/2x/fuka_zj.webp b/assets/image/2x/fuka_zj.webp new file mode 100644 index 00000000..24012c6c Binary files /dev/null and b/assets/image/2x/fuka_zj.webp differ diff --git a/assets/image/2x/guan_zhu.png b/assets/image/2x/guan_zhu.png deleted file mode 100644 index 4100e4e5..00000000 Binary files a/assets/image/2x/guan_zhu.png and /dev/null differ diff --git a/assets/image/2x/guan_zhu.webp b/assets/image/2x/guan_zhu.webp new file mode 100644 index 00000000..351c61d5 Binary files /dev/null and b/assets/image/2x/guan_zhu.webp differ diff --git a/assets/image/2x/hj_badge.png b/assets/image/2x/hj_badge.png deleted file mode 100644 index a09e0bbf..00000000 Binary files a/assets/image/2x/hj_badge.png and /dev/null differ diff --git a/assets/image/2x/hj_badge.webp b/assets/image/2x/hj_badge.webp new file mode 100644 index 00000000..e5fe2d72 Binary files /dev/null and b/assets/image/2x/hj_badge.webp differ diff --git a/assets/image/2x/home_activity.png b/assets/image/2x/home_activity.png deleted file mode 100644 index 973dd8ff..00000000 Binary files a/assets/image/2x/home_activity.png and /dev/null differ diff --git a/assets/image/2x/home_activity.webp b/assets/image/2x/home_activity.webp new file mode 100644 index 00000000..efd9122e Binary files /dev/null and b/assets/image/2x/home_activity.webp differ diff --git a/assets/image/2x/home_coupon.png b/assets/image/2x/home_coupon.png deleted file mode 100644 index ae9a63ca..00000000 Binary files a/assets/image/2x/home_coupon.png and /dev/null differ diff --git a/assets/image/2x/home_coupon.webp b/assets/image/2x/home_coupon.webp new file mode 100644 index 00000000..ebff850d Binary files /dev/null and b/assets/image/2x/home_coupon.webp differ diff --git a/assets/image/2x/home_order.png b/assets/image/2x/home_order.png deleted file mode 100644 index 33612170..00000000 Binary files a/assets/image/2x/home_order.png and /dev/null differ diff --git a/assets/image/2x/home_order.webp b/assets/image/2x/home_order.webp new file mode 100644 index 00000000..aa503bf0 Binary files /dev/null and b/assets/image/2x/home_order.webp differ diff --git a/assets/image/2x/home_recharge.png b/assets/image/2x/home_recharge.png deleted file mode 100644 index 9f8380c8..00000000 Binary files a/assets/image/2x/home_recharge.png and /dev/null differ diff --git a/assets/image/2x/home_recharge.webp b/assets/image/2x/home_recharge.webp new file mode 100644 index 00000000..d41bdd1c Binary files /dev/null and b/assets/image/2x/home_recharge.webp differ diff --git a/assets/image/2x/ic_coupon_bg.png b/assets/image/2x/ic_coupon_bg.png deleted file mode 100644 index ee01e11b..00000000 Binary files a/assets/image/2x/ic_coupon_bg.png and /dev/null differ diff --git a/assets/image/2x/ic_coupon_bg.webp b/assets/image/2x/ic_coupon_bg.webp new file mode 100644 index 00000000..1e6ebb8b Binary files /dev/null and b/assets/image/2x/ic_coupon_bg.webp differ diff --git a/assets/image/2x/ic_coupon_invalid_bg.png b/assets/image/2x/ic_coupon_invalid_bg.png deleted file mode 100644 index 012e5d8c..00000000 Binary files a/assets/image/2x/ic_coupon_invalid_bg.png and /dev/null differ diff --git a/assets/image/2x/ic_coupon_invalid_bg.webp b/assets/image/2x/ic_coupon_invalid_bg.webp new file mode 100644 index 00000000..b63adfb1 Binary files /dev/null and b/assets/image/2x/ic_coupon_invalid_bg.webp differ diff --git a/assets/image/2x/ic_splash_bg.png b/assets/image/2x/ic_splash_bg.png deleted file mode 100644 index eae093e9..00000000 Binary files a/assets/image/2x/ic_splash_bg.png and /dev/null differ diff --git a/assets/image/2x/ic_splash_bg.webp b/assets/image/2x/ic_splash_bg.webp new file mode 100644 index 00000000..a723fa10 Binary files /dev/null and b/assets/image/2x/ic_splash_bg.webp differ diff --git a/assets/image/2x/icon_about_logo.png b/assets/image/2x/icon_about_logo.png deleted file mode 100644 index 326a91cf..00000000 Binary files a/assets/image/2x/icon_about_logo.png and /dev/null differ diff --git a/assets/image/2x/icon_about_logo.webp b/assets/image/2x/icon_about_logo.webp new file mode 100644 index 00000000..0f3f8e87 Binary files /dev/null and b/assets/image/2x/icon_about_logo.webp differ diff --git a/assets/image/2x/icon_address_call.png b/assets/image/2x/icon_address_call.png deleted file mode 100644 index 7ee5b423..00000000 Binary files a/assets/image/2x/icon_address_call.png and /dev/null differ diff --git a/assets/image/2x/icon_address_call.webp b/assets/image/2x/icon_address_call.webp new file mode 100644 index 00000000..29b81ab6 Binary files /dev/null and b/assets/image/2x/icon_address_call.webp differ diff --git a/assets/image/2x/icon_address_edit.png b/assets/image/2x/icon_address_edit.png deleted file mode 100644 index c2d9516c..00000000 Binary files a/assets/image/2x/icon_address_edit.png and /dev/null differ diff --git a/assets/image/2x/icon_address_edit.webp b/assets/image/2x/icon_address_edit.webp new file mode 100644 index 00000000..d18db0f9 Binary files /dev/null and b/assets/image/2x/icon_address_edit.webp differ diff --git a/assets/image/2x/icon_address_location.png b/assets/image/2x/icon_address_location.png deleted file mode 100644 index a53449d1..00000000 Binary files a/assets/image/2x/icon_address_location.png and /dev/null differ diff --git a/assets/image/2x/icon_address_location.webp b/assets/image/2x/icon_address_location.webp new file mode 100644 index 00000000..e985c13a Binary files /dev/null and b/assets/image/2x/icon_address_location.webp differ diff --git a/assets/image/2x/icon_address_location_action.png b/assets/image/2x/icon_address_location_action.png deleted file mode 100644 index 36edfa27..00000000 Binary files a/assets/image/2x/icon_address_location_action.png and /dev/null differ diff --git a/assets/image/2x/icon_address_location_action.webp b/assets/image/2x/icon_address_location_action.webp new file mode 100644 index 00000000..98df2880 Binary files /dev/null and b/assets/image/2x/icon_address_location_action.webp differ diff --git a/assets/image/2x/icon_alipay.png b/assets/image/2x/icon_alipay.png deleted file mode 100644 index 5ad03156..00000000 Binary files a/assets/image/2x/icon_alipay.png and /dev/null differ diff --git a/assets/image/2x/icon_alipay.webp b/assets/image/2x/icon_alipay.webp new file mode 100644 index 00000000..23a469fc Binary files /dev/null and b/assets/image/2x/icon_alipay.webp differ diff --git a/assets/image/2x/icon_an_crown.png b/assets/image/2x/icon_an_crown.png deleted file mode 100644 index 6ebeb4fe..00000000 Binary files a/assets/image/2x/icon_an_crown.png and /dev/null differ diff --git a/assets/image/2x/icon_an_crown.webp b/assets/image/2x/icon_an_crown.webp new file mode 100644 index 00000000..6612e4e6 Binary files /dev/null and b/assets/image/2x/icon_an_crown.webp differ diff --git a/assets/image/2x/icon_bi_n.png b/assets/image/2x/icon_bi_n.png deleted file mode 100644 index 875b7cd6..00000000 Binary files a/assets/image/2x/icon_bi_n.png and /dev/null differ diff --git a/assets/image/2x/icon_bi_n.webp b/assets/image/2x/icon_bi_n.webp new file mode 100644 index 00000000..c659673a Binary files /dev/null and b/assets/image/2x/icon_bi_n.webp differ diff --git a/assets/image/2x/icon_bi_s.png b/assets/image/2x/icon_bi_s.png deleted file mode 100644 index d76eb353..00000000 Binary files a/assets/image/2x/icon_bi_s.png and /dev/null differ diff --git a/assets/image/2x/icon_bi_s.webp b/assets/image/2x/icon_bi_s.webp new file mode 100644 index 00000000..ecf1216b Binary files /dev/null and b/assets/image/2x/icon_bi_s.webp differ diff --git a/assets/image/2x/icon_brand_introduction.png b/assets/image/2x/icon_brand_introduction.png deleted file mode 100644 index 74947dc4..00000000 Binary files a/assets/image/2x/icon_brand_introduction.png and /dev/null differ diff --git a/assets/image/2x/icon_brand_introduction.webp b/assets/image/2x/icon_brand_introduction.webp new file mode 100644 index 00000000..4a77ffc6 Binary files /dev/null and b/assets/image/2x/icon_brand_introduction.webp differ diff --git a/assets/image/2x/icon_brand_n.png b/assets/image/2x/icon_brand_n.png deleted file mode 100644 index b60c31fe..00000000 Binary files a/assets/image/2x/icon_brand_n.png and /dev/null differ diff --git a/assets/image/2x/icon_brand_n.webp b/assets/image/2x/icon_brand_n.webp new file mode 100644 index 00000000..e7272378 Binary files /dev/null and b/assets/image/2x/icon_brand_n.webp differ diff --git a/assets/image/2x/icon_brand_s.png b/assets/image/2x/icon_brand_s.png deleted file mode 100644 index 4eadf9b8..00000000 Binary files a/assets/image/2x/icon_brand_s.png and /dev/null differ diff --git a/assets/image/2x/icon_brand_s.webp b/assets/image/2x/icon_brand_s.webp new file mode 100644 index 00000000..77552945 Binary files /dev/null and b/assets/image/2x/icon_brand_s.webp differ diff --git a/assets/image/2x/icon_bread.png b/assets/image/2x/icon_bread.png deleted file mode 100644 index 975d1549..00000000 Binary files a/assets/image/2x/icon_bread.png and /dev/null differ diff --git a/assets/image/2x/icon_bread_bg.png b/assets/image/2x/icon_bread_bg.png deleted file mode 100644 index 469a5f0b..00000000 Binary files a/assets/image/2x/icon_bread_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_bread_bg.webp b/assets/image/2x/icon_bread_bg.webp new file mode 100644 index 00000000..7f16da8c Binary files /dev/null and b/assets/image/2x/icon_bread_bg.webp differ diff --git a/assets/image/2x/icon_calendar_today_sharp.png b/assets/image/2x/icon_calendar_today_sharp.png deleted file mode 100644 index e7fb5fc3..00000000 Binary files a/assets/image/2x/icon_calendar_today_sharp.png and /dev/null differ diff --git a/assets/image/2x/icon_calendar_today_sharp.webp b/assets/image/2x/icon_calendar_today_sharp.webp new file mode 100644 index 00000000..0c863f75 Binary files /dev/null and b/assets/image/2x/icon_calendar_today_sharp.webp differ diff --git a/assets/image/2x/icon_camera_permission_tips.png b/assets/image/2x/icon_camera_permission_tips.png deleted file mode 100644 index c15b3ca0..00000000 Binary files a/assets/image/2x/icon_camera_permission_tips.png and /dev/null differ diff --git a/assets/image/2x/icon_camera_permission_tips.webp b/assets/image/2x/icon_camera_permission_tips.webp new file mode 100644 index 00000000..dbc53731 Binary files /dev/null and b/assets/image/2x/icon_camera_permission_tips.webp differ diff --git a/assets/image/2x/icon_card_coupon.png b/assets/image/2x/icon_card_coupon.png deleted file mode 100644 index cdf0eb6e..00000000 Binary files a/assets/image/2x/icon_card_coupon.png and /dev/null differ diff --git a/assets/image/2x/icon_card_coupon.webp b/assets/image/2x/icon_card_coupon.webp new file mode 100644 index 00000000..640630e1 Binary files /dev/null and b/assets/image/2x/icon_card_coupon.webp differ diff --git a/assets/image/2x/icon_chili.png b/assets/image/2x/icon_chili.png deleted file mode 100644 index 4816f619..00000000 Binary files a/assets/image/2x/icon_chili.png and /dev/null differ diff --git a/assets/image/2x/icon_comment.png b/assets/image/2x/icon_comment.png deleted file mode 100644 index 35a98742..00000000 Binary files a/assets/image/2x/icon_comment.png and /dev/null differ diff --git a/assets/image/2x/icon_comment.webp b/assets/image/2x/icon_comment.webp new file mode 100644 index 00000000..7637dd7a Binary files /dev/null and b/assets/image/2x/icon_comment.webp differ diff --git a/assets/image/2x/icon_del.png b/assets/image/2x/icon_del.png deleted file mode 100644 index f7a17cd0..00000000 Binary files a/assets/image/2x/icon_del.png and /dev/null differ diff --git a/assets/image/2x/icon_del.webp b/assets/image/2x/icon_del.webp new file mode 100644 index 00000000..499e5e8c Binary files /dev/null and b/assets/image/2x/icon_del.webp differ diff --git a/assets/image/2x/icon_delete.png b/assets/image/2x/icon_delete.png deleted file mode 100644 index 2a414f70..00000000 Binary files a/assets/image/2x/icon_delete.png and /dev/null differ diff --git a/assets/image/2x/icon_delete.webp b/assets/image/2x/icon_delete.webp new file mode 100644 index 00000000..cdaf1043 Binary files /dev/null and b/assets/image/2x/icon_delete.webp differ diff --git a/assets/image/2x/icon_deliver_goods.png b/assets/image/2x/icon_deliver_goods.png deleted file mode 100644 index f81a9ccd..00000000 Binary files a/assets/image/2x/icon_deliver_goods.png and /dev/null differ diff --git a/assets/image/2x/icon_deliver_goods.webp b/assets/image/2x/icon_deliver_goods.webp new file mode 100644 index 00000000..979f5f0e Binary files /dev/null and b/assets/image/2x/icon_deliver_goods.webp differ diff --git a/assets/image/2x/icon_deliver_goods_h.png b/assets/image/2x/icon_deliver_goods_h.png deleted file mode 100644 index 61a3275a..00000000 Binary files a/assets/image/2x/icon_deliver_goods_h.png and /dev/null differ diff --git a/assets/image/2x/icon_deliver_goods_h.webp b/assets/image/2x/icon_deliver_goods_h.webp new file mode 100644 index 00000000..44165120 Binary files /dev/null and b/assets/image/2x/icon_deliver_goods_h.webp differ diff --git a/assets/image/2x/icon_delivery.png b/assets/image/2x/icon_delivery.png deleted file mode 100644 index df72d8ac..00000000 Binary files a/assets/image/2x/icon_delivery.png and /dev/null differ diff --git a/assets/image/2x/icon_delivery.webp b/assets/image/2x/icon_delivery.webp new file mode 100644 index 00000000..53799cd4 Binary files /dev/null and b/assets/image/2x/icon_delivery.webp differ diff --git a/assets/image/2x/icon_delivery_h.png b/assets/image/2x/icon_delivery_h.png deleted file mode 100644 index ead68ec2..00000000 Binary files a/assets/image/2x/icon_delivery_h.png and /dev/null differ diff --git a/assets/image/2x/icon_delivery_h.webp b/assets/image/2x/icon_delivery_h.webp new file mode 100644 index 00000000..0e44b58f Binary files /dev/null and b/assets/image/2x/icon_delivery_h.webp differ diff --git a/assets/image/2x/icon_empty.png b/assets/image/2x/icon_empty.png deleted file mode 100644 index e4401327..00000000 Binary files a/assets/image/2x/icon_empty.png and /dev/null differ diff --git a/assets/image/2x/icon_empty.webp b/assets/image/2x/icon_empty.webp new file mode 100644 index 00000000..d60adb97 Binary files /dev/null and b/assets/image/2x/icon_empty.webp differ diff --git a/assets/image/2x/icon_enlarge.png b/assets/image/2x/icon_enlarge.png deleted file mode 100644 index a3bb371b..00000000 Binary files a/assets/image/2x/icon_enlarge.png and /dev/null differ diff --git a/assets/image/2x/icon_enlarge.webp b/assets/image/2x/icon_enlarge.webp new file mode 100644 index 00000000..68ac78d1 Binary files /dev/null and b/assets/image/2x/icon_enlarge.webp differ diff --git a/assets/image/2x/icon_facebook.png b/assets/image/2x/icon_facebook.png deleted file mode 100644 index ee2f0eec..00000000 Binary files a/assets/image/2x/icon_facebook.png and /dev/null differ diff --git a/assets/image/2x/icon_facebook.webp b/assets/image/2x/icon_facebook.webp new file mode 100644 index 00000000..d3dc9968 Binary files /dev/null and b/assets/image/2x/icon_facebook.webp differ diff --git a/assets/image/2x/icon_founder.png b/assets/image/2x/icon_founder.png deleted file mode 100644 index eeba4c51..00000000 Binary files a/assets/image/2x/icon_founder.png and /dev/null differ diff --git a/assets/image/2x/icon_founder.webp b/assets/image/2x/icon_founder.webp new file mode 100644 index 00000000..191fc353 Binary files /dev/null and b/assets/image/2x/icon_founder.webp differ diff --git a/assets/image/2x/icon_founder_text.png b/assets/image/2x/icon_founder_text.png deleted file mode 100644 index 15bb6503..00000000 Binary files a/assets/image/2x/icon_founder_text.png and /dev/null differ diff --git a/assets/image/2x/icon_founder_text.webp b/assets/image/2x/icon_founder_text.webp new file mode 100644 index 00000000..faab6eb4 Binary files /dev/null and b/assets/image/2x/icon_founder_text.webp differ diff --git a/assets/image/2x/icon_get_coupons.png b/assets/image/2x/icon_get_coupons.png deleted file mode 100644 index a9a679de..00000000 Binary files a/assets/image/2x/icon_get_coupons.png and /dev/null differ diff --git a/assets/image/2x/icon_get_coupons.webp b/assets/image/2x/icon_get_coupons.webp new file mode 100644 index 00000000..eba63d83 Binary files /dev/null and b/assets/image/2x/icon_get_coupons.webp differ diff --git a/assets/image/2x/icon_gold_blessing.png b/assets/image/2x/icon_gold_blessing.png deleted file mode 100644 index b0947643..00000000 Binary files a/assets/image/2x/icon_gold_blessing.png and /dev/null differ diff --git a/assets/image/2x/icon_gold_blessing.webp b/assets/image/2x/icon_gold_blessing.webp new file mode 100644 index 00000000..ff7db233 Binary files /dev/null and b/assets/image/2x/icon_gold_blessing.webp differ diff --git a/assets/image/2x/icon_gold_coin.png b/assets/image/2x/icon_gold_coin.png deleted file mode 100644 index 91ee0ba8..00000000 Binary files a/assets/image/2x/icon_gold_coin.png and /dev/null differ diff --git a/assets/image/2x/icon_gold_coin.webp b/assets/image/2x/icon_gold_coin.webp new file mode 100644 index 00000000..93319e79 Binary files /dev/null and b/assets/image/2x/icon_gold_coin.webp differ diff --git a/assets/image/2x/icon_guide_1.png b/assets/image/2x/icon_guide_1.png deleted file mode 100644 index 2ba34331..00000000 Binary files a/assets/image/2x/icon_guide_1.png and /dev/null differ diff --git a/assets/image/2x/icon_guide_1.webp b/assets/image/2x/icon_guide_1.webp new file mode 100644 index 00000000..a1a9f3b4 Binary files /dev/null and b/assets/image/2x/icon_guide_1.webp differ diff --git a/assets/image/2x/icon_guide_2.png b/assets/image/2x/icon_guide_2.png deleted file mode 100644 index f016c4fa..00000000 Binary files a/assets/image/2x/icon_guide_2.png and /dev/null differ diff --git a/assets/image/2x/icon_guide_2.webp b/assets/image/2x/icon_guide_2.webp new file mode 100644 index 00000000..e1cdaa92 Binary files /dev/null and b/assets/image/2x/icon_guide_2.webp differ diff --git a/assets/image/2x/icon_guide_3.png b/assets/image/2x/icon_guide_3.png deleted file mode 100644 index 7edd1819..00000000 Binary files a/assets/image/2x/icon_guide_3.png and /dev/null differ diff --git a/assets/image/2x/icon_guide_3.webp b/assets/image/2x/icon_guide_3.webp new file mode 100644 index 00000000..8b12a602 Binary files /dev/null and b/assets/image/2x/icon_guide_3.webp differ diff --git a/assets/image/2x/icon_guide_4.png b/assets/image/2x/icon_guide_4.png deleted file mode 100644 index 80003ba5..00000000 Binary files a/assets/image/2x/icon_guide_4.png and /dev/null differ diff --git a/assets/image/2x/icon_guide_4.webp b/assets/image/2x/icon_guide_4.webp new file mode 100644 index 00000000..5f229cb9 Binary files /dev/null and b/assets/image/2x/icon_guide_4.webp differ diff --git a/assets/image/2x/icon_gz.png b/assets/image/2x/icon_gz.png deleted file mode 100644 index d0895af4..00000000 Binary files a/assets/image/2x/icon_gz.png and /dev/null differ diff --git a/assets/image/2x/icon_gz.webp b/assets/image/2x/icon_gz.webp new file mode 100644 index 00000000..3611d1f1 Binary files /dev/null and b/assets/image/2x/icon_gz.webp differ diff --git a/assets/image/2x/icon_header_loading.png b/assets/image/2x/icon_header_loading.png deleted file mode 100644 index 41c46347..00000000 Binary files a/assets/image/2x/icon_header_loading.png and /dev/null differ diff --git a/assets/image/2x/icon_header_loading.webp b/assets/image/2x/icon_header_loading.webp new file mode 100644 index 00000000..844584d2 Binary files /dev/null and b/assets/image/2x/icon_header_loading.webp differ diff --git a/assets/image/2x/icon_history.png b/assets/image/2x/icon_history.png deleted file mode 100644 index f113c9c4..00000000 Binary files a/assets/image/2x/icon_history.png and /dev/null differ diff --git a/assets/image/2x/icon_history.webp b/assets/image/2x/icon_history.webp new file mode 100644 index 00000000..b56f543a Binary files /dev/null and b/assets/image/2x/icon_history.webp differ diff --git a/assets/image/2x/icon_hot_right_top.png b/assets/image/2x/icon_hot_right_top.png deleted file mode 100644 index 8f83e6c8..00000000 Binary files a/assets/image/2x/icon_hot_right_top.png and /dev/null differ diff --git a/assets/image/2x/icon_hot_right_top.webp b/assets/image/2x/icon_hot_right_top.webp new file mode 100644 index 00000000..03b7562b Binary files /dev/null and b/assets/image/2x/icon_hot_right_top.webp differ diff --git a/assets/image/2x/icon_idea_cj.png b/assets/image/2x/icon_idea_cj.png deleted file mode 100644 index 24da637a..00000000 Binary files a/assets/image/2x/icon_idea_cj.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_cj.webp b/assets/image/2x/icon_idea_cj.webp new file mode 100644 index 00000000..8a6eacee Binary files /dev/null and b/assets/image/2x/icon_idea_cj.webp differ diff --git a/assets/image/2x/icon_idea_hb.png b/assets/image/2x/icon_idea_hb.png deleted file mode 100644 index ae4b426e..00000000 Binary files a/assets/image/2x/icon_idea_hb.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_hb.webp b/assets/image/2x/icon_idea_hb.webp new file mode 100644 index 00000000..782e08c0 Binary files /dev/null and b/assets/image/2x/icon_idea_hb.webp differ diff --git a/assets/image/2x/icon_idea_jk.png b/assets/image/2x/icon_idea_jk.png deleted file mode 100644 index 4406681d..00000000 Binary files a/assets/image/2x/icon_idea_jk.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_jk.webp b/assets/image/2x/icon_idea_jk.webp new file mode 100644 index 00000000..d0f713ff Binary files /dev/null and b/assets/image/2x/icon_idea_jk.webp differ diff --git a/assets/image/2x/icon_idea_ya.png b/assets/image/2x/icon_idea_ya.png deleted file mode 100644 index 09314707..00000000 Binary files a/assets/image/2x/icon_idea_ya.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_ya.webp b/assets/image/2x/icon_idea_ya.webp new file mode 100644 index 00000000..7ca0d9b8 Binary files /dev/null and b/assets/image/2x/icon_idea_ya.webp differ diff --git a/assets/image/2x/icon_idea_yj.png b/assets/image/2x/icon_idea_yj.png deleted file mode 100644 index c733bc93..00000000 Binary files a/assets/image/2x/icon_idea_yj.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_yj.webp b/assets/image/2x/icon_idea_yj.webp new file mode 100644 index 00000000..32784496 Binary files /dev/null and b/assets/image/2x/icon_idea_yj.webp differ diff --git a/assets/image/2x/icon_idea_zh.png b/assets/image/2x/icon_idea_zh.png deleted file mode 100644 index 96ab80e0..00000000 Binary files a/assets/image/2x/icon_idea_zh.png and /dev/null differ diff --git a/assets/image/2x/icon_idea_zh.webp b/assets/image/2x/icon_idea_zh.webp new file mode 100644 index 00000000..0086874f Binary files /dev/null and b/assets/image/2x/icon_idea_zh.webp differ diff --git a/assets/image/2x/icon_integral_login.png b/assets/image/2x/icon_integral_login.png deleted file mode 100644 index c341bbc8..00000000 Binary files a/assets/image/2x/icon_integral_login.png and /dev/null differ diff --git a/assets/image/2x/icon_integral_login.webp b/assets/image/2x/icon_integral_login.webp new file mode 100644 index 00000000..1a08438a Binary files /dev/null and b/assets/image/2x/icon_integral_login.webp differ diff --git a/assets/image/2x/icon_integral_order.png b/assets/image/2x/icon_integral_order.png deleted file mode 100644 index a69632a5..00000000 Binary files a/assets/image/2x/icon_integral_order.png and /dev/null differ diff --git a/assets/image/2x/icon_integral_order.webp b/assets/image/2x/icon_integral_order.webp new file mode 100644 index 00000000..f7623922 Binary files /dev/null and b/assets/image/2x/icon_integral_order.webp differ diff --git a/assets/image/2x/icon_integral_share.png b/assets/image/2x/icon_integral_share.png deleted file mode 100644 index 63b52af4..00000000 Binary files a/assets/image/2x/icon_integral_share.png and /dev/null differ diff --git a/assets/image/2x/icon_integral_share.webp b/assets/image/2x/icon_integral_share.webp new file mode 100644 index 00000000..2699c4c1 Binary files /dev/null and b/assets/image/2x/icon_integral_share.webp differ diff --git a/assets/image/2x/icon_integral_sign.png b/assets/image/2x/icon_integral_sign.png deleted file mode 100644 index 8d467061..00000000 Binary files a/assets/image/2x/icon_integral_sign.png and /dev/null differ diff --git a/assets/image/2x/icon_integral_sign.webp b/assets/image/2x/icon_integral_sign.webp new file mode 100644 index 00000000..ac0a2457 Binary files /dev/null and b/assets/image/2x/icon_integral_sign.webp differ diff --git a/assets/image/2x/icon_intergral_sign.png b/assets/image/2x/icon_intergral_sign.png deleted file mode 100644 index ea42f26b..00000000 Binary files a/assets/image/2x/icon_intergral_sign.png and /dev/null differ diff --git a/assets/image/2x/icon_intergral_sign.webp b/assets/image/2x/icon_intergral_sign.webp new file mode 100644 index 00000000..42adace8 Binary files /dev/null and b/assets/image/2x/icon_intergral_sign.webp differ diff --git a/assets/image/2x/icon_like.png b/assets/image/2x/icon_like.png deleted file mode 100644 index b60f9bfc..00000000 Binary files a/assets/image/2x/icon_like.png and /dev/null differ diff --git a/assets/image/2x/icon_like.webp b/assets/image/2x/icon_like.webp new file mode 100644 index 00000000..15a3218d Binary files /dev/null and b/assets/image/2x/icon_like.webp differ diff --git a/assets/image/2x/icon_like_h.png b/assets/image/2x/icon_like_h.png deleted file mode 100644 index 09f69c4f..00000000 Binary files a/assets/image/2x/icon_like_h.png and /dev/null differ diff --git a/assets/image/2x/icon_like_h.webp b/assets/image/2x/icon_like_h.webp new file mode 100644 index 00000000..f57df391 Binary files /dev/null and b/assets/image/2x/icon_like_h.webp differ diff --git a/assets/image/2x/icon_likes.png b/assets/image/2x/icon_likes.png deleted file mode 100644 index df19bc9f..00000000 Binary files a/assets/image/2x/icon_likes.png and /dev/null differ diff --git a/assets/image/2x/icon_likes.webp b/assets/image/2x/icon_likes.webp new file mode 100644 index 00000000..db8f74f8 Binary files /dev/null and b/assets/image/2x/icon_likes.webp differ diff --git a/assets/image/2x/icon_line.png b/assets/image/2x/icon_line.png deleted file mode 100644 index 133f567f..00000000 Binary files a/assets/image/2x/icon_line.png and /dev/null differ diff --git a/assets/image/2x/icon_line.webp b/assets/image/2x/icon_line.webp new file mode 100644 index 00000000..9db04572 Binary files /dev/null and b/assets/image/2x/icon_line.webp differ diff --git a/assets/image/2x/icon_location_address.png b/assets/image/2x/icon_location_address.png deleted file mode 100644 index 0d8c73d1..00000000 Binary files a/assets/image/2x/icon_location_address.png and /dev/null differ diff --git a/assets/image/2x/icon_location_address.webp b/assets/image/2x/icon_location_address.webp new file mode 100644 index 00000000..b8ac737b Binary files /dev/null and b/assets/image/2x/icon_location_address.webp differ diff --git a/assets/image/2x/icon_location_permission_tips.png b/assets/image/2x/icon_location_permission_tips.png deleted file mode 100644 index 55aa8c3d..00000000 Binary files a/assets/image/2x/icon_location_permission_tips.png and /dev/null differ diff --git a/assets/image/2x/icon_location_permission_tips.webp b/assets/image/2x/icon_location_permission_tips.webp new file mode 100644 index 00000000..4acf43ea Binary files /dev/null and b/assets/image/2x/icon_location_permission_tips.webp differ diff --git a/assets/image/2x/icon_login_bg.png b/assets/image/2x/icon_login_bg.png deleted file mode 100644 index e99fdd5a..00000000 Binary files a/assets/image/2x/icon_login_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_login_bg.webp b/assets/image/2x/icon_login_bg.webp new file mode 100644 index 00000000..560f9bc4 Binary files /dev/null and b/assets/image/2x/icon_login_bg.webp differ diff --git a/assets/image/2x/icon_login_hide_bg.png b/assets/image/2x/icon_login_hide_bg.png deleted file mode 100644 index 19535c7d..00000000 Binary files a/assets/image/2x/icon_login_hide_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_login_hide_bg.webp b/assets/image/2x/icon_login_hide_bg.webp new file mode 100644 index 00000000..321b10da Binary files /dev/null and b/assets/image/2x/icon_login_hide_bg.webp differ diff --git a/assets/image/2x/icon_login_logo.png b/assets/image/2x/icon_login_logo.png deleted file mode 100644 index 477c5dc8..00000000 Binary files a/assets/image/2x/icon_login_logo.png and /dev/null differ diff --git a/assets/image/2x/icon_login_logo.webp b/assets/image/2x/icon_login_logo.webp new file mode 100644 index 00000000..033a20e0 Binary files /dev/null and b/assets/image/2x/icon_login_logo.webp differ diff --git a/assets/image/2x/icon_login_tips.png b/assets/image/2x/icon_login_tips.png deleted file mode 100644 index e1b58f77..00000000 Binary files a/assets/image/2x/icon_login_tips.png and /dev/null differ diff --git a/assets/image/2x/icon_login_tips.webp b/assets/image/2x/icon_login_tips.webp new file mode 100644 index 00000000..69219329 Binary files /dev/null and b/assets/image/2x/icon_login_tips.webp differ diff --git a/assets/image/2x/icon_look.png b/assets/image/2x/icon_look.png deleted file mode 100644 index e18e2638..00000000 Binary files a/assets/image/2x/icon_look.png and /dev/null differ diff --git a/assets/image/2x/icon_look.webp b/assets/image/2x/icon_look.webp new file mode 100644 index 00000000..bf1cdfe0 Binary files /dev/null and b/assets/image/2x/icon_look.webp differ diff --git a/assets/image/2x/icon_map_bubble.png b/assets/image/2x/icon_map_bubble.png deleted file mode 100644 index 46f7e969..00000000 Binary files a/assets/image/2x/icon_map_bubble.png and /dev/null differ diff --git a/assets/image/2x/icon_map_bubble.webp b/assets/image/2x/icon_map_bubble.webp new file mode 100644 index 00000000..8d74e9b7 Binary files /dev/null and b/assets/image/2x/icon_map_bubble.webp differ diff --git a/assets/image/2x/icon_map_dot.png b/assets/image/2x/icon_map_dot.png deleted file mode 100644 index 2708fd99..00000000 Binary files a/assets/image/2x/icon_map_dot.png and /dev/null differ diff --git a/assets/image/2x/icon_map_dot.webp b/assets/image/2x/icon_map_dot.webp new file mode 100644 index 00000000..b483ba24 Binary files /dev/null and b/assets/image/2x/icon_map_dot.webp differ diff --git a/assets/image/2x/icon_map_marker.png b/assets/image/2x/icon_map_marker.png deleted file mode 100644 index 01d25319..00000000 Binary files a/assets/image/2x/icon_map_marker.png and /dev/null differ diff --git a/assets/image/2x/icon_map_marker.webp b/assets/image/2x/icon_map_marker.webp new file mode 100644 index 00000000..b89b70f0 Binary files /dev/null and b/assets/image/2x/icon_map_marker.webp differ diff --git a/assets/image/2x/icon_meng_n.png b/assets/image/2x/icon_meng_n.png deleted file mode 100644 index 415b6cb2..00000000 Binary files a/assets/image/2x/icon_meng_n.png and /dev/null differ diff --git a/assets/image/2x/icon_meng_n.webp b/assets/image/2x/icon_meng_n.webp new file mode 100644 index 00000000..d3e16b9d Binary files /dev/null and b/assets/image/2x/icon_meng_n.webp differ diff --git a/assets/image/2x/icon_meng_s.png b/assets/image/2x/icon_meng_s.png deleted file mode 100644 index 9cb0a658..00000000 Binary files a/assets/image/2x/icon_meng_s.png and /dev/null differ diff --git a/assets/image/2x/icon_meng_s.webp b/assets/image/2x/icon_meng_s.webp new file mode 100644 index 00000000..f2c3698b Binary files /dev/null and b/assets/image/2x/icon_meng_s.webp differ diff --git a/assets/image/2x/icon_milk_tea.png b/assets/image/2x/icon_milk_tea.png deleted file mode 100644 index ae5808c4..00000000 Binary files a/assets/image/2x/icon_milk_tea.png and /dev/null differ diff --git a/assets/image/2x/icon_milk_tea_bg.png b/assets/image/2x/icon_milk_tea_bg.png deleted file mode 100644 index 0300f4b3..00000000 Binary files a/assets/image/2x/icon_milk_tea_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_milk_tea_bg.webp b/assets/image/2x/icon_milk_tea_bg.webp new file mode 100644 index 00000000..a2cb56d6 Binary files /dev/null and b/assets/image/2x/icon_milk_tea_bg.webp differ diff --git a/assets/image/2x/icon_mine_card.png b/assets/image/2x/icon_mine_card.png deleted file mode 100644 index 72d76ff0..00000000 Binary files a/assets/image/2x/icon_mine_card.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_card.webp b/assets/image/2x/icon_mine_card.webp new file mode 100644 index 00000000..1bfc1e22 Binary files /dev/null and b/assets/image/2x/icon_mine_card.webp differ diff --git a/assets/image/2x/icon_mine_edit.png b/assets/image/2x/icon_mine_edit.png deleted file mode 100644 index 21dad93f..00000000 Binary files a/assets/image/2x/icon_mine_edit.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_edit.webp b/assets/image/2x/icon_mine_edit.webp new file mode 100644 index 00000000..7f5e2676 Binary files /dev/null and b/assets/image/2x/icon_mine_edit.webp differ diff --git a/assets/image/2x/icon_mine_feedback.png b/assets/image/2x/icon_mine_feedback.png deleted file mode 100644 index 5ee9fe77..00000000 Binary files a/assets/image/2x/icon_mine_feedback.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_feedback.webp b/assets/image/2x/icon_mine_feedback.webp new file mode 100644 index 00000000..b1048288 Binary files /dev/null and b/assets/image/2x/icon_mine_feedback.webp differ diff --git a/assets/image/2x/icon_mine_huixiang_logo.png b/assets/image/2x/icon_mine_huixiang_logo.png deleted file mode 100644 index 3b455e79..00000000 Binary files a/assets/image/2x/icon_mine_huixiang_logo.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_huixiang_logo.webp b/assets/image/2x/icon_mine_huixiang_logo.webp new file mode 100644 index 00000000..c21004eb Binary files /dev/null and b/assets/image/2x/icon_mine_huixiang_logo.webp differ diff --git a/assets/image/2x/icon_mine_invoice_assistant.png b/assets/image/2x/icon_mine_invoice_assistant.png deleted file mode 100644 index 5ed5074b..00000000 Binary files a/assets/image/2x/icon_mine_invoice_assistant.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_invoice_assistant.webp b/assets/image/2x/icon_mine_invoice_assistant.webp new file mode 100644 index 00000000..24491855 Binary files /dev/null and b/assets/image/2x/icon_mine_invoice_assistant.webp differ diff --git a/assets/image/2x/icon_mine_motorcycle.png b/assets/image/2x/icon_mine_motorcycle.png deleted file mode 100644 index e8f4c0a0..00000000 Binary files a/assets/image/2x/icon_mine_motorcycle.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_motorcycle.webp b/assets/image/2x/icon_mine_motorcycle.webp new file mode 100644 index 00000000..c384c70c Binary files /dev/null and b/assets/image/2x/icon_mine_motorcycle.webp differ diff --git a/assets/image/2x/icon_mine_online_service.webp b/assets/image/2x/icon_mine_online_service.webp new file mode 100644 index 00000000..b2cd9aef Binary files /dev/null and b/assets/image/2x/icon_mine_online_service.webp differ diff --git a/assets/image/2x/icon_mine_order.png b/assets/image/2x/icon_mine_order.png deleted file mode 100644 index 5752cefa..00000000 Binary files a/assets/image/2x/icon_mine_order.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_order.webp b/assets/image/2x/icon_mine_order.webp new file mode 100644 index 00000000..d8374063 Binary files /dev/null and b/assets/image/2x/icon_mine_order.webp differ diff --git a/assets/image/2x/icon_mine_order_dfk.png b/assets/image/2x/icon_mine_order_dfk.png deleted file mode 100644 index 169e41e6..00000000 Binary files a/assets/image/2x/icon_mine_order_dfk.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_order_dfk.webp b/assets/image/2x/icon_mine_order_dfk.webp new file mode 100644 index 00000000..7bf28188 Binary files /dev/null and b/assets/image/2x/icon_mine_order_dfk.webp differ diff --git a/assets/image/2x/icon_mine_order_qb.png b/assets/image/2x/icon_mine_order_qb.png deleted file mode 100644 index 8e522c84..00000000 Binary files a/assets/image/2x/icon_mine_order_qb.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_order_qb.webp b/assets/image/2x/icon_mine_order_qb.webp new file mode 100644 index 00000000..e496bbcc Binary files /dev/null and b/assets/image/2x/icon_mine_order_qb.webp differ diff --git a/assets/image/2x/icon_mine_order_wwc.png b/assets/image/2x/icon_mine_order_wwc.png deleted file mode 100644 index f11ff417..00000000 Binary files a/assets/image/2x/icon_mine_order_wwc.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_order_wwc.webp b/assets/image/2x/icon_mine_order_wwc.webp new file mode 100644 index 00000000..f7f568e0 Binary files /dev/null and b/assets/image/2x/icon_mine_order_wwc.webp differ diff --git a/assets/image/2x/icon_mine_order_ywc.png b/assets/image/2x/icon_mine_order_ywc.png deleted file mode 100644 index c4f4ce5d..00000000 Binary files a/assets/image/2x/icon_mine_order_ywc.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_order_ywc.webp b/assets/image/2x/icon_mine_order_ywc.webp new file mode 100644 index 00000000..01bdf8ac Binary files /dev/null and b/assets/image/2x/icon_mine_order_ywc.webp differ diff --git a/assets/image/2x/icon_mine_promotion_code.png b/assets/image/2x/icon_mine_promotion_code.png deleted file mode 100644 index b6f43839..00000000 Binary files a/assets/image/2x/icon_mine_promotion_code.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_promotion_code.webp b/assets/image/2x/icon_mine_promotion_code.webp new file mode 100644 index 00000000..6ccfccbc Binary files /dev/null and b/assets/image/2x/icon_mine_promotion_code.webp differ diff --git a/assets/image/2x/icon_mine_records_of_consumption.png b/assets/image/2x/icon_mine_records_of_consumption.png deleted file mode 100644 index cf8407b7..00000000 Binary files a/assets/image/2x/icon_mine_records_of_consumption.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_records_of_consumption.webp b/assets/image/2x/icon_mine_records_of_consumption.webp new file mode 100644 index 00000000..84276882 Binary files /dev/null and b/assets/image/2x/icon_mine_records_of_consumption.webp differ diff --git a/assets/image/2x/icon_mine_setting.png b/assets/image/2x/icon_mine_setting.png deleted file mode 100644 index ba044c68..00000000 Binary files a/assets/image/2x/icon_mine_setting.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_setting.webp b/assets/image/2x/icon_mine_setting.webp new file mode 100644 index 00000000..5fa6b159 Binary files /dev/null and b/assets/image/2x/icon_mine_setting.webp differ diff --git a/assets/image/2x/icon_mine_wallet.png b/assets/image/2x/icon_mine_wallet.png deleted file mode 100644 index 4182f7b8..00000000 Binary files a/assets/image/2x/icon_mine_wallet.png and /dev/null differ diff --git a/assets/image/2x/icon_mine_wallet.webp b/assets/image/2x/icon_mine_wallet.webp new file mode 100644 index 00000000..ebf81c67 Binary files /dev/null and b/assets/image/2x/icon_mine_wallet.webp differ diff --git a/assets/image/2x/icon_more.png b/assets/image/2x/icon_more.png deleted file mode 100644 index 90a3bab3..00000000 Binary files a/assets/image/2x/icon_more.png and /dev/null differ diff --git a/assets/image/2x/icon_more.webp b/assets/image/2x/icon_more.webp new file mode 100644 index 00000000..e2d42fe1 Binary files /dev/null and b/assets/image/2x/icon_more.webp differ diff --git a/assets/image/2x/icon_natification_permission_tips.png b/assets/image/2x/icon_natification_permission_tips.png deleted file mode 100644 index 798b0a19..00000000 Binary files a/assets/image/2x/icon_natification_permission_tips.png and /dev/null differ diff --git a/assets/image/2x/icon_natification_permission_tips.webp b/assets/image/2x/icon_natification_permission_tips.webp new file mode 100644 index 00000000..122a912a Binary files /dev/null and b/assets/image/2x/icon_natification_permission_tips.webp differ diff --git a/assets/image/2x/icon_notices.png b/assets/image/2x/icon_notices.png deleted file mode 100644 index 38ca098c..00000000 Binary files a/assets/image/2x/icon_notices.png and /dev/null differ diff --git a/assets/image/2x/icon_notices.webp b/assets/image/2x/icon_notices.webp new file mode 100644 index 00000000..f95279ce Binary files /dev/null and b/assets/image/2x/icon_notices.webp differ diff --git a/assets/image/2x/icon_order_agin.png b/assets/image/2x/icon_order_agin.png deleted file mode 100644 index 0c5290bd..00000000 Binary files a/assets/image/2x/icon_order_agin.png and /dev/null differ diff --git a/assets/image/2x/icon_order_agin.webp b/assets/image/2x/icon_order_agin.webp new file mode 100644 index 00000000..d23d0c7d Binary files /dev/null and b/assets/image/2x/icon_order_agin.webp differ diff --git a/assets/image/2x/icon_order_cancel.png b/assets/image/2x/icon_order_cancel.png deleted file mode 100644 index ed00b24b..00000000 Binary files a/assets/image/2x/icon_order_cancel.png and /dev/null differ diff --git a/assets/image/2x/icon_order_cancel.webp b/assets/image/2x/icon_order_cancel.webp new file mode 100644 index 00000000..bacb498e Binary files /dev/null and b/assets/image/2x/icon_order_cancel.webp differ diff --git a/assets/image/2x/icon_order_commodity_info.png b/assets/image/2x/icon_order_commodity_info.png deleted file mode 100644 index b16c18d9..00000000 Binary files a/assets/image/2x/icon_order_commodity_info.png and /dev/null differ diff --git a/assets/image/2x/icon_order_commodity_info.webp b/assets/image/2x/icon_order_commodity_info.webp new file mode 100644 index 00000000..8ef06e67 Binary files /dev/null and b/assets/image/2x/icon_order_commodity_info.webp differ diff --git a/assets/image/2x/icon_order_exchange_info.png b/assets/image/2x/icon_order_exchange_info.png deleted file mode 100644 index 3931bfbb..00000000 Binary files a/assets/image/2x/icon_order_exchange_info.png and /dev/null differ diff --git a/assets/image/2x/icon_order_exchange_info.webp b/assets/image/2x/icon_order_exchange_info.webp new file mode 100644 index 00000000..1dc85d42 Binary files /dev/null and b/assets/image/2x/icon_order_exchange_info.webp differ diff --git a/assets/image/2x/icon_order_more.png b/assets/image/2x/icon_order_more.png deleted file mode 100644 index 434e3814..00000000 Binary files a/assets/image/2x/icon_order_more.png and /dev/null differ diff --git a/assets/image/2x/icon_order_more.webp b/assets/image/2x/icon_order_more.webp new file mode 100644 index 00000000..164ce511 Binary files /dev/null and b/assets/image/2x/icon_order_more.webp differ diff --git a/assets/image/2x/icon_order_ok.png b/assets/image/2x/icon_order_ok.png deleted file mode 100644 index 3fcd1904..00000000 Binary files a/assets/image/2x/icon_order_ok.png and /dev/null differ diff --git a/assets/image/2x/icon_order_ok.webp b/assets/image/2x/icon_order_ok.webp new file mode 100644 index 00000000..4efd97b9 Binary files /dev/null and b/assets/image/2x/icon_order_ok.webp differ diff --git a/assets/image/2x/icon_order_renminbi.png b/assets/image/2x/icon_order_renminbi.png deleted file mode 100644 index 662d1f30..00000000 Binary files a/assets/image/2x/icon_order_renminbi.png and /dev/null differ diff --git a/assets/image/2x/icon_order_renminbi.webp b/assets/image/2x/icon_order_renminbi.webp new file mode 100644 index 00000000..db655404 Binary files /dev/null and b/assets/image/2x/icon_order_renminbi.webp differ diff --git a/assets/image/2x/icon_order_success.png b/assets/image/2x/icon_order_success.png deleted file mode 100644 index 8703b786..00000000 Binary files a/assets/image/2x/icon_order_success.png and /dev/null differ diff --git a/assets/image/2x/icon_order_success.webp b/assets/image/2x/icon_order_success.webp new file mode 100644 index 00000000..bf5724ba Binary files /dev/null and b/assets/image/2x/icon_order_success.webp differ diff --git a/assets/image/2x/icon_order_time.png b/assets/image/2x/icon_order_time.png deleted file mode 100644 index 0aca4a61..00000000 Binary files a/assets/image/2x/icon_order_time.png and /dev/null differ diff --git a/assets/image/2x/icon_order_time.webp b/assets/image/2x/icon_order_time.webp new file mode 100644 index 00000000..85f8eb77 Binary files /dev/null and b/assets/image/2x/icon_order_time.webp differ diff --git a/assets/image/2x/icon_pengyouquan.png b/assets/image/2x/icon_pengyouquan.png deleted file mode 100644 index 739669e3..00000000 Binary files a/assets/image/2x/icon_pengyouquan.png and /dev/null differ diff --git a/assets/image/2x/icon_pengyouquan.webp b/assets/image/2x/icon_pengyouquan.webp new file mode 100644 index 00000000..4268c60c Binary files /dev/null and b/assets/image/2x/icon_pengyouquan.webp differ diff --git a/assets/image/2x/icon_permission_camera.png b/assets/image/2x/icon_permission_camera.png deleted file mode 100644 index 5c78faea..00000000 Binary files a/assets/image/2x/icon_permission_camera.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_camera.webp b/assets/image/2x/icon_permission_camera.webp new file mode 100644 index 00000000..daa7993e Binary files /dev/null and b/assets/image/2x/icon_permission_camera.webp differ diff --git a/assets/image/2x/icon_permission_face_id.png b/assets/image/2x/icon_permission_face_id.png deleted file mode 100644 index 8de62e64..00000000 Binary files a/assets/image/2x/icon_permission_face_id.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_face_id.webp b/assets/image/2x/icon_permission_face_id.webp new file mode 100644 index 00000000..c22c13e2 Binary files /dev/null and b/assets/image/2x/icon_permission_face_id.webp differ diff --git a/assets/image/2x/icon_permission_location.png b/assets/image/2x/icon_permission_location.png deleted file mode 100644 index dbdecc93..00000000 Binary files a/assets/image/2x/icon_permission_location.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_location.webp b/assets/image/2x/icon_permission_location.webp new file mode 100644 index 00000000..f6d31722 Binary files /dev/null and b/assets/image/2x/icon_permission_location.webp differ diff --git a/assets/image/2x/icon_permission_location_bg.png b/assets/image/2x/icon_permission_location_bg.png deleted file mode 100644 index 18d4d453..00000000 Binary files a/assets/image/2x/icon_permission_location_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_location_bg.webp b/assets/image/2x/icon_permission_location_bg.webp new file mode 100644 index 00000000..4acf43ea Binary files /dev/null and b/assets/image/2x/icon_permission_location_bg.webp differ diff --git a/assets/image/2x/icon_permission_notices.png b/assets/image/2x/icon_permission_notices.png deleted file mode 100644 index 2f50efd3..00000000 Binary files a/assets/image/2x/icon_permission_notices.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_notices.webp b/assets/image/2x/icon_permission_notices.webp new file mode 100644 index 00000000..4b0529d2 Binary files /dev/null and b/assets/image/2x/icon_permission_notices.webp differ diff --git a/assets/image/2x/icon_permission_storage.png b/assets/image/2x/icon_permission_storage.png deleted file mode 100644 index 0791f431..00000000 Binary files a/assets/image/2x/icon_permission_storage.png and /dev/null differ diff --git a/assets/image/2x/icon_permission_storage.webp b/assets/image/2x/icon_permission_storage.webp new file mode 100644 index 00000000..4e652137 Binary files /dev/null and b/assets/image/2x/icon_permission_storage.webp differ diff --git a/assets/image/2x/icon_pl.png b/assets/image/2x/icon_pl.png deleted file mode 100644 index 797562e6..00000000 Binary files a/assets/image/2x/icon_pl.png and /dev/null differ diff --git a/assets/image/2x/icon_pl.webp b/assets/image/2x/icon_pl.webp new file mode 100644 index 00000000..3b61e9e0 Binary files /dev/null and b/assets/image/2x/icon_pl.webp differ diff --git a/assets/image/2x/icon_place_ order.png b/assets/image/2x/icon_place_ order.png deleted file mode 100644 index c4bb8748..00000000 Binary files a/assets/image/2x/icon_place_ order.png and /dev/null differ diff --git a/assets/image/2x/icon_place_ order.webp b/assets/image/2x/icon_place_ order.webp new file mode 100644 index 00000000..7b12cd9a Binary files /dev/null and b/assets/image/2x/icon_place_ order.webp differ diff --git a/assets/image/2x/icon_place_ order_h.png b/assets/image/2x/icon_place_ order_h.png deleted file mode 100644 index fac74520..00000000 Binary files a/assets/image/2x/icon_place_ order_h.png and /dev/null differ diff --git a/assets/image/2x/icon_place_ order_h.webp b/assets/image/2x/icon_place_ order_h.webp new file mode 100644 index 00000000..b1029baf Binary files /dev/null and b/assets/image/2x/icon_place_ order_h.webp differ diff --git a/assets/image/2x/icon_play.png b/assets/image/2x/icon_play.png deleted file mode 100644 index 6e8344ac..00000000 Binary files a/assets/image/2x/icon_play.png and /dev/null differ diff --git a/assets/image/2x/icon_play.webp b/assets/image/2x/icon_play.webp new file mode 100644 index 00000000..acc2c5b3 Binary files /dev/null and b/assets/image/2x/icon_play.webp differ diff --git a/assets/image/2x/icon_points_mall.png b/assets/image/2x/icon_points_mall.png deleted file mode 100644 index 453234d9..00000000 Binary files a/assets/image/2x/icon_points_mall.png and /dev/null differ diff --git a/assets/image/2x/icon_points_mall.webp b/assets/image/2x/icon_points_mall.webp new file mode 100644 index 00000000..5e851566 Binary files /dev/null and b/assets/image/2x/icon_points_mall.webp differ diff --git a/assets/image/2x/icon_radio_selected.png b/assets/image/2x/icon_radio_selected.png deleted file mode 100644 index ace749f9..00000000 Binary files a/assets/image/2x/icon_radio_selected.png and /dev/null differ diff --git a/assets/image/2x/icon_radio_selected.webp b/assets/image/2x/icon_radio_selected.webp new file mode 100644 index 00000000..ef152a37 Binary files /dev/null and b/assets/image/2x/icon_radio_selected.webp differ diff --git a/assets/image/2x/icon_radio_unselected.png b/assets/image/2x/icon_radio_unselected.png deleted file mode 100644 index 54ca16c4..00000000 Binary files a/assets/image/2x/icon_radio_unselected.png and /dev/null differ diff --git a/assets/image/2x/icon_radio_unselected.webp b/assets/image/2x/icon_radio_unselected.webp new file mode 100644 index 00000000..49e1f03a Binary files /dev/null and b/assets/image/2x/icon_radio_unselected.webp differ diff --git a/assets/image/2x/icon_request_refund.png b/assets/image/2x/icon_request_refund.png deleted file mode 100644 index 245b87dc..00000000 Binary files a/assets/image/2x/icon_request_refund.png and /dev/null differ diff --git a/assets/image/2x/icon_request_refund.webp b/assets/image/2x/icon_request_refund.webp new file mode 100644 index 00000000..07962363 Binary files /dev/null and b/assets/image/2x/icon_request_refund.webp differ diff --git a/assets/image/2x/icon_right.png b/assets/image/2x/icon_right.png deleted file mode 100644 index ed563dc6..00000000 Binary files a/assets/image/2x/icon_right.png and /dev/null differ diff --git a/assets/image/2x/icon_right.webp b/assets/image/2x/icon_right.webp new file mode 100644 index 00000000..bb907c06 Binary files /dev/null and b/assets/image/2x/icon_right.webp differ diff --git a/assets/image/2x/icon_right_z.png b/assets/image/2x/icon_right_z.png deleted file mode 100644 index 3e559d9b..00000000 Binary files a/assets/image/2x/icon_right_z.png and /dev/null differ diff --git a/assets/image/2x/icon_right_z.webp b/assets/image/2x/icon_right_z.webp new file mode 100644 index 00000000..e5753934 Binary files /dev/null and b/assets/image/2x/icon_right_z.webp differ diff --git a/assets/image/2x/icon_scan_qr_code.png b/assets/image/2x/icon_scan_qr_code.png deleted file mode 100644 index dd2c5d95..00000000 Binary files a/assets/image/2x/icon_scan_qr_code.png and /dev/null differ diff --git a/assets/image/2x/icon_scan_qr_code.webp b/assets/image/2x/icon_scan_qr_code.webp new file mode 100644 index 00000000..87b4da15 Binary files /dev/null and b/assets/image/2x/icon_scan_qr_code.webp differ diff --git a/assets/image/2x/icon_share.png b/assets/image/2x/icon_share.png deleted file mode 100644 index 5acc1d10..00000000 Binary files a/assets/image/2x/icon_share.png and /dev/null differ diff --git a/assets/image/2x/icon_share.webp b/assets/image/2x/icon_share.webp new file mode 100644 index 00000000..bfbaec8c Binary files /dev/null and b/assets/image/2x/icon_share.webp differ diff --git a/assets/image/2x/icon_share_w.png b/assets/image/2x/icon_share_w.png deleted file mode 100644 index 22e0c7a4..00000000 Binary files a/assets/image/2x/icon_share_w.png and /dev/null differ diff --git a/assets/image/2x/icon_share_w.webp b/assets/image/2x/icon_share_w.webp new file mode 100644 index 00000000..a385d70f Binary files /dev/null and b/assets/image/2x/icon_share_w.webp differ diff --git a/assets/image/2x/icon_shop.png b/assets/image/2x/icon_shop.png deleted file mode 100644 index f7d545db..00000000 Binary files a/assets/image/2x/icon_shop.png and /dev/null differ diff --git a/assets/image/2x/icon_shop.webp b/assets/image/2x/icon_shop.webp new file mode 100644 index 00000000..c5c726c0 Binary files /dev/null and b/assets/image/2x/icon_shop.webp differ diff --git a/assets/image/2x/icon_sign.png b/assets/image/2x/icon_sign.png deleted file mode 100644 index 3b02f561..00000000 Binary files a/assets/image/2x/icon_sign.png and /dev/null differ diff --git a/assets/image/2x/icon_sign.webp b/assets/image/2x/icon_sign.webp new file mode 100644 index 00000000..d9987ac8 Binary files /dev/null and b/assets/image/2x/icon_sign.webp differ diff --git a/assets/image/2x/icon_sign_h.png b/assets/image/2x/icon_sign_h.png deleted file mode 100644 index 862eda9c..00000000 Binary files a/assets/image/2x/icon_sign_h.png and /dev/null differ diff --git a/assets/image/2x/icon_sign_h.webp b/assets/image/2x/icon_sign_h.webp new file mode 100644 index 00000000..b107ee62 Binary files /dev/null and b/assets/image/2x/icon_sign_h.webp differ diff --git a/assets/image/2x/icon_sign_ok.png b/assets/image/2x/icon_sign_ok.png deleted file mode 100644 index 013121c5..00000000 Binary files a/assets/image/2x/icon_sign_ok.png and /dev/null differ diff --git a/assets/image/2x/icon_sign_ok.webp b/assets/image/2x/icon_sign_ok.webp new file mode 100644 index 00000000..4b401f0e Binary files /dev/null and b/assets/image/2x/icon_sign_ok.webp differ diff --git a/assets/image/2x/icon_sign_success.png b/assets/image/2x/icon_sign_success.png deleted file mode 100644 index 176b7014..00000000 Binary files a/assets/image/2x/icon_sign_success.png and /dev/null differ diff --git a/assets/image/2x/icon_sign_success.webp b/assets/image/2x/icon_sign_success.webp new file mode 100644 index 00000000..de901868 Binary files /dev/null and b/assets/image/2x/icon_sign_success.webp differ diff --git a/assets/image/2x/icon_sisters.png b/assets/image/2x/icon_sisters.png deleted file mode 100644 index ac70bbe3..00000000 Binary files a/assets/image/2x/icon_sisters.png and /dev/null differ diff --git a/assets/image/2x/icon_sisters.webp b/assets/image/2x/icon_sisters.webp new file mode 100644 index 00000000..fa85d480 Binary files /dev/null and b/assets/image/2x/icon_sisters.webp differ diff --git a/assets/image/2x/icon_sisters_bj.png b/assets/image/2x/icon_sisters_bj.png deleted file mode 100644 index 130e3807..00000000 Binary files a/assets/image/2x/icon_sisters_bj.png and /dev/null differ diff --git a/assets/image/2x/icon_sisters_bj.webp b/assets/image/2x/icon_sisters_bj.webp new file mode 100644 index 00000000..2be04348 Binary files /dev/null and b/assets/image/2x/icon_sisters_bj.webp differ diff --git a/assets/image/2x/icon_sisters_vip.png b/assets/image/2x/icon_sisters_vip.png deleted file mode 100644 index a42c5d36..00000000 Binary files a/assets/image/2x/icon_sisters_vip.png and /dev/null differ diff --git a/assets/image/2x/icon_sisters_vip.webp b/assets/image/2x/icon_sisters_vip.webp new file mode 100644 index 00000000..ccb0df18 Binary files /dev/null and b/assets/image/2x/icon_sisters_vip.webp differ diff --git a/assets/image/2x/icon_storage_permission_tips.png b/assets/image/2x/icon_storage_permission_tips.png deleted file mode 100644 index c15b3ca0..00000000 Binary files a/assets/image/2x/icon_storage_permission_tips.png and /dev/null differ diff --git a/assets/image/2x/icon_storage_permission_tips.webp b/assets/image/2x/icon_storage_permission_tips.webp new file mode 100644 index 00000000..dbc53731 Binary files /dev/null and b/assets/image/2x/icon_storage_permission_tips.webp differ diff --git a/assets/image/2x/icon_store_c.png b/assets/image/2x/icon_store_c.png deleted file mode 100644 index 7183fe9e..00000000 Binary files a/assets/image/2x/icon_store_c.png and /dev/null differ diff --git a/assets/image/2x/icon_store_c.webp b/assets/image/2x/icon_store_c.webp new file mode 100644 index 00000000..71006816 Binary files /dev/null and b/assets/image/2x/icon_store_c.webp differ diff --git a/assets/image/2x/icon_story_1.png b/assets/image/2x/icon_story_1.png deleted file mode 100644 index 80a32315..00000000 Binary files a/assets/image/2x/icon_story_1.png and /dev/null differ diff --git a/assets/image/2x/icon_story_1.webp b/assets/image/2x/icon_story_1.webp new file mode 100644 index 00000000..819bb59e Binary files /dev/null and b/assets/image/2x/icon_story_1.webp differ diff --git a/assets/image/2x/icon_story_2.png b/assets/image/2x/icon_story_2.png deleted file mode 100644 index b9029044..00000000 Binary files a/assets/image/2x/icon_story_2.png and /dev/null differ diff --git a/assets/image/2x/icon_story_2.webp b/assets/image/2x/icon_story_2.webp new file mode 100644 index 00000000..7133c90c Binary files /dev/null and b/assets/image/2x/icon_story_2.webp differ diff --git a/assets/image/2x/icon_story_bj.png b/assets/image/2x/icon_story_bj.png deleted file mode 100644 index 9f88cacc..00000000 Binary files a/assets/image/2x/icon_story_bj.png and /dev/null differ diff --git a/assets/image/2x/icon_story_bj.webp b/assets/image/2x/icon_story_bj.webp new file mode 100644 index 00000000..34b2eb19 Binary files /dev/null and b/assets/image/2x/icon_story_bj.webp differ diff --git a/assets/image/2x/icon_story_td.png b/assets/image/2x/icon_story_td.png deleted file mode 100644 index 4198ffa2..00000000 Binary files a/assets/image/2x/icon_story_td.png and /dev/null differ diff --git a/assets/image/2x/icon_story_td.webp b/assets/image/2x/icon_story_td.webp new file mode 100644 index 00000000..2580c1e2 Binary files /dev/null and b/assets/image/2x/icon_story_td.webp differ diff --git a/assets/image/2x/icon_system_message.png b/assets/image/2x/icon_system_message.png deleted file mode 100644 index 117a9241..00000000 Binary files a/assets/image/2x/icon_system_message.png and /dev/null differ diff --git a/assets/image/2x/icon_system_message.webp b/assets/image/2x/icon_system_message.webp new file mode 100644 index 00000000..dc24acb0 Binary files /dev/null and b/assets/image/2x/icon_system_message.webp differ diff --git a/assets/image/2x/icon_system_notices.png b/assets/image/2x/icon_system_notices.png deleted file mode 100644 index 7d5a1e49..00000000 Binary files a/assets/image/2x/icon_system_notices.png and /dev/null differ diff --git a/assets/image/2x/icon_system_notices.webp b/assets/image/2x/icon_system_notices.webp new file mode 100644 index 00000000..4c37e64c Binary files /dev/null and b/assets/image/2x/icon_system_notices.webp differ diff --git a/assets/image/2x/icon_system_order.png b/assets/image/2x/icon_system_order.png deleted file mode 100644 index 000f3f47..00000000 Binary files a/assets/image/2x/icon_system_order.png and /dev/null differ diff --git a/assets/image/2x/icon_system_order.webp b/assets/image/2x/icon_system_order.webp new file mode 100644 index 00000000..4ea3a99c Binary files /dev/null and b/assets/image/2x/icon_system_order.webp differ diff --git a/assets/image/2x/icon_system_recharge.png b/assets/image/2x/icon_system_recharge.png deleted file mode 100644 index b3d5e768..00000000 Binary files a/assets/image/2x/icon_system_recharge.png and /dev/null differ diff --git a/assets/image/2x/icon_system_recharge.webp b/assets/image/2x/icon_system_recharge.webp new file mode 100644 index 00000000..a12bffc6 Binary files /dev/null and b/assets/image/2x/icon_system_recharge.webp differ diff --git a/assets/image/2x/icon_today_task.png b/assets/image/2x/icon_today_task.png deleted file mode 100644 index f25c0b76..00000000 Binary files a/assets/image/2x/icon_today_task.png and /dev/null differ diff --git a/assets/image/2x/icon_today_task.webp b/assets/image/2x/icon_today_task.webp new file mode 100644 index 00000000..1c22e81c Binary files /dev/null and b/assets/image/2x/icon_today_task.webp differ diff --git a/assets/image/2x/icon_today_video.png b/assets/image/2x/icon_today_video.png deleted file mode 100644 index 3039e2f2..00000000 Binary files a/assets/image/2x/icon_today_video.png and /dev/null differ diff --git a/assets/image/2x/icon_today_video.webp b/assets/image/2x/icon_today_video.webp new file mode 100644 index 00000000..8df2c163 Binary files /dev/null and b/assets/image/2x/icon_today_video.webp differ diff --git a/assets/image/2x/icon_transport.png b/assets/image/2x/icon_transport.png deleted file mode 100644 index 4368ffc1..00000000 Binary files a/assets/image/2x/icon_transport.png and /dev/null differ diff --git a/assets/image/2x/icon_transport.webp b/assets/image/2x/icon_transport.webp new file mode 100644 index 00000000..f0eb0a14 Binary files /dev/null and b/assets/image/2x/icon_transport.webp differ diff --git a/assets/image/2x/icon_transport_h.png b/assets/image/2x/icon_transport_h.png deleted file mode 100644 index 713fa035..00000000 Binary files a/assets/image/2x/icon_transport_h.png and /dev/null differ diff --git a/assets/image/2x/icon_transport_h.webp b/assets/image/2x/icon_transport_h.webp new file mode 100644 index 00000000..94602485 Binary files /dev/null and b/assets/image/2x/icon_transport_h.webp differ diff --git a/assets/image/2x/icon_union_call.png b/assets/image/2x/icon_union_call.png deleted file mode 100644 index 23f2d6a1..00000000 Binary files a/assets/image/2x/icon_union_call.png and /dev/null differ diff --git a/assets/image/2x/icon_union_call.webp b/assets/image/2x/icon_union_call.webp new file mode 100644 index 00000000..d5307eb5 Binary files /dev/null and b/assets/image/2x/icon_union_call.webp differ diff --git a/assets/image/2x/icon_union_coupons.png b/assets/image/2x/icon_union_coupons.png deleted file mode 100644 index c33287cd..00000000 Binary files a/assets/image/2x/icon_union_coupons.png and /dev/null differ diff --git a/assets/image/2x/icon_union_coupons.webp b/assets/image/2x/icon_union_coupons.webp new file mode 100644 index 00000000..cbeff621 Binary files /dev/null and b/assets/image/2x/icon_union_coupons.webp differ diff --git a/assets/image/2x/icon_union_coupons_bg.png b/assets/image/2x/icon_union_coupons_bg.png deleted file mode 100644 index 156b260b..00000000 Binary files a/assets/image/2x/icon_union_coupons_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_union_coupons_bg.webp b/assets/image/2x/icon_union_coupons_bg.webp new file mode 100644 index 00000000..febdd3d6 Binary files /dev/null and b/assets/image/2x/icon_union_coupons_bg.webp differ diff --git a/assets/image/2x/icon_union_location.png b/assets/image/2x/icon_union_location.png deleted file mode 100644 index 6f20936f..00000000 Binary files a/assets/image/2x/icon_union_location.png and /dev/null differ diff --git a/assets/image/2x/icon_union_location.png.png b/assets/image/2x/icon_union_location.png.png deleted file mode 100644 index 6f20936f..00000000 Binary files a/assets/image/2x/icon_union_location.png.png and /dev/null differ diff --git a/assets/image/2x/icon_union_location.png.webp b/assets/image/2x/icon_union_location.png.webp new file mode 100644 index 00000000..6e9bf5d5 Binary files /dev/null and b/assets/image/2x/icon_union_location.png.webp differ diff --git a/assets/image/2x/icon_union_location.webp b/assets/image/2x/icon_union_location.webp new file mode 100644 index 00000000..6e9bf5d5 Binary files /dev/null and b/assets/image/2x/icon_union_location.webp differ diff --git a/assets/image/2x/icon_union_location_black.png b/assets/image/2x/icon_union_location_black.png deleted file mode 100644 index 21755f40..00000000 Binary files a/assets/image/2x/icon_union_location_black.png and /dev/null differ diff --git a/assets/image/2x/icon_union_location_black.webp b/assets/image/2x/icon_union_location_black.webp new file mode 100644 index 00000000..1309051b Binary files /dev/null and b/assets/image/2x/icon_union_location_black.webp differ diff --git a/assets/image/2x/icon_union_start_store.png b/assets/image/2x/icon_union_start_store.png deleted file mode 100644 index 4e167e52..00000000 Binary files a/assets/image/2x/icon_union_start_store.png and /dev/null differ diff --git a/assets/image/2x/icon_union_start_store.webp b/assets/image/2x/icon_union_start_store.webp new file mode 100644 index 00000000..cee47022 Binary files /dev/null and b/assets/image/2x/icon_union_start_store.webp differ diff --git a/assets/image/2x/icon_union_store.png b/assets/image/2x/icon_union_store.png deleted file mode 100644 index 5c7a1f79..00000000 Binary files a/assets/image/2x/icon_union_store.png and /dev/null differ diff --git a/assets/image/2x/icon_union_store.webp b/assets/image/2x/icon_union_store.webp new file mode 100644 index 00000000..b1e79baa Binary files /dev/null and b/assets/image/2x/icon_union_store.webp differ diff --git a/assets/image/2x/icon_union_time.png b/assets/image/2x/icon_union_time.png deleted file mode 100644 index 7c807956..00000000 Binary files a/assets/image/2x/icon_union_time.png and /dev/null differ diff --git a/assets/image/2x/icon_union_time.webp b/assets/image/2x/icon_union_time.webp new file mode 100644 index 00000000..7a4ca4dd Binary files /dev/null and b/assets/image/2x/icon_union_time.webp differ diff --git a/assets/image/2x/icon_user.png b/assets/image/2x/icon_user.png deleted file mode 100644 index 629844cf..00000000 Binary files a/assets/image/2x/icon_user.png and /dev/null differ diff --git a/assets/image/2x/icon_user.webp b/assets/image/2x/icon_user.webp new file mode 100644 index 00000000..63495b74 Binary files /dev/null and b/assets/image/2x/icon_user.webp differ diff --git a/assets/image/2x/icon_views.png b/assets/image/2x/icon_views.png deleted file mode 100644 index 515f7b2a..00000000 Binary files a/assets/image/2x/icon_views.png and /dev/null differ diff --git a/assets/image/2x/icon_views.webp b/assets/image/2x/icon_views.webp new file mode 100644 index 00000000..d1b100fd Binary files /dev/null and b/assets/image/2x/icon_views.webp differ diff --git a/assets/image/2x/icon_vip.png b/assets/image/2x/icon_vip.png deleted file mode 100644 index 87d73c84..00000000 Binary files a/assets/image/2x/icon_vip.png and /dev/null differ diff --git a/assets/image/2x/icon_vip.webp b/assets/image/2x/icon_vip.webp new file mode 100644 index 00000000..4cae8f4b Binary files /dev/null and b/assets/image/2x/icon_vip.webp differ diff --git a/assets/image/2x/icon_vip_bg.png b/assets/image/2x/icon_vip_bg.png deleted file mode 100644 index b34e1b64..00000000 Binary files a/assets/image/2x/icon_vip_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_vip_bg.webp b/assets/image/2x/icon_vip_bg.webp new file mode 100644 index 00000000..a7f53161 Binary files /dev/null and b/assets/image/2x/icon_vip_bg.webp differ diff --git a/assets/image/2x/icon_vip_bj.png b/assets/image/2x/icon_vip_bj.png deleted file mode 100644 index be328b23..00000000 Binary files a/assets/image/2x/icon_vip_bj.png and /dev/null differ diff --git a/assets/image/2x/icon_vip_bj.webp b/assets/image/2x/icon_vip_bj.webp new file mode 100644 index 00000000..93be0b35 Binary files /dev/null and b/assets/image/2x/icon_vip_bj.webp differ diff --git a/assets/image/2x/icon_vip_name.png b/assets/image/2x/icon_vip_name.png deleted file mode 100644 index 30da120b..00000000 Binary files a/assets/image/2x/icon_vip_name.png and /dev/null differ diff --git a/assets/image/2x/icon_vip_name.webp b/assets/image/2x/icon_vip_name.webp new file mode 100644 index 00000000..be2b6b10 Binary files /dev/null and b/assets/image/2x/icon_vip_name.webp differ diff --git a/assets/image/2x/icon_wallet_recharge.png b/assets/image/2x/icon_wallet_recharge.png deleted file mode 100644 index ec6d0d8d..00000000 Binary files a/assets/image/2x/icon_wallet_recharge.png and /dev/null differ diff --git a/assets/image/2x/icon_wallet_recharge.webp b/assets/image/2x/icon_wallet_recharge.webp new file mode 100644 index 00000000..5c27644e Binary files /dev/null and b/assets/image/2x/icon_wallet_recharge.webp differ diff --git a/assets/image/2x/icon_wallet_withdrawal.png b/assets/image/2x/icon_wallet_withdrawal.png deleted file mode 100644 index ec4675b4..00000000 Binary files a/assets/image/2x/icon_wallet_withdrawal.png and /dev/null differ diff --git a/assets/image/2x/icon_wallet_withdrawal.webp b/assets/image/2x/icon_wallet_withdrawal.webp new file mode 100644 index 00000000..92cc7839 Binary files /dev/null and b/assets/image/2x/icon_wallet_withdrawal.webp differ diff --git a/assets/image/2x/icon_we_chat.png b/assets/image/2x/icon_we_chat.png deleted file mode 100644 index ca23880f..00000000 Binary files a/assets/image/2x/icon_we_chat.png and /dev/null differ diff --git a/assets/image/2x/icon_we_chat.webp b/assets/image/2x/icon_we_chat.webp new file mode 100644 index 00000000..ac297eb3 Binary files /dev/null and b/assets/image/2x/icon_we_chat.webp differ diff --git a/assets/image/2x/icon_weixin.png b/assets/image/2x/icon_weixin.png deleted file mode 100644 index 14e5a49e..00000000 Binary files a/assets/image/2x/icon_weixin.png and /dev/null differ diff --git a/assets/image/2x/icon_weixin.webp b/assets/image/2x/icon_weixin.webp new file mode 100644 index 00000000..02e725ac Binary files /dev/null and b/assets/image/2x/icon_weixin.webp differ diff --git a/assets/image/2x/icon_wo_n.png b/assets/image/2x/icon_wo_n.png deleted file mode 100644 index 1e24c155..00000000 Binary files a/assets/image/2x/icon_wo_n.png and /dev/null differ diff --git a/assets/image/2x/icon_wo_n.webp b/assets/image/2x/icon_wo_n.webp new file mode 100644 index 00000000..c51e26e3 Binary files /dev/null and b/assets/image/2x/icon_wo_n.webp differ diff --git a/assets/image/2x/icon_wo_s.png b/assets/image/2x/icon_wo_s.png deleted file mode 100644 index 3b4cd302..00000000 Binary files a/assets/image/2x/icon_wo_s.png and /dev/null differ diff --git a/assets/image/2x/icon_wo_s.webp b/assets/image/2x/icon_wo_s.webp new file mode 100644 index 00000000..b76676b1 Binary files /dev/null and b/assets/image/2x/icon_wo_s.webp differ diff --git a/assets/image/2x/icon_write_off_bg.png b/assets/image/2x/icon_write_off_bg.png deleted file mode 100644 index b675f91c..00000000 Binary files a/assets/image/2x/icon_write_off_bg.png and /dev/null differ diff --git a/assets/image/2x/icon_write_off_bg.webp b/assets/image/2x/icon_write_off_bg.webp new file mode 100644 index 00000000..1bcc0745 Binary files /dev/null and b/assets/image/2x/icon_write_off_bg.webp differ diff --git a/assets/image/2x/icon_xuanzhong.png b/assets/image/2x/icon_xuanzhong.png deleted file mode 100644 index a569b9a4..00000000 Binary files a/assets/image/2x/icon_xuanzhong.png and /dev/null differ diff --git a/assets/image/2x/icon_xuanzhong.webp b/assets/image/2x/icon_xuanzhong.webp new file mode 100644 index 00000000..526e342c Binary files /dev/null and b/assets/image/2x/icon_xuanzhong.webp differ diff --git a/assets/image/2x/icon_z.png b/assets/image/2x/icon_z.png deleted file mode 100644 index df1f19f5..00000000 Binary files a/assets/image/2x/icon_z.png and /dev/null differ diff --git a/assets/image/2x/icon_z.webp b/assets/image/2x/icon_z.webp new file mode 100644 index 00000000..77b48e80 Binary files /dev/null and b/assets/image/2x/icon_z.webp differ diff --git a/assets/image/2x/icon_zan.png b/assets/image/2x/icon_zan.png deleted file mode 100644 index 395e0c97..00000000 Binary files a/assets/image/2x/icon_zan.png and /dev/null differ diff --git a/assets/image/2x/icon_zan.webp b/assets/image/2x/icon_zan.webp new file mode 100644 index 00000000..9c9079ed Binary files /dev/null and b/assets/image/2x/icon_zan.webp differ diff --git a/assets/image/2x/integral_return.png b/assets/image/2x/integral_return.png deleted file mode 100644 index 1e1699bc..00000000 Binary files a/assets/image/2x/integral_return.png and /dev/null differ diff --git a/assets/image/2x/integral_return.webp b/assets/image/2x/integral_return.webp new file mode 100644 index 00000000..cd645dd9 Binary files /dev/null and b/assets/image/2x/integral_return.webp differ diff --git a/assets/image/2x/ji_fen.png b/assets/image/2x/ji_fen.png deleted file mode 100644 index c7e2ca1c..00000000 Binary files a/assets/image/2x/ji_fen.png and /dev/null differ diff --git a/assets/image/2x/ji_fen.webp b/assets/image/2x/ji_fen.webp new file mode 100644 index 00000000..583ab06c Binary files /dev/null and b/assets/image/2x/ji_fen.webp differ diff --git a/assets/image/2x/jian_j.png b/assets/image/2x/jian_j.png deleted file mode 100644 index 84e6fce4..00000000 Binary files a/assets/image/2x/jian_j.png and /dev/null differ diff --git a/assets/image/2x/jian_j.webp b/assets/image/2x/jian_j.webp new file mode 100644 index 00000000..17fe6b2d Binary files /dev/null and b/assets/image/2x/jian_j.webp differ diff --git a/assets/image/2x/ju_bao.png b/assets/image/2x/ju_bao.png deleted file mode 100644 index 9a1f86c8..00000000 Binary files a/assets/image/2x/ju_bao.png and /dev/null differ diff --git a/assets/image/2x/ju_bao.webp b/assets/image/2x/ju_bao.webp new file mode 100644 index 00000000..a4eea092 Binary files /dev/null and b/assets/image/2x/ju_bao.webp differ diff --git a/assets/image/2x/ka.png b/assets/image/2x/ka.png deleted file mode 100644 index bb66655b..00000000 Binary files a/assets/image/2x/ka.png and /dev/null differ diff --git a/assets/image/2x/ka.webp b/assets/image/2x/ka.webp new file mode 100644 index 00000000..64cf74e9 Binary files /dev/null and b/assets/image/2x/ka.webp differ diff --git a/assets/image/2x/ketang.png b/assets/image/2x/ketang.png deleted file mode 100644 index c65f4956..00000000 Binary files a/assets/image/2x/ketang.png and /dev/null differ diff --git a/assets/image/2x/ketang.webp b/assets/image/2x/ketang.webp new file mode 100644 index 00000000..3b658d3d Binary files /dev/null and b/assets/image/2x/ketang.webp differ diff --git a/assets/image/2x/ketang_like.png b/assets/image/2x/ketang_like.png deleted file mode 100644 index e9b86803..00000000 Binary files a/assets/image/2x/ketang_like.png and /dev/null differ diff --git a/assets/image/2x/ketang_like.webp b/assets/image/2x/ketang_like.webp new file mode 100644 index 00000000..e90a4e5d Binary files /dev/null and b/assets/image/2x/ketang_like.webp differ diff --git a/assets/image/2x/ketang_message.png b/assets/image/2x/ketang_message.png deleted file mode 100644 index f69de896..00000000 Binary files a/assets/image/2x/ketang_message.png and /dev/null differ diff --git a/assets/image/2x/ketang_message.webp b/assets/image/2x/ketang_message.webp new file mode 100644 index 00000000..e78a6e52 Binary files /dev/null and b/assets/image/2x/ketang_message.webp differ diff --git a/assets/image/2x/ketang_play.png b/assets/image/2x/ketang_play.png deleted file mode 100644 index 0329d21b..00000000 Binary files a/assets/image/2x/ketang_play.png and /dev/null differ diff --git a/assets/image/2x/ketang_play.webp b/assets/image/2x/ketang_play.webp new file mode 100644 index 00000000..f047af48 Binary files /dev/null and b/assets/image/2x/ketang_play.webp differ diff --git a/assets/image/2x/landmark.png b/assets/image/2x/landmark.png deleted file mode 100644 index b5e24830..00000000 Binary files a/assets/image/2x/landmark.png and /dev/null differ diff --git a/assets/image/2x/landmark.webp b/assets/image/2x/landmark.webp new file mode 100644 index 00000000..7ef949c5 Binary files /dev/null and b/assets/image/2x/landmark.webp differ diff --git a/assets/image/2x/laoban.png b/assets/image/2x/laoban.png deleted file mode 100644 index f64e6a26..00000000 Binary files a/assets/image/2x/laoban.png and /dev/null differ diff --git a/assets/image/2x/laoban.webp b/assets/image/2x/laoban.webp new file mode 100644 index 00000000..ac414c84 Binary files /dev/null and b/assets/image/2x/laoban.webp differ diff --git a/assets/image/2x/leaving_message.png b/assets/image/2x/leaving_message.png deleted file mode 100644 index a8bb451c..00000000 Binary files a/assets/image/2x/leaving_message.png and /dev/null differ diff --git a/assets/image/2x/leaving_message.webp b/assets/image/2x/leaving_message.webp new file mode 100644 index 00000000..4cce8019 Binary files /dev/null and b/assets/image/2x/leaving_message.webp differ diff --git a/assets/image/2x/logout.png b/assets/image/2x/logout.png deleted file mode 100644 index a3d13819..00000000 Binary files a/assets/image/2x/logout.png and /dev/null differ diff --git a/assets/image/2x/logout.webp b/assets/image/2x/logout.webp new file mode 100644 index 00000000..da7766ca Binary files /dev/null and b/assets/image/2x/logout.webp differ diff --git a/assets/image/2x/logout_s.png b/assets/image/2x/logout_s.png deleted file mode 100644 index 15e58aac..00000000 Binary files a/assets/image/2x/logout_s.png and /dev/null differ diff --git a/assets/image/2x/logout_s.webp b/assets/image/2x/logout_s.webp new file mode 100644 index 00000000..5723fc77 Binary files /dev/null and b/assets/image/2x/logout_s.webp differ diff --git a/assets/image/2x/map.png b/assets/image/2x/map.png deleted file mode 100644 index 7b8e5f0b..00000000 Binary files a/assets/image/2x/map.png and /dev/null differ diff --git a/assets/image/2x/map.webp b/assets/image/2x/map.webp new file mode 100644 index 00000000..75de906e Binary files /dev/null and b/assets/image/2x/map.webp differ diff --git a/assets/image/2x/oeder_cancel.png b/assets/image/2x/oeder_cancel.png deleted file mode 100644 index e40a05c5..00000000 Binary files a/assets/image/2x/oeder_cancel.png and /dev/null differ diff --git a/assets/image/2x/oeder_cancel.webp b/assets/image/2x/oeder_cancel.webp new file mode 100644 index 00000000..54a8da2b Binary files /dev/null and b/assets/image/2x/oeder_cancel.webp differ diff --git a/assets/image/2x/order.png b/assets/image/2x/order.png deleted file mode 100644 index 23f99281..00000000 Binary files a/assets/image/2x/order.png and /dev/null differ diff --git a/assets/image/2x/order.webp b/assets/image/2x/order.webp new file mode 100644 index 00000000..7d5d8715 Binary files /dev/null and b/assets/image/2x/order.webp differ diff --git a/assets/image/2x/order_ok.png b/assets/image/2x/order_ok.png deleted file mode 100644 index 8f5504dd..00000000 Binary files a/assets/image/2x/order_ok.png and /dev/null differ diff --git a/assets/image/2x/order_ok.webp b/assets/image/2x/order_ok.webp new file mode 100644 index 00000000..a7a02a11 Binary files /dev/null and b/assets/image/2x/order_ok.webp differ diff --git a/assets/image/2x/oreder_refund.png b/assets/image/2x/oreder_refund.png deleted file mode 100644 index dd49a9fa..00000000 Binary files a/assets/image/2x/oreder_refund.png and /dev/null differ diff --git a/assets/image/2x/oreder_refund.webp b/assets/image/2x/oreder_refund.webp new file mode 100644 index 00000000..3bc60337 Binary files /dev/null and b/assets/image/2x/oreder_refund.webp differ diff --git a/assets/image/2x/pen.png b/assets/image/2x/pen.png deleted file mode 100644 index 3ddedf59..00000000 Binary files a/assets/image/2x/pen.png and /dev/null differ diff --git a/assets/image/2x/pen.webp b/assets/image/2x/pen.webp new file mode 100644 index 00000000..3ccdc653 Binary files /dev/null and b/assets/image/2x/pen.webp differ diff --git a/assets/image/2x/qr_share_bg.png b/assets/image/2x/qr_share_bg.png deleted file mode 100644 index 6e65c2eb..00000000 Binary files a/assets/image/2x/qr_share_bg.png and /dev/null differ diff --git a/assets/image/2x/qr_share_bg.webp b/assets/image/2x/qr_share_bg.webp new file mode 100644 index 00000000..02ab3639 Binary files /dev/null and b/assets/image/2x/qr_share_bg.webp differ diff --git a/assets/image/2x/qr_share_bg_yq.png b/assets/image/2x/qr_share_bg_yq.png deleted file mode 100644 index ddf803ac..00000000 Binary files a/assets/image/2x/qr_share_bg_yq.png and /dev/null differ diff --git a/assets/image/2x/qr_share_bg_yq.webp b/assets/image/2x/qr_share_bg_yq.webp new file mode 100644 index 00000000..10893ac7 Binary files /dev/null and b/assets/image/2x/qr_share_bg_yq.webp differ diff --git a/assets/image/2x/qr_share_info_bg.png b/assets/image/2x/qr_share_info_bg.png deleted file mode 100644 index bf2374b1..00000000 Binary files a/assets/image/2x/qr_share_info_bg.png and /dev/null differ diff --git a/assets/image/2x/qr_share_info_bg.webp b/assets/image/2x/qr_share_info_bg.webp new file mode 100644 index 00000000..2a651c61 Binary files /dev/null and b/assets/image/2x/qr_share_info_bg.webp differ diff --git a/assets/image/2x/qt_badge.png b/assets/image/2x/qt_badge.png deleted file mode 100644 index 6933d52e..00000000 Binary files a/assets/image/2x/qt_badge.png and /dev/null differ diff --git a/assets/image/2x/qt_badge.webp b/assets/image/2x/qt_badge.webp new file mode 100644 index 00000000..59a0aa16 Binary files /dev/null and b/assets/image/2x/qt_badge.webp differ diff --git a/assets/image/2x/recharge.webp b/assets/image/2x/recharge.webp new file mode 100644 index 00000000..22995ef6 Binary files /dev/null and b/assets/image/2x/recharge.webp differ diff --git a/assets/image/2x/reduce.png b/assets/image/2x/reduce.png deleted file mode 100644 index 9c5868c5..00000000 Binary files a/assets/image/2x/reduce.png and /dev/null differ diff --git a/assets/image/2x/reduce.webp b/assets/image/2x/reduce.webp new file mode 100644 index 00000000..d0c58b64 Binary files /dev/null and b/assets/image/2x/reduce.webp differ diff --git a/assets/image/2x/service.png b/assets/image/2x/service.png deleted file mode 100644 index 52af324f..00000000 Binary files a/assets/image/2x/service.png and /dev/null differ diff --git a/assets/image/2x/service.webp b/assets/image/2x/service.webp new file mode 100644 index 00000000..24852305 Binary files /dev/null and b/assets/image/2x/service.webp differ diff --git a/assets/image/2x/shadow.png b/assets/image/2x/shadow.png deleted file mode 100644 index 08515091..00000000 Binary files a/assets/image/2x/shadow.png and /dev/null differ diff --git a/assets/image/2x/shadow.webp b/assets/image/2x/shadow.webp new file mode 100644 index 00000000..5fba3c95 Binary files /dev/null and b/assets/image/2x/shadow.webp differ diff --git a/assets/image/2x/share_image_bg.png b/assets/image/2x/share_image_bg.png deleted file mode 100644 index 06158b21..00000000 Binary files a/assets/image/2x/share_image_bg.png and /dev/null differ diff --git a/assets/image/2x/share_image_bg.webp b/assets/image/2x/share_image_bg.webp new file mode 100644 index 00000000..b30e5767 Binary files /dev/null and b/assets/image/2x/share_image_bg.webp differ diff --git a/assets/image/2x/share_image_bg_yq.png b/assets/image/2x/share_image_bg_yq.png deleted file mode 100644 index 5cc73373..00000000 Binary files a/assets/image/2x/share_image_bg_yq.png and /dev/null differ diff --git a/assets/image/2x/share_image_bg_yq.webp b/assets/image/2x/share_image_bg_yq.webp new file mode 100644 index 00000000..4b8dbfd7 Binary files /dev/null and b/assets/image/2x/share_image_bg_yq.webp differ diff --git a/assets/image/2x/share_image_close.png b/assets/image/2x/share_image_close.png deleted file mode 100644 index c9ffcf2c..00000000 Binary files a/assets/image/2x/share_image_close.png and /dev/null differ diff --git a/assets/image/2x/share_image_close.webp b/assets/image/2x/share_image_close.webp new file mode 100644 index 00000000..30c0a676 Binary files /dev/null and b/assets/image/2x/share_image_close.webp differ diff --git a/assets/image/2x/shop_logo.png b/assets/image/2x/shop_logo.png deleted file mode 100644 index b7c2f62f..00000000 Binary files a/assets/image/2x/shop_logo.png and /dev/null differ diff --git a/assets/image/2x/shop_logo.webp b/assets/image/2x/shop_logo.webp new file mode 100644 index 00000000..c108518f Binary files /dev/null and b/assets/image/2x/shop_logo.webp differ diff --git a/assets/image/2x/shopp.png b/assets/image/2x/shopp.png deleted file mode 100644 index f213533e..00000000 Binary files a/assets/image/2x/shopp.png and /dev/null differ diff --git a/assets/image/2x/shopp.webp b/assets/image/2x/shopp.webp new file mode 100644 index 00000000..c921b59c Binary files /dev/null and b/assets/image/2x/shopp.webp differ diff --git a/assets/image/2x/shopping_k.png b/assets/image/2x/shopping_k.png deleted file mode 100644 index 09a1f810..00000000 Binary files a/assets/image/2x/shopping_k.png and /dev/null differ diff --git a/assets/image/2x/shopping_k.webp b/assets/image/2x/shopping_k.webp new file mode 100644 index 00000000..d29cf4d3 Binary files /dev/null and b/assets/image/2x/shopping_k.webp differ diff --git a/assets/image/2x/t_right.png b/assets/image/2x/t_right.png deleted file mode 100644 index 5bebd770..00000000 Binary files a/assets/image/2x/t_right.png and /dev/null differ diff --git a/assets/image/2x/t_right.webp b/assets/image/2x/t_right.webp new file mode 100644 index 00000000..28b56fde Binary files /dev/null and b/assets/image/2x/t_right.webp differ diff --git a/assets/image/2x/vip_contrastive_table.png b/assets/image/2x/vip_contrastive_table.png deleted file mode 100644 index a4d0d82e..00000000 Binary files a/assets/image/2x/vip_contrastive_table.png and /dev/null differ diff --git a/assets/image/2x/vip_contrastive_table.webp b/assets/image/2x/vip_contrastive_table.webp new file mode 100644 index 00000000..a103b43a Binary files /dev/null and b/assets/image/2x/vip_contrastive_table.webp differ diff --git a/assets/image/2x/vip_gc.png b/assets/image/2x/vip_gc.png deleted file mode 100644 index 9b43195f..00000000 Binary files a/assets/image/2x/vip_gc.png and /dev/null differ diff --git a/assets/image/2x/vip_gc.webp b/assets/image/2x/vip_gc.webp new file mode 100644 index 00000000..b87ab429 Binary files /dev/null and b/assets/image/2x/vip_gc.webp differ diff --git a/assets/image/2x/vip_jk.png b/assets/image/2x/vip_jk.png deleted file mode 100644 index e0cb11a1..00000000 Binary files a/assets/image/2x/vip_jk.png and /dev/null differ diff --git a/assets/image/2x/vip_jk.webp b/assets/image/2x/vip_jk.webp new file mode 100644 index 00000000..71c9d28f Binary files /dev/null and b/assets/image/2x/vip_jk.webp differ diff --git a/assets/image/2x/vip_qy.png b/assets/image/2x/vip_qy.png deleted file mode 100644 index c11c562c..00000000 Binary files a/assets/image/2x/vip_qy.png and /dev/null differ diff --git a/assets/image/2x/vip_qy.webp b/assets/image/2x/vip_qy.webp new file mode 100644 index 00000000..23f75a11 Binary files /dev/null and b/assets/image/2x/vip_qy.webp differ diff --git a/assets/image/2x/vip_yk.png b/assets/image/2x/vip_yk.png deleted file mode 100644 index 718741dd..00000000 Binary files a/assets/image/2x/vip_yk.png and /dev/null differ diff --git a/assets/image/2x/vip_yk.webp b/assets/image/2x/vip_yk.webp new file mode 100644 index 00000000..ab766ef0 Binary files /dev/null and b/assets/image/2x/vip_yk.webp differ diff --git a/assets/image/2x/wait_meal.png b/assets/image/2x/wait_meal.png deleted file mode 100644 index a143c1f6..00000000 Binary files a/assets/image/2x/wait_meal.png and /dev/null differ diff --git a/assets/image/2x/wait_meal.webp b/assets/image/2x/wait_meal.webp new file mode 100644 index 00000000..c12d4f67 Binary files /dev/null and b/assets/image/2x/wait_meal.webp differ diff --git a/assets/image/2x/xiao_fei.png b/assets/image/2x/xiao_fei.png deleted file mode 100644 index ff427bb8..00000000 Binary files a/assets/image/2x/xiao_fei.png and /dev/null differ diff --git a/assets/image/2x/xiao_fei.webp b/assets/image/2x/xiao_fei.webp new file mode 100644 index 00000000..099c33fb Binary files /dev/null and b/assets/image/2x/xiao_fei.webp differ diff --git a/assets/image/2x/xin_ren.png b/assets/image/2x/xin_ren.png deleted file mode 100644 index 2e8e190d..00000000 Binary files a/assets/image/2x/xin_ren.png and /dev/null differ diff --git a/assets/image/2x/xin_ren.webp b/assets/image/2x/xin_ren.webp new file mode 100644 index 00000000..15ddc328 Binary files /dev/null and b/assets/image/2x/xin_ren.webp differ diff --git a/assets/image/2x/xin_rq.png b/assets/image/2x/xin_rq.png deleted file mode 100644 index c89eb12c..00000000 Binary files a/assets/image/2x/xin_rq.png and /dev/null differ diff --git a/assets/image/2x/xin_rq.webp b/assets/image/2x/xin_rq.webp new file mode 100644 index 00000000..621c8cae Binary files /dev/null and b/assets/image/2x/xin_rq.webp differ diff --git a/assets/image/2x/yao_q.png b/assets/image/2x/yao_q.png deleted file mode 100644 index 0a43148e..00000000 Binary files a/assets/image/2x/yao_q.png and /dev/null differ diff --git a/assets/image/2x/yao_q.webp b/assets/image/2x/yao_q.webp new file mode 100644 index 00000000..853b1f53 Binary files /dev/null and b/assets/image/2x/yao_q.webp differ diff --git a/assets/image/2x/yq.png b/assets/image/2x/yq.png deleted file mode 100644 index 2f25e3e2..00000000 Binary files a/assets/image/2x/yq.png and /dev/null differ diff --git a/assets/image/2x/yq.webp b/assets/image/2x/yq.webp new file mode 100644 index 00000000..e325107b Binary files /dev/null and b/assets/image/2x/yq.webp differ diff --git a/assets/image/2x/yq_qx.png b/assets/image/2x/yq_qx.png deleted file mode 100644 index d40fd34b..00000000 Binary files a/assets/image/2x/yq_qx.png and /dev/null differ diff --git a/assets/image/2x/yq_qx.webp b/assets/image/2x/yq_qx.webp new file mode 100644 index 00000000..0f070fbe Binary files /dev/null and b/assets/image/2x/yq_qx.webp differ diff --git a/assets/image/3x/activity_hot.png b/assets/image/3x/activity_hot.png deleted file mode 100644 index 65abff9d..00000000 Binary files a/assets/image/3x/activity_hot.png and /dev/null differ diff --git a/assets/image/3x/activity_hot.webp b/assets/image/3x/activity_hot.webp new file mode 100644 index 00000000..75b85ee2 Binary files /dev/null and b/assets/image/3x/activity_hot.webp differ diff --git a/assets/image/3x/activity_q.png b/assets/image/3x/activity_q.png deleted file mode 100644 index 5d82dfa7..00000000 Binary files a/assets/image/3x/activity_q.png and /dev/null differ diff --git a/assets/image/3x/activity_q.webp b/assets/image/3x/activity_q.webp new file mode 100644 index 00000000..3c132dfe Binary files /dev/null and b/assets/image/3x/activity_q.webp differ diff --git a/assets/image/3x/add.png b/assets/image/3x/add.png deleted file mode 100644 index e87e1787..00000000 Binary files a/assets/image/3x/add.png and /dev/null differ diff --git a/assets/image/3x/add.webp b/assets/image/3x/add.webp new file mode 100644 index 00000000..507f8289 Binary files /dev/null and b/assets/image/3x/add.webp differ diff --git a/assets/image/3x/attainment_bj.png b/assets/image/3x/attainment_bj.png deleted file mode 100644 index 296bd261..00000000 Binary files a/assets/image/3x/attainment_bj.png and /dev/null differ diff --git a/assets/image/3x/attainment_bj.webp b/assets/image/3x/attainment_bj.webp new file mode 100644 index 00000000..415b0d12 Binary files /dev/null and b/assets/image/3x/attainment_bj.webp differ diff --git a/assets/image/3x/badge_img.png b/assets/image/3x/badge_img.png deleted file mode 100644 index 5cdc2d2d..00000000 Binary files a/assets/image/3x/badge_img.png and /dev/null differ diff --git a/assets/image/3x/badge_img.webp b/assets/image/3x/badge_img.webp new file mode 100644 index 00000000..bd572d2d Binary files /dev/null and b/assets/image/3x/badge_img.webp differ diff --git a/assets/image/3x/bianhao.png b/assets/image/3x/bianhao.png deleted file mode 100644 index 794d99aa..00000000 Binary files a/assets/image/3x/bianhao.png and /dev/null differ diff --git a/assets/image/3x/bianhao.webp b/assets/image/3x/bianhao.webp new file mode 100644 index 00000000..e22df9d2 Binary files /dev/null and b/assets/image/3x/bianhao.webp differ diff --git a/assets/image/3x/bj_badge.png b/assets/image/3x/bj_badge.png deleted file mode 100644 index fec30b19..00000000 Binary files a/assets/image/3x/bj_badge.png and /dev/null differ diff --git a/assets/image/3x/bj_badge.webp b/assets/image/3x/bj_badge.webp new file mode 100644 index 00000000..81a78745 Binary files /dev/null and b/assets/image/3x/bj_badge.webp differ diff --git a/assets/image/3x/browse.png b/assets/image/3x/browse.png deleted file mode 100644 index b16f7196..00000000 Binary files a/assets/image/3x/browse.png and /dev/null differ diff --git a/assets/image/3x/browse.webp b/assets/image/3x/browse.webp new file mode 100644 index 00000000..41f98223 Binary files /dev/null and b/assets/image/3x/browse.webp differ diff --git a/assets/image/3x/by_badge.png b/assets/image/3x/by_badge.png deleted file mode 100644 index f4951941..00000000 Binary files a/assets/image/3x/by_badge.png and /dev/null differ diff --git a/assets/image/3x/by_badge.webp b/assets/image/3x/by_badge.webp new file mode 100644 index 00000000..b92dc40c Binary files /dev/null and b/assets/image/3x/by_badge.webp differ diff --git a/assets/image/3x/c_z.png b/assets/image/3x/c_z.png deleted file mode 100644 index 80055084..00000000 Binary files a/assets/image/3x/c_z.png and /dev/null differ diff --git a/assets/image/3x/c_z.webp b/assets/image/3x/c_z.webp new file mode 100644 index 00000000..cd545fe5 Binary files /dev/null and b/assets/image/3x/c_z.webp differ diff --git a/assets/image/3x/cancel2.png b/assets/image/3x/cancel2.png deleted file mode 100644 index 76a5f54c..00000000 Binary files a/assets/image/3x/cancel2.png and /dev/null differ diff --git a/assets/image/3x/cancel2.webp b/assets/image/3x/cancel2.webp new file mode 100644 index 00000000..95261672 Binary files /dev/null and b/assets/image/3x/cancel2.webp differ diff --git a/assets/image/3x/closed_bill.png b/assets/image/3x/closed_bill.png deleted file mode 100644 index 6601bbb1..00000000 Binary files a/assets/image/3x/closed_bill.png and /dev/null differ diff --git a/assets/image/3x/closed_bill.webp b/assets/image/3x/closed_bill.webp new file mode 100644 index 00000000..448017ff Binary files /dev/null and b/assets/image/3x/closed_bill.webp differ diff --git a/assets/image/3x/default_1.png b/assets/image/3x/default_1.png deleted file mode 100644 index fcae70d1..00000000 Binary files a/assets/image/3x/default_1.png and /dev/null differ diff --git a/assets/image/3x/default_1.webp b/assets/image/3x/default_1.webp new file mode 100644 index 00000000..80446407 Binary files /dev/null and b/assets/image/3x/default_1.webp differ diff --git a/assets/image/3x/default_2_1.png b/assets/image/3x/default_2_1.png deleted file mode 100644 index b554cadc..00000000 Binary files a/assets/image/3x/default_2_1.png and /dev/null differ diff --git a/assets/image/3x/default_2_1.webp b/assets/image/3x/default_2_1.webp new file mode 100644 index 00000000..15ddd5b4 Binary files /dev/null and b/assets/image/3x/default_2_1.webp differ diff --git a/assets/image/3x/default_user.png b/assets/image/3x/default_user.png deleted file mode 100644 index d79237b1..00000000 Binary files a/assets/image/3x/default_user.png and /dev/null differ diff --git a/assets/image/3x/default_user.webp b/assets/image/3x/default_user.webp new file mode 100644 index 00000000..177a9145 Binary files /dev/null and b/assets/image/3x/default_user.webp differ diff --git a/assets/image/3x/default_user1.png b/assets/image/3x/default_user1.png deleted file mode 100644 index 8b067d13..00000000 Binary files a/assets/image/3x/default_user1.png and /dev/null differ diff --git a/assets/image/3x/default_user1.webp b/assets/image/3x/default_user1.webp new file mode 100644 index 00000000..66330a06 Binary files /dev/null and b/assets/image/3x/default_user1.webp differ diff --git a/assets/image/3x/delete.png b/assets/image/3x/delete.png deleted file mode 100644 index 806575e7..00000000 Binary files a/assets/image/3x/delete.png and /dev/null differ diff --git a/assets/image/3x/delete.webp b/assets/image/3x/delete.webp new file mode 100644 index 00000000..c7ab5588 Binary files /dev/null and b/assets/image/3x/delete.webp differ diff --git a/assets/image/3x/di_zhi.png b/assets/image/3x/di_zhi.png deleted file mode 100644 index 47fea0b9..00000000 Binary files a/assets/image/3x/di_zhi.png and /dev/null differ diff --git a/assets/image/3x/di_zhi.webp b/assets/image/3x/di_zhi.webp new file mode 100644 index 00000000..69f8f1c1 Binary files /dev/null and b/assets/image/3x/di_zhi.webp differ diff --git a/assets/image/3x/ding_dan.png b/assets/image/3x/ding_dan.png deleted file mode 100644 index 415d6844..00000000 Binary files a/assets/image/3x/ding_dan.png and /dev/null differ diff --git a/assets/image/3x/ding_dan.webp b/assets/image/3x/ding_dan.webp new file mode 100644 index 00000000..63946eab Binary files /dev/null and b/assets/image/3x/ding_dan.webp differ diff --git a/assets/image/3x/distribution.png b/assets/image/3x/distribution.png deleted file mode 100644 index f90a99b9..00000000 Binary files a/assets/image/3x/distribution.png and /dev/null differ diff --git a/assets/image/3x/distribution.webp b/assets/image/3x/distribution.webp new file mode 100644 index 00000000..7bdd9a00 Binary files /dev/null and b/assets/image/3x/distribution.webp differ diff --git a/assets/image/3x/dong_tai.png b/assets/image/3x/dong_tai.png deleted file mode 100644 index 0f509803..00000000 Binary files a/assets/image/3x/dong_tai.png and /dev/null differ diff --git a/assets/image/3x/dong_tai.webp b/assets/image/3x/dong_tai.webp new file mode 100644 index 00000000..002a7faa Binary files /dev/null and b/assets/image/3x/dong_tai.webp differ diff --git a/assets/image/3x/dynamic.png b/assets/image/3x/dynamic.png deleted file mode 100644 index 5676c4ad..00000000 Binary files a/assets/image/3x/dynamic.png and /dev/null differ diff --git a/assets/image/3x/dynamic.webp b/assets/image/3x/dynamic.webp new file mode 100644 index 00000000..02b32ba9 Binary files /dev/null and b/assets/image/3x/dynamic.webp differ diff --git a/assets/image/3x/fen_si.png b/assets/image/3x/fen_si.png deleted file mode 100644 index 999e78ba..00000000 Binary files a/assets/image/3x/fen_si.png and /dev/null differ diff --git a/assets/image/3x/fen_si.webp b/assets/image/3x/fen_si.webp new file mode 100644 index 00000000..b1306a14 Binary files /dev/null and b/assets/image/3x/fen_si.webp differ diff --git a/assets/image/3x/follow.png b/assets/image/3x/follow.png deleted file mode 100644 index bae709e5..00000000 Binary files a/assets/image/3x/follow.png and /dev/null differ diff --git a/assets/image/3x/follow.webp b/assets/image/3x/follow.webp new file mode 100644 index 00000000..f2a1550b Binary files /dev/null and b/assets/image/3x/follow.webp differ diff --git a/assets/image/3x/fuka_j.png b/assets/image/3x/fuka_j.png deleted file mode 100644 index 71b541da..00000000 Binary files a/assets/image/3x/fuka_j.png and /dev/null differ diff --git a/assets/image/3x/fuka_j.webp b/assets/image/3x/fuka_j.webp new file mode 100644 index 00000000..b85cb390 Binary files /dev/null and b/assets/image/3x/fuka_j.webp differ diff --git a/assets/image/3x/fuka_zj.png b/assets/image/3x/fuka_zj.png deleted file mode 100644 index 8def7e52..00000000 Binary files a/assets/image/3x/fuka_zj.png and /dev/null differ diff --git a/assets/image/3x/fuka_zj.webp b/assets/image/3x/fuka_zj.webp new file mode 100644 index 00000000..3a6797e7 Binary files /dev/null and b/assets/image/3x/fuka_zj.webp differ diff --git a/assets/image/3x/guan_zhu.png b/assets/image/3x/guan_zhu.png deleted file mode 100644 index 94d3d42e..00000000 Binary files a/assets/image/3x/guan_zhu.png and /dev/null differ diff --git a/assets/image/3x/guan_zhu.webp b/assets/image/3x/guan_zhu.webp new file mode 100644 index 00000000..866ddbe4 Binary files /dev/null and b/assets/image/3x/guan_zhu.webp differ diff --git a/assets/image/3x/hj_badge.png b/assets/image/3x/hj_badge.png deleted file mode 100644 index 7ed2cfc3..00000000 Binary files a/assets/image/3x/hj_badge.png and /dev/null differ diff --git a/assets/image/3x/hj_badge.webp b/assets/image/3x/hj_badge.webp new file mode 100644 index 00000000..9dc57708 Binary files /dev/null and b/assets/image/3x/hj_badge.webp differ diff --git a/assets/image/3x/home_activity.png b/assets/image/3x/home_activity.png deleted file mode 100644 index c7dbeebd..00000000 Binary files a/assets/image/3x/home_activity.png and /dev/null differ diff --git a/assets/image/3x/home_activity.webp b/assets/image/3x/home_activity.webp new file mode 100644 index 00000000..8db58663 Binary files /dev/null and b/assets/image/3x/home_activity.webp differ diff --git a/assets/image/3x/home_coupon.png b/assets/image/3x/home_coupon.png deleted file mode 100644 index 7e2d35e6..00000000 Binary files a/assets/image/3x/home_coupon.png and /dev/null differ diff --git a/assets/image/3x/home_coupon.webp b/assets/image/3x/home_coupon.webp new file mode 100644 index 00000000..b0f3c673 Binary files /dev/null and b/assets/image/3x/home_coupon.webp differ diff --git a/assets/image/3x/home_order.png b/assets/image/3x/home_order.png deleted file mode 100644 index 715c6bb0..00000000 Binary files a/assets/image/3x/home_order.png and /dev/null differ diff --git a/assets/image/3x/home_order.webp b/assets/image/3x/home_order.webp new file mode 100644 index 00000000..dec64d03 Binary files /dev/null and b/assets/image/3x/home_order.webp differ diff --git a/assets/image/3x/home_recharge.png b/assets/image/3x/home_recharge.png deleted file mode 100644 index fe963e61..00000000 Binary files a/assets/image/3x/home_recharge.png and /dev/null differ diff --git a/assets/image/3x/home_recharge.webp b/assets/image/3x/home_recharge.webp new file mode 100644 index 00000000..03ed58fb Binary files /dev/null and b/assets/image/3x/home_recharge.webp differ diff --git a/assets/image/3x/ic_coupon_bg.png b/assets/image/3x/ic_coupon_bg.png deleted file mode 100644 index e1862281..00000000 Binary files a/assets/image/3x/ic_coupon_bg.png and /dev/null differ diff --git a/assets/image/3x/ic_coupon_bg.webp b/assets/image/3x/ic_coupon_bg.webp new file mode 100644 index 00000000..3bb84d0f Binary files /dev/null and b/assets/image/3x/ic_coupon_bg.webp differ diff --git a/assets/image/3x/ic_coupon_invalid_bg.png b/assets/image/3x/ic_coupon_invalid_bg.png deleted file mode 100644 index af3497d3..00000000 Binary files a/assets/image/3x/ic_coupon_invalid_bg.png and /dev/null differ diff --git a/assets/image/3x/ic_coupon_invalid_bg.webp b/assets/image/3x/ic_coupon_invalid_bg.webp new file mode 100644 index 00000000..46ff4bdd Binary files /dev/null and b/assets/image/3x/ic_coupon_invalid_bg.webp differ diff --git a/assets/image/3x/ic_splash_bg.png b/assets/image/3x/ic_splash_bg.png deleted file mode 100644 index 9c14a22a..00000000 Binary files a/assets/image/3x/ic_splash_bg.png and /dev/null differ diff --git a/assets/image/3x/ic_splash_bg.webp b/assets/image/3x/ic_splash_bg.webp new file mode 100644 index 00000000..e23b2ab5 Binary files /dev/null and b/assets/image/3x/ic_splash_bg.webp differ diff --git a/assets/image/3x/icon_about_logo.png b/assets/image/3x/icon_about_logo.png deleted file mode 100644 index 93e545b9..00000000 Binary files a/assets/image/3x/icon_about_logo.png and /dev/null differ diff --git a/assets/image/3x/icon_about_logo.webp b/assets/image/3x/icon_about_logo.webp new file mode 100644 index 00000000..1c9c78cf Binary files /dev/null and b/assets/image/3x/icon_about_logo.webp differ diff --git a/assets/image/3x/icon_address_call.png b/assets/image/3x/icon_address_call.png deleted file mode 100644 index 7ee5b423..00000000 Binary files a/assets/image/3x/icon_address_call.png and /dev/null differ diff --git a/assets/image/3x/icon_address_call.webp b/assets/image/3x/icon_address_call.webp new file mode 100644 index 00000000..29b81ab6 Binary files /dev/null and b/assets/image/3x/icon_address_call.webp differ diff --git a/assets/image/3x/icon_address_edit.png b/assets/image/3x/icon_address_edit.png deleted file mode 100644 index c2d9516c..00000000 Binary files a/assets/image/3x/icon_address_edit.png and /dev/null differ diff --git a/assets/image/3x/icon_address_edit.webp b/assets/image/3x/icon_address_edit.webp new file mode 100644 index 00000000..d18db0f9 Binary files /dev/null and b/assets/image/3x/icon_address_edit.webp differ diff --git a/assets/image/3x/icon_address_location.png b/assets/image/3x/icon_address_location.png deleted file mode 100644 index a53449d1..00000000 Binary files a/assets/image/3x/icon_address_location.png and /dev/null differ diff --git a/assets/image/3x/icon_address_location.webp b/assets/image/3x/icon_address_location.webp new file mode 100644 index 00000000..e985c13a Binary files /dev/null and b/assets/image/3x/icon_address_location.webp differ diff --git a/assets/image/3x/icon_address_location_action.png b/assets/image/3x/icon_address_location_action.png deleted file mode 100644 index ccd18009..00000000 Binary files a/assets/image/3x/icon_address_location_action.png and /dev/null differ diff --git a/assets/image/3x/icon_address_location_action.webp b/assets/image/3x/icon_address_location_action.webp new file mode 100644 index 00000000..c91d39a4 Binary files /dev/null and b/assets/image/3x/icon_address_location_action.webp differ diff --git a/assets/image/3x/icon_alipay.png b/assets/image/3x/icon_alipay.png deleted file mode 100644 index 82f4933e..00000000 Binary files a/assets/image/3x/icon_alipay.png and /dev/null differ diff --git a/assets/image/3x/icon_alipay.webp b/assets/image/3x/icon_alipay.webp new file mode 100644 index 00000000..3104a332 Binary files /dev/null and b/assets/image/3x/icon_alipay.webp differ diff --git a/assets/image/3x/icon_an_crown.png b/assets/image/3x/icon_an_crown.png deleted file mode 100644 index 285254c1..00000000 Binary files a/assets/image/3x/icon_an_crown.png and /dev/null differ diff --git a/assets/image/3x/icon_an_crown.webp b/assets/image/3x/icon_an_crown.webp new file mode 100644 index 00000000..8e22e3cd Binary files /dev/null and b/assets/image/3x/icon_an_crown.webp differ diff --git a/assets/image/3x/icon_bi_n.png b/assets/image/3x/icon_bi_n.png deleted file mode 100644 index a75daf95..00000000 Binary files a/assets/image/3x/icon_bi_n.png and /dev/null differ diff --git a/assets/image/3x/icon_bi_n.webp b/assets/image/3x/icon_bi_n.webp new file mode 100644 index 00000000..6488202a Binary files /dev/null and b/assets/image/3x/icon_bi_n.webp differ diff --git a/assets/image/3x/icon_bi_s.png b/assets/image/3x/icon_bi_s.png deleted file mode 100644 index c9268cb2..00000000 Binary files a/assets/image/3x/icon_bi_s.png and /dev/null differ diff --git a/assets/image/3x/icon_bi_s.webp b/assets/image/3x/icon_bi_s.webp new file mode 100644 index 00000000..3b83b24b Binary files /dev/null and b/assets/image/3x/icon_bi_s.webp differ diff --git a/assets/image/3x/icon_brand_introduction.png b/assets/image/3x/icon_brand_introduction.png deleted file mode 100644 index da72c0ee..00000000 Binary files a/assets/image/3x/icon_brand_introduction.png and /dev/null differ diff --git a/assets/image/3x/icon_brand_introduction.webp b/assets/image/3x/icon_brand_introduction.webp new file mode 100644 index 00000000..9b8eae0c Binary files /dev/null and b/assets/image/3x/icon_brand_introduction.webp differ diff --git a/assets/image/3x/icon_brand_n.png b/assets/image/3x/icon_brand_n.png deleted file mode 100644 index 1ec47eee..00000000 Binary files a/assets/image/3x/icon_brand_n.png and /dev/null differ diff --git a/assets/image/3x/icon_brand_n.webp b/assets/image/3x/icon_brand_n.webp new file mode 100644 index 00000000..e151a71e Binary files /dev/null and b/assets/image/3x/icon_brand_n.webp differ diff --git a/assets/image/3x/icon_brand_s.png b/assets/image/3x/icon_brand_s.png deleted file mode 100644 index 6f8f0e7c..00000000 Binary files a/assets/image/3x/icon_brand_s.png and /dev/null differ diff --git a/assets/image/3x/icon_brand_s.webp b/assets/image/3x/icon_brand_s.webp new file mode 100644 index 00000000..a494b7d8 Binary files /dev/null and b/assets/image/3x/icon_brand_s.webp differ diff --git a/assets/image/3x/icon_bread.png b/assets/image/3x/icon_bread.png deleted file mode 100644 index 3d0ad4a5..00000000 Binary files a/assets/image/3x/icon_bread.png and /dev/null differ diff --git a/assets/image/3x/icon_bread_bg.png b/assets/image/3x/icon_bread_bg.png deleted file mode 100644 index 96908ae8..00000000 Binary files a/assets/image/3x/icon_bread_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_bread_bg.webp b/assets/image/3x/icon_bread_bg.webp new file mode 100644 index 00000000..48e79f27 Binary files /dev/null and b/assets/image/3x/icon_bread_bg.webp differ diff --git a/assets/image/3x/icon_calendar_today_sharp.png b/assets/image/3x/icon_calendar_today_sharp.png deleted file mode 100644 index 2fd67933..00000000 Binary files a/assets/image/3x/icon_calendar_today_sharp.png and /dev/null differ diff --git a/assets/image/3x/icon_calendar_today_sharp.webp b/assets/image/3x/icon_calendar_today_sharp.webp new file mode 100644 index 00000000..08211bb1 Binary files /dev/null and b/assets/image/3x/icon_calendar_today_sharp.webp differ diff --git a/assets/image/3x/icon_camera_permission_tips.png b/assets/image/3x/icon_camera_permission_tips.png deleted file mode 100644 index 1da4585e..00000000 Binary files a/assets/image/3x/icon_camera_permission_tips.png and /dev/null differ diff --git a/assets/image/3x/icon_camera_permission_tips.webp b/assets/image/3x/icon_camera_permission_tips.webp new file mode 100644 index 00000000..34da5deb Binary files /dev/null and b/assets/image/3x/icon_camera_permission_tips.webp differ diff --git a/assets/image/3x/icon_card_coupon.png b/assets/image/3x/icon_card_coupon.png deleted file mode 100644 index 124a45ba..00000000 Binary files a/assets/image/3x/icon_card_coupon.png and /dev/null differ diff --git a/assets/image/3x/icon_card_coupon.webp b/assets/image/3x/icon_card_coupon.webp new file mode 100644 index 00000000..bfcbf2cb Binary files /dev/null and b/assets/image/3x/icon_card_coupon.webp differ diff --git a/assets/image/3x/icon_chili.png b/assets/image/3x/icon_chili.png deleted file mode 100644 index b7aeb742..00000000 Binary files a/assets/image/3x/icon_chili.png and /dev/null differ diff --git a/assets/image/3x/icon_comment.png b/assets/image/3x/icon_comment.png deleted file mode 100644 index bddb2830..00000000 Binary files a/assets/image/3x/icon_comment.png and /dev/null differ diff --git a/assets/image/3x/icon_comment.webp b/assets/image/3x/icon_comment.webp new file mode 100644 index 00000000..e070bd2d Binary files /dev/null and b/assets/image/3x/icon_comment.webp differ diff --git a/assets/image/3x/icon_del.jpg b/assets/image/3x/icon_del.jpg deleted file mode 100644 index 2deeaa5d..00000000 Binary files a/assets/image/3x/icon_del.jpg and /dev/null differ diff --git a/assets/image/3x/icon_del.png b/assets/image/3x/icon_del.png deleted file mode 100644 index 20debb98..00000000 Binary files a/assets/image/3x/icon_del.png and /dev/null differ diff --git a/assets/image/3x/icon_del.webp b/assets/image/3x/icon_del.webp new file mode 100644 index 00000000..4bfa817c Binary files /dev/null and b/assets/image/3x/icon_del.webp differ diff --git a/assets/image/3x/icon_delete.png b/assets/image/3x/icon_delete.png deleted file mode 100644 index ef51129c..00000000 Binary files a/assets/image/3x/icon_delete.png and /dev/null differ diff --git a/assets/image/3x/icon_delete.webp b/assets/image/3x/icon_delete.webp new file mode 100644 index 00000000..deff169d Binary files /dev/null and b/assets/image/3x/icon_delete.webp differ diff --git a/assets/image/3x/icon_deliver_goods.png b/assets/image/3x/icon_deliver_goods.png deleted file mode 100644 index e4b0f19a..00000000 Binary files a/assets/image/3x/icon_deliver_goods.png and /dev/null differ diff --git a/assets/image/3x/icon_deliver_goods.webp b/assets/image/3x/icon_deliver_goods.webp new file mode 100644 index 00000000..84dc99a3 Binary files /dev/null and b/assets/image/3x/icon_deliver_goods.webp differ diff --git a/assets/image/3x/icon_deliver_goods_h.png b/assets/image/3x/icon_deliver_goods_h.png deleted file mode 100644 index 104bb0a6..00000000 Binary files a/assets/image/3x/icon_deliver_goods_h.png and /dev/null differ diff --git a/assets/image/3x/icon_deliver_goods_h.webp b/assets/image/3x/icon_deliver_goods_h.webp new file mode 100644 index 00000000..a527d4b7 Binary files /dev/null and b/assets/image/3x/icon_deliver_goods_h.webp differ diff --git a/assets/image/3x/icon_delivery.png b/assets/image/3x/icon_delivery.png deleted file mode 100644 index 71e4326c..00000000 Binary files a/assets/image/3x/icon_delivery.png and /dev/null differ diff --git a/assets/image/3x/icon_delivery.webp b/assets/image/3x/icon_delivery.webp new file mode 100644 index 00000000..adcfc5db Binary files /dev/null and b/assets/image/3x/icon_delivery.webp differ diff --git a/assets/image/3x/icon_delivery_h.png b/assets/image/3x/icon_delivery_h.png deleted file mode 100644 index 94a57b3f..00000000 Binary files a/assets/image/3x/icon_delivery_h.png and /dev/null differ diff --git a/assets/image/3x/icon_delivery_h.webp b/assets/image/3x/icon_delivery_h.webp new file mode 100644 index 00000000..ea94f051 Binary files /dev/null and b/assets/image/3x/icon_delivery_h.webp differ diff --git a/assets/image/3x/icon_empty.png b/assets/image/3x/icon_empty.png deleted file mode 100644 index 23b3ce7b..00000000 Binary files a/assets/image/3x/icon_empty.png and /dev/null differ diff --git a/assets/image/3x/icon_empty.webp b/assets/image/3x/icon_empty.webp new file mode 100644 index 00000000..fa6957c5 Binary files /dev/null and b/assets/image/3x/icon_empty.webp differ diff --git a/assets/image/3x/icon_enlarge.png b/assets/image/3x/icon_enlarge.png deleted file mode 100644 index 69881c3f..00000000 Binary files a/assets/image/3x/icon_enlarge.png and /dev/null differ diff --git a/assets/image/3x/icon_enlarge.webp b/assets/image/3x/icon_enlarge.webp new file mode 100644 index 00000000..68876fe4 Binary files /dev/null and b/assets/image/3x/icon_enlarge.webp differ diff --git a/assets/image/3x/icon_facebook.png b/assets/image/3x/icon_facebook.png deleted file mode 100644 index 5eddadbe..00000000 Binary files a/assets/image/3x/icon_facebook.png and /dev/null differ diff --git a/assets/image/3x/icon_facebook.webp b/assets/image/3x/icon_facebook.webp new file mode 100644 index 00000000..484e3740 Binary files /dev/null and b/assets/image/3x/icon_facebook.webp differ diff --git a/assets/image/3x/icon_founder.png b/assets/image/3x/icon_founder.png deleted file mode 100644 index bb364ddd..00000000 Binary files a/assets/image/3x/icon_founder.png and /dev/null differ diff --git a/assets/image/3x/icon_founder.webp b/assets/image/3x/icon_founder.webp new file mode 100644 index 00000000..8e39f3c7 Binary files /dev/null and b/assets/image/3x/icon_founder.webp differ diff --git a/assets/image/3x/icon_founder_text.png b/assets/image/3x/icon_founder_text.png deleted file mode 100644 index a9087012..00000000 Binary files a/assets/image/3x/icon_founder_text.png and /dev/null differ diff --git a/assets/image/3x/icon_founder_text.webp b/assets/image/3x/icon_founder_text.webp new file mode 100644 index 00000000..24210dbd Binary files /dev/null and b/assets/image/3x/icon_founder_text.webp differ diff --git a/assets/image/3x/icon_get_coupons.png b/assets/image/3x/icon_get_coupons.png deleted file mode 100644 index 18929049..00000000 Binary files a/assets/image/3x/icon_get_coupons.png and /dev/null differ diff --git a/assets/image/3x/icon_get_coupons.webp b/assets/image/3x/icon_get_coupons.webp new file mode 100644 index 00000000..14a49fbe Binary files /dev/null and b/assets/image/3x/icon_get_coupons.webp differ diff --git a/assets/image/3x/icon_gold_blessing.png b/assets/image/3x/icon_gold_blessing.png deleted file mode 100644 index 0630aa88..00000000 Binary files a/assets/image/3x/icon_gold_blessing.png and /dev/null differ diff --git a/assets/image/3x/icon_gold_blessing.webp b/assets/image/3x/icon_gold_blessing.webp new file mode 100644 index 00000000..4b47cbd1 Binary files /dev/null and b/assets/image/3x/icon_gold_blessing.webp differ diff --git a/assets/image/3x/icon_gold_coin.png b/assets/image/3x/icon_gold_coin.png deleted file mode 100644 index d238dc15..00000000 Binary files a/assets/image/3x/icon_gold_coin.png and /dev/null differ diff --git a/assets/image/3x/icon_gold_coin.webp b/assets/image/3x/icon_gold_coin.webp new file mode 100644 index 00000000..5ae6c840 Binary files /dev/null and b/assets/image/3x/icon_gold_coin.webp differ diff --git a/assets/image/3x/icon_guide_1.png b/assets/image/3x/icon_guide_1.png deleted file mode 100644 index 5ec0a484..00000000 Binary files a/assets/image/3x/icon_guide_1.png and /dev/null differ diff --git a/assets/image/3x/icon_guide_1.webp b/assets/image/3x/icon_guide_1.webp new file mode 100644 index 00000000..6fc360ee Binary files /dev/null and b/assets/image/3x/icon_guide_1.webp differ diff --git a/assets/image/3x/icon_guide_2.png b/assets/image/3x/icon_guide_2.png deleted file mode 100644 index 01f368f0..00000000 Binary files a/assets/image/3x/icon_guide_2.png and /dev/null differ diff --git a/assets/image/3x/icon_guide_2.webp b/assets/image/3x/icon_guide_2.webp new file mode 100644 index 00000000..c0006e87 Binary files /dev/null and b/assets/image/3x/icon_guide_2.webp differ diff --git a/assets/image/3x/icon_guide_33.png b/assets/image/3x/icon_guide_33.png deleted file mode 100644 index f2554a01..00000000 Binary files a/assets/image/3x/icon_guide_33.png and /dev/null differ diff --git a/assets/image/3x/icon_guide_33.webp b/assets/image/3x/icon_guide_33.webp new file mode 100644 index 00000000..d6340078 Binary files /dev/null and b/assets/image/3x/icon_guide_33.webp differ diff --git a/assets/image/3x/icon_guide_4.png b/assets/image/3x/icon_guide_4.png deleted file mode 100644 index e0e78b55..00000000 Binary files a/assets/image/3x/icon_guide_4.png and /dev/null differ diff --git a/assets/image/3x/icon_guide_4.webp b/assets/image/3x/icon_guide_4.webp new file mode 100644 index 00000000..71a9f8e2 Binary files /dev/null and b/assets/image/3x/icon_guide_4.webp differ diff --git a/assets/image/3x/icon_gz.png b/assets/image/3x/icon_gz.png deleted file mode 100644 index 2047e60b..00000000 Binary files a/assets/image/3x/icon_gz.png and /dev/null differ diff --git a/assets/image/3x/icon_gz.webp b/assets/image/3x/icon_gz.webp new file mode 100644 index 00000000..ab41b159 Binary files /dev/null and b/assets/image/3x/icon_gz.webp differ diff --git a/assets/image/3x/icon_header_loading.png b/assets/image/3x/icon_header_loading.png deleted file mode 100644 index 38819fa2..00000000 Binary files a/assets/image/3x/icon_header_loading.png and /dev/null differ diff --git a/assets/image/3x/icon_header_loading.webp b/assets/image/3x/icon_header_loading.webp new file mode 100644 index 00000000..fca49dbb Binary files /dev/null and b/assets/image/3x/icon_header_loading.webp differ diff --git a/assets/image/3x/icon_history.png b/assets/image/3x/icon_history.png deleted file mode 100644 index 1e81ecdc..00000000 Binary files a/assets/image/3x/icon_history.png and /dev/null differ diff --git a/assets/image/3x/icon_history.webp b/assets/image/3x/icon_history.webp new file mode 100644 index 00000000..56827200 Binary files /dev/null and b/assets/image/3x/icon_history.webp differ diff --git a/assets/image/3x/icon_hot_right_top.png b/assets/image/3x/icon_hot_right_top.png deleted file mode 100644 index 662075c4..00000000 Binary files a/assets/image/3x/icon_hot_right_top.png and /dev/null differ diff --git a/assets/image/3x/icon_hot_right_top.webp b/assets/image/3x/icon_hot_right_top.webp new file mode 100644 index 00000000..1b97866a Binary files /dev/null and b/assets/image/3x/icon_hot_right_top.webp differ diff --git a/assets/image/3x/icon_idea_cj.png b/assets/image/3x/icon_idea_cj.png deleted file mode 100644 index bccd7982..00000000 Binary files a/assets/image/3x/icon_idea_cj.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_cj.webp b/assets/image/3x/icon_idea_cj.webp new file mode 100644 index 00000000..4eafce36 Binary files /dev/null and b/assets/image/3x/icon_idea_cj.webp differ diff --git a/assets/image/3x/icon_idea_hb.png b/assets/image/3x/icon_idea_hb.png deleted file mode 100644 index 71d6debe..00000000 Binary files a/assets/image/3x/icon_idea_hb.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_hb.webp b/assets/image/3x/icon_idea_hb.webp new file mode 100644 index 00000000..b7bf6f91 Binary files /dev/null and b/assets/image/3x/icon_idea_hb.webp differ diff --git a/assets/image/3x/icon_idea_jk.png b/assets/image/3x/icon_idea_jk.png deleted file mode 100644 index dd8358d5..00000000 Binary files a/assets/image/3x/icon_idea_jk.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_jk.webp b/assets/image/3x/icon_idea_jk.webp new file mode 100644 index 00000000..4e3faa35 Binary files /dev/null and b/assets/image/3x/icon_idea_jk.webp differ diff --git a/assets/image/3x/icon_idea_ya.png b/assets/image/3x/icon_idea_ya.png deleted file mode 100644 index aa6ea934..00000000 Binary files a/assets/image/3x/icon_idea_ya.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_ya.webp b/assets/image/3x/icon_idea_ya.webp new file mode 100644 index 00000000..8e535da7 Binary files /dev/null and b/assets/image/3x/icon_idea_ya.webp differ diff --git a/assets/image/3x/icon_idea_yj.png b/assets/image/3x/icon_idea_yj.png deleted file mode 100644 index 3c90cfd0..00000000 Binary files a/assets/image/3x/icon_idea_yj.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_yj.webp b/assets/image/3x/icon_idea_yj.webp new file mode 100644 index 00000000..dd54a18b Binary files /dev/null and b/assets/image/3x/icon_idea_yj.webp differ diff --git a/assets/image/3x/icon_idea_zh.png b/assets/image/3x/icon_idea_zh.png deleted file mode 100644 index cca73501..00000000 Binary files a/assets/image/3x/icon_idea_zh.png and /dev/null differ diff --git a/assets/image/3x/icon_idea_zh.webp b/assets/image/3x/icon_idea_zh.webp new file mode 100644 index 00000000..4e939a6c Binary files /dev/null and b/assets/image/3x/icon_idea_zh.webp differ diff --git a/assets/image/3x/icon_integral_login.png b/assets/image/3x/icon_integral_login.png deleted file mode 100644 index 27009e61..00000000 Binary files a/assets/image/3x/icon_integral_login.png and /dev/null differ diff --git a/assets/image/3x/icon_integral_login.webp b/assets/image/3x/icon_integral_login.webp new file mode 100644 index 00000000..0bcc549a Binary files /dev/null and b/assets/image/3x/icon_integral_login.webp differ diff --git a/assets/image/3x/icon_integral_order.png b/assets/image/3x/icon_integral_order.png deleted file mode 100644 index 54489155..00000000 Binary files a/assets/image/3x/icon_integral_order.png and /dev/null differ diff --git a/assets/image/3x/icon_integral_order.webp b/assets/image/3x/icon_integral_order.webp new file mode 100644 index 00000000..733585e7 Binary files /dev/null and b/assets/image/3x/icon_integral_order.webp differ diff --git a/assets/image/3x/icon_integral_share.png b/assets/image/3x/icon_integral_share.png deleted file mode 100644 index e240995a..00000000 Binary files a/assets/image/3x/icon_integral_share.png and /dev/null differ diff --git a/assets/image/3x/icon_integral_share.webp b/assets/image/3x/icon_integral_share.webp new file mode 100644 index 00000000..1f58775c Binary files /dev/null and b/assets/image/3x/icon_integral_share.webp differ diff --git a/assets/image/3x/icon_integral_sign.png b/assets/image/3x/icon_integral_sign.png deleted file mode 100644 index 18ab1809..00000000 Binary files a/assets/image/3x/icon_integral_sign.png and /dev/null differ diff --git a/assets/image/3x/icon_integral_sign.webp b/assets/image/3x/icon_integral_sign.webp new file mode 100644 index 00000000..1569eced Binary files /dev/null and b/assets/image/3x/icon_integral_sign.webp differ diff --git a/assets/image/3x/icon_intergral_sign.png b/assets/image/3x/icon_intergral_sign.png deleted file mode 100644 index 100f6ba5..00000000 Binary files a/assets/image/3x/icon_intergral_sign.png and /dev/null differ diff --git a/assets/image/3x/icon_intergral_sign.webp b/assets/image/3x/icon_intergral_sign.webp new file mode 100644 index 00000000..ea49567b Binary files /dev/null and b/assets/image/3x/icon_intergral_sign.webp differ diff --git a/assets/image/3x/icon_like.png b/assets/image/3x/icon_like.png deleted file mode 100644 index 8810984a..00000000 Binary files a/assets/image/3x/icon_like.png and /dev/null differ diff --git a/assets/image/3x/icon_like.webp b/assets/image/3x/icon_like.webp new file mode 100644 index 00000000..0036acf0 Binary files /dev/null and b/assets/image/3x/icon_like.webp differ diff --git a/assets/image/3x/icon_like_h.png b/assets/image/3x/icon_like_h.png deleted file mode 100644 index e110a8a5..00000000 Binary files a/assets/image/3x/icon_like_h.png and /dev/null differ diff --git a/assets/image/3x/icon_like_h.webp b/assets/image/3x/icon_like_h.webp new file mode 100644 index 00000000..28b73088 Binary files /dev/null and b/assets/image/3x/icon_like_h.webp differ diff --git a/assets/image/3x/icon_likes.png b/assets/image/3x/icon_likes.png deleted file mode 100644 index 807aeb5e..00000000 Binary files a/assets/image/3x/icon_likes.png and /dev/null differ diff --git a/assets/image/3x/icon_likes.webp b/assets/image/3x/icon_likes.webp new file mode 100644 index 00000000..6521e39b Binary files /dev/null and b/assets/image/3x/icon_likes.webp differ diff --git a/assets/image/3x/icon_line.png b/assets/image/3x/icon_line.png deleted file mode 100644 index 31b57869..00000000 Binary files a/assets/image/3x/icon_line.png and /dev/null differ diff --git a/assets/image/3x/icon_line.webp b/assets/image/3x/icon_line.webp new file mode 100644 index 00000000..35a575b7 Binary files /dev/null and b/assets/image/3x/icon_line.webp differ diff --git a/assets/image/3x/icon_location_address.png b/assets/image/3x/icon_location_address.png deleted file mode 100644 index 52de0f02..00000000 Binary files a/assets/image/3x/icon_location_address.png and /dev/null differ diff --git a/assets/image/3x/icon_location_address.webp b/assets/image/3x/icon_location_address.webp new file mode 100644 index 00000000..6173f5c3 Binary files /dev/null and b/assets/image/3x/icon_location_address.webp differ diff --git a/assets/image/3x/icon_location_permission_tips.png b/assets/image/3x/icon_location_permission_tips.png deleted file mode 100644 index 82bccb48..00000000 Binary files a/assets/image/3x/icon_location_permission_tips.png and /dev/null differ diff --git a/assets/image/3x/icon_location_permission_tips.webp b/assets/image/3x/icon_location_permission_tips.webp new file mode 100644 index 00000000..fb979bd6 Binary files /dev/null and b/assets/image/3x/icon_location_permission_tips.webp differ diff --git a/assets/image/3x/icon_login_hide_bg.png b/assets/image/3x/icon_login_hide_bg.png deleted file mode 100644 index 763cb15f..00000000 Binary files a/assets/image/3x/icon_login_hide_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_login_hide_bg.webp b/assets/image/3x/icon_login_hide_bg.webp new file mode 100644 index 00000000..4ce6c398 Binary files /dev/null and b/assets/image/3x/icon_login_hide_bg.webp differ diff --git a/assets/image/3x/icon_login_logo.png b/assets/image/3x/icon_login_logo.png deleted file mode 100644 index f6ef0e71..00000000 Binary files a/assets/image/3x/icon_login_logo.png and /dev/null differ diff --git a/assets/image/3x/icon_login_logo.webp b/assets/image/3x/icon_login_logo.webp new file mode 100644 index 00000000..a4fce724 Binary files /dev/null and b/assets/image/3x/icon_login_logo.webp differ diff --git a/assets/image/3x/icon_login_tips.png b/assets/image/3x/icon_login_tips.png deleted file mode 100644 index 0c4a8225..00000000 Binary files a/assets/image/3x/icon_login_tips.png and /dev/null differ diff --git a/assets/image/3x/icon_login_tips.webp b/assets/image/3x/icon_login_tips.webp new file mode 100644 index 00000000..0f4ca904 Binary files /dev/null and b/assets/image/3x/icon_login_tips.webp differ diff --git a/assets/image/3x/icon_look.png b/assets/image/3x/icon_look.png deleted file mode 100644 index 6551fd2d..00000000 Binary files a/assets/image/3x/icon_look.png and /dev/null differ diff --git a/assets/image/3x/icon_look.webp b/assets/image/3x/icon_look.webp new file mode 100644 index 00000000..705e01b1 Binary files /dev/null and b/assets/image/3x/icon_look.webp differ diff --git a/assets/image/3x/icon_map_bubble.png b/assets/image/3x/icon_map_bubble.png deleted file mode 100644 index 60c12a70..00000000 Binary files a/assets/image/3x/icon_map_bubble.png and /dev/null differ diff --git a/assets/image/3x/icon_map_bubble.webp b/assets/image/3x/icon_map_bubble.webp new file mode 100644 index 00000000..72dd47b4 Binary files /dev/null and b/assets/image/3x/icon_map_bubble.webp differ diff --git a/assets/image/3x/icon_map_dot.png b/assets/image/3x/icon_map_dot.png deleted file mode 100644 index 32d390e4..00000000 Binary files a/assets/image/3x/icon_map_dot.png and /dev/null differ diff --git a/assets/image/3x/icon_map_dot.webp b/assets/image/3x/icon_map_dot.webp new file mode 100644 index 00000000..209340fa Binary files /dev/null and b/assets/image/3x/icon_map_dot.webp differ diff --git a/assets/image/3x/icon_map_marker.png b/assets/image/3x/icon_map_marker.png deleted file mode 100644 index 01d25319..00000000 Binary files a/assets/image/3x/icon_map_marker.png and /dev/null differ diff --git a/assets/image/3x/icon_map_marker.webp b/assets/image/3x/icon_map_marker.webp new file mode 100644 index 00000000..b89b70f0 Binary files /dev/null and b/assets/image/3x/icon_map_marker.webp differ diff --git a/assets/image/3x/icon_meng_n.png b/assets/image/3x/icon_meng_n.png deleted file mode 100644 index 40affa49..00000000 Binary files a/assets/image/3x/icon_meng_n.png and /dev/null differ diff --git a/assets/image/3x/icon_meng_n.webp b/assets/image/3x/icon_meng_n.webp new file mode 100644 index 00000000..6f0d04cb Binary files /dev/null and b/assets/image/3x/icon_meng_n.webp differ diff --git a/assets/image/3x/icon_meng_s.png b/assets/image/3x/icon_meng_s.png deleted file mode 100644 index 54854faa..00000000 Binary files a/assets/image/3x/icon_meng_s.png and /dev/null differ diff --git a/assets/image/3x/icon_meng_s.webp b/assets/image/3x/icon_meng_s.webp new file mode 100644 index 00000000..45417e33 Binary files /dev/null and b/assets/image/3x/icon_meng_s.webp differ diff --git a/assets/image/3x/icon_milk_tea.png b/assets/image/3x/icon_milk_tea.png deleted file mode 100644 index 3cfe79ec..00000000 Binary files a/assets/image/3x/icon_milk_tea.png and /dev/null differ diff --git a/assets/image/3x/icon_milk_tea_bg.png b/assets/image/3x/icon_milk_tea_bg.png deleted file mode 100644 index 3149ab3f..00000000 Binary files a/assets/image/3x/icon_milk_tea_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_milk_tea_bg.webp b/assets/image/3x/icon_milk_tea_bg.webp new file mode 100644 index 00000000..261f4592 Binary files /dev/null and b/assets/image/3x/icon_milk_tea_bg.webp differ diff --git a/assets/image/3x/icon_mine_card.png b/assets/image/3x/icon_mine_card.png deleted file mode 100644 index 527ece33..00000000 Binary files a/assets/image/3x/icon_mine_card.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_card.webp b/assets/image/3x/icon_mine_card.webp new file mode 100644 index 00000000..81271b37 Binary files /dev/null and b/assets/image/3x/icon_mine_card.webp differ diff --git a/assets/image/3x/icon_mine_edit.png b/assets/image/3x/icon_mine_edit.png deleted file mode 100644 index 0d95663f..00000000 Binary files a/assets/image/3x/icon_mine_edit.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_edit.webp b/assets/image/3x/icon_mine_edit.webp new file mode 100644 index 00000000..12e626d9 Binary files /dev/null and b/assets/image/3x/icon_mine_edit.webp differ diff --git a/assets/image/3x/icon_mine_feedback.png b/assets/image/3x/icon_mine_feedback.png deleted file mode 100644 index 00acf2fa..00000000 Binary files a/assets/image/3x/icon_mine_feedback.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_feedback.webp b/assets/image/3x/icon_mine_feedback.webp new file mode 100644 index 00000000..6622f095 Binary files /dev/null and b/assets/image/3x/icon_mine_feedback.webp differ diff --git a/assets/image/3x/icon_mine_huixiang_logo.png b/assets/image/3x/icon_mine_huixiang_logo.png deleted file mode 100644 index eecce2b4..00000000 Binary files a/assets/image/3x/icon_mine_huixiang_logo.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_huixiang_logo.webp b/assets/image/3x/icon_mine_huixiang_logo.webp new file mode 100644 index 00000000..2560595c Binary files /dev/null and b/assets/image/3x/icon_mine_huixiang_logo.webp differ diff --git a/assets/image/3x/icon_mine_invoice_assistant.png b/assets/image/3x/icon_mine_invoice_assistant.png deleted file mode 100644 index a39544fc..00000000 Binary files a/assets/image/3x/icon_mine_invoice_assistant.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_invoice_assistant.webp b/assets/image/3x/icon_mine_invoice_assistant.webp new file mode 100644 index 00000000..0b2ea978 Binary files /dev/null and b/assets/image/3x/icon_mine_invoice_assistant.webp differ diff --git a/assets/image/3x/icon_mine_motorcycle.png b/assets/image/3x/icon_mine_motorcycle.png deleted file mode 100644 index 6217d272..00000000 Binary files a/assets/image/3x/icon_mine_motorcycle.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_motorcycle.webp b/assets/image/3x/icon_mine_motorcycle.webp new file mode 100644 index 00000000..b8f37727 Binary files /dev/null and b/assets/image/3x/icon_mine_motorcycle.webp differ diff --git a/assets/image/3x/icon_mine_online_service.webp b/assets/image/3x/icon_mine_online_service.webp new file mode 100644 index 00000000..5e44161c Binary files /dev/null and b/assets/image/3x/icon_mine_online_service.webp differ diff --git a/assets/image/3x/icon_mine_order.png b/assets/image/3x/icon_mine_order.png deleted file mode 100644 index edabd917..00000000 Binary files a/assets/image/3x/icon_mine_order.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_order.webp b/assets/image/3x/icon_mine_order.webp new file mode 100644 index 00000000..e52f421e Binary files /dev/null and b/assets/image/3x/icon_mine_order.webp differ diff --git a/assets/image/3x/icon_mine_order_dfk.png b/assets/image/3x/icon_mine_order_dfk.png deleted file mode 100644 index 3cee50ad..00000000 Binary files a/assets/image/3x/icon_mine_order_dfk.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_order_dfk.webp b/assets/image/3x/icon_mine_order_dfk.webp new file mode 100644 index 00000000..b6c5de4c Binary files /dev/null and b/assets/image/3x/icon_mine_order_dfk.webp differ diff --git a/assets/image/3x/icon_mine_order_qb.png b/assets/image/3x/icon_mine_order_qb.png deleted file mode 100644 index 05b6eca8..00000000 Binary files a/assets/image/3x/icon_mine_order_qb.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_order_qb.webp b/assets/image/3x/icon_mine_order_qb.webp new file mode 100644 index 00000000..28a9e6d9 Binary files /dev/null and b/assets/image/3x/icon_mine_order_qb.webp differ diff --git a/assets/image/3x/icon_mine_order_wwc.png b/assets/image/3x/icon_mine_order_wwc.png deleted file mode 100644 index ddefebcc..00000000 Binary files a/assets/image/3x/icon_mine_order_wwc.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_order_wwc.webp b/assets/image/3x/icon_mine_order_wwc.webp new file mode 100644 index 00000000..05528d52 Binary files /dev/null and b/assets/image/3x/icon_mine_order_wwc.webp differ diff --git a/assets/image/3x/icon_mine_order_ywc.png b/assets/image/3x/icon_mine_order_ywc.png deleted file mode 100644 index d5941420..00000000 Binary files a/assets/image/3x/icon_mine_order_ywc.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_order_ywc.webp b/assets/image/3x/icon_mine_order_ywc.webp new file mode 100644 index 00000000..8e4928ce Binary files /dev/null and b/assets/image/3x/icon_mine_order_ywc.webp differ diff --git a/assets/image/3x/icon_mine_promotion_code.png b/assets/image/3x/icon_mine_promotion_code.png deleted file mode 100644 index 10dfa2e1..00000000 Binary files a/assets/image/3x/icon_mine_promotion_code.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_promotion_code.webp b/assets/image/3x/icon_mine_promotion_code.webp new file mode 100644 index 00000000..6be58329 Binary files /dev/null and b/assets/image/3x/icon_mine_promotion_code.webp differ diff --git a/assets/image/3x/icon_mine_records_of_consumption.png b/assets/image/3x/icon_mine_records_of_consumption.png deleted file mode 100644 index 399c1292..00000000 Binary files a/assets/image/3x/icon_mine_records_of_consumption.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_records_of_consumption.webp b/assets/image/3x/icon_mine_records_of_consumption.webp new file mode 100644 index 00000000..bd664651 Binary files /dev/null and b/assets/image/3x/icon_mine_records_of_consumption.webp differ diff --git a/assets/image/3x/icon_mine_setting.png b/assets/image/3x/icon_mine_setting.png deleted file mode 100644 index 33384e9a..00000000 Binary files a/assets/image/3x/icon_mine_setting.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_setting.webp b/assets/image/3x/icon_mine_setting.webp new file mode 100644 index 00000000..28cf0bba Binary files /dev/null and b/assets/image/3x/icon_mine_setting.webp differ diff --git a/assets/image/3x/icon_mine_wallet.png b/assets/image/3x/icon_mine_wallet.png deleted file mode 100644 index e2799eec..00000000 Binary files a/assets/image/3x/icon_mine_wallet.png and /dev/null differ diff --git a/assets/image/3x/icon_mine_wallet.webp b/assets/image/3x/icon_mine_wallet.webp new file mode 100644 index 00000000..d6575335 Binary files /dev/null and b/assets/image/3x/icon_mine_wallet.webp differ diff --git a/assets/image/3x/icon_more.png b/assets/image/3x/icon_more.png deleted file mode 100644 index 3dc22e5f..00000000 Binary files a/assets/image/3x/icon_more.png and /dev/null differ diff --git a/assets/image/3x/icon_more.webp b/assets/image/3x/icon_more.webp new file mode 100644 index 00000000..8da58bee Binary files /dev/null and b/assets/image/3x/icon_more.webp differ diff --git a/assets/image/3x/icon_natification_permission_tips.png b/assets/image/3x/icon_natification_permission_tips.png deleted file mode 100644 index 056d661d..00000000 Binary files a/assets/image/3x/icon_natification_permission_tips.png and /dev/null differ diff --git a/assets/image/3x/icon_natification_permission_tips.webp b/assets/image/3x/icon_natification_permission_tips.webp new file mode 100644 index 00000000..14ab8248 Binary files /dev/null and b/assets/image/3x/icon_natification_permission_tips.webp differ diff --git a/assets/image/3x/icon_notices.png b/assets/image/3x/icon_notices.png deleted file mode 100644 index d24c26ef..00000000 Binary files a/assets/image/3x/icon_notices.png and /dev/null differ diff --git a/assets/image/3x/icon_notices.webp b/assets/image/3x/icon_notices.webp new file mode 100644 index 00000000..79df1d47 Binary files /dev/null and b/assets/image/3x/icon_notices.webp differ diff --git a/assets/image/3x/icon_order_agin.png b/assets/image/3x/icon_order_agin.png deleted file mode 100644 index 5b2c7722..00000000 Binary files a/assets/image/3x/icon_order_agin.png and /dev/null differ diff --git a/assets/image/3x/icon_order_agin.webp b/assets/image/3x/icon_order_agin.webp new file mode 100644 index 00000000..1e9ca1ff Binary files /dev/null and b/assets/image/3x/icon_order_agin.webp differ diff --git a/assets/image/3x/icon_order_cancel.png b/assets/image/3x/icon_order_cancel.png deleted file mode 100644 index 65b76ce8..00000000 Binary files a/assets/image/3x/icon_order_cancel.png and /dev/null differ diff --git a/assets/image/3x/icon_order_cancel.webp b/assets/image/3x/icon_order_cancel.webp new file mode 100644 index 00000000..44510de6 Binary files /dev/null and b/assets/image/3x/icon_order_cancel.webp differ diff --git a/assets/image/3x/icon_order_commodity_info.png b/assets/image/3x/icon_order_commodity_info.png deleted file mode 100644 index 4affb254..00000000 Binary files a/assets/image/3x/icon_order_commodity_info.png and /dev/null differ diff --git a/assets/image/3x/icon_order_commodity_info.webp b/assets/image/3x/icon_order_commodity_info.webp new file mode 100644 index 00000000..1b60a8cc Binary files /dev/null and b/assets/image/3x/icon_order_commodity_info.webp differ diff --git a/assets/image/3x/icon_order_exchange_info.png b/assets/image/3x/icon_order_exchange_info.png deleted file mode 100644 index b1307429..00000000 Binary files a/assets/image/3x/icon_order_exchange_info.png and /dev/null differ diff --git a/assets/image/3x/icon_order_exchange_info.webp b/assets/image/3x/icon_order_exchange_info.webp new file mode 100644 index 00000000..55b66ed7 Binary files /dev/null and b/assets/image/3x/icon_order_exchange_info.webp differ diff --git a/assets/image/3x/icon_order_more.png b/assets/image/3x/icon_order_more.png deleted file mode 100644 index 6dc8df70..00000000 Binary files a/assets/image/3x/icon_order_more.png and /dev/null differ diff --git a/assets/image/3x/icon_order_more.webp b/assets/image/3x/icon_order_more.webp new file mode 100644 index 00000000..8da58bee Binary files /dev/null and b/assets/image/3x/icon_order_more.webp differ diff --git a/assets/image/3x/icon_order_ok.png b/assets/image/3x/icon_order_ok.png deleted file mode 100644 index db8f1054..00000000 Binary files a/assets/image/3x/icon_order_ok.png and /dev/null differ diff --git a/assets/image/3x/icon_order_ok.webp b/assets/image/3x/icon_order_ok.webp new file mode 100644 index 00000000..ac0c1193 Binary files /dev/null and b/assets/image/3x/icon_order_ok.webp differ diff --git a/assets/image/3x/icon_order_renminbi.png b/assets/image/3x/icon_order_renminbi.png deleted file mode 100644 index 61b4aed7..00000000 Binary files a/assets/image/3x/icon_order_renminbi.png and /dev/null differ diff --git a/assets/image/3x/icon_order_renminbi.webp b/assets/image/3x/icon_order_renminbi.webp new file mode 100644 index 00000000..765f4a96 Binary files /dev/null and b/assets/image/3x/icon_order_renminbi.webp differ diff --git a/assets/image/3x/icon_order_success.png b/assets/image/3x/icon_order_success.png deleted file mode 100644 index 5812bb52..00000000 Binary files a/assets/image/3x/icon_order_success.png and /dev/null differ diff --git a/assets/image/3x/icon_order_success.webp b/assets/image/3x/icon_order_success.webp new file mode 100644 index 00000000..0f258a64 Binary files /dev/null and b/assets/image/3x/icon_order_success.webp differ diff --git a/assets/image/3x/icon_order_time.png b/assets/image/3x/icon_order_time.png deleted file mode 100644 index 31d1b2b4..00000000 Binary files a/assets/image/3x/icon_order_time.png and /dev/null differ diff --git a/assets/image/3x/icon_order_time.webp b/assets/image/3x/icon_order_time.webp new file mode 100644 index 00000000..ff46b8dc Binary files /dev/null and b/assets/image/3x/icon_order_time.webp differ diff --git a/assets/image/3x/icon_pengyouquan.png b/assets/image/3x/icon_pengyouquan.png deleted file mode 100644 index 4683e5f6..00000000 Binary files a/assets/image/3x/icon_pengyouquan.png and /dev/null differ diff --git a/assets/image/3x/icon_pengyouquan.webp b/assets/image/3x/icon_pengyouquan.webp new file mode 100644 index 00000000..231e73ec Binary files /dev/null and b/assets/image/3x/icon_pengyouquan.webp differ diff --git a/assets/image/3x/icon_permission_camera.png b/assets/image/3x/icon_permission_camera.png deleted file mode 100644 index 04ea98d3..00000000 Binary files a/assets/image/3x/icon_permission_camera.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_camera.webp b/assets/image/3x/icon_permission_camera.webp new file mode 100644 index 00000000..6a4ecccb Binary files /dev/null and b/assets/image/3x/icon_permission_camera.webp differ diff --git a/assets/image/3x/icon_permission_face_id.png b/assets/image/3x/icon_permission_face_id.png deleted file mode 100644 index 767bc0f8..00000000 Binary files a/assets/image/3x/icon_permission_face_id.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_face_id.webp b/assets/image/3x/icon_permission_face_id.webp new file mode 100644 index 00000000..ccb2c243 Binary files /dev/null and b/assets/image/3x/icon_permission_face_id.webp differ diff --git a/assets/image/3x/icon_permission_location.png b/assets/image/3x/icon_permission_location.png deleted file mode 100644 index 846f9501..00000000 Binary files a/assets/image/3x/icon_permission_location.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_location.webp b/assets/image/3x/icon_permission_location.webp new file mode 100644 index 00000000..2ec97ed2 Binary files /dev/null and b/assets/image/3x/icon_permission_location.webp differ diff --git a/assets/image/3x/icon_permission_location_bg.png b/assets/image/3x/icon_permission_location_bg.png deleted file mode 100644 index b992f9a3..00000000 Binary files a/assets/image/3x/icon_permission_location_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_location_bg.webp b/assets/image/3x/icon_permission_location_bg.webp new file mode 100644 index 00000000..fb979bd6 Binary files /dev/null and b/assets/image/3x/icon_permission_location_bg.webp differ diff --git a/assets/image/3x/icon_permission_notices.png b/assets/image/3x/icon_permission_notices.png deleted file mode 100644 index 0e512992..00000000 Binary files a/assets/image/3x/icon_permission_notices.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_notices.webp b/assets/image/3x/icon_permission_notices.webp new file mode 100644 index 00000000..764a82df Binary files /dev/null and b/assets/image/3x/icon_permission_notices.webp differ diff --git a/assets/image/3x/icon_permission_storage.png b/assets/image/3x/icon_permission_storage.png deleted file mode 100644 index 61efb027..00000000 Binary files a/assets/image/3x/icon_permission_storage.png and /dev/null differ diff --git a/assets/image/3x/icon_permission_storage.webp b/assets/image/3x/icon_permission_storage.webp new file mode 100644 index 00000000..62f1d9df Binary files /dev/null and b/assets/image/3x/icon_permission_storage.webp differ diff --git a/assets/image/3x/icon_pl.png b/assets/image/3x/icon_pl.png deleted file mode 100644 index b2b3cce5..00000000 Binary files a/assets/image/3x/icon_pl.png and /dev/null differ diff --git a/assets/image/3x/icon_pl.webp b/assets/image/3x/icon_pl.webp new file mode 100644 index 00000000..d0a79b70 Binary files /dev/null and b/assets/image/3x/icon_pl.webp differ diff --git a/assets/image/3x/icon_place_ order.png b/assets/image/3x/icon_place_ order.png deleted file mode 100644 index 8acec1a9..00000000 Binary files a/assets/image/3x/icon_place_ order.png and /dev/null differ diff --git a/assets/image/3x/icon_place_ order.webp b/assets/image/3x/icon_place_ order.webp new file mode 100644 index 00000000..129d3b27 Binary files /dev/null and b/assets/image/3x/icon_place_ order.webp differ diff --git a/assets/image/3x/icon_place_ order_h.png b/assets/image/3x/icon_place_ order_h.png deleted file mode 100644 index 8531d94f..00000000 Binary files a/assets/image/3x/icon_place_ order_h.png and /dev/null differ diff --git a/assets/image/3x/icon_place_ order_h.webp b/assets/image/3x/icon_place_ order_h.webp new file mode 100644 index 00000000..396da342 Binary files /dev/null and b/assets/image/3x/icon_place_ order_h.webp differ diff --git a/assets/image/3x/icon_play.png b/assets/image/3x/icon_play.png deleted file mode 100644 index 77231d8e..00000000 Binary files a/assets/image/3x/icon_play.png and /dev/null differ diff --git a/assets/image/3x/icon_play.webp b/assets/image/3x/icon_play.webp new file mode 100644 index 00000000..0cf4b901 Binary files /dev/null and b/assets/image/3x/icon_play.webp differ diff --git a/assets/image/3x/icon_points_mall.png b/assets/image/3x/icon_points_mall.png deleted file mode 100644 index 3ecb0863..00000000 Binary files a/assets/image/3x/icon_points_mall.png and /dev/null differ diff --git a/assets/image/3x/icon_points_mall.webp b/assets/image/3x/icon_points_mall.webp new file mode 100644 index 00000000..51f04f69 Binary files /dev/null and b/assets/image/3x/icon_points_mall.webp differ diff --git a/assets/image/3x/icon_radio_selected.png b/assets/image/3x/icon_radio_selected.png deleted file mode 100644 index aa8ca30c..00000000 Binary files a/assets/image/3x/icon_radio_selected.png and /dev/null differ diff --git a/assets/image/3x/icon_radio_selected.webp b/assets/image/3x/icon_radio_selected.webp new file mode 100644 index 00000000..ce01b3c5 Binary files /dev/null and b/assets/image/3x/icon_radio_selected.webp differ diff --git a/assets/image/3x/icon_radio_unselected.png b/assets/image/3x/icon_radio_unselected.png deleted file mode 100644 index 776197f1..00000000 Binary files a/assets/image/3x/icon_radio_unselected.png and /dev/null differ diff --git a/assets/image/3x/icon_radio_unselected.webp b/assets/image/3x/icon_radio_unselected.webp new file mode 100644 index 00000000..b5ff5f9a Binary files /dev/null and b/assets/image/3x/icon_radio_unselected.webp differ diff --git a/assets/image/3x/icon_request_refund.png b/assets/image/3x/icon_request_refund.png deleted file mode 100644 index c0647902..00000000 Binary files a/assets/image/3x/icon_request_refund.png and /dev/null differ diff --git a/assets/image/3x/icon_request_refund.webp b/assets/image/3x/icon_request_refund.webp new file mode 100644 index 00000000..c4c374ed Binary files /dev/null and b/assets/image/3x/icon_request_refund.webp differ diff --git a/assets/image/3x/icon_right.png b/assets/image/3x/icon_right.png deleted file mode 100644 index 576fda65..00000000 Binary files a/assets/image/3x/icon_right.png and /dev/null differ diff --git a/assets/image/3x/icon_right.webp b/assets/image/3x/icon_right.webp new file mode 100644 index 00000000..2e2bd627 Binary files /dev/null and b/assets/image/3x/icon_right.webp differ diff --git a/assets/image/3x/icon_right_z.png b/assets/image/3x/icon_right_z.png deleted file mode 100644 index 94e1c5c5..00000000 Binary files a/assets/image/3x/icon_right_z.png and /dev/null differ diff --git a/assets/image/3x/icon_right_z.webp b/assets/image/3x/icon_right_z.webp new file mode 100644 index 00000000..1e263e2b Binary files /dev/null and b/assets/image/3x/icon_right_z.webp differ diff --git a/assets/image/3x/icon_scan_qr_code.png b/assets/image/3x/icon_scan_qr_code.png deleted file mode 100644 index d2b59602..00000000 Binary files a/assets/image/3x/icon_scan_qr_code.png and /dev/null differ diff --git a/assets/image/3x/icon_scan_qr_code.webp b/assets/image/3x/icon_scan_qr_code.webp new file mode 100644 index 00000000..e9900820 Binary files /dev/null and b/assets/image/3x/icon_scan_qr_code.webp differ diff --git a/assets/image/3x/icon_share.png b/assets/image/3x/icon_share.png deleted file mode 100644 index 3932374b..00000000 Binary files a/assets/image/3x/icon_share.png and /dev/null differ diff --git a/assets/image/3x/icon_share.webp b/assets/image/3x/icon_share.webp new file mode 100644 index 00000000..74af3d80 Binary files /dev/null and b/assets/image/3x/icon_share.webp differ diff --git a/assets/image/3x/icon_share_w.png b/assets/image/3x/icon_share_w.png deleted file mode 100644 index e1e2558e..00000000 Binary files a/assets/image/3x/icon_share_w.png and /dev/null differ diff --git a/assets/image/3x/icon_share_w.webp b/assets/image/3x/icon_share_w.webp new file mode 100644 index 00000000..26fd5109 Binary files /dev/null and b/assets/image/3x/icon_share_w.webp differ diff --git a/assets/image/3x/icon_shop.png b/assets/image/3x/icon_shop.png deleted file mode 100644 index eb8f125a..00000000 Binary files a/assets/image/3x/icon_shop.png and /dev/null differ diff --git a/assets/image/3x/icon_shop.webp b/assets/image/3x/icon_shop.webp new file mode 100644 index 00000000..289bd3ed Binary files /dev/null and b/assets/image/3x/icon_shop.webp differ diff --git a/assets/image/3x/icon_sign.png b/assets/image/3x/icon_sign.png deleted file mode 100644 index 18ae5c08..00000000 Binary files a/assets/image/3x/icon_sign.png and /dev/null differ diff --git a/assets/image/3x/icon_sign.webp b/assets/image/3x/icon_sign.webp new file mode 100644 index 00000000..c4b10628 Binary files /dev/null and b/assets/image/3x/icon_sign.webp differ diff --git a/assets/image/3x/icon_sign_h.png b/assets/image/3x/icon_sign_h.png deleted file mode 100644 index d9efe0d1..00000000 Binary files a/assets/image/3x/icon_sign_h.png and /dev/null differ diff --git a/assets/image/3x/icon_sign_h.webp b/assets/image/3x/icon_sign_h.webp new file mode 100644 index 00000000..b2209c5c Binary files /dev/null and b/assets/image/3x/icon_sign_h.webp differ diff --git a/assets/image/3x/icon_sign_ok.png b/assets/image/3x/icon_sign_ok.png deleted file mode 100644 index 13c2f2f5..00000000 Binary files a/assets/image/3x/icon_sign_ok.png and /dev/null differ diff --git a/assets/image/3x/icon_sign_ok.webp b/assets/image/3x/icon_sign_ok.webp new file mode 100644 index 00000000..065c21f1 Binary files /dev/null and b/assets/image/3x/icon_sign_ok.webp differ diff --git a/assets/image/3x/icon_sign_success.png b/assets/image/3x/icon_sign_success.png deleted file mode 100644 index e9275beb..00000000 Binary files a/assets/image/3x/icon_sign_success.png and /dev/null differ diff --git a/assets/image/3x/icon_sign_success.webp b/assets/image/3x/icon_sign_success.webp new file mode 100644 index 00000000..e7b93270 Binary files /dev/null and b/assets/image/3x/icon_sign_success.webp differ diff --git a/assets/image/3x/icon_sisters.png b/assets/image/3x/icon_sisters.png deleted file mode 100644 index 53845121..00000000 Binary files a/assets/image/3x/icon_sisters.png and /dev/null differ diff --git a/assets/image/3x/icon_sisters.webp b/assets/image/3x/icon_sisters.webp new file mode 100644 index 00000000..a38929fb Binary files /dev/null and b/assets/image/3x/icon_sisters.webp differ diff --git a/assets/image/3x/icon_sisters_bj.png b/assets/image/3x/icon_sisters_bj.png deleted file mode 100644 index f1b5f6c0..00000000 Binary files a/assets/image/3x/icon_sisters_bj.png and /dev/null differ diff --git a/assets/image/3x/icon_sisters_bj.webp b/assets/image/3x/icon_sisters_bj.webp new file mode 100644 index 00000000..cc86e4b0 Binary files /dev/null and b/assets/image/3x/icon_sisters_bj.webp differ diff --git a/assets/image/3x/icon_sisters_vip.png b/assets/image/3x/icon_sisters_vip.png deleted file mode 100644 index 7954a879..00000000 Binary files a/assets/image/3x/icon_sisters_vip.png and /dev/null differ diff --git a/assets/image/3x/icon_sisters_vip.webp b/assets/image/3x/icon_sisters_vip.webp new file mode 100644 index 00000000..49a1c192 Binary files /dev/null and b/assets/image/3x/icon_sisters_vip.webp differ diff --git a/assets/image/3x/icon_storage_permission_tips.png b/assets/image/3x/icon_storage_permission_tips.png deleted file mode 100644 index 1da4585e..00000000 Binary files a/assets/image/3x/icon_storage_permission_tips.png and /dev/null differ diff --git a/assets/image/3x/icon_storage_permission_tips.webp b/assets/image/3x/icon_storage_permission_tips.webp new file mode 100644 index 00000000..34da5deb Binary files /dev/null and b/assets/image/3x/icon_storage_permission_tips.webp differ diff --git a/assets/image/3x/icon_store_c.png b/assets/image/3x/icon_store_c.png deleted file mode 100644 index 91567512..00000000 Binary files a/assets/image/3x/icon_store_c.png and /dev/null differ diff --git a/assets/image/3x/icon_store_c.webp b/assets/image/3x/icon_store_c.webp new file mode 100644 index 00000000..4699358d Binary files /dev/null and b/assets/image/3x/icon_store_c.webp differ diff --git a/assets/image/3x/icon_story_1.png b/assets/image/3x/icon_story_1.png deleted file mode 100644 index 49373677..00000000 Binary files a/assets/image/3x/icon_story_1.png and /dev/null differ diff --git a/assets/image/3x/icon_story_1.webp b/assets/image/3x/icon_story_1.webp new file mode 100644 index 00000000..1f2e5a58 Binary files /dev/null and b/assets/image/3x/icon_story_1.webp differ diff --git a/assets/image/3x/icon_story_2.png b/assets/image/3x/icon_story_2.png deleted file mode 100644 index 322f31e3..00000000 Binary files a/assets/image/3x/icon_story_2.png and /dev/null differ diff --git a/assets/image/3x/icon_story_2.webp b/assets/image/3x/icon_story_2.webp new file mode 100644 index 00000000..1c0c76b3 Binary files /dev/null and b/assets/image/3x/icon_story_2.webp differ diff --git a/assets/image/3x/icon_story_bj.png b/assets/image/3x/icon_story_bj.png deleted file mode 100644 index 427beae3..00000000 Binary files a/assets/image/3x/icon_story_bj.png and /dev/null differ diff --git a/assets/image/3x/icon_story_bj.webp b/assets/image/3x/icon_story_bj.webp new file mode 100644 index 00000000..a78802c8 Binary files /dev/null and b/assets/image/3x/icon_story_bj.webp differ diff --git a/assets/image/3x/icon_story_td.png b/assets/image/3x/icon_story_td.png deleted file mode 100644 index ea4288e3..00000000 Binary files a/assets/image/3x/icon_story_td.png and /dev/null differ diff --git a/assets/image/3x/icon_story_td.webp b/assets/image/3x/icon_story_td.webp new file mode 100644 index 00000000..84c1a691 Binary files /dev/null and b/assets/image/3x/icon_story_td.webp differ diff --git a/assets/image/3x/icon_system_message.png b/assets/image/3x/icon_system_message.png deleted file mode 100644 index 1d02c78e..00000000 Binary files a/assets/image/3x/icon_system_message.png and /dev/null differ diff --git a/assets/image/3x/icon_system_message.webp b/assets/image/3x/icon_system_message.webp new file mode 100644 index 00000000..e6d478bc Binary files /dev/null and b/assets/image/3x/icon_system_message.webp differ diff --git a/assets/image/3x/icon_system_notices.png b/assets/image/3x/icon_system_notices.png deleted file mode 100644 index ea35e96a..00000000 Binary files a/assets/image/3x/icon_system_notices.png and /dev/null differ diff --git a/assets/image/3x/icon_system_notices.webp b/assets/image/3x/icon_system_notices.webp new file mode 100644 index 00000000..cfe737ac Binary files /dev/null and b/assets/image/3x/icon_system_notices.webp differ diff --git a/assets/image/3x/icon_system_order.png b/assets/image/3x/icon_system_order.png deleted file mode 100644 index 5d536dea..00000000 Binary files a/assets/image/3x/icon_system_order.png and /dev/null differ diff --git a/assets/image/3x/icon_system_order.webp b/assets/image/3x/icon_system_order.webp new file mode 100644 index 00000000..a73cfc3b Binary files /dev/null and b/assets/image/3x/icon_system_order.webp differ diff --git a/assets/image/3x/icon_system_recharge.png b/assets/image/3x/icon_system_recharge.png deleted file mode 100644 index 04579a67..00000000 Binary files a/assets/image/3x/icon_system_recharge.png and /dev/null differ diff --git a/assets/image/3x/icon_system_recharge.webp b/assets/image/3x/icon_system_recharge.webp new file mode 100644 index 00000000..d6e56aeb Binary files /dev/null and b/assets/image/3x/icon_system_recharge.webp differ diff --git a/assets/image/3x/icon_today_task.png b/assets/image/3x/icon_today_task.png deleted file mode 100644 index 1d51f010..00000000 Binary files a/assets/image/3x/icon_today_task.png and /dev/null differ diff --git a/assets/image/3x/icon_today_task.webp b/assets/image/3x/icon_today_task.webp new file mode 100644 index 00000000..203333d6 Binary files /dev/null and b/assets/image/3x/icon_today_task.webp differ diff --git a/assets/image/3x/icon_today_video.png.png b/assets/image/3x/icon_today_video.png.png deleted file mode 100644 index b2d20e09..00000000 Binary files a/assets/image/3x/icon_today_video.png.png and /dev/null differ diff --git a/assets/image/3x/icon_today_video.png.webp b/assets/image/3x/icon_today_video.png.webp new file mode 100644 index 00000000..e5937e87 Binary files /dev/null and b/assets/image/3x/icon_today_video.png.webp differ diff --git a/assets/image/3x/icon_transport.png b/assets/image/3x/icon_transport.png deleted file mode 100644 index 74e0bdf3..00000000 Binary files a/assets/image/3x/icon_transport.png and /dev/null differ diff --git a/assets/image/3x/icon_transport.webp b/assets/image/3x/icon_transport.webp new file mode 100644 index 00000000..71abb717 Binary files /dev/null and b/assets/image/3x/icon_transport.webp differ diff --git a/assets/image/3x/icon_transport_h.png b/assets/image/3x/icon_transport_h.png deleted file mode 100644 index ffb55548..00000000 Binary files a/assets/image/3x/icon_transport_h.png and /dev/null differ diff --git a/assets/image/3x/icon_transport_h.webp b/assets/image/3x/icon_transport_h.webp new file mode 100644 index 00000000..4f88e876 Binary files /dev/null and b/assets/image/3x/icon_transport_h.webp differ diff --git a/assets/image/3x/icon_union_call.png b/assets/image/3x/icon_union_call.png deleted file mode 100644 index 0d923fca..00000000 Binary files a/assets/image/3x/icon_union_call.png and /dev/null differ diff --git a/assets/image/3x/icon_union_call.webp b/assets/image/3x/icon_union_call.webp new file mode 100644 index 00000000..7ead3256 Binary files /dev/null and b/assets/image/3x/icon_union_call.webp differ diff --git a/assets/image/3x/icon_union_coupons.png b/assets/image/3x/icon_union_coupons.png deleted file mode 100644 index 345f18df..00000000 Binary files a/assets/image/3x/icon_union_coupons.png and /dev/null differ diff --git a/assets/image/3x/icon_union_coupons.webp b/assets/image/3x/icon_union_coupons.webp new file mode 100644 index 00000000..3868f5e5 Binary files /dev/null and b/assets/image/3x/icon_union_coupons.webp differ diff --git a/assets/image/3x/icon_union_coupons_bg.png b/assets/image/3x/icon_union_coupons_bg.png deleted file mode 100644 index 041699c4..00000000 Binary files a/assets/image/3x/icon_union_coupons_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_union_coupons_bg.webp b/assets/image/3x/icon_union_coupons_bg.webp new file mode 100644 index 00000000..e8d35282 Binary files /dev/null and b/assets/image/3x/icon_union_coupons_bg.webp differ diff --git a/assets/image/3x/icon_union_location.png b/assets/image/3x/icon_union_location.png deleted file mode 100644 index 804ecbcd..00000000 Binary files a/assets/image/3x/icon_union_location.png and /dev/null differ diff --git a/assets/image/3x/icon_union_location.png.png b/assets/image/3x/icon_union_location.png.png deleted file mode 100644 index 804ecbcd..00000000 Binary files a/assets/image/3x/icon_union_location.png.png and /dev/null differ diff --git a/assets/image/3x/icon_union_location.png.webp b/assets/image/3x/icon_union_location.png.webp new file mode 100644 index 00000000..123ce93e Binary files /dev/null and b/assets/image/3x/icon_union_location.png.webp differ diff --git a/assets/image/3x/icon_union_location.webp b/assets/image/3x/icon_union_location.webp new file mode 100644 index 00000000..123ce93e Binary files /dev/null and b/assets/image/3x/icon_union_location.webp differ diff --git a/assets/image/3x/icon_union_location_black.png b/assets/image/3x/icon_union_location_black.png deleted file mode 100644 index 29ce11f1..00000000 Binary files a/assets/image/3x/icon_union_location_black.png and /dev/null differ diff --git a/assets/image/3x/icon_union_location_black.webp b/assets/image/3x/icon_union_location_black.webp new file mode 100644 index 00000000..5b4a8690 Binary files /dev/null and b/assets/image/3x/icon_union_location_black.webp differ diff --git a/assets/image/3x/icon_union_start_store.png b/assets/image/3x/icon_union_start_store.png deleted file mode 100644 index 3a38e7d8..00000000 Binary files a/assets/image/3x/icon_union_start_store.png and /dev/null differ diff --git a/assets/image/3x/icon_union_start_store.webp b/assets/image/3x/icon_union_start_store.webp new file mode 100644 index 00000000..3f6db5af Binary files /dev/null and b/assets/image/3x/icon_union_start_store.webp differ diff --git a/assets/image/3x/icon_union_store.png b/assets/image/3x/icon_union_store.png deleted file mode 100644 index 1a4a3e45..00000000 Binary files a/assets/image/3x/icon_union_store.png and /dev/null differ diff --git a/assets/image/3x/icon_union_store.webp b/assets/image/3x/icon_union_store.webp new file mode 100644 index 00000000..2d691b96 Binary files /dev/null and b/assets/image/3x/icon_union_store.webp differ diff --git a/assets/image/3x/icon_union_time.png b/assets/image/3x/icon_union_time.png deleted file mode 100644 index 17d19723..00000000 Binary files a/assets/image/3x/icon_union_time.png and /dev/null differ diff --git a/assets/image/3x/icon_union_time.webp b/assets/image/3x/icon_union_time.webp new file mode 100644 index 00000000..750d504c Binary files /dev/null and b/assets/image/3x/icon_union_time.webp differ diff --git a/assets/image/3x/icon_user.png b/assets/image/3x/icon_user.png deleted file mode 100644 index 82395453..00000000 Binary files a/assets/image/3x/icon_user.png and /dev/null differ diff --git a/assets/image/3x/icon_user.webp b/assets/image/3x/icon_user.webp new file mode 100644 index 00000000..dcd7e810 Binary files /dev/null and b/assets/image/3x/icon_user.webp differ diff --git a/assets/image/3x/icon_views.png b/assets/image/3x/icon_views.png deleted file mode 100644 index 3d8e001d..00000000 Binary files a/assets/image/3x/icon_views.png and /dev/null differ diff --git a/assets/image/3x/icon_views.webp b/assets/image/3x/icon_views.webp new file mode 100644 index 00000000..ad856f7c Binary files /dev/null and b/assets/image/3x/icon_views.webp differ diff --git a/assets/image/3x/icon_vip.png b/assets/image/3x/icon_vip.png deleted file mode 100644 index 15d82147..00000000 Binary files a/assets/image/3x/icon_vip.png and /dev/null differ diff --git a/assets/image/3x/icon_vip.webp b/assets/image/3x/icon_vip.webp new file mode 100644 index 00000000..bfae81ca Binary files /dev/null and b/assets/image/3x/icon_vip.webp differ diff --git a/assets/image/3x/icon_vip_bg.png b/assets/image/3x/icon_vip_bg.png deleted file mode 100644 index 101621e2..00000000 Binary files a/assets/image/3x/icon_vip_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_vip_bg.webp b/assets/image/3x/icon_vip_bg.webp new file mode 100644 index 00000000..52160259 Binary files /dev/null and b/assets/image/3x/icon_vip_bg.webp differ diff --git a/assets/image/3x/icon_vip_bj.png b/assets/image/3x/icon_vip_bj.png deleted file mode 100644 index f30c0f53..00000000 Binary files a/assets/image/3x/icon_vip_bj.png and /dev/null differ diff --git a/assets/image/3x/icon_vip_bj.webp b/assets/image/3x/icon_vip_bj.webp new file mode 100644 index 00000000..872d9614 Binary files /dev/null and b/assets/image/3x/icon_vip_bj.webp differ diff --git a/assets/image/3x/icon_vip_name.png b/assets/image/3x/icon_vip_name.png deleted file mode 100644 index 5d8096bb..00000000 Binary files a/assets/image/3x/icon_vip_name.png and /dev/null differ diff --git a/assets/image/3x/icon_vip_name.webp b/assets/image/3x/icon_vip_name.webp new file mode 100644 index 00000000..63c08cef Binary files /dev/null and b/assets/image/3x/icon_vip_name.webp differ diff --git a/assets/image/3x/icon_wallet_recharge.png b/assets/image/3x/icon_wallet_recharge.png deleted file mode 100644 index 6b791807..00000000 Binary files a/assets/image/3x/icon_wallet_recharge.png and /dev/null differ diff --git a/assets/image/3x/icon_wallet_recharge.webp b/assets/image/3x/icon_wallet_recharge.webp new file mode 100644 index 00000000..24030067 Binary files /dev/null and b/assets/image/3x/icon_wallet_recharge.webp differ diff --git a/assets/image/3x/icon_wallet_withdrawal.png b/assets/image/3x/icon_wallet_withdrawal.png deleted file mode 100644 index eb82676d..00000000 Binary files a/assets/image/3x/icon_wallet_withdrawal.png and /dev/null differ diff --git a/assets/image/3x/icon_wallet_withdrawal.webp b/assets/image/3x/icon_wallet_withdrawal.webp new file mode 100644 index 00000000..9ad18c94 Binary files /dev/null and b/assets/image/3x/icon_wallet_withdrawal.webp differ diff --git a/assets/image/3x/icon_we_chat.png b/assets/image/3x/icon_we_chat.png deleted file mode 100644 index c9b8a1e8..00000000 Binary files a/assets/image/3x/icon_we_chat.png and /dev/null differ diff --git a/assets/image/3x/icon_we_chat.webp b/assets/image/3x/icon_we_chat.webp new file mode 100644 index 00000000..4722de07 Binary files /dev/null and b/assets/image/3x/icon_we_chat.webp differ diff --git a/assets/image/3x/icon_weixin.png b/assets/image/3x/icon_weixin.png deleted file mode 100644 index 00296778..00000000 Binary files a/assets/image/3x/icon_weixin.png and /dev/null differ diff --git a/assets/image/3x/icon_weixin.webp b/assets/image/3x/icon_weixin.webp new file mode 100644 index 00000000..afc425d7 Binary files /dev/null and b/assets/image/3x/icon_weixin.webp differ diff --git a/assets/image/3x/icon_wo_n.png b/assets/image/3x/icon_wo_n.png deleted file mode 100644 index 5a84610e..00000000 Binary files a/assets/image/3x/icon_wo_n.png and /dev/null differ diff --git a/assets/image/3x/icon_wo_n.webp b/assets/image/3x/icon_wo_n.webp new file mode 100644 index 00000000..0bebd173 Binary files /dev/null and b/assets/image/3x/icon_wo_n.webp differ diff --git a/assets/image/3x/icon_wo_s.png b/assets/image/3x/icon_wo_s.png deleted file mode 100644 index 5e494bff..00000000 Binary files a/assets/image/3x/icon_wo_s.png and /dev/null differ diff --git a/assets/image/3x/icon_wo_s.webp b/assets/image/3x/icon_wo_s.webp new file mode 100644 index 00000000..f0bf748b Binary files /dev/null and b/assets/image/3x/icon_wo_s.webp differ diff --git a/assets/image/3x/icon_write_off_bg.png b/assets/image/3x/icon_write_off_bg.png deleted file mode 100644 index 167d4457..00000000 Binary files a/assets/image/3x/icon_write_off_bg.png and /dev/null differ diff --git a/assets/image/3x/icon_write_off_bg.webp b/assets/image/3x/icon_write_off_bg.webp new file mode 100644 index 00000000..4ab8d31f Binary files /dev/null and b/assets/image/3x/icon_write_off_bg.webp differ diff --git a/assets/image/3x/icon_xuanzhong.png b/assets/image/3x/icon_xuanzhong.png deleted file mode 100644 index a569b9a4..00000000 Binary files a/assets/image/3x/icon_xuanzhong.png and /dev/null differ diff --git a/assets/image/3x/icon_xuanzhong.webp b/assets/image/3x/icon_xuanzhong.webp new file mode 100644 index 00000000..526e342c Binary files /dev/null and b/assets/image/3x/icon_xuanzhong.webp differ diff --git a/assets/image/3x/icon_z.png b/assets/image/3x/icon_z.png deleted file mode 100644 index ef42dc7e..00000000 Binary files a/assets/image/3x/icon_z.png and /dev/null differ diff --git a/assets/image/3x/icon_z.webp b/assets/image/3x/icon_z.webp new file mode 100644 index 00000000..b26cd79c Binary files /dev/null and b/assets/image/3x/icon_z.webp differ diff --git a/assets/image/3x/icon_zan.png b/assets/image/3x/icon_zan.png deleted file mode 100644 index 869df3f8..00000000 Binary files a/assets/image/3x/icon_zan.png and /dev/null differ diff --git a/assets/image/3x/icon_zan.webp b/assets/image/3x/icon_zan.webp new file mode 100644 index 00000000..03c5dd08 Binary files /dev/null and b/assets/image/3x/icon_zan.webp differ diff --git a/assets/image/3x/integral_return.png b/assets/image/3x/integral_return.png deleted file mode 100644 index 13290b60..00000000 Binary files a/assets/image/3x/integral_return.png and /dev/null differ diff --git a/assets/image/3x/integral_return.webp b/assets/image/3x/integral_return.webp new file mode 100644 index 00000000..84c6b37f Binary files /dev/null and b/assets/image/3x/integral_return.webp differ diff --git a/assets/image/3x/ji_fen.png b/assets/image/3x/ji_fen.png deleted file mode 100644 index d11a5a46..00000000 Binary files a/assets/image/3x/ji_fen.png and /dev/null differ diff --git a/assets/image/3x/ji_fen.webp b/assets/image/3x/ji_fen.webp new file mode 100644 index 00000000..35ef05d6 Binary files /dev/null and b/assets/image/3x/ji_fen.webp differ diff --git a/assets/image/3x/jian_j.png b/assets/image/3x/jian_j.png deleted file mode 100644 index d5bbe20a..00000000 Binary files a/assets/image/3x/jian_j.png and /dev/null differ diff --git a/assets/image/3x/jian_j.webp b/assets/image/3x/jian_j.webp new file mode 100644 index 00000000..c224d13f Binary files /dev/null and b/assets/image/3x/jian_j.webp differ diff --git a/assets/image/3x/ju_bao.png b/assets/image/3x/ju_bao.png deleted file mode 100644 index a3e5bf8f..00000000 Binary files a/assets/image/3x/ju_bao.png and /dev/null differ diff --git a/assets/image/3x/ju_bao.webp b/assets/image/3x/ju_bao.webp new file mode 100644 index 00000000..4eacf0d2 Binary files /dev/null and b/assets/image/3x/ju_bao.webp differ diff --git a/assets/image/3x/ka.png b/assets/image/3x/ka.png deleted file mode 100644 index c05163f3..00000000 Binary files a/assets/image/3x/ka.png and /dev/null differ diff --git a/assets/image/3x/ka.webp b/assets/image/3x/ka.webp new file mode 100644 index 00000000..67be603f Binary files /dev/null and b/assets/image/3x/ka.webp differ diff --git a/assets/image/3x/ketang.png b/assets/image/3x/ketang.png deleted file mode 100644 index 9d0fb402..00000000 Binary files a/assets/image/3x/ketang.png and /dev/null differ diff --git a/assets/image/3x/ketang.webp b/assets/image/3x/ketang.webp new file mode 100644 index 00000000..e2239fa7 Binary files /dev/null and b/assets/image/3x/ketang.webp differ diff --git a/assets/image/3x/ketang_like.png b/assets/image/3x/ketang_like.png deleted file mode 100644 index 5d55917b..00000000 Binary files a/assets/image/3x/ketang_like.png and /dev/null differ diff --git a/assets/image/3x/ketang_like.webp b/assets/image/3x/ketang_like.webp new file mode 100644 index 00000000..402603a6 Binary files /dev/null and b/assets/image/3x/ketang_like.webp differ diff --git a/assets/image/3x/ketang_message.png b/assets/image/3x/ketang_message.png deleted file mode 100644 index a0cba0df..00000000 Binary files a/assets/image/3x/ketang_message.png and /dev/null differ diff --git a/assets/image/3x/ketang_message.webp b/assets/image/3x/ketang_message.webp new file mode 100644 index 00000000..6779f7db Binary files /dev/null and b/assets/image/3x/ketang_message.webp differ diff --git a/assets/image/3x/ketang_play.png b/assets/image/3x/ketang_play.png deleted file mode 100644 index 300a2912..00000000 Binary files a/assets/image/3x/ketang_play.png and /dev/null differ diff --git a/assets/image/3x/ketang_play.webp b/assets/image/3x/ketang_play.webp new file mode 100644 index 00000000..5ad3ca93 Binary files /dev/null and b/assets/image/3x/ketang_play.webp differ diff --git a/assets/image/3x/landmark.png b/assets/image/3x/landmark.png deleted file mode 100644 index 72ea70ac..00000000 Binary files a/assets/image/3x/landmark.png and /dev/null differ diff --git a/assets/image/3x/landmark.webp b/assets/image/3x/landmark.webp new file mode 100644 index 00000000..1e8593db Binary files /dev/null and b/assets/image/3x/landmark.webp differ diff --git a/assets/image/3x/laoban.png b/assets/image/3x/laoban.png deleted file mode 100644 index 88929484..00000000 Binary files a/assets/image/3x/laoban.png and /dev/null differ diff --git a/assets/image/3x/laoban.webp b/assets/image/3x/laoban.webp new file mode 100644 index 00000000..fb300ae2 Binary files /dev/null and b/assets/image/3x/laoban.webp differ diff --git a/assets/image/3x/leaving_message.png b/assets/image/3x/leaving_message.png deleted file mode 100644 index 4747c584..00000000 Binary files a/assets/image/3x/leaving_message.png and /dev/null differ diff --git a/assets/image/3x/leaving_message.webp b/assets/image/3x/leaving_message.webp new file mode 100644 index 00000000..cf94abdd Binary files /dev/null and b/assets/image/3x/leaving_message.webp differ diff --git a/assets/image/3x/logout.png b/assets/image/3x/logout.png deleted file mode 100644 index a2ae2c7f..00000000 Binary files a/assets/image/3x/logout.png and /dev/null differ diff --git a/assets/image/3x/logout.webp b/assets/image/3x/logout.webp new file mode 100644 index 00000000..6b08f324 Binary files /dev/null and b/assets/image/3x/logout.webp differ diff --git a/assets/image/3x/logout_s.png b/assets/image/3x/logout_s.png deleted file mode 100644 index 894718a2..00000000 Binary files a/assets/image/3x/logout_s.png and /dev/null differ diff --git a/assets/image/3x/logout_s.webp b/assets/image/3x/logout_s.webp new file mode 100644 index 00000000..25ed8a2e Binary files /dev/null and b/assets/image/3x/logout_s.webp differ diff --git a/assets/image/3x/map.png b/assets/image/3x/map.png deleted file mode 100644 index 3bd6886e..00000000 Binary files a/assets/image/3x/map.png and /dev/null differ diff --git a/assets/image/3x/map.webp b/assets/image/3x/map.webp new file mode 100644 index 00000000..6caaf403 Binary files /dev/null and b/assets/image/3x/map.webp differ diff --git a/assets/image/3x/oeder_cancel.png b/assets/image/3x/oeder_cancel.png deleted file mode 100644 index 09a1fc60..00000000 Binary files a/assets/image/3x/oeder_cancel.png and /dev/null differ diff --git a/assets/image/3x/oeder_cancel.webp b/assets/image/3x/oeder_cancel.webp new file mode 100644 index 00000000..f2ca4213 Binary files /dev/null and b/assets/image/3x/oeder_cancel.webp differ diff --git a/assets/image/3x/order_ok.png b/assets/image/3x/order_ok.png deleted file mode 100644 index b4da7a11..00000000 Binary files a/assets/image/3x/order_ok.png and /dev/null differ diff --git a/assets/image/3x/order_ok.webp b/assets/image/3x/order_ok.webp new file mode 100644 index 00000000..0bd3a383 Binary files /dev/null and b/assets/image/3x/order_ok.webp differ diff --git a/assets/image/3x/order_refund.png b/assets/image/3x/order_refund.png deleted file mode 100644 index 96c049c9..00000000 Binary files a/assets/image/3x/order_refund.png and /dev/null differ diff --git a/assets/image/3x/order_refund.webp b/assets/image/3x/order_refund.webp new file mode 100644 index 00000000..3b70ff0d Binary files /dev/null and b/assets/image/3x/order_refund.webp differ diff --git a/assets/image/3x/oredr.png b/assets/image/3x/oredr.png deleted file mode 100644 index 683eea45..00000000 Binary files a/assets/image/3x/oredr.png and /dev/null differ diff --git a/assets/image/3x/oredr.webp b/assets/image/3x/oredr.webp new file mode 100644 index 00000000..d1c13fea Binary files /dev/null and b/assets/image/3x/oredr.webp differ diff --git a/assets/image/3x/pen.png b/assets/image/3x/pen.png deleted file mode 100644 index 2978a750..00000000 Binary files a/assets/image/3x/pen.png and /dev/null differ diff --git a/assets/image/3x/pen.webp b/assets/image/3x/pen.webp new file mode 100644 index 00000000..3068bb94 Binary files /dev/null and b/assets/image/3x/pen.webp differ diff --git a/assets/image/3x/qr_share_bg.png b/assets/image/3x/qr_share_bg.png deleted file mode 100644 index 69a46b61..00000000 Binary files a/assets/image/3x/qr_share_bg.png and /dev/null differ diff --git a/assets/image/3x/qr_share_bg.webp b/assets/image/3x/qr_share_bg.webp new file mode 100644 index 00000000..48f983cb Binary files /dev/null and b/assets/image/3x/qr_share_bg.webp differ diff --git a/assets/image/3x/qr_share_bg_yq.png b/assets/image/3x/qr_share_bg_yq.png deleted file mode 100644 index 1049d60b..00000000 Binary files a/assets/image/3x/qr_share_bg_yq.png and /dev/null differ diff --git a/assets/image/3x/qr_share_bg_yq.webp b/assets/image/3x/qr_share_bg_yq.webp new file mode 100644 index 00000000..32fa630b Binary files /dev/null and b/assets/image/3x/qr_share_bg_yq.webp differ diff --git a/assets/image/3x/qr_share_info_bg.png b/assets/image/3x/qr_share_info_bg.png deleted file mode 100644 index 935ff8ea..00000000 Binary files a/assets/image/3x/qr_share_info_bg.png and /dev/null differ diff --git a/assets/image/3x/qr_share_info_bg.webp b/assets/image/3x/qr_share_info_bg.webp new file mode 100644 index 00000000..30e39f14 Binary files /dev/null and b/assets/image/3x/qr_share_info_bg.webp differ diff --git a/assets/image/3x/qt_badge.png b/assets/image/3x/qt_badge.png deleted file mode 100644 index c1cc7464..00000000 Binary files a/assets/image/3x/qt_badge.png and /dev/null differ diff --git a/assets/image/3x/qt_badge.webp b/assets/image/3x/qt_badge.webp new file mode 100644 index 00000000..45de3006 Binary files /dev/null and b/assets/image/3x/qt_badge.webp differ diff --git a/assets/image/3x/recharge.webp b/assets/image/3x/recharge.webp new file mode 100644 index 00000000..9c0bcf31 Binary files /dev/null and b/assets/image/3x/recharge.webp differ diff --git a/assets/image/3x/reduce.png b/assets/image/3x/reduce.png deleted file mode 100644 index 790bf8b1..00000000 Binary files a/assets/image/3x/reduce.png and /dev/null differ diff --git a/assets/image/3x/reduce.webp b/assets/image/3x/reduce.webp new file mode 100644 index 00000000..e7edbc83 Binary files /dev/null and b/assets/image/3x/reduce.webp differ diff --git a/assets/image/3x/service.png b/assets/image/3x/service.png deleted file mode 100644 index b977862f..00000000 Binary files a/assets/image/3x/service.png and /dev/null differ diff --git a/assets/image/3x/service.webp b/assets/image/3x/service.webp new file mode 100644 index 00000000..ca023df9 Binary files /dev/null and b/assets/image/3x/service.webp differ diff --git a/assets/image/3x/shadow.png b/assets/image/3x/shadow.png deleted file mode 100644 index 8307e93a..00000000 Binary files a/assets/image/3x/shadow.png and /dev/null differ diff --git a/assets/image/3x/shadow.webp b/assets/image/3x/shadow.webp new file mode 100644 index 00000000..419b79e7 Binary files /dev/null and b/assets/image/3x/shadow.webp differ diff --git a/assets/image/3x/share_image_bg.png b/assets/image/3x/share_image_bg.png deleted file mode 100644 index 58665fed..00000000 Binary files a/assets/image/3x/share_image_bg.png and /dev/null differ diff --git a/assets/image/3x/share_image_bg.webp b/assets/image/3x/share_image_bg.webp new file mode 100644 index 00000000..6be2b482 Binary files /dev/null and b/assets/image/3x/share_image_bg.webp differ diff --git a/assets/image/3x/share_image_bg_yq.png b/assets/image/3x/share_image_bg_yq.png deleted file mode 100644 index 607e35fb..00000000 Binary files a/assets/image/3x/share_image_bg_yq.png and /dev/null differ diff --git a/assets/image/3x/share_image_bg_yq.webp b/assets/image/3x/share_image_bg_yq.webp new file mode 100644 index 00000000..6c32e713 Binary files /dev/null and b/assets/image/3x/share_image_bg_yq.webp differ diff --git a/assets/image/3x/share_image_close.png b/assets/image/3x/share_image_close.png deleted file mode 100644 index 656c5d88..00000000 Binary files a/assets/image/3x/share_image_close.png and /dev/null differ diff --git a/assets/image/3x/share_image_close.webp b/assets/image/3x/share_image_close.webp new file mode 100644 index 00000000..26af6233 Binary files /dev/null and b/assets/image/3x/share_image_close.webp differ diff --git a/assets/image/3x/shop_logo.png b/assets/image/3x/shop_logo.png deleted file mode 100644 index f7dbd82e..00000000 Binary files a/assets/image/3x/shop_logo.png and /dev/null differ diff --git a/assets/image/3x/shop_logo.webp b/assets/image/3x/shop_logo.webp new file mode 100644 index 00000000..93a5c6fd Binary files /dev/null and b/assets/image/3x/shop_logo.webp differ diff --git a/assets/image/3x/shopp.png b/assets/image/3x/shopp.png deleted file mode 100644 index a845e32f..00000000 Binary files a/assets/image/3x/shopp.png and /dev/null differ diff --git a/assets/image/3x/shopp.webp b/assets/image/3x/shopp.webp new file mode 100644 index 00000000..35bb3139 Binary files /dev/null and b/assets/image/3x/shopp.webp differ diff --git a/assets/image/3x/shopping_k.png b/assets/image/3x/shopping_k.png deleted file mode 100644 index b15bb5a5..00000000 Binary files a/assets/image/3x/shopping_k.png and /dev/null differ diff --git a/assets/image/3x/shopping_k.webp b/assets/image/3x/shopping_k.webp new file mode 100644 index 00000000..72fae2c8 Binary files /dev/null and b/assets/image/3x/shopping_k.webp differ diff --git a/assets/image/3x/t_right.png b/assets/image/3x/t_right.png deleted file mode 100644 index 99457d04..00000000 Binary files a/assets/image/3x/t_right.png and /dev/null differ diff --git a/assets/image/3x/t_right.webp b/assets/image/3x/t_right.webp new file mode 100644 index 00000000..7a047522 Binary files /dev/null and b/assets/image/3x/t_right.webp differ diff --git a/assets/image/3x/vip_contrastive_table.png b/assets/image/3x/vip_contrastive_table.png deleted file mode 100644 index 45453ff7..00000000 Binary files a/assets/image/3x/vip_contrastive_table.png and /dev/null differ diff --git a/assets/image/3x/vip_contrastive_table.webp b/assets/image/3x/vip_contrastive_table.webp new file mode 100644 index 00000000..401248df Binary files /dev/null and b/assets/image/3x/vip_contrastive_table.webp differ diff --git a/assets/image/3x/vip_gc.png b/assets/image/3x/vip_gc.png deleted file mode 100644 index b5020646..00000000 Binary files a/assets/image/3x/vip_gc.png and /dev/null differ diff --git a/assets/image/3x/vip_gc.webp b/assets/image/3x/vip_gc.webp new file mode 100644 index 00000000..d61a7ff8 Binary files /dev/null and b/assets/image/3x/vip_gc.webp differ diff --git a/assets/image/3x/vip_jk.png b/assets/image/3x/vip_jk.png deleted file mode 100644 index c4c72089..00000000 Binary files a/assets/image/3x/vip_jk.png and /dev/null differ diff --git a/assets/image/3x/vip_jk.webp b/assets/image/3x/vip_jk.webp new file mode 100644 index 00000000..c46ac4cc Binary files /dev/null and b/assets/image/3x/vip_jk.webp differ diff --git a/assets/image/3x/vip_qy.png b/assets/image/3x/vip_qy.png deleted file mode 100644 index 32cd870d..00000000 Binary files a/assets/image/3x/vip_qy.png and /dev/null differ diff --git a/assets/image/3x/vip_qy.webp b/assets/image/3x/vip_qy.webp new file mode 100644 index 00000000..6d87ef14 Binary files /dev/null and b/assets/image/3x/vip_qy.webp differ diff --git a/assets/image/3x/vip_yk.png b/assets/image/3x/vip_yk.png deleted file mode 100644 index 0ba57b61..00000000 Binary files a/assets/image/3x/vip_yk.png and /dev/null differ diff --git a/assets/image/3x/vip_yk.webp b/assets/image/3x/vip_yk.webp new file mode 100644 index 00000000..b5f96563 Binary files /dev/null and b/assets/image/3x/vip_yk.webp differ diff --git a/assets/image/3x/wait_meal.png b/assets/image/3x/wait_meal.png deleted file mode 100644 index 544819ef..00000000 Binary files a/assets/image/3x/wait_meal.png and /dev/null differ diff --git a/assets/image/3x/wait_meal.webp b/assets/image/3x/wait_meal.webp new file mode 100644 index 00000000..f7e2d448 Binary files /dev/null and b/assets/image/3x/wait_meal.webp differ diff --git a/assets/image/3x/xiao_fei.png b/assets/image/3x/xiao_fei.png deleted file mode 100644 index 561d6005..00000000 Binary files a/assets/image/3x/xiao_fei.png and /dev/null differ diff --git a/assets/image/3x/xiao_fei.webp b/assets/image/3x/xiao_fei.webp new file mode 100644 index 00000000..a4c46552 Binary files /dev/null and b/assets/image/3x/xiao_fei.webp differ diff --git a/assets/image/3x/xin_ren.png b/assets/image/3x/xin_ren.png deleted file mode 100644 index 6aea2f16..00000000 Binary files a/assets/image/3x/xin_ren.png and /dev/null differ diff --git a/assets/image/3x/xin_ren.webp b/assets/image/3x/xin_ren.webp new file mode 100644 index 00000000..2e9d834b Binary files /dev/null and b/assets/image/3x/xin_ren.webp differ diff --git a/assets/image/3x/xin_rq.png b/assets/image/3x/xin_rq.png deleted file mode 100644 index e97aaf0f..00000000 Binary files a/assets/image/3x/xin_rq.png and /dev/null differ diff --git a/assets/image/3x/xin_rq.webp b/assets/image/3x/xin_rq.webp new file mode 100644 index 00000000..1f6c157b Binary files /dev/null and b/assets/image/3x/xin_rq.webp differ diff --git a/assets/image/3x/yao_q.png b/assets/image/3x/yao_q.png deleted file mode 100644 index cabb787d..00000000 Binary files a/assets/image/3x/yao_q.png and /dev/null differ diff --git a/assets/image/3x/yao_q.webp b/assets/image/3x/yao_q.webp new file mode 100644 index 00000000..df8d5da2 Binary files /dev/null and b/assets/image/3x/yao_q.webp differ diff --git a/assets/image/3x/yq.png b/assets/image/3x/yq.png deleted file mode 100644 index d46dd544..00000000 Binary files a/assets/image/3x/yq.png and /dev/null differ diff --git a/assets/image/3x/yq.webp b/assets/image/3x/yq.webp new file mode 100644 index 00000000..7e1a399a Binary files /dev/null and b/assets/image/3x/yq.webp differ diff --git a/assets/image/3x/yq_qx.png b/assets/image/3x/yq_qx.png deleted file mode 100644 index 5d29cf22..00000000 Binary files a/assets/image/3x/yq_qx.png and /dev/null differ diff --git a/assets/image/3x/yq_qx.webp b/assets/image/3x/yq_qx.webp new file mode 100644 index 00000000..cfdb46b1 Binary files /dev/null and b/assets/image/3x/yq_qx.webp differ diff --git a/assets/image/activity_hot.png b/assets/image/activity_hot.png deleted file mode 100644 index c7eb44da..00000000 Binary files a/assets/image/activity_hot.png and /dev/null differ diff --git a/assets/image/activity_hot.webp b/assets/image/activity_hot.webp new file mode 100644 index 00000000..0022eb47 Binary files /dev/null and b/assets/image/activity_hot.webp differ diff --git a/assets/image/activity_q.png b/assets/image/activity_q.png deleted file mode 100644 index 31b4621a..00000000 Binary files a/assets/image/activity_q.png and /dev/null differ diff --git a/assets/image/activity_q.webp b/assets/image/activity_q.webp new file mode 100644 index 00000000..f952bb23 Binary files /dev/null and b/assets/image/activity_q.webp differ diff --git a/assets/image/add.png b/assets/image/add.png deleted file mode 100644 index 2a90ea24..00000000 Binary files a/assets/image/add.png and /dev/null differ diff --git a/assets/image/add.webp b/assets/image/add.webp new file mode 100644 index 00000000..dff3b1be Binary files /dev/null and b/assets/image/add.webp differ diff --git a/assets/image/attainment_bj.png b/assets/image/attainment_bj.png deleted file mode 100644 index ebef994d..00000000 Binary files a/assets/image/attainment_bj.png and /dev/null differ diff --git a/assets/image/attainment_bj.webp b/assets/image/attainment_bj.webp new file mode 100644 index 00000000..b4f9a9d9 Binary files /dev/null and b/assets/image/attainment_bj.webp differ diff --git a/assets/image/badge_img.png b/assets/image/badge_img.png deleted file mode 100644 index 31c966ca..00000000 Binary files a/assets/image/badge_img.png and /dev/null differ diff --git a/assets/image/badge_img.webp b/assets/image/badge_img.webp new file mode 100644 index 00000000..b4cc8fc4 Binary files /dev/null and b/assets/image/badge_img.webp differ diff --git a/assets/image/bianhao.png b/assets/image/bianhao.png deleted file mode 100644 index 09a8f7aa..00000000 Binary files a/assets/image/bianhao.png and /dev/null differ diff --git a/assets/image/bianhao.webp b/assets/image/bianhao.webp new file mode 100644 index 00000000..2131e715 Binary files /dev/null and b/assets/image/bianhao.webp differ diff --git a/assets/image/bj_badge.png b/assets/image/bj_badge.png deleted file mode 100644 index 14af253c..00000000 Binary files a/assets/image/bj_badge.png and /dev/null differ diff --git a/assets/image/bj_badge.webp b/assets/image/bj_badge.webp new file mode 100644 index 00000000..caac27d4 Binary files /dev/null and b/assets/image/bj_badge.webp differ diff --git a/assets/image/browse.png b/assets/image/browse.png deleted file mode 100644 index 44820e93..00000000 Binary files a/assets/image/browse.png and /dev/null differ diff --git a/assets/image/browse.webp b/assets/image/browse.webp new file mode 100644 index 00000000..1b8414d3 Binary files /dev/null and b/assets/image/browse.webp differ diff --git a/assets/image/by_badge.png b/assets/image/by_badge.png deleted file mode 100644 index c021b622..00000000 Binary files a/assets/image/by_badge.png and /dev/null differ diff --git a/assets/image/by_badge.webp b/assets/image/by_badge.webp new file mode 100644 index 00000000..57b3fc3a Binary files /dev/null and b/assets/image/by_badge.webp differ diff --git a/assets/image/c_z.png b/assets/image/c_z.png deleted file mode 100644 index 71d21f72..00000000 Binary files a/assets/image/c_z.png and /dev/null differ diff --git a/assets/image/c_z.webp b/assets/image/c_z.webp new file mode 100644 index 00000000..48c9a9c4 Binary files /dev/null and b/assets/image/c_z.webp differ diff --git a/assets/image/cancel.png b/assets/image/cancel.png deleted file mode 100644 index 7ea9178a..00000000 Binary files a/assets/image/cancel.png and /dev/null differ diff --git a/assets/image/cancel.webp b/assets/image/cancel.webp new file mode 100644 index 00000000..fc67b2b2 Binary files /dev/null and b/assets/image/cancel.webp differ diff --git a/assets/image/closed_bill.png b/assets/image/closed_bill.png deleted file mode 100644 index bf2dd754..00000000 Binary files a/assets/image/closed_bill.png and /dev/null differ diff --git a/assets/image/closed_bill.webp b/assets/image/closed_bill.webp new file mode 100644 index 00000000..5737d6e3 Binary files /dev/null and b/assets/image/closed_bill.webp differ diff --git a/assets/image/default_1.png b/assets/image/default_1.png deleted file mode 100644 index fcae70d1..00000000 Binary files a/assets/image/default_1.png and /dev/null differ diff --git a/assets/image/default_1.webp b/assets/image/default_1.webp new file mode 100644 index 00000000..80446407 Binary files /dev/null and b/assets/image/default_1.webp differ diff --git a/assets/image/default_2_1.png b/assets/image/default_2_1.png deleted file mode 100644 index c118bf58..00000000 Binary files a/assets/image/default_2_1.png and /dev/null differ diff --git a/assets/image/default_2_1.webp b/assets/image/default_2_1.webp new file mode 100644 index 00000000..ab776824 Binary files /dev/null and b/assets/image/default_2_1.webp differ diff --git a/assets/image/default_user.png b/assets/image/default_user.png deleted file mode 100644 index 931c7144..00000000 Binary files a/assets/image/default_user.png and /dev/null differ diff --git a/assets/image/default_user.webp b/assets/image/default_user.webp new file mode 100644 index 00000000..bd827283 Binary files /dev/null and b/assets/image/default_user.webp differ diff --git a/assets/image/default_user1.png b/assets/image/default_user1.png deleted file mode 100644 index c3e34f28..00000000 Binary files a/assets/image/default_user1.png and /dev/null differ diff --git a/assets/image/default_user1.webp b/assets/image/default_user1.webp new file mode 100644 index 00000000..f6ebe684 Binary files /dev/null and b/assets/image/default_user1.webp differ diff --git a/assets/image/delete.png b/assets/image/delete.png deleted file mode 100644 index 86f3efbe..00000000 Binary files a/assets/image/delete.png and /dev/null differ diff --git a/assets/image/delete.webp b/assets/image/delete.webp new file mode 100644 index 00000000..e1d89fa8 Binary files /dev/null and b/assets/image/delete.webp differ diff --git a/assets/image/di_zhi.png b/assets/image/di_zhi.png deleted file mode 100644 index 469c5e6a..00000000 Binary files a/assets/image/di_zhi.png and /dev/null differ diff --git a/assets/image/di_zhi.webp b/assets/image/di_zhi.webp new file mode 100644 index 00000000..1aaa45ea Binary files /dev/null and b/assets/image/di_zhi.webp differ diff --git a/assets/image/ding_dan.png b/assets/image/ding_dan.png deleted file mode 100644 index c64ac543..00000000 Binary files a/assets/image/ding_dan.png and /dev/null differ diff --git a/assets/image/ding_dan.webp b/assets/image/ding_dan.webp new file mode 100644 index 00000000..65c0f6f0 Binary files /dev/null and b/assets/image/ding_dan.webp differ diff --git a/assets/image/distribution.png b/assets/image/distribution.png deleted file mode 100644 index 1723467c..00000000 Binary files a/assets/image/distribution.png and /dev/null differ diff --git a/assets/image/distribution.webp b/assets/image/distribution.webp new file mode 100644 index 00000000..bfbbce83 Binary files /dev/null and b/assets/image/distribution.webp differ diff --git a/assets/image/dong_tai.png b/assets/image/dong_tai.png deleted file mode 100644 index 54d4b464..00000000 Binary files a/assets/image/dong_tai.png and /dev/null differ diff --git a/assets/image/dong_tai.webp b/assets/image/dong_tai.webp new file mode 100644 index 00000000..e45e807c Binary files /dev/null and b/assets/image/dong_tai.webp differ diff --git a/assets/image/dynamic.png b/assets/image/dynamic.png deleted file mode 100644 index 51a01057..00000000 Binary files a/assets/image/dynamic.png and /dev/null differ diff --git a/assets/image/dynamic.webp b/assets/image/dynamic.webp new file mode 100644 index 00000000..112a7449 Binary files /dev/null and b/assets/image/dynamic.webp differ diff --git a/assets/image/fen_si.png b/assets/image/fen_si.png deleted file mode 100644 index 48715fb2..00000000 Binary files a/assets/image/fen_si.png and /dev/null differ diff --git a/assets/image/fen_si.webp b/assets/image/fen_si.webp new file mode 100644 index 00000000..7a8b7ee1 Binary files /dev/null and b/assets/image/fen_si.webp differ diff --git a/assets/image/follow.png b/assets/image/follow.png deleted file mode 100644 index a241b48e..00000000 Binary files a/assets/image/follow.png and /dev/null differ diff --git a/assets/image/follow.webp b/assets/image/follow.webp new file mode 100644 index 00000000..b7a5d53f Binary files /dev/null and b/assets/image/follow.webp differ diff --git a/assets/image/fuka_j.png b/assets/image/fuka_j.png deleted file mode 100644 index da848593..00000000 Binary files a/assets/image/fuka_j.png and /dev/null differ diff --git a/assets/image/fuka_j.webp b/assets/image/fuka_j.webp new file mode 100644 index 00000000..a3634758 Binary files /dev/null and b/assets/image/fuka_j.webp differ diff --git a/assets/image/fuka_zj.png b/assets/image/fuka_zj.png deleted file mode 100644 index 63726792..00000000 Binary files a/assets/image/fuka_zj.png and /dev/null differ diff --git a/assets/image/fuka_zj.webp b/assets/image/fuka_zj.webp new file mode 100644 index 00000000..31d1a3c7 Binary files /dev/null and b/assets/image/fuka_zj.webp differ diff --git a/assets/image/guan_zhu.png b/assets/image/guan_zhu.png deleted file mode 100644 index 63eb501f..00000000 Binary files a/assets/image/guan_zhu.png and /dev/null differ diff --git a/assets/image/guan_zhu.webp b/assets/image/guan_zhu.webp new file mode 100644 index 00000000..26530fb1 Binary files /dev/null and b/assets/image/guan_zhu.webp differ diff --git a/assets/image/hj_badge.png b/assets/image/hj_badge.png deleted file mode 100644 index a7ba57cd..00000000 Binary files a/assets/image/hj_badge.png and /dev/null differ diff --git a/assets/image/hj_badge.webp b/assets/image/hj_badge.webp new file mode 100644 index 00000000..877789d9 Binary files /dev/null and b/assets/image/hj_badge.webp differ diff --git a/assets/image/home_activity.png b/assets/image/home_activity.png deleted file mode 100644 index 2e604435..00000000 Binary files a/assets/image/home_activity.png and /dev/null differ diff --git a/assets/image/home_activity.webp b/assets/image/home_activity.webp new file mode 100644 index 00000000..b549cb40 Binary files /dev/null and b/assets/image/home_activity.webp differ diff --git a/assets/image/home_coupon.png b/assets/image/home_coupon.png deleted file mode 100644 index e19036ef..00000000 Binary files a/assets/image/home_coupon.png and /dev/null differ diff --git a/assets/image/home_coupon.webp b/assets/image/home_coupon.webp new file mode 100644 index 00000000..51c19d67 Binary files /dev/null and b/assets/image/home_coupon.webp differ diff --git a/assets/image/home_order.png b/assets/image/home_order.png deleted file mode 100644 index 861a96f7..00000000 Binary files a/assets/image/home_order.png and /dev/null differ diff --git a/assets/image/home_order.webp b/assets/image/home_order.webp new file mode 100644 index 00000000..8d2cc35e Binary files /dev/null and b/assets/image/home_order.webp differ diff --git a/assets/image/home_recharge.png b/assets/image/home_recharge.png deleted file mode 100644 index a86370de..00000000 Binary files a/assets/image/home_recharge.png and /dev/null differ diff --git a/assets/image/home_recharge.webp b/assets/image/home_recharge.webp new file mode 100644 index 00000000..85fe28dc Binary files /dev/null and b/assets/image/home_recharge.webp differ diff --git a/assets/image/ic_coupon_bg.png b/assets/image/ic_coupon_bg.png deleted file mode 100644 index 8d2cadd0..00000000 Binary files a/assets/image/ic_coupon_bg.png and /dev/null differ diff --git a/assets/image/ic_coupon_bg.webp b/assets/image/ic_coupon_bg.webp new file mode 100644 index 00000000..5febd0a3 Binary files /dev/null and b/assets/image/ic_coupon_bg.webp differ diff --git a/assets/image/ic_coupon_invalid_bg.png b/assets/image/ic_coupon_invalid_bg.png deleted file mode 100644 index 911c59a3..00000000 Binary files a/assets/image/ic_coupon_invalid_bg.png and /dev/null differ diff --git a/assets/image/ic_coupon_invalid_bg.webp b/assets/image/ic_coupon_invalid_bg.webp new file mode 100644 index 00000000..359408d2 Binary files /dev/null and b/assets/image/ic_coupon_invalid_bg.webp differ diff --git a/assets/image/ic_splash_bg.png b/assets/image/ic_splash_bg.png deleted file mode 100644 index 4198ace5..00000000 Binary files a/assets/image/ic_splash_bg.png and /dev/null differ diff --git a/assets/image/ic_splash_bg.webp b/assets/image/ic_splash_bg.webp new file mode 100644 index 00000000..b95c3416 Binary files /dev/null and b/assets/image/ic_splash_bg.webp differ diff --git a/assets/image/icon_about_logo.png b/assets/image/icon_about_logo.png deleted file mode 100644 index c062e8e2..00000000 Binary files a/assets/image/icon_about_logo.png and /dev/null differ diff --git a/assets/image/icon_about_logo.webp b/assets/image/icon_about_logo.webp new file mode 100644 index 00000000..32351efe Binary files /dev/null and b/assets/image/icon_about_logo.webp differ diff --git a/assets/image/icon_address_call.png b/assets/image/icon_address_call.png deleted file mode 100644 index 00a8fb16..00000000 Binary files a/assets/image/icon_address_call.png and /dev/null differ diff --git a/assets/image/icon_address_call.webp b/assets/image/icon_address_call.webp new file mode 100644 index 00000000..0b59a712 Binary files /dev/null and b/assets/image/icon_address_call.webp differ diff --git a/assets/image/icon_address_edit.png b/assets/image/icon_address_edit.png deleted file mode 100644 index 9fe4e83a..00000000 Binary files a/assets/image/icon_address_edit.png and /dev/null differ diff --git a/assets/image/icon_address_edit.webp b/assets/image/icon_address_edit.webp new file mode 100644 index 00000000..54b75de6 Binary files /dev/null and b/assets/image/icon_address_edit.webp differ diff --git a/assets/image/icon_address_location.png b/assets/image/icon_address_location.png deleted file mode 100644 index a53449d1..00000000 Binary files a/assets/image/icon_address_location.png and /dev/null differ diff --git a/assets/image/icon_address_location.webp b/assets/image/icon_address_location.webp new file mode 100644 index 00000000..e985c13a Binary files /dev/null and b/assets/image/icon_address_location.webp differ diff --git a/assets/image/icon_address_location_action.png b/assets/image/icon_address_location_action.png deleted file mode 100644 index 3037173b..00000000 Binary files a/assets/image/icon_address_location_action.png and /dev/null differ diff --git a/assets/image/icon_address_location_action.webp b/assets/image/icon_address_location_action.webp new file mode 100644 index 00000000..43ee6a30 Binary files /dev/null and b/assets/image/icon_address_location_action.webp differ diff --git a/assets/image/icon_alipay.png b/assets/image/icon_alipay.png deleted file mode 100644 index cc4a83ce..00000000 Binary files a/assets/image/icon_alipay.png and /dev/null differ diff --git a/assets/image/icon_alipay.webp b/assets/image/icon_alipay.webp new file mode 100644 index 00000000..6a509f6d Binary files /dev/null and b/assets/image/icon_alipay.webp differ diff --git a/assets/image/icon_an_crown.png b/assets/image/icon_an_crown.png deleted file mode 100644 index a1692f67..00000000 Binary files a/assets/image/icon_an_crown.png and /dev/null differ diff --git a/assets/image/icon_an_crown.webp b/assets/image/icon_an_crown.webp new file mode 100644 index 00000000..67011e47 Binary files /dev/null and b/assets/image/icon_an_crown.webp differ diff --git a/assets/image/icon_bi_n.png b/assets/image/icon_bi_n.png deleted file mode 100644 index 2f4d9c85..00000000 Binary files a/assets/image/icon_bi_n.png and /dev/null differ diff --git a/assets/image/icon_bi_n.webp b/assets/image/icon_bi_n.webp new file mode 100644 index 00000000..40f89b9c Binary files /dev/null and b/assets/image/icon_bi_n.webp differ diff --git a/assets/image/icon_bi_s.png b/assets/image/icon_bi_s.png deleted file mode 100644 index b05e11be..00000000 Binary files a/assets/image/icon_bi_s.png and /dev/null differ diff --git a/assets/image/icon_bi_s.webp b/assets/image/icon_bi_s.webp new file mode 100644 index 00000000..470ca72a Binary files /dev/null and b/assets/image/icon_bi_s.webp differ diff --git a/assets/image/icon_brand_introduction.png b/assets/image/icon_brand_introduction.png deleted file mode 100644 index 110c5995..00000000 Binary files a/assets/image/icon_brand_introduction.png and /dev/null differ diff --git a/assets/image/icon_brand_introduction.webp b/assets/image/icon_brand_introduction.webp new file mode 100644 index 00000000..32d34d01 Binary files /dev/null and b/assets/image/icon_brand_introduction.webp differ diff --git a/assets/image/icon_brand_n.png b/assets/image/icon_brand_n.png deleted file mode 100644 index 2dd8e8b4..00000000 Binary files a/assets/image/icon_brand_n.png and /dev/null differ diff --git a/assets/image/icon_brand_n.webp b/assets/image/icon_brand_n.webp new file mode 100644 index 00000000..2d20d628 Binary files /dev/null and b/assets/image/icon_brand_n.webp differ diff --git a/assets/image/icon_brand_s.png b/assets/image/icon_brand_s.png deleted file mode 100644 index a5993ca3..00000000 Binary files a/assets/image/icon_brand_s.png and /dev/null differ diff --git a/assets/image/icon_brand_s.webp b/assets/image/icon_brand_s.webp new file mode 100644 index 00000000..098f8db3 Binary files /dev/null and b/assets/image/icon_brand_s.webp differ diff --git a/assets/image/icon_bread.png b/assets/image/icon_bread.png deleted file mode 100644 index f6626c0a..00000000 Binary files a/assets/image/icon_bread.png and /dev/null differ diff --git a/assets/image/icon_bread_bg.png b/assets/image/icon_bread_bg.png deleted file mode 100644 index e0e8317a..00000000 Binary files a/assets/image/icon_bread_bg.png and /dev/null differ diff --git a/assets/image/icon_bread_bg.webp b/assets/image/icon_bread_bg.webp new file mode 100644 index 00000000..f27a525c Binary files /dev/null and b/assets/image/icon_bread_bg.webp differ diff --git a/assets/image/icon_calendar_today_sharp.png b/assets/image/icon_calendar_today_sharp.png deleted file mode 100644 index 8e88897e..00000000 Binary files a/assets/image/icon_calendar_today_sharp.png and /dev/null differ diff --git a/assets/image/icon_calendar_today_sharp.webp b/assets/image/icon_calendar_today_sharp.webp new file mode 100644 index 00000000..6a593a5f Binary files /dev/null and b/assets/image/icon_calendar_today_sharp.webp differ diff --git a/assets/image/icon_camera_permission_tips.png b/assets/image/icon_camera_permission_tips.png deleted file mode 100644 index 60fe84a4..00000000 Binary files a/assets/image/icon_camera_permission_tips.png and /dev/null differ diff --git a/assets/image/icon_camera_permission_tips.webp b/assets/image/icon_camera_permission_tips.webp new file mode 100644 index 00000000..e513e773 Binary files /dev/null and b/assets/image/icon_camera_permission_tips.webp differ diff --git a/assets/image/icon_card_coupon.png b/assets/image/icon_card_coupon.png deleted file mode 100644 index 9511f2a7..00000000 Binary files a/assets/image/icon_card_coupon.png and /dev/null differ diff --git a/assets/image/icon_card_coupon.webp b/assets/image/icon_card_coupon.webp new file mode 100644 index 00000000..0abea923 Binary files /dev/null and b/assets/image/icon_card_coupon.webp differ diff --git a/assets/image/icon_chili.png b/assets/image/icon_chili.png deleted file mode 100644 index 49b4a69c..00000000 Binary files a/assets/image/icon_chili.png and /dev/null differ diff --git a/assets/image/icon_comment.png b/assets/image/icon_comment.png deleted file mode 100644 index 501761c5..00000000 Binary files a/assets/image/icon_comment.png and /dev/null differ diff --git a/assets/image/icon_comment.webp b/assets/image/icon_comment.webp new file mode 100644 index 00000000..028cfbc1 Binary files /dev/null and b/assets/image/icon_comment.webp differ diff --git a/assets/image/icon_del.png b/assets/image/icon_del.png deleted file mode 100644 index b189cbcf..00000000 Binary files a/assets/image/icon_del.png and /dev/null differ diff --git a/assets/image/icon_del.webp b/assets/image/icon_del.webp new file mode 100644 index 00000000..4e8ac6bb Binary files /dev/null and b/assets/image/icon_del.webp differ diff --git a/assets/image/icon_delete.png b/assets/image/icon_delete.png deleted file mode 100644 index f1c6aa0a..00000000 Binary files a/assets/image/icon_delete.png and /dev/null differ diff --git a/assets/image/icon_delete.webp b/assets/image/icon_delete.webp new file mode 100644 index 00000000..c2edbf7e Binary files /dev/null and b/assets/image/icon_delete.webp differ diff --git a/assets/image/icon_deliver_goods.png b/assets/image/icon_deliver_goods.png deleted file mode 100644 index 44d49238..00000000 Binary files a/assets/image/icon_deliver_goods.png and /dev/null differ diff --git a/assets/image/icon_deliver_goods.webp b/assets/image/icon_deliver_goods.webp new file mode 100644 index 00000000..fa8dcca0 Binary files /dev/null and b/assets/image/icon_deliver_goods.webp differ diff --git a/assets/image/icon_deliver_goods_h.png b/assets/image/icon_deliver_goods_h.png deleted file mode 100644 index 44eb8d84..00000000 Binary files a/assets/image/icon_deliver_goods_h.png and /dev/null differ diff --git a/assets/image/icon_deliver_goods_h.webp b/assets/image/icon_deliver_goods_h.webp new file mode 100644 index 00000000..28e15a42 Binary files /dev/null and b/assets/image/icon_deliver_goods_h.webp differ diff --git a/assets/image/icon_delivery.png b/assets/image/icon_delivery.png deleted file mode 100644 index a9a06bcc..00000000 Binary files a/assets/image/icon_delivery.png and /dev/null differ diff --git a/assets/image/icon_delivery.webp b/assets/image/icon_delivery.webp new file mode 100644 index 00000000..a33e0a8b Binary files /dev/null and b/assets/image/icon_delivery.webp differ diff --git a/assets/image/icon_delivery_h.png b/assets/image/icon_delivery_h.png deleted file mode 100644 index 02150251..00000000 Binary files a/assets/image/icon_delivery_h.png and /dev/null differ diff --git a/assets/image/icon_delivery_h.webp b/assets/image/icon_delivery_h.webp new file mode 100644 index 00000000..dc645caf Binary files /dev/null and b/assets/image/icon_delivery_h.webp differ diff --git a/assets/image/icon_empty.png b/assets/image/icon_empty.png deleted file mode 100644 index 2784e388..00000000 Binary files a/assets/image/icon_empty.png and /dev/null differ diff --git a/assets/image/icon_empty.webp b/assets/image/icon_empty.webp new file mode 100644 index 00000000..dccbc5d9 Binary files /dev/null and b/assets/image/icon_empty.webp differ diff --git a/assets/image/icon_enlarge.png b/assets/image/icon_enlarge.png deleted file mode 100644 index ec30a933..00000000 Binary files a/assets/image/icon_enlarge.png and /dev/null differ diff --git a/assets/image/icon_enlarge.webp b/assets/image/icon_enlarge.webp new file mode 100644 index 00000000..ffc4ad73 Binary files /dev/null and b/assets/image/icon_enlarge.webp differ diff --git a/assets/image/icon_facebook.png b/assets/image/icon_facebook.png deleted file mode 100644 index a001d5d0..00000000 Binary files a/assets/image/icon_facebook.png and /dev/null differ diff --git a/assets/image/icon_facebook.webp b/assets/image/icon_facebook.webp new file mode 100644 index 00000000..a39402af Binary files /dev/null and b/assets/image/icon_facebook.webp differ diff --git a/assets/image/icon_founder.png b/assets/image/icon_founder.png deleted file mode 100644 index 68bbf30d..00000000 Binary files a/assets/image/icon_founder.png and /dev/null differ diff --git a/assets/image/icon_founder.webp b/assets/image/icon_founder.webp new file mode 100644 index 00000000..606bc2f1 Binary files /dev/null and b/assets/image/icon_founder.webp differ diff --git a/assets/image/icon_founder_text.png b/assets/image/icon_founder_text.png deleted file mode 100644 index 3386f571..00000000 Binary files a/assets/image/icon_founder_text.png and /dev/null differ diff --git a/assets/image/icon_founder_text.webp b/assets/image/icon_founder_text.webp new file mode 100644 index 00000000..dbc3cab3 Binary files /dev/null and b/assets/image/icon_founder_text.webp differ diff --git a/assets/image/icon_get_coupons.png b/assets/image/icon_get_coupons.png deleted file mode 100644 index 2ef4bf6e..00000000 Binary files a/assets/image/icon_get_coupons.png and /dev/null differ diff --git a/assets/image/icon_get_coupons.webp b/assets/image/icon_get_coupons.webp new file mode 100644 index 00000000..20a49394 Binary files /dev/null and b/assets/image/icon_get_coupons.webp differ diff --git a/assets/image/icon_gold_blessing.png b/assets/image/icon_gold_blessing.png deleted file mode 100644 index a8e9aa7b..00000000 Binary files a/assets/image/icon_gold_blessing.png and /dev/null differ diff --git a/assets/image/icon_gold_blessing.webp b/assets/image/icon_gold_blessing.webp new file mode 100644 index 00000000..91a8d574 Binary files /dev/null and b/assets/image/icon_gold_blessing.webp differ diff --git a/assets/image/icon_gold_coin.png b/assets/image/icon_gold_coin.png deleted file mode 100644 index 8a840475..00000000 Binary files a/assets/image/icon_gold_coin.png and /dev/null differ diff --git a/assets/image/icon_gold_coin.webp b/assets/image/icon_gold_coin.webp new file mode 100644 index 00000000..2f31a443 Binary files /dev/null and b/assets/image/icon_gold_coin.webp differ diff --git a/assets/image/icon_guide_1.png b/assets/image/icon_guide_1.png deleted file mode 100644 index eca67070..00000000 Binary files a/assets/image/icon_guide_1.png and /dev/null differ diff --git a/assets/image/icon_guide_1.webp b/assets/image/icon_guide_1.webp new file mode 100644 index 00000000..17382ac5 Binary files /dev/null and b/assets/image/icon_guide_1.webp differ diff --git a/assets/image/icon_guide_2.png b/assets/image/icon_guide_2.png deleted file mode 100644 index 871a1b29..00000000 Binary files a/assets/image/icon_guide_2.png and /dev/null differ diff --git a/assets/image/icon_guide_2.webp b/assets/image/icon_guide_2.webp new file mode 100644 index 00000000..713a1a3d Binary files /dev/null and b/assets/image/icon_guide_2.webp differ diff --git a/assets/image/icon_guide_3.png b/assets/image/icon_guide_3.png deleted file mode 100644 index 238f3712..00000000 Binary files a/assets/image/icon_guide_3.png and /dev/null differ diff --git a/assets/image/icon_guide_3.webp b/assets/image/icon_guide_3.webp new file mode 100644 index 00000000..28e14bbd Binary files /dev/null and b/assets/image/icon_guide_3.webp differ diff --git a/assets/image/icon_guide_4.png b/assets/image/icon_guide_4.png deleted file mode 100644 index 51570cb1..00000000 Binary files a/assets/image/icon_guide_4.png and /dev/null differ diff --git a/assets/image/icon_guide_4.webp b/assets/image/icon_guide_4.webp new file mode 100644 index 00000000..acf457ac Binary files /dev/null and b/assets/image/icon_guide_4.webp differ diff --git a/assets/image/icon_gz.png b/assets/image/icon_gz.png deleted file mode 100644 index e024a3c8..00000000 Binary files a/assets/image/icon_gz.png and /dev/null differ diff --git a/assets/image/icon_gz.webp b/assets/image/icon_gz.webp new file mode 100644 index 00000000..9e2a50c1 Binary files /dev/null and b/assets/image/icon_gz.webp differ diff --git a/assets/image/icon_header_loading.png b/assets/image/icon_header_loading.png deleted file mode 100644 index 1179b3fa..00000000 Binary files a/assets/image/icon_header_loading.png and /dev/null differ diff --git a/assets/image/icon_header_loading.webp b/assets/image/icon_header_loading.webp new file mode 100644 index 00000000..a428f9f1 Binary files /dev/null and b/assets/image/icon_header_loading.webp differ diff --git a/assets/image/icon_history.png b/assets/image/icon_history.png deleted file mode 100644 index 71b54353..00000000 Binary files a/assets/image/icon_history.png and /dev/null differ diff --git a/assets/image/icon_history.webp b/assets/image/icon_history.webp new file mode 100644 index 00000000..07f6166c Binary files /dev/null and b/assets/image/icon_history.webp differ diff --git a/assets/image/icon_hot_right_top.png b/assets/image/icon_hot_right_top.png deleted file mode 100644 index c6917fa0..00000000 Binary files a/assets/image/icon_hot_right_top.png and /dev/null differ diff --git a/assets/image/icon_hot_right_top.webp b/assets/image/icon_hot_right_top.webp new file mode 100644 index 00000000..4771398b Binary files /dev/null and b/assets/image/icon_hot_right_top.webp differ diff --git a/assets/image/icon_idea_cj.png b/assets/image/icon_idea_cj.png deleted file mode 100644 index d82449f7..00000000 Binary files a/assets/image/icon_idea_cj.png and /dev/null differ diff --git a/assets/image/icon_idea_cj.webp b/assets/image/icon_idea_cj.webp new file mode 100644 index 00000000..4e16a103 Binary files /dev/null and b/assets/image/icon_idea_cj.webp differ diff --git a/assets/image/icon_idea_hb.png b/assets/image/icon_idea_hb.png deleted file mode 100644 index abcf579f..00000000 Binary files a/assets/image/icon_idea_hb.png and /dev/null differ diff --git a/assets/image/icon_idea_hb.webp b/assets/image/icon_idea_hb.webp new file mode 100644 index 00000000..fe808795 Binary files /dev/null and b/assets/image/icon_idea_hb.webp differ diff --git a/assets/image/icon_idea_jk.png b/assets/image/icon_idea_jk.png deleted file mode 100644 index 5554524a..00000000 Binary files a/assets/image/icon_idea_jk.png and /dev/null differ diff --git a/assets/image/icon_idea_jk.webp b/assets/image/icon_idea_jk.webp new file mode 100644 index 00000000..83e1b2bb Binary files /dev/null and b/assets/image/icon_idea_jk.webp differ diff --git a/assets/image/icon_idea_ya.png b/assets/image/icon_idea_ya.png deleted file mode 100644 index dd3fc351..00000000 Binary files a/assets/image/icon_idea_ya.png and /dev/null differ diff --git a/assets/image/icon_idea_ya.webp b/assets/image/icon_idea_ya.webp new file mode 100644 index 00000000..8242863a Binary files /dev/null and b/assets/image/icon_idea_ya.webp differ diff --git a/assets/image/icon_idea_yj.png b/assets/image/icon_idea_yj.png deleted file mode 100644 index b3b40538..00000000 Binary files a/assets/image/icon_idea_yj.png and /dev/null differ diff --git a/assets/image/icon_idea_yj.webp b/assets/image/icon_idea_yj.webp new file mode 100644 index 00000000..b8114355 Binary files /dev/null and b/assets/image/icon_idea_yj.webp differ diff --git a/assets/image/icon_idea_zh.png b/assets/image/icon_idea_zh.png deleted file mode 100644 index 3071654a..00000000 Binary files a/assets/image/icon_idea_zh.png and /dev/null differ diff --git a/assets/image/icon_idea_zh.webp b/assets/image/icon_idea_zh.webp new file mode 100644 index 00000000..c7143c49 Binary files /dev/null and b/assets/image/icon_idea_zh.webp differ diff --git a/assets/image/icon_integral_login.png b/assets/image/icon_integral_login.png deleted file mode 100644 index b87c72af..00000000 Binary files a/assets/image/icon_integral_login.png and /dev/null differ diff --git a/assets/image/icon_integral_login.webp b/assets/image/icon_integral_login.webp new file mode 100644 index 00000000..b9506946 Binary files /dev/null and b/assets/image/icon_integral_login.webp differ diff --git a/assets/image/icon_integral_order.png b/assets/image/icon_integral_order.png deleted file mode 100644 index be7627ca..00000000 Binary files a/assets/image/icon_integral_order.png and /dev/null differ diff --git a/assets/image/icon_integral_order.webp b/assets/image/icon_integral_order.webp new file mode 100644 index 00000000..23c6704b Binary files /dev/null and b/assets/image/icon_integral_order.webp differ diff --git a/assets/image/icon_integral_share.png b/assets/image/icon_integral_share.png deleted file mode 100644 index 018fae54..00000000 Binary files a/assets/image/icon_integral_share.png and /dev/null differ diff --git a/assets/image/icon_integral_share.webp b/assets/image/icon_integral_share.webp new file mode 100644 index 00000000..e5d926d5 Binary files /dev/null and b/assets/image/icon_integral_share.webp differ diff --git a/assets/image/icon_integral_sign.png b/assets/image/icon_integral_sign.png deleted file mode 100644 index 45c18a88..00000000 Binary files a/assets/image/icon_integral_sign.png and /dev/null differ diff --git a/assets/image/icon_integral_sign.webp b/assets/image/icon_integral_sign.webp new file mode 100644 index 00000000..dfddcef9 Binary files /dev/null and b/assets/image/icon_integral_sign.webp differ diff --git a/assets/image/icon_intergral_sign.png b/assets/image/icon_intergral_sign.png deleted file mode 100644 index e033ed00..00000000 Binary files a/assets/image/icon_intergral_sign.png and /dev/null differ diff --git a/assets/image/icon_intergral_sign.webp b/assets/image/icon_intergral_sign.webp new file mode 100644 index 00000000..4b279bc8 Binary files /dev/null and b/assets/image/icon_intergral_sign.webp differ diff --git a/assets/image/icon_like.png b/assets/image/icon_like.png deleted file mode 100644 index ded7335f..00000000 Binary files a/assets/image/icon_like.png and /dev/null differ diff --git a/assets/image/icon_like.webp b/assets/image/icon_like.webp new file mode 100644 index 00000000..31aae9ca Binary files /dev/null and b/assets/image/icon_like.webp differ diff --git a/assets/image/icon_like_h.png b/assets/image/icon_like_h.png deleted file mode 100644 index 27551785..00000000 Binary files a/assets/image/icon_like_h.png and /dev/null differ diff --git a/assets/image/icon_like_h.webp b/assets/image/icon_like_h.webp new file mode 100644 index 00000000..d069968f Binary files /dev/null and b/assets/image/icon_like_h.webp differ diff --git a/assets/image/icon_likes.png b/assets/image/icon_likes.png deleted file mode 100644 index 921f3322..00000000 Binary files a/assets/image/icon_likes.png and /dev/null differ diff --git a/assets/image/icon_likes.webp b/assets/image/icon_likes.webp new file mode 100644 index 00000000..c132da46 Binary files /dev/null and b/assets/image/icon_likes.webp differ diff --git a/assets/image/icon_line.png b/assets/image/icon_line.png deleted file mode 100644 index 75a16636..00000000 Binary files a/assets/image/icon_line.png and /dev/null differ diff --git a/assets/image/icon_line.webp b/assets/image/icon_line.webp new file mode 100644 index 00000000..fa023374 Binary files /dev/null and b/assets/image/icon_line.webp differ diff --git a/assets/image/icon_location_address.png b/assets/image/icon_location_address.png deleted file mode 100644 index dcbd756e..00000000 Binary files a/assets/image/icon_location_address.png and /dev/null differ diff --git a/assets/image/icon_location_address.webp b/assets/image/icon_location_address.webp new file mode 100644 index 00000000..174e1772 Binary files /dev/null and b/assets/image/icon_location_address.webp differ diff --git a/assets/image/icon_location_permission_tips.png b/assets/image/icon_location_permission_tips.png deleted file mode 100644 index 43fafd10..00000000 Binary files a/assets/image/icon_location_permission_tips.png and /dev/null differ diff --git a/assets/image/icon_location_permission_tips.webp b/assets/image/icon_location_permission_tips.webp new file mode 100644 index 00000000..e0e77c3c Binary files /dev/null and b/assets/image/icon_location_permission_tips.webp differ diff --git a/assets/image/icon_login_bg.png b/assets/image/icon_login_bg.png deleted file mode 100644 index 644c04bd..00000000 Binary files a/assets/image/icon_login_bg.png and /dev/null differ diff --git a/assets/image/icon_login_bg.webp b/assets/image/icon_login_bg.webp new file mode 100644 index 00000000..b6a27985 Binary files /dev/null and b/assets/image/icon_login_bg.webp differ diff --git a/assets/image/icon_login_hide_bg.png b/assets/image/icon_login_hide_bg.png deleted file mode 100644 index 53e2bf3f..00000000 Binary files a/assets/image/icon_login_hide_bg.png and /dev/null differ diff --git a/assets/image/icon_login_hide_bg.webp b/assets/image/icon_login_hide_bg.webp new file mode 100644 index 00000000..47546159 Binary files /dev/null and b/assets/image/icon_login_hide_bg.webp differ diff --git a/assets/image/icon_login_logo.png b/assets/image/icon_login_logo.png deleted file mode 100644 index 0126e10f..00000000 Binary files a/assets/image/icon_login_logo.png and /dev/null differ diff --git a/assets/image/icon_login_logo.webp b/assets/image/icon_login_logo.webp new file mode 100644 index 00000000..018b904b Binary files /dev/null and b/assets/image/icon_login_logo.webp differ diff --git a/assets/image/icon_login_tips.png b/assets/image/icon_login_tips.png deleted file mode 100644 index 8c77908e..00000000 Binary files a/assets/image/icon_login_tips.png and /dev/null differ diff --git a/assets/image/icon_login_tips.webp b/assets/image/icon_login_tips.webp new file mode 100644 index 00000000..7987bf35 Binary files /dev/null and b/assets/image/icon_login_tips.webp differ diff --git a/assets/image/icon_look.png b/assets/image/icon_look.png deleted file mode 100644 index c918137f..00000000 Binary files a/assets/image/icon_look.png and /dev/null differ diff --git a/assets/image/icon_look.webp b/assets/image/icon_look.webp new file mode 100644 index 00000000..78547653 Binary files /dev/null and b/assets/image/icon_look.webp differ diff --git a/assets/image/icon_map_bubble.png b/assets/image/icon_map_bubble.png deleted file mode 100644 index 7465e472..00000000 Binary files a/assets/image/icon_map_bubble.png and /dev/null differ diff --git a/assets/image/icon_map_bubble.webp b/assets/image/icon_map_bubble.webp new file mode 100644 index 00000000..928f0ac1 Binary files /dev/null and b/assets/image/icon_map_bubble.webp differ diff --git a/assets/image/icon_map_dot.png b/assets/image/icon_map_dot.png deleted file mode 100644 index 0398c0b9..00000000 Binary files a/assets/image/icon_map_dot.png and /dev/null differ diff --git a/assets/image/icon_map_dot.webp b/assets/image/icon_map_dot.webp new file mode 100644 index 00000000..e0d5db0a Binary files /dev/null and b/assets/image/icon_map_dot.webp differ diff --git a/assets/image/icon_map_marker.png b/assets/image/icon_map_marker.png deleted file mode 100644 index 01d25319..00000000 Binary files a/assets/image/icon_map_marker.png and /dev/null differ diff --git a/assets/image/icon_map_marker.webp b/assets/image/icon_map_marker.webp new file mode 100644 index 00000000..b89b70f0 Binary files /dev/null and b/assets/image/icon_map_marker.webp differ diff --git a/assets/image/icon_meng_n.png b/assets/image/icon_meng_n.png deleted file mode 100644 index bc4ae83b..00000000 Binary files a/assets/image/icon_meng_n.png and /dev/null differ diff --git a/assets/image/icon_meng_n.webp b/assets/image/icon_meng_n.webp new file mode 100644 index 00000000..744c4f33 Binary files /dev/null and b/assets/image/icon_meng_n.webp differ diff --git a/assets/image/icon_meng_s.png b/assets/image/icon_meng_s.png deleted file mode 100644 index c846f6e6..00000000 Binary files a/assets/image/icon_meng_s.png and /dev/null differ diff --git a/assets/image/icon_meng_s.webp b/assets/image/icon_meng_s.webp new file mode 100644 index 00000000..db7a1074 Binary files /dev/null and b/assets/image/icon_meng_s.webp differ diff --git a/assets/image/icon_milk_tea.png b/assets/image/icon_milk_tea.png deleted file mode 100644 index e96c5742..00000000 Binary files a/assets/image/icon_milk_tea.png and /dev/null differ diff --git a/assets/image/icon_milk_tea_bg.png b/assets/image/icon_milk_tea_bg.png deleted file mode 100644 index 046faf37..00000000 Binary files a/assets/image/icon_milk_tea_bg.png and /dev/null differ diff --git a/assets/image/icon_milk_tea_bg.webp b/assets/image/icon_milk_tea_bg.webp new file mode 100644 index 00000000..01f9e692 Binary files /dev/null and b/assets/image/icon_milk_tea_bg.webp differ diff --git a/assets/image/icon_mine_card.png b/assets/image/icon_mine_card.png deleted file mode 100644 index 97b826e0..00000000 Binary files a/assets/image/icon_mine_card.png and /dev/null differ diff --git a/assets/image/icon_mine_card.webp b/assets/image/icon_mine_card.webp new file mode 100644 index 00000000..150b7133 Binary files /dev/null and b/assets/image/icon_mine_card.webp differ diff --git a/assets/image/icon_mine_edit.png b/assets/image/icon_mine_edit.png deleted file mode 100644 index a107036b..00000000 Binary files a/assets/image/icon_mine_edit.png and /dev/null differ diff --git a/assets/image/icon_mine_edit.webp b/assets/image/icon_mine_edit.webp new file mode 100644 index 00000000..132b56d4 Binary files /dev/null and b/assets/image/icon_mine_edit.webp differ diff --git a/assets/image/icon_mine_feedback.png b/assets/image/icon_mine_feedback.png deleted file mode 100644 index 5790c3d8..00000000 Binary files a/assets/image/icon_mine_feedback.png and /dev/null differ diff --git a/assets/image/icon_mine_feedback.webp b/assets/image/icon_mine_feedback.webp new file mode 100644 index 00000000..e7fe9b53 Binary files /dev/null and b/assets/image/icon_mine_feedback.webp differ diff --git a/assets/image/icon_mine_huixiang_logo.png b/assets/image/icon_mine_huixiang_logo.png deleted file mode 100644 index 74b630cf..00000000 Binary files a/assets/image/icon_mine_huixiang_logo.png and /dev/null differ diff --git a/assets/image/icon_mine_huixiang_logo.webp b/assets/image/icon_mine_huixiang_logo.webp new file mode 100644 index 00000000..f1858a61 Binary files /dev/null and b/assets/image/icon_mine_huixiang_logo.webp differ diff --git a/assets/image/icon_mine_invoice_assistant.png b/assets/image/icon_mine_invoice_assistant.png deleted file mode 100644 index ddf2c440..00000000 Binary files a/assets/image/icon_mine_invoice_assistant.png and /dev/null differ diff --git a/assets/image/icon_mine_invoice_assistant.webp b/assets/image/icon_mine_invoice_assistant.webp new file mode 100644 index 00000000..2eaad74b Binary files /dev/null and b/assets/image/icon_mine_invoice_assistant.webp differ diff --git a/assets/image/icon_mine_motorcycle.png b/assets/image/icon_mine_motorcycle.png deleted file mode 100644 index 5ffae8e9..00000000 Binary files a/assets/image/icon_mine_motorcycle.png and /dev/null differ diff --git a/assets/image/icon_mine_motorcycle.webp b/assets/image/icon_mine_motorcycle.webp new file mode 100644 index 00000000..25208b8f Binary files /dev/null and b/assets/image/icon_mine_motorcycle.webp differ diff --git a/assets/image/icon_mine_online_service.webp b/assets/image/icon_mine_online_service.webp new file mode 100644 index 00000000..be33bb54 Binary files /dev/null and b/assets/image/icon_mine_online_service.webp differ diff --git a/assets/image/icon_mine_order.png b/assets/image/icon_mine_order.png deleted file mode 100644 index 24030435..00000000 Binary files a/assets/image/icon_mine_order.png and /dev/null differ diff --git a/assets/image/icon_mine_order.webp b/assets/image/icon_mine_order.webp new file mode 100644 index 00000000..d6092b85 Binary files /dev/null and b/assets/image/icon_mine_order.webp differ diff --git a/assets/image/icon_mine_order_dfk.png b/assets/image/icon_mine_order_dfk.png deleted file mode 100644 index 46ca1500..00000000 Binary files a/assets/image/icon_mine_order_dfk.png and /dev/null differ diff --git a/assets/image/icon_mine_order_dfk.webp b/assets/image/icon_mine_order_dfk.webp new file mode 100644 index 00000000..6b872fed Binary files /dev/null and b/assets/image/icon_mine_order_dfk.webp differ diff --git a/assets/image/icon_mine_order_qb.png b/assets/image/icon_mine_order_qb.png deleted file mode 100644 index a178b8cc..00000000 Binary files a/assets/image/icon_mine_order_qb.png and /dev/null differ diff --git a/assets/image/icon_mine_order_qb.webp b/assets/image/icon_mine_order_qb.webp new file mode 100644 index 00000000..bcea2e4b Binary files /dev/null and b/assets/image/icon_mine_order_qb.webp differ diff --git a/assets/image/icon_mine_order_wwc.png b/assets/image/icon_mine_order_wwc.png deleted file mode 100644 index dd732278..00000000 Binary files a/assets/image/icon_mine_order_wwc.png and /dev/null differ diff --git a/assets/image/icon_mine_order_wwc.webp b/assets/image/icon_mine_order_wwc.webp new file mode 100644 index 00000000..1710e117 Binary files /dev/null and b/assets/image/icon_mine_order_wwc.webp differ diff --git a/assets/image/icon_mine_order_ywc.png b/assets/image/icon_mine_order_ywc.png deleted file mode 100644 index c3581ff3..00000000 Binary files a/assets/image/icon_mine_order_ywc.png and /dev/null differ diff --git a/assets/image/icon_mine_order_ywc.webp b/assets/image/icon_mine_order_ywc.webp new file mode 100644 index 00000000..b96bf9a1 Binary files /dev/null and b/assets/image/icon_mine_order_ywc.webp differ diff --git a/assets/image/icon_mine_promotion_code.png b/assets/image/icon_mine_promotion_code.png deleted file mode 100644 index 8915a509..00000000 Binary files a/assets/image/icon_mine_promotion_code.png and /dev/null differ diff --git a/assets/image/icon_mine_promotion_code.webp b/assets/image/icon_mine_promotion_code.webp new file mode 100644 index 00000000..e80bad6b Binary files /dev/null and b/assets/image/icon_mine_promotion_code.webp differ diff --git a/assets/image/icon_mine_records_of_consumption.png b/assets/image/icon_mine_records_of_consumption.png deleted file mode 100644 index 26dcea48..00000000 Binary files a/assets/image/icon_mine_records_of_consumption.png and /dev/null differ diff --git a/assets/image/icon_mine_records_of_consumption.webp b/assets/image/icon_mine_records_of_consumption.webp new file mode 100644 index 00000000..cbe2a21a Binary files /dev/null and b/assets/image/icon_mine_records_of_consumption.webp differ diff --git a/assets/image/icon_mine_setting.png b/assets/image/icon_mine_setting.png deleted file mode 100644 index bf2a499c..00000000 Binary files a/assets/image/icon_mine_setting.png and /dev/null differ diff --git a/assets/image/icon_mine_setting.webp b/assets/image/icon_mine_setting.webp new file mode 100644 index 00000000..338b0640 Binary files /dev/null and b/assets/image/icon_mine_setting.webp differ diff --git a/assets/image/icon_mine_wallet.png b/assets/image/icon_mine_wallet.png deleted file mode 100644 index 2f820f29..00000000 Binary files a/assets/image/icon_mine_wallet.png and /dev/null differ diff --git a/assets/image/icon_mine_wallet.webp b/assets/image/icon_mine_wallet.webp new file mode 100644 index 00000000..258fdacf Binary files /dev/null and b/assets/image/icon_mine_wallet.webp differ diff --git a/assets/image/icon_more.png b/assets/image/icon_more.png deleted file mode 100644 index 67a0be1e..00000000 Binary files a/assets/image/icon_more.png and /dev/null differ diff --git a/assets/image/icon_more.webp b/assets/image/icon_more.webp new file mode 100644 index 00000000..96e56156 Binary files /dev/null and b/assets/image/icon_more.webp differ diff --git a/assets/image/icon_natification_permission_tips.png b/assets/image/icon_natification_permission_tips.png deleted file mode 100644 index fbc8b77e..00000000 Binary files a/assets/image/icon_natification_permission_tips.png and /dev/null differ diff --git a/assets/image/icon_natification_permission_tips.webp b/assets/image/icon_natification_permission_tips.webp new file mode 100644 index 00000000..1a6bf206 Binary files /dev/null and b/assets/image/icon_natification_permission_tips.webp differ diff --git a/assets/image/icon_notices.png b/assets/image/icon_notices.png deleted file mode 100644 index 95123108..00000000 Binary files a/assets/image/icon_notices.png and /dev/null differ diff --git a/assets/image/icon_notices.webp b/assets/image/icon_notices.webp new file mode 100644 index 00000000..0a982669 Binary files /dev/null and b/assets/image/icon_notices.webp differ diff --git a/assets/image/icon_order_agin.png b/assets/image/icon_order_agin.png deleted file mode 100644 index c54cf0ca..00000000 Binary files a/assets/image/icon_order_agin.png and /dev/null differ diff --git a/assets/image/icon_order_agin.webp b/assets/image/icon_order_agin.webp new file mode 100644 index 00000000..436730c2 Binary files /dev/null and b/assets/image/icon_order_agin.webp differ diff --git a/assets/image/icon_order_cancel.png b/assets/image/icon_order_cancel.png deleted file mode 100644 index bd95d30c..00000000 Binary files a/assets/image/icon_order_cancel.png and /dev/null differ diff --git a/assets/image/icon_order_cancel.webp b/assets/image/icon_order_cancel.webp new file mode 100644 index 00000000..fb7eee40 Binary files /dev/null and b/assets/image/icon_order_cancel.webp differ diff --git a/assets/image/icon_order_commodity_info.png b/assets/image/icon_order_commodity_info.png deleted file mode 100644 index 118f68b1..00000000 Binary files a/assets/image/icon_order_commodity_info.png and /dev/null differ diff --git a/assets/image/icon_order_commodity_info.webp b/assets/image/icon_order_commodity_info.webp new file mode 100644 index 00000000..3f981dda Binary files /dev/null and b/assets/image/icon_order_commodity_info.webp differ diff --git a/assets/image/icon_order_exchange_info.png b/assets/image/icon_order_exchange_info.png deleted file mode 100644 index 6fed466f..00000000 Binary files a/assets/image/icon_order_exchange_info.png and /dev/null differ diff --git a/assets/image/icon_order_exchange_info.webp b/assets/image/icon_order_exchange_info.webp new file mode 100644 index 00000000..89c7ca51 Binary files /dev/null and b/assets/image/icon_order_exchange_info.webp differ diff --git a/assets/image/icon_order_more.png b/assets/image/icon_order_more.png deleted file mode 100644 index c8b06626..00000000 Binary files a/assets/image/icon_order_more.png and /dev/null differ diff --git a/assets/image/icon_order_more.webp b/assets/image/icon_order_more.webp new file mode 100644 index 00000000..244a3b1f Binary files /dev/null and b/assets/image/icon_order_more.webp differ diff --git a/assets/image/icon_order_ok.png b/assets/image/icon_order_ok.png deleted file mode 100644 index 7d3d8551..00000000 Binary files a/assets/image/icon_order_ok.png and /dev/null differ diff --git a/assets/image/icon_order_ok.webp b/assets/image/icon_order_ok.webp new file mode 100644 index 00000000..a155d6b6 Binary files /dev/null and b/assets/image/icon_order_ok.webp differ diff --git a/assets/image/icon_order_renminbi.png b/assets/image/icon_order_renminbi.png deleted file mode 100644 index 9789e7ba..00000000 Binary files a/assets/image/icon_order_renminbi.png and /dev/null differ diff --git a/assets/image/icon_order_renminbi.webp b/assets/image/icon_order_renminbi.webp new file mode 100644 index 00000000..a4ebc4e9 Binary files /dev/null and b/assets/image/icon_order_renminbi.webp differ diff --git a/assets/image/icon_order_success.png b/assets/image/icon_order_success.png deleted file mode 100644 index 6e33d339..00000000 Binary files a/assets/image/icon_order_success.png and /dev/null differ diff --git a/assets/image/icon_order_success.webp b/assets/image/icon_order_success.webp new file mode 100644 index 00000000..4cc49a87 Binary files /dev/null and b/assets/image/icon_order_success.webp differ diff --git a/assets/image/icon_order_time.png b/assets/image/icon_order_time.png deleted file mode 100644 index 564f06fc..00000000 Binary files a/assets/image/icon_order_time.png and /dev/null differ diff --git a/assets/image/icon_order_time.webp b/assets/image/icon_order_time.webp new file mode 100644 index 00000000..b5f08797 Binary files /dev/null and b/assets/image/icon_order_time.webp differ diff --git a/assets/image/icon_pengyouquan.png b/assets/image/icon_pengyouquan.png deleted file mode 100644 index 0790e48d..00000000 Binary files a/assets/image/icon_pengyouquan.png and /dev/null differ diff --git a/assets/image/icon_pengyouquan.webp b/assets/image/icon_pengyouquan.webp new file mode 100644 index 00000000..d32bdfd8 Binary files /dev/null and b/assets/image/icon_pengyouquan.webp differ diff --git a/assets/image/icon_permission_camera.png b/assets/image/icon_permission_camera.png deleted file mode 100644 index 259e7bf4..00000000 Binary files a/assets/image/icon_permission_camera.png and /dev/null differ diff --git a/assets/image/icon_permission_camera.webp b/assets/image/icon_permission_camera.webp new file mode 100644 index 00000000..1c988256 Binary files /dev/null and b/assets/image/icon_permission_camera.webp differ diff --git a/assets/image/icon_permission_face_id.png b/assets/image/icon_permission_face_id.png deleted file mode 100644 index 0d8364ed..00000000 Binary files a/assets/image/icon_permission_face_id.png and /dev/null differ diff --git a/assets/image/icon_permission_face_id.webp b/assets/image/icon_permission_face_id.webp new file mode 100644 index 00000000..7f63572a Binary files /dev/null and b/assets/image/icon_permission_face_id.webp differ diff --git a/assets/image/icon_permission_location.png b/assets/image/icon_permission_location.png deleted file mode 100644 index f36c4e0f..00000000 Binary files a/assets/image/icon_permission_location.png and /dev/null differ diff --git a/assets/image/icon_permission_location.webp b/assets/image/icon_permission_location.webp new file mode 100644 index 00000000..a1b188d9 Binary files /dev/null and b/assets/image/icon_permission_location.webp differ diff --git a/assets/image/icon_permission_location_bg.png b/assets/image/icon_permission_location_bg.png deleted file mode 100644 index 34011521..00000000 Binary files a/assets/image/icon_permission_location_bg.png and /dev/null differ diff --git a/assets/image/icon_permission_location_bg.webp b/assets/image/icon_permission_location_bg.webp new file mode 100644 index 00000000..e0e77c3c Binary files /dev/null and b/assets/image/icon_permission_location_bg.webp differ diff --git a/assets/image/icon_permission_notices.png b/assets/image/icon_permission_notices.png deleted file mode 100644 index d83de500..00000000 Binary files a/assets/image/icon_permission_notices.png and /dev/null differ diff --git a/assets/image/icon_permission_notices.webp b/assets/image/icon_permission_notices.webp new file mode 100644 index 00000000..86b93704 Binary files /dev/null and b/assets/image/icon_permission_notices.webp differ diff --git a/assets/image/icon_permission_storage.png b/assets/image/icon_permission_storage.png deleted file mode 100644 index 44d1f544..00000000 Binary files a/assets/image/icon_permission_storage.png and /dev/null differ diff --git a/assets/image/icon_permission_storage.webp b/assets/image/icon_permission_storage.webp new file mode 100644 index 00000000..03d84d2c Binary files /dev/null and b/assets/image/icon_permission_storage.webp differ diff --git a/assets/image/icon_pl.png b/assets/image/icon_pl.png deleted file mode 100644 index 3424e8b3..00000000 Binary files a/assets/image/icon_pl.png and /dev/null differ diff --git a/assets/image/icon_pl.webp b/assets/image/icon_pl.webp new file mode 100644 index 00000000..ce3e2b6d Binary files /dev/null and b/assets/image/icon_pl.webp differ diff --git a/assets/image/icon_place_ order.png b/assets/image/icon_place_ order.png deleted file mode 100644 index 6d786fda..00000000 Binary files a/assets/image/icon_place_ order.png and /dev/null differ diff --git a/assets/image/icon_place_ order.webp b/assets/image/icon_place_ order.webp new file mode 100644 index 00000000..9f891a12 Binary files /dev/null and b/assets/image/icon_place_ order.webp differ diff --git a/assets/image/icon_place_ order_h.png b/assets/image/icon_place_ order_h.png deleted file mode 100644 index 4785e352..00000000 Binary files a/assets/image/icon_place_ order_h.png and /dev/null differ diff --git a/assets/image/icon_place_ order_h.webp b/assets/image/icon_place_ order_h.webp new file mode 100644 index 00000000..87012337 Binary files /dev/null and b/assets/image/icon_place_ order_h.webp differ diff --git a/assets/image/icon_play.png b/assets/image/icon_play.png deleted file mode 100644 index 6703a153..00000000 Binary files a/assets/image/icon_play.png and /dev/null differ diff --git a/assets/image/icon_play.webp b/assets/image/icon_play.webp new file mode 100644 index 00000000..bfb83a15 Binary files /dev/null and b/assets/image/icon_play.webp differ diff --git a/assets/image/icon_points_mall.png b/assets/image/icon_points_mall.png deleted file mode 100644 index e4551b65..00000000 Binary files a/assets/image/icon_points_mall.png and /dev/null differ diff --git a/assets/image/icon_points_mall.webp b/assets/image/icon_points_mall.webp new file mode 100644 index 00000000..b6398886 Binary files /dev/null and b/assets/image/icon_points_mall.webp differ diff --git a/assets/image/icon_radio_selected.png b/assets/image/icon_radio_selected.png deleted file mode 100644 index 1a215c5a..00000000 Binary files a/assets/image/icon_radio_selected.png and /dev/null differ diff --git a/assets/image/icon_radio_selected.webp b/assets/image/icon_radio_selected.webp new file mode 100644 index 00000000..328486a2 Binary files /dev/null and b/assets/image/icon_radio_selected.webp differ diff --git a/assets/image/icon_radio_unselected.png b/assets/image/icon_radio_unselected.png deleted file mode 100644 index 4d8bab6d..00000000 Binary files a/assets/image/icon_radio_unselected.png and /dev/null differ diff --git a/assets/image/icon_radio_unselected.webp b/assets/image/icon_radio_unselected.webp new file mode 100644 index 00000000..d82b727e Binary files /dev/null and b/assets/image/icon_radio_unselected.webp differ diff --git a/assets/image/icon_request_refund.png b/assets/image/icon_request_refund.png deleted file mode 100644 index 9bd6d641..00000000 Binary files a/assets/image/icon_request_refund.png and /dev/null differ diff --git a/assets/image/icon_request_refund.webp b/assets/image/icon_request_refund.webp new file mode 100644 index 00000000..e5fd89f0 Binary files /dev/null and b/assets/image/icon_request_refund.webp differ diff --git a/assets/image/icon_right.png b/assets/image/icon_right.png deleted file mode 100644 index bb9cd94a..00000000 Binary files a/assets/image/icon_right.png and /dev/null differ diff --git a/assets/image/icon_right.webp b/assets/image/icon_right.webp new file mode 100644 index 00000000..b485c7e0 Binary files /dev/null and b/assets/image/icon_right.webp differ diff --git a/assets/image/icon_right_z.png b/assets/image/icon_right_z.png deleted file mode 100644 index 55767215..00000000 Binary files a/assets/image/icon_right_z.png and /dev/null differ diff --git a/assets/image/icon_right_z.webp b/assets/image/icon_right_z.webp new file mode 100644 index 00000000..29179995 Binary files /dev/null and b/assets/image/icon_right_z.webp differ diff --git a/assets/image/icon_scan_qr_code.png b/assets/image/icon_scan_qr_code.png deleted file mode 100644 index edb2edba..00000000 Binary files a/assets/image/icon_scan_qr_code.png and /dev/null differ diff --git a/assets/image/icon_scan_qr_code.webp b/assets/image/icon_scan_qr_code.webp new file mode 100644 index 00000000..fef2d544 Binary files /dev/null and b/assets/image/icon_scan_qr_code.webp differ diff --git a/assets/image/icon_share.png b/assets/image/icon_share.png deleted file mode 100644 index f7cee20d..00000000 Binary files a/assets/image/icon_share.png and /dev/null differ diff --git a/assets/image/icon_share.webp b/assets/image/icon_share.webp new file mode 100644 index 00000000..fbc98618 Binary files /dev/null and b/assets/image/icon_share.webp differ diff --git a/assets/image/icon_share_w.png b/assets/image/icon_share_w.png deleted file mode 100644 index 94bda096..00000000 Binary files a/assets/image/icon_share_w.png and /dev/null differ diff --git a/assets/image/icon_share_w.webp b/assets/image/icon_share_w.webp new file mode 100644 index 00000000..a14aba04 Binary files /dev/null and b/assets/image/icon_share_w.webp differ diff --git a/assets/image/icon_shop.png b/assets/image/icon_shop.png deleted file mode 100644 index 674ffd8d..00000000 Binary files a/assets/image/icon_shop.png and /dev/null differ diff --git a/assets/image/icon_shop.webp b/assets/image/icon_shop.webp new file mode 100644 index 00000000..a778dc20 Binary files /dev/null and b/assets/image/icon_shop.webp differ diff --git a/assets/image/icon_sign.png b/assets/image/icon_sign.png deleted file mode 100644 index c3d9c9f5..00000000 Binary files a/assets/image/icon_sign.png and /dev/null differ diff --git a/assets/image/icon_sign.webp b/assets/image/icon_sign.webp new file mode 100644 index 00000000..0e2908c5 Binary files /dev/null and b/assets/image/icon_sign.webp differ diff --git a/assets/image/icon_sign_h.png b/assets/image/icon_sign_h.png deleted file mode 100644 index 0a4d29b0..00000000 Binary files a/assets/image/icon_sign_h.png and /dev/null differ diff --git a/assets/image/icon_sign_h.webp b/assets/image/icon_sign_h.webp new file mode 100644 index 00000000..9afaaa4e Binary files /dev/null and b/assets/image/icon_sign_h.webp differ diff --git a/assets/image/icon_sign_ok.png b/assets/image/icon_sign_ok.png deleted file mode 100644 index 47e7bdab..00000000 Binary files a/assets/image/icon_sign_ok.png and /dev/null differ diff --git a/assets/image/icon_sign_ok.webp b/assets/image/icon_sign_ok.webp new file mode 100644 index 00000000..3556ffa7 Binary files /dev/null and b/assets/image/icon_sign_ok.webp differ diff --git a/assets/image/icon_sign_success.png b/assets/image/icon_sign_success.png deleted file mode 100644 index f9c6c93b..00000000 Binary files a/assets/image/icon_sign_success.png and /dev/null differ diff --git a/assets/image/icon_sign_success.webp b/assets/image/icon_sign_success.webp new file mode 100644 index 00000000..ff1de355 Binary files /dev/null and b/assets/image/icon_sign_success.webp differ diff --git a/assets/image/icon_sisters.png b/assets/image/icon_sisters.png deleted file mode 100644 index a5e30dc6..00000000 Binary files a/assets/image/icon_sisters.png and /dev/null differ diff --git a/assets/image/icon_sisters.webp b/assets/image/icon_sisters.webp new file mode 100644 index 00000000..7d2ec150 Binary files /dev/null and b/assets/image/icon_sisters.webp differ diff --git a/assets/image/icon_sisters_bj.png b/assets/image/icon_sisters_bj.png deleted file mode 100644 index 7a984f38..00000000 Binary files a/assets/image/icon_sisters_bj.png and /dev/null differ diff --git a/assets/image/icon_sisters_bj.webp b/assets/image/icon_sisters_bj.webp new file mode 100644 index 00000000..b1a053fa Binary files /dev/null and b/assets/image/icon_sisters_bj.webp differ diff --git a/assets/image/icon_sisters_vip.png b/assets/image/icon_sisters_vip.png deleted file mode 100644 index 5aa94cfb..00000000 Binary files a/assets/image/icon_sisters_vip.png and /dev/null differ diff --git a/assets/image/icon_sisters_vip.webp b/assets/image/icon_sisters_vip.webp new file mode 100644 index 00000000..8b7f7db0 Binary files /dev/null and b/assets/image/icon_sisters_vip.webp differ diff --git a/assets/image/icon_storage_permission_tips.png b/assets/image/icon_storage_permission_tips.png deleted file mode 100644 index 60fe84a4..00000000 Binary files a/assets/image/icon_storage_permission_tips.png and /dev/null differ diff --git a/assets/image/icon_storage_permission_tips.webp b/assets/image/icon_storage_permission_tips.webp new file mode 100644 index 00000000..e513e773 Binary files /dev/null and b/assets/image/icon_storage_permission_tips.webp differ diff --git a/assets/image/icon_store_c.png b/assets/image/icon_store_c.png deleted file mode 100644 index 7fd7c679..00000000 Binary files a/assets/image/icon_store_c.png and /dev/null differ diff --git a/assets/image/icon_store_c.webp b/assets/image/icon_store_c.webp new file mode 100644 index 00000000..0bccb7f1 Binary files /dev/null and b/assets/image/icon_store_c.webp differ diff --git a/assets/image/icon_story_1.png b/assets/image/icon_story_1.png deleted file mode 100644 index 27188b69..00000000 Binary files a/assets/image/icon_story_1.png and /dev/null differ diff --git a/assets/image/icon_story_1.webp b/assets/image/icon_story_1.webp new file mode 100644 index 00000000..2295eaa2 Binary files /dev/null and b/assets/image/icon_story_1.webp differ diff --git a/assets/image/icon_story_2.png b/assets/image/icon_story_2.png deleted file mode 100644 index 1614ff0f..00000000 Binary files a/assets/image/icon_story_2.png and /dev/null differ diff --git a/assets/image/icon_story_2.webp b/assets/image/icon_story_2.webp new file mode 100644 index 00000000..94557bfa Binary files /dev/null and b/assets/image/icon_story_2.webp differ diff --git a/assets/image/icon_story_bj.png b/assets/image/icon_story_bj.png deleted file mode 100644 index 19abcb53..00000000 Binary files a/assets/image/icon_story_bj.png and /dev/null differ diff --git a/assets/image/icon_story_bj.webp b/assets/image/icon_story_bj.webp new file mode 100644 index 00000000..9b82b739 Binary files /dev/null and b/assets/image/icon_story_bj.webp differ diff --git a/assets/image/icon_story_td.png b/assets/image/icon_story_td.png deleted file mode 100644 index 4405a5f4..00000000 Binary files a/assets/image/icon_story_td.png and /dev/null differ diff --git a/assets/image/icon_story_td.webp b/assets/image/icon_story_td.webp new file mode 100644 index 00000000..16e08bac Binary files /dev/null and b/assets/image/icon_story_td.webp differ diff --git a/assets/image/icon_system_message.png b/assets/image/icon_system_message.png deleted file mode 100644 index e11399f1..00000000 Binary files a/assets/image/icon_system_message.png and /dev/null differ diff --git a/assets/image/icon_system_message.webp b/assets/image/icon_system_message.webp new file mode 100644 index 00000000..8a42f386 Binary files /dev/null and b/assets/image/icon_system_message.webp differ diff --git a/assets/image/icon_system_notices.png b/assets/image/icon_system_notices.png deleted file mode 100644 index 42121768..00000000 Binary files a/assets/image/icon_system_notices.png and /dev/null differ diff --git a/assets/image/icon_system_notices.webp b/assets/image/icon_system_notices.webp new file mode 100644 index 00000000..b8a8c938 Binary files /dev/null and b/assets/image/icon_system_notices.webp differ diff --git a/assets/image/icon_system_order.png b/assets/image/icon_system_order.png deleted file mode 100644 index 5342cb3e..00000000 Binary files a/assets/image/icon_system_order.png and /dev/null differ diff --git a/assets/image/icon_system_order.webp b/assets/image/icon_system_order.webp new file mode 100644 index 00000000..e24f6304 Binary files /dev/null and b/assets/image/icon_system_order.webp differ diff --git a/assets/image/icon_system_recharge.png b/assets/image/icon_system_recharge.png deleted file mode 100644 index 5617d7de..00000000 Binary files a/assets/image/icon_system_recharge.png and /dev/null differ diff --git a/assets/image/icon_system_recharge.webp b/assets/image/icon_system_recharge.webp new file mode 100644 index 00000000..c3b04def Binary files /dev/null and b/assets/image/icon_system_recharge.webp differ diff --git a/assets/image/icon_today_task.png b/assets/image/icon_today_task.png deleted file mode 100644 index db70d99c..00000000 Binary files a/assets/image/icon_today_task.png and /dev/null differ diff --git a/assets/image/icon_today_task.webp b/assets/image/icon_today_task.webp new file mode 100644 index 00000000..6d8a0029 Binary files /dev/null and b/assets/image/icon_today_task.webp differ diff --git a/assets/image/icon_today_video.png b/assets/image/icon_today_video.png deleted file mode 100644 index 62ab896b..00000000 Binary files a/assets/image/icon_today_video.png and /dev/null differ diff --git a/assets/image/icon_today_video.webp b/assets/image/icon_today_video.webp new file mode 100644 index 00000000..141f16bc Binary files /dev/null and b/assets/image/icon_today_video.webp differ diff --git a/assets/image/icon_transport.png b/assets/image/icon_transport.png deleted file mode 100644 index bc6e9f82..00000000 Binary files a/assets/image/icon_transport.png and /dev/null differ diff --git a/assets/image/icon_transport.webp b/assets/image/icon_transport.webp new file mode 100644 index 00000000..a36217d7 Binary files /dev/null and b/assets/image/icon_transport.webp differ diff --git a/assets/image/icon_transport_h.png b/assets/image/icon_transport_h.png deleted file mode 100644 index 3bc0f49f..00000000 Binary files a/assets/image/icon_transport_h.png and /dev/null differ diff --git a/assets/image/icon_transport_h.webp b/assets/image/icon_transport_h.webp new file mode 100644 index 00000000..5638a7c2 Binary files /dev/null and b/assets/image/icon_transport_h.webp differ diff --git a/assets/image/icon_union_call.png b/assets/image/icon_union_call.png deleted file mode 100644 index 550ebed9..00000000 Binary files a/assets/image/icon_union_call.png and /dev/null differ diff --git a/assets/image/icon_union_call.webp b/assets/image/icon_union_call.webp new file mode 100644 index 00000000..2036aefe Binary files /dev/null and b/assets/image/icon_union_call.webp differ diff --git a/assets/image/icon_union_coupons.png b/assets/image/icon_union_coupons.png deleted file mode 100644 index 85d5b280..00000000 Binary files a/assets/image/icon_union_coupons.png and /dev/null differ diff --git a/assets/image/icon_union_coupons.webp b/assets/image/icon_union_coupons.webp new file mode 100644 index 00000000..409b219d Binary files /dev/null and b/assets/image/icon_union_coupons.webp differ diff --git a/assets/image/icon_union_coupons_bg.png b/assets/image/icon_union_coupons_bg.png deleted file mode 100644 index 98cefa8c..00000000 Binary files a/assets/image/icon_union_coupons_bg.png and /dev/null differ diff --git a/assets/image/icon_union_coupons_bg.webp b/assets/image/icon_union_coupons_bg.webp new file mode 100644 index 00000000..9382ac69 Binary files /dev/null and b/assets/image/icon_union_coupons_bg.webp differ diff --git a/assets/image/icon_union_location.png b/assets/image/icon_union_location.png deleted file mode 100644 index fc3a6c81..00000000 Binary files a/assets/image/icon_union_location.png and /dev/null differ diff --git a/assets/image/icon_union_location.webp b/assets/image/icon_union_location.webp new file mode 100644 index 00000000..e3689e2a Binary files /dev/null and b/assets/image/icon_union_location.webp differ diff --git a/assets/image/icon_union_location_black.png b/assets/image/icon_union_location_black.png deleted file mode 100644 index a83f7aa1..00000000 Binary files a/assets/image/icon_union_location_black.png and /dev/null differ diff --git a/assets/image/icon_union_location_black.webp b/assets/image/icon_union_location_black.webp new file mode 100644 index 00000000..05c9491d Binary files /dev/null and b/assets/image/icon_union_location_black.webp differ diff --git a/assets/image/icon_union_start_store.png b/assets/image/icon_union_start_store.png deleted file mode 100644 index 8b879af9..00000000 Binary files a/assets/image/icon_union_start_store.png and /dev/null differ diff --git a/assets/image/icon_union_start_store.webp b/assets/image/icon_union_start_store.webp new file mode 100644 index 00000000..dc7eb7ab Binary files /dev/null and b/assets/image/icon_union_start_store.webp differ diff --git a/assets/image/icon_union_store.png b/assets/image/icon_union_store.png deleted file mode 100644 index 5a5e54d9..00000000 Binary files a/assets/image/icon_union_store.png and /dev/null differ diff --git a/assets/image/icon_union_store.webp b/assets/image/icon_union_store.webp new file mode 100644 index 00000000..b24e8338 Binary files /dev/null and b/assets/image/icon_union_store.webp differ diff --git a/assets/image/icon_union_time.png b/assets/image/icon_union_time.png deleted file mode 100644 index 04e9088e..00000000 Binary files a/assets/image/icon_union_time.png and /dev/null differ diff --git a/assets/image/icon_union_time.webp b/assets/image/icon_union_time.webp new file mode 100644 index 00000000..801c2e96 Binary files /dev/null and b/assets/image/icon_union_time.webp differ diff --git a/assets/image/icon_user.png b/assets/image/icon_user.png deleted file mode 100644 index a90520f9..00000000 Binary files a/assets/image/icon_user.png and /dev/null differ diff --git a/assets/image/icon_user.webp b/assets/image/icon_user.webp new file mode 100644 index 00000000..e4ba288d Binary files /dev/null and b/assets/image/icon_user.webp differ diff --git a/assets/image/icon_views.png b/assets/image/icon_views.png deleted file mode 100644 index 1385d4be..00000000 Binary files a/assets/image/icon_views.png and /dev/null differ diff --git a/assets/image/icon_views.webp b/assets/image/icon_views.webp new file mode 100644 index 00000000..0c92a7fe Binary files /dev/null and b/assets/image/icon_views.webp differ diff --git a/assets/image/icon_vip.png b/assets/image/icon_vip.png deleted file mode 100644 index 41d9c701..00000000 Binary files a/assets/image/icon_vip.png and /dev/null differ diff --git a/assets/image/icon_vip.webp b/assets/image/icon_vip.webp new file mode 100644 index 00000000..ab62b542 Binary files /dev/null and b/assets/image/icon_vip.webp differ diff --git a/assets/image/icon_vip_bg.png b/assets/image/icon_vip_bg.png deleted file mode 100644 index 49a0f274..00000000 Binary files a/assets/image/icon_vip_bg.png and /dev/null differ diff --git a/assets/image/icon_vip_bg.webp b/assets/image/icon_vip_bg.webp new file mode 100644 index 00000000..e3cebb9b Binary files /dev/null and b/assets/image/icon_vip_bg.webp differ diff --git a/assets/image/icon_vip_bj.png b/assets/image/icon_vip_bj.png deleted file mode 100644 index 97b0e5f7..00000000 Binary files a/assets/image/icon_vip_bj.png and /dev/null differ diff --git a/assets/image/icon_vip_bj.webp b/assets/image/icon_vip_bj.webp new file mode 100644 index 00000000..8530fbc6 Binary files /dev/null and b/assets/image/icon_vip_bj.webp differ diff --git a/assets/image/icon_vip_name.png b/assets/image/icon_vip_name.png deleted file mode 100644 index 289b730d..00000000 Binary files a/assets/image/icon_vip_name.png and /dev/null differ diff --git a/assets/image/icon_vip_name.webp b/assets/image/icon_vip_name.webp new file mode 100644 index 00000000..b02c2c26 Binary files /dev/null and b/assets/image/icon_vip_name.webp differ diff --git a/assets/image/icon_wallet_recharge.png b/assets/image/icon_wallet_recharge.png deleted file mode 100644 index 7a1a5f95..00000000 Binary files a/assets/image/icon_wallet_recharge.png and /dev/null differ diff --git a/assets/image/icon_wallet_recharge.webp b/assets/image/icon_wallet_recharge.webp new file mode 100644 index 00000000..e96b33a9 Binary files /dev/null and b/assets/image/icon_wallet_recharge.webp differ diff --git a/assets/image/icon_wallet_withdrawal.png b/assets/image/icon_wallet_withdrawal.png deleted file mode 100644 index 56f1e7e9..00000000 Binary files a/assets/image/icon_wallet_withdrawal.png and /dev/null differ diff --git a/assets/image/icon_wallet_withdrawal.webp b/assets/image/icon_wallet_withdrawal.webp new file mode 100644 index 00000000..55c50617 Binary files /dev/null and b/assets/image/icon_wallet_withdrawal.webp differ diff --git a/assets/image/icon_we_chat.png b/assets/image/icon_we_chat.png deleted file mode 100644 index 9eeeb829..00000000 Binary files a/assets/image/icon_we_chat.png and /dev/null differ diff --git a/assets/image/icon_we_chat.webp b/assets/image/icon_we_chat.webp new file mode 100644 index 00000000..55a370bc Binary files /dev/null and b/assets/image/icon_we_chat.webp differ diff --git a/assets/image/icon_weixin.png b/assets/image/icon_weixin.png deleted file mode 100644 index 798092e9..00000000 Binary files a/assets/image/icon_weixin.png and /dev/null differ diff --git a/assets/image/icon_weixin.webp b/assets/image/icon_weixin.webp new file mode 100644 index 00000000..8702b3ce Binary files /dev/null and b/assets/image/icon_weixin.webp differ diff --git a/assets/image/icon_wo_n.png b/assets/image/icon_wo_n.png deleted file mode 100644 index a5c6f784..00000000 Binary files a/assets/image/icon_wo_n.png and /dev/null differ diff --git a/assets/image/icon_wo_n.webp b/assets/image/icon_wo_n.webp new file mode 100644 index 00000000..aa8e513f Binary files /dev/null and b/assets/image/icon_wo_n.webp differ diff --git a/assets/image/icon_wo_s.png b/assets/image/icon_wo_s.png deleted file mode 100644 index 43f26a41..00000000 Binary files a/assets/image/icon_wo_s.png and /dev/null differ diff --git a/assets/image/icon_wo_s.webp b/assets/image/icon_wo_s.webp new file mode 100644 index 00000000..84dd69ef Binary files /dev/null and b/assets/image/icon_wo_s.webp differ diff --git a/assets/image/icon_write_off_bg.png b/assets/image/icon_write_off_bg.png deleted file mode 100644 index 2f6eb9c4..00000000 Binary files a/assets/image/icon_write_off_bg.png and /dev/null differ diff --git a/assets/image/icon_write_off_bg.webp b/assets/image/icon_write_off_bg.webp new file mode 100644 index 00000000..937a9309 Binary files /dev/null and b/assets/image/icon_write_off_bg.webp differ diff --git a/assets/image/icon_xuanzhong.png b/assets/image/icon_xuanzhong.png deleted file mode 100644 index a569b9a4..00000000 Binary files a/assets/image/icon_xuanzhong.png and /dev/null differ diff --git a/assets/image/icon_xuanzhong.webp b/assets/image/icon_xuanzhong.webp new file mode 100644 index 00000000..526e342c Binary files /dev/null and b/assets/image/icon_xuanzhong.webp differ diff --git a/assets/image/icon_z.png b/assets/image/icon_z.png deleted file mode 100644 index 20b0f313..00000000 Binary files a/assets/image/icon_z.png and /dev/null differ diff --git a/assets/image/icon_z.webp b/assets/image/icon_z.webp new file mode 100644 index 00000000..dc3a8889 Binary files /dev/null and b/assets/image/icon_z.webp differ diff --git a/assets/image/icon_zan.png b/assets/image/icon_zan.png deleted file mode 100644 index 654d865b..00000000 Binary files a/assets/image/icon_zan.png and /dev/null differ diff --git a/assets/image/icon_zan.webp b/assets/image/icon_zan.webp new file mode 100644 index 00000000..96148b30 Binary files /dev/null and b/assets/image/icon_zan.webp differ diff --git a/assets/image/integral_return.png b/assets/image/integral_return.png deleted file mode 100644 index c90e78b6..00000000 Binary files a/assets/image/integral_return.png and /dev/null differ diff --git a/assets/image/integral_return.webp b/assets/image/integral_return.webp new file mode 100644 index 00000000..15aa52d2 Binary files /dev/null and b/assets/image/integral_return.webp differ diff --git a/assets/image/ji_fen.png b/assets/image/ji_fen.png deleted file mode 100644 index b7aa7d1b..00000000 Binary files a/assets/image/ji_fen.png and /dev/null differ diff --git a/assets/image/ji_fen.webp b/assets/image/ji_fen.webp new file mode 100644 index 00000000..1859de1b Binary files /dev/null and b/assets/image/ji_fen.webp differ diff --git a/assets/image/jian_j.png b/assets/image/jian_j.png deleted file mode 100644 index b4597601..00000000 Binary files a/assets/image/jian_j.png and /dev/null differ diff --git a/assets/image/jian_j.webp b/assets/image/jian_j.webp new file mode 100644 index 00000000..8a5d9a5e Binary files /dev/null and b/assets/image/jian_j.webp differ diff --git a/assets/image/ju_bao.png b/assets/image/ju_bao.png deleted file mode 100644 index c0d2a3eb..00000000 Binary files a/assets/image/ju_bao.png and /dev/null differ diff --git a/assets/image/ju_bao.webp b/assets/image/ju_bao.webp new file mode 100644 index 00000000..a6078e84 Binary files /dev/null and b/assets/image/ju_bao.webp differ diff --git a/assets/image/ka.png b/assets/image/ka.png deleted file mode 100644 index dfe1580a..00000000 Binary files a/assets/image/ka.png and /dev/null differ diff --git a/assets/image/ka.webp b/assets/image/ka.webp new file mode 100644 index 00000000..c583e925 Binary files /dev/null and b/assets/image/ka.webp differ diff --git a/assets/image/ketang.png b/assets/image/ketang.png deleted file mode 100644 index e3ed6ce4..00000000 Binary files a/assets/image/ketang.png and /dev/null differ diff --git a/assets/image/ketang.webp b/assets/image/ketang.webp new file mode 100644 index 00000000..e6e9fbdd Binary files /dev/null and b/assets/image/ketang.webp differ diff --git a/assets/image/ketang_like.png b/assets/image/ketang_like.png deleted file mode 100644 index 2dcc4f9e..00000000 Binary files a/assets/image/ketang_like.png and /dev/null differ diff --git a/assets/image/ketang_like.webp b/assets/image/ketang_like.webp new file mode 100644 index 00000000..4a02f2f0 Binary files /dev/null and b/assets/image/ketang_like.webp differ diff --git a/assets/image/ketang_message.png b/assets/image/ketang_message.png deleted file mode 100644 index cb153759..00000000 Binary files a/assets/image/ketang_message.png and /dev/null differ diff --git a/assets/image/ketang_message.webp b/assets/image/ketang_message.webp new file mode 100644 index 00000000..0d0d46e2 Binary files /dev/null and b/assets/image/ketang_message.webp differ diff --git a/assets/image/ketang_play.png b/assets/image/ketang_play.png deleted file mode 100644 index 73ce258a..00000000 Binary files a/assets/image/ketang_play.png and /dev/null differ diff --git a/assets/image/ketang_play.webp b/assets/image/ketang_play.webp new file mode 100644 index 00000000..65955790 Binary files /dev/null and b/assets/image/ketang_play.webp differ diff --git a/assets/image/landmark.png b/assets/image/landmark.png deleted file mode 100644 index 9978eb93..00000000 Binary files a/assets/image/landmark.png and /dev/null differ diff --git a/assets/image/landmark.webp b/assets/image/landmark.webp new file mode 100644 index 00000000..8240f643 Binary files /dev/null and b/assets/image/landmark.webp differ diff --git a/assets/image/laoban.png b/assets/image/laoban.png deleted file mode 100644 index 81cf02f3..00000000 Binary files a/assets/image/laoban.png and /dev/null differ diff --git a/assets/image/laoban.webp b/assets/image/laoban.webp new file mode 100644 index 00000000..bbfaefaf Binary files /dev/null and b/assets/image/laoban.webp differ diff --git a/assets/image/leaving_message.png b/assets/image/leaving_message.png deleted file mode 100644 index 6cabe1af..00000000 Binary files a/assets/image/leaving_message.png and /dev/null differ diff --git a/assets/image/leaving_message.webp b/assets/image/leaving_message.webp new file mode 100644 index 00000000..cf0f8c0d Binary files /dev/null and b/assets/image/leaving_message.webp differ diff --git a/assets/image/logout.png b/assets/image/logout.png deleted file mode 100644 index 398b0d8e..00000000 Binary files a/assets/image/logout.png and /dev/null differ diff --git a/assets/image/logout.webp b/assets/image/logout.webp new file mode 100644 index 00000000..8903da5b Binary files /dev/null and b/assets/image/logout.webp differ diff --git a/assets/image/logout_s.png b/assets/image/logout_s.png deleted file mode 100644 index 18170ae4..00000000 Binary files a/assets/image/logout_s.png and /dev/null differ diff --git a/assets/image/logout_s.webp b/assets/image/logout_s.webp new file mode 100644 index 00000000..653bf513 Binary files /dev/null and b/assets/image/logout_s.webp differ diff --git a/assets/image/map.png b/assets/image/map.png deleted file mode 100644 index 827b6285..00000000 Binary files a/assets/image/map.png and /dev/null differ diff --git a/assets/image/map.webp b/assets/image/map.webp new file mode 100644 index 00000000..d8fb07fc Binary files /dev/null and b/assets/image/map.webp differ diff --git a/assets/image/oeder_cancel.png b/assets/image/oeder_cancel.png deleted file mode 100644 index b831b507..00000000 Binary files a/assets/image/oeder_cancel.png and /dev/null differ diff --git a/assets/image/oeder_cancel.webp b/assets/image/oeder_cancel.webp new file mode 100644 index 00000000..37cd5628 Binary files /dev/null and b/assets/image/oeder_cancel.webp differ diff --git a/assets/image/order.png b/assets/image/order.png deleted file mode 100644 index 646dc211..00000000 Binary files a/assets/image/order.png and /dev/null differ diff --git a/assets/image/order.webp b/assets/image/order.webp new file mode 100644 index 00000000..94e2c9eb Binary files /dev/null and b/assets/image/order.webp differ diff --git a/assets/image/order_btn1.png b/assets/image/order_btn1.png deleted file mode 100644 index cf7d5be7..00000000 Binary files a/assets/image/order_btn1.png and /dev/null differ diff --git a/assets/image/order_btn1.webp b/assets/image/order_btn1.webp new file mode 100644 index 00000000..7d8706ae Binary files /dev/null and b/assets/image/order_btn1.webp differ diff --git a/assets/image/order_btn2.png b/assets/image/order_btn2.png deleted file mode 100644 index 3c53f1db..00000000 Binary files a/assets/image/order_btn2.png and /dev/null differ diff --git a/assets/image/order_btn2.webp b/assets/image/order_btn2.webp new file mode 100644 index 00000000..068adad7 Binary files /dev/null and b/assets/image/order_btn2.webp differ diff --git a/assets/image/order_btn3.png b/assets/image/order_btn3.png deleted file mode 100644 index 1b697ed4..00000000 Binary files a/assets/image/order_btn3.png and /dev/null differ diff --git a/assets/image/order_btn3.webp b/assets/image/order_btn3.webp new file mode 100644 index 00000000..30dc605d Binary files /dev/null and b/assets/image/order_btn3.webp differ diff --git a/assets/image/order_ok.png b/assets/image/order_ok.png deleted file mode 100644 index 64952128..00000000 Binary files a/assets/image/order_ok.png and /dev/null differ diff --git a/assets/image/order_ok.webp b/assets/image/order_ok.webp new file mode 100644 index 00000000..81f6e195 Binary files /dev/null and b/assets/image/order_ok.webp differ diff --git a/assets/image/order_refund.png b/assets/image/order_refund.png deleted file mode 100644 index 9b0dd7c4..00000000 Binary files a/assets/image/order_refund.png and /dev/null differ diff --git a/assets/image/order_refund.webp b/assets/image/order_refund.webp new file mode 100644 index 00000000..1333add7 Binary files /dev/null and b/assets/image/order_refund.webp differ diff --git a/assets/image/pen.png b/assets/image/pen.png deleted file mode 100644 index 00d1336b..00000000 Binary files a/assets/image/pen.png and /dev/null differ diff --git a/assets/image/pen.webp b/assets/image/pen.webp new file mode 100644 index 00000000..9a178af9 Binary files /dev/null and b/assets/image/pen.webp differ diff --git a/assets/image/qr_share_bg.png b/assets/image/qr_share_bg.png deleted file mode 100644 index ba7e0acf..00000000 Binary files a/assets/image/qr_share_bg.png and /dev/null differ diff --git a/assets/image/qr_share_bg.webp b/assets/image/qr_share_bg.webp new file mode 100644 index 00000000..73a15790 Binary files /dev/null and b/assets/image/qr_share_bg.webp differ diff --git a/assets/image/qr_share_bg_yq.png b/assets/image/qr_share_bg_yq.png deleted file mode 100644 index ddf803ac..00000000 Binary files a/assets/image/qr_share_bg_yq.png and /dev/null differ diff --git a/assets/image/qr_share_bg_yq.webp b/assets/image/qr_share_bg_yq.webp new file mode 100644 index 00000000..10893ac7 Binary files /dev/null and b/assets/image/qr_share_bg_yq.webp differ diff --git a/assets/image/qr_share_info_bg.png b/assets/image/qr_share_info_bg.png deleted file mode 100644 index 60a5bb0e..00000000 Binary files a/assets/image/qr_share_info_bg.png and /dev/null differ diff --git a/assets/image/qr_share_info_bg.webp b/assets/image/qr_share_info_bg.webp new file mode 100644 index 00000000..15266c13 Binary files /dev/null and b/assets/image/qr_share_info_bg.webp differ diff --git a/assets/image/qt_badge.png b/assets/image/qt_badge.png deleted file mode 100644 index 5ebcbf45..00000000 Binary files a/assets/image/qt_badge.png and /dev/null differ diff --git a/assets/image/qt_badge.webp b/assets/image/qt_badge.webp new file mode 100644 index 00000000..e3aa21f6 Binary files /dev/null and b/assets/image/qt_badge.webp differ diff --git a/assets/image/recharge.webp b/assets/image/recharge.webp new file mode 100644 index 00000000..a0e0c5c1 Binary files /dev/null and b/assets/image/recharge.webp differ diff --git a/assets/image/reduce.png b/assets/image/reduce.png deleted file mode 100644 index b40443d9..00000000 Binary files a/assets/image/reduce.png and /dev/null differ diff --git a/assets/image/reduce.webp b/assets/image/reduce.webp new file mode 100644 index 00000000..e2072825 Binary files /dev/null and b/assets/image/reduce.webp differ diff --git a/assets/image/service.png b/assets/image/service.png deleted file mode 100644 index 44d9b7cf..00000000 Binary files a/assets/image/service.png and /dev/null differ diff --git a/assets/image/service.webp b/assets/image/service.webp new file mode 100644 index 00000000..bb6e08b4 Binary files /dev/null and b/assets/image/service.webp differ diff --git a/assets/image/shadow.png b/assets/image/shadow.png deleted file mode 100644 index 5901488b..00000000 Binary files a/assets/image/shadow.png and /dev/null differ diff --git a/assets/image/shadow.webp b/assets/image/shadow.webp new file mode 100644 index 00000000..556a7bb9 Binary files /dev/null and b/assets/image/shadow.webp differ diff --git a/assets/image/share_image_bg.png b/assets/image/share_image_bg.png deleted file mode 100644 index bd744c27..00000000 Binary files a/assets/image/share_image_bg.png and /dev/null differ diff --git a/assets/image/share_image_bg.webp b/assets/image/share_image_bg.webp new file mode 100644 index 00000000..be513e0c Binary files /dev/null and b/assets/image/share_image_bg.webp differ diff --git a/assets/image/share_image_bg_yq.png b/assets/image/share_image_bg_yq.png deleted file mode 100644 index fbc28f83..00000000 Binary files a/assets/image/share_image_bg_yq.png and /dev/null differ diff --git a/assets/image/share_image_bg_yq.webp b/assets/image/share_image_bg_yq.webp new file mode 100644 index 00000000..6416f412 Binary files /dev/null and b/assets/image/share_image_bg_yq.webp differ diff --git a/assets/image/share_image_close.png b/assets/image/share_image_close.png deleted file mode 100644 index f77c779d..00000000 Binary files a/assets/image/share_image_close.png and /dev/null differ diff --git a/assets/image/share_image_close.webp b/assets/image/share_image_close.webp new file mode 100644 index 00000000..35372c42 Binary files /dev/null and b/assets/image/share_image_close.webp differ diff --git a/assets/image/shop_logo.png b/assets/image/shop_logo.png deleted file mode 100644 index 009b2701..00000000 Binary files a/assets/image/shop_logo.png and /dev/null differ diff --git a/assets/image/shop_logo.webp b/assets/image/shop_logo.webp new file mode 100644 index 00000000..ace81830 Binary files /dev/null and b/assets/image/shop_logo.webp differ diff --git a/assets/image/shopp.png b/assets/image/shopp.png deleted file mode 100644 index 6ccf56d9..00000000 Binary files a/assets/image/shopp.png and /dev/null differ diff --git a/assets/image/shopp.webp b/assets/image/shopp.webp new file mode 100644 index 00000000..c9a9c17f Binary files /dev/null and b/assets/image/shopp.webp differ diff --git a/assets/image/shopping_k.png b/assets/image/shopping_k.png deleted file mode 100644 index e03be6e7..00000000 Binary files a/assets/image/shopping_k.png and /dev/null differ diff --git a/assets/image/shopping_k.webp b/assets/image/shopping_k.webp new file mode 100644 index 00000000..5d7f7ace Binary files /dev/null and b/assets/image/shopping_k.webp differ diff --git a/assets/image/t_right.png b/assets/image/t_right.png deleted file mode 100644 index 7137a694..00000000 Binary files a/assets/image/t_right.png and /dev/null differ diff --git a/assets/image/t_right.webp b/assets/image/t_right.webp new file mode 100644 index 00000000..2c50be97 Binary files /dev/null and b/assets/image/t_right.webp differ diff --git a/assets/image/vip_contrastive_table.png b/assets/image/vip_contrastive_table.png deleted file mode 100644 index 8e1a77b4..00000000 Binary files a/assets/image/vip_contrastive_table.png and /dev/null differ diff --git a/assets/image/vip_contrastive_table.webp b/assets/image/vip_contrastive_table.webp new file mode 100644 index 00000000..3fd015fa Binary files /dev/null and b/assets/image/vip_contrastive_table.webp differ diff --git a/assets/image/vip_gc.png b/assets/image/vip_gc.png deleted file mode 100644 index 1d84e5bf..00000000 Binary files a/assets/image/vip_gc.png and /dev/null differ diff --git a/assets/image/vip_gc.webp b/assets/image/vip_gc.webp new file mode 100644 index 00000000..293fd315 Binary files /dev/null and b/assets/image/vip_gc.webp differ diff --git a/assets/image/vip_jk.png b/assets/image/vip_jk.png deleted file mode 100644 index c33527d3..00000000 Binary files a/assets/image/vip_jk.png and /dev/null differ diff --git a/assets/image/vip_jk.webp b/assets/image/vip_jk.webp new file mode 100644 index 00000000..3d6b5848 Binary files /dev/null and b/assets/image/vip_jk.webp differ diff --git a/assets/image/vip_qy.png b/assets/image/vip_qy.png deleted file mode 100644 index 6ccfc4ee..00000000 Binary files a/assets/image/vip_qy.png and /dev/null differ diff --git a/assets/image/vip_qy.webp b/assets/image/vip_qy.webp new file mode 100644 index 00000000..fe62fa73 Binary files /dev/null and b/assets/image/vip_qy.webp differ diff --git a/assets/image/vip_yk.png b/assets/image/vip_yk.png deleted file mode 100644 index 7e629c29..00000000 Binary files a/assets/image/vip_yk.png and /dev/null differ diff --git a/assets/image/vip_yk.webp b/assets/image/vip_yk.webp new file mode 100644 index 00000000..038588cc Binary files /dev/null and b/assets/image/vip_yk.webp differ diff --git a/assets/image/wait_meal.png b/assets/image/wait_meal.png deleted file mode 100644 index 4acf1a4f..00000000 Binary files a/assets/image/wait_meal.png and /dev/null differ diff --git a/assets/image/wait_meal.webp b/assets/image/wait_meal.webp new file mode 100644 index 00000000..062401a8 Binary files /dev/null and b/assets/image/wait_meal.webp differ diff --git a/assets/image/xiao_fei.png b/assets/image/xiao_fei.png deleted file mode 100644 index 11363d43..00000000 Binary files a/assets/image/xiao_fei.png and /dev/null differ diff --git a/assets/image/xiao_fei.webp b/assets/image/xiao_fei.webp new file mode 100644 index 00000000..a5738c03 Binary files /dev/null and b/assets/image/xiao_fei.webp differ diff --git a/assets/image/xin_ren.png b/assets/image/xin_ren.png deleted file mode 100644 index 20de91cf..00000000 Binary files a/assets/image/xin_ren.png and /dev/null differ diff --git a/assets/image/xin_ren.webp b/assets/image/xin_ren.webp new file mode 100644 index 00000000..56d207a2 Binary files /dev/null and b/assets/image/xin_ren.webp differ diff --git a/assets/image/xin_rq.png b/assets/image/xin_rq.png deleted file mode 100644 index 06feb0be..00000000 Binary files a/assets/image/xin_rq.png and /dev/null differ diff --git a/assets/image/xin_rq.webp b/assets/image/xin_rq.webp new file mode 100644 index 00000000..b0f51560 Binary files /dev/null and b/assets/image/xin_rq.webp differ diff --git a/assets/image/yao_q.png b/assets/image/yao_q.png deleted file mode 100644 index d683294c..00000000 Binary files a/assets/image/yao_q.png and /dev/null differ diff --git a/assets/image/yao_q.webp b/assets/image/yao_q.webp new file mode 100644 index 00000000..df6e379f Binary files /dev/null and b/assets/image/yao_q.webp differ diff --git a/assets/image/yq.png b/assets/image/yq.png deleted file mode 100644 index dbbd30c9..00000000 Binary files a/assets/image/yq.png and /dev/null differ diff --git a/assets/image/yq.webp b/assets/image/yq.webp new file mode 100644 index 00000000..1778c916 Binary files /dev/null and b/assets/image/yq.webp differ diff --git a/assets/image/yq_qx.png b/assets/image/yq_qx.png deleted file mode 100644 index 52378b57..00000000 Binary files a/assets/image/yq_qx.png and /dev/null differ diff --git a/assets/image/yq_qx.webp b/assets/image/yq_qx.webp new file mode 100644 index 00000000..4ad47594 Binary files /dev/null and b/assets/image/yq_qx.webp differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 26d1a564..8b1a0fe0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -213,10 +213,10 @@ PODS: - SSZipArchive (2.4.2) - thumbnails (0.0.1): - Flutter - - TPNS-iOS (1.3.3.0) - - tpns_flutter_plugin (1.1.2): + - TPNS-iOS (1.3.4.1) + - tpns_flutter_plugin (1.1.4): - Flutter - - TPNS-iOS (= 1.3.3.0) + - TPNS-iOS (= 1.3.4.1) - url_launcher (0.0.1): - Flutter - video_player (0.0.1): @@ -317,7 +317,7 @@ SPEC CHECKSUMS: flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c - fluwx: c192ef1ea3617badb813fa1a761ffc5c9c12208a + fluwx: 02670633ce7509206f62b366e9734e7dda81e100 image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e @@ -330,8 +330,8 @@ SPEC CHECKSUMS: sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad - TPNS-iOS: 57a146496858ba2fb5d43e5f240feb19243b69cb - tpns_flutter_plugin: a366649c8ad71f19dfb864d3c994ed0480b69daa + TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff + tpns_flutter_plugin: 9bbb12c9cc9682a5aec38a7def5c01ddb0cf0723 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9ed6d340..9553253d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 83; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.79; + MARKETING_VERSION = 1.0.83; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -816,7 +816,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 83; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.79; + MARKETING_VERSION = 1.0.83; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -907,7 +907,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 83; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.79; + MARKETING_VERSION = 1.0.83; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/ios/Runner/AppDelegate.mm b/ios/Runner/AppDelegate.mm index d7a1f2e5..7169e504 100644 --- a/ios/Runner/AppDelegate.mm +++ b/ios/Runner/AppDelegate.mm @@ -1,6 +1,5 @@ #import "AppDelegate.h" #import "GeneratedPluginRegistrant.h" -#import "WXApi.h" @implementation AppDelegate @@ -10,12 +9,28 @@ [GeneratedPluginRegistrant registerWithRegistry:self]; // Override point for customization after application launch. - - return [super application:application didFinishLaunchingWithOptions:launchOptions]; +FlutterViewController* controller = (FlutterViewController*)self.window.rootViewController; +__block NSDictionary *remoteNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey]; + + FlutterMethodChannel* bridgeAppChannel = [FlutterMethodChannel methodChannelWithName:@"bridge" binaryMessenger:(NSObject *)controller]; + [bridgeAppChannel setMethodCallHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult _Nonnull result) { + NSString * method = call.method; + if ([method isEqual:@"action"]) { + if (remoteNotification != NULL) { + result(remoteNotification[@"custom"]); + remoteNotification = nil; + } + result(@""); + } + if ([method isEqual:@"toAppStore"]) { + NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review"; + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]]; + result(@""); + } + //result(FlutterMethodNotImplemented); + }]; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } - - - -@end +@end \ No newline at end of file diff --git a/lib/address/address_map_page.dart b/lib/address/address_map_page.dart index a88efc69..0db191ba 100644 --- a/lib/address/address_map_page.dart +++ b/lib/address/address_map_page.dart @@ -220,7 +220,7 @@ class _AddressMapPage extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweigongnengweikaiqi, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).dakaidingwei, @@ -244,7 +244,7 @@ class _AddressMapPage extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweiquanxianweiyunxu, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).kaiqiquanxian, @@ -311,7 +311,7 @@ class _AddressMapPage extends State { isLockedToScreen: true, centerOffset: BMFPoint(0.5, 0.7), enabled: false, - icon: "assets/image/icon_address_location.png", + icon: "assets/image/icon_address_location.webp", draggable: false, ); _mapController.addMarker(bmfMarker); @@ -394,7 +394,7 @@ class _AddressMapPage extends State { // child: Container( // margin: EdgeInsets.only(bottom: 44.h), // child: Image.asset( - // "assets/image/icon_address_location.png", + // "assets/image/icon_address_location.webp", // width: 66.w, // height: 75.h, // ), @@ -418,7 +418,7 @@ class _AddressMapPage extends State { color: Colors.white, ), child: Image.asset( - "assets/image/icon_address_location_action.png", + "assets/image/icon_address_location_action.webp", width: 16.w, height: 16.h, ), diff --git a/lib/article/hot_article_details_page.dart b/lib/article/hot_article_details_page.dart index 025199ad..bb517dd1 100644 --- a/lib/article/hot_article_details_page.dart +++ b/lib/article/hot_article_details_page.dart @@ -26,7 +26,7 @@ class _HotArticleDetailsPage extends State { action: Padding( padding: EdgeInsets.only(right: 16.w), child: Image.asset( - "assets/image/icon_share.png", + "assets/image/icon_share.webp", width: 24.w, height: 24.h, ), @@ -247,7 +247,7 @@ class _HotArticleDetailsPage extends State { color: Color(0XFF1A1A1A)), ), ), - Image.asset("assets/image/icon_like_h.png") + Image.asset("assets/image/icon_like_h.webp") ], ), ), @@ -271,7 +271,7 @@ class _HotArticleDetailsPage extends State { // }); // }, // child: Image.asset( - // "assets/image/icon_share.png", + // "assets/image/icon_share.webp", // width: 24, // height: 24, // ), @@ -362,7 +362,7 @@ class _HotArticleDetailsPage extends State { child: Row( children: [ Image.asset( - "assets/image/icon_like.png", + "assets/image/icon_like.webp", width: 16.w, height: 16.h, ), diff --git a/lib/article/video_playback_page.dart b/lib/article/video_playback_page.dart index 67e1fb09..a5a38e43 100644 --- a/lib/article/video_playback_page.dart +++ b/lib/article/video_playback_page.dart @@ -88,7 +88,7 @@ class _VideoPlaybackPage extends State { }, ), Image.asset( - "assets/image/icon_share_w.png", + "assets/image/icon_share_w.webp", width: 24.w, height: 24.h, ), @@ -290,7 +290,7 @@ class _VideoPlaybackPage extends State { color: Color(0XFF1A1A1A)), ), ), - Image.asset("assets/image/icon_like_h.png") + Image.asset("assets/image/icon_like_h.webp") ], ), ), @@ -361,7 +361,7 @@ class _VideoPlaybackPage extends State { child: Row( children: [ Image.asset( - "assets/image/icon_like.png", + "assets/image/icon_like.webp", width: 16.w, height: 16.h, ), diff --git a/lib/community/community_child_page.dart b/lib/community/community_child_page.dart index 968a0140..b4c84200 100644 --- a/lib/community/community_child_page.dart +++ b/lib/community/community_child_page.dart @@ -18,15 +18,15 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; class CommunityChildPage extends StatefulWidget { final String typeStr; - CommunityChildPage(this.typeStr); + CommunityChildPage(Key key, this.typeStr): super(key: key); @override State createState() { - return _CommunityChildPage(); + return CommunityChildPageState(); } } -class _CommunityChildPage extends State with AutomaticKeepAliveClientMixin { +class CommunityChildPageState extends State with AutomaticKeepAliveClientMixin { RefreshController refreshController = RefreshController(); ApiService apiService; int pageNum = 1; @@ -38,10 +38,10 @@ class _CommunityChildPage extends State with AutomaticKeepAl @override void initState() { super.initState(); - _onRefresh(); + onRefresh(); } - _onRefresh() async { + onRefresh() async { setState(() {}); } @@ -120,13 +120,13 @@ class _CommunityChildPage extends State with AutomaticKeepAl return MyFooter(mode); }, ), - onRefresh: _onRefresh, + onRefresh: onRefresh, onLoading: () { isLoadMore = true; setState(() {}); }, child: (articles == null || articles.length == 0)? NoDataView( - src: "assets/image/guan_zhu.png", + src: "assets/image/guan_zhu.webp", isShowBtn: false, text: "目前暂无添加关注,可在推荐中关注自己喜欢的人哦~", fontSize: 16.sp, @@ -142,7 +142,7 @@ class _CommunityChildPage extends State with AutomaticKeepAl isList: true, exitFull: () { setState(() { - _onRefresh(); + onRefresh(); }); }, ), @@ -154,7 +154,7 @@ class _CommunityChildPage extends State with AutomaticKeepAl "userId": userId, }, ).then((value) { - _onRefresh(); + onRefresh(); setState(() {}); }); setState(() {}); diff --git a/lib/community/community_course.dart b/lib/community/community_course.dart index 06210d79..a610886c 100644 --- a/lib/community/community_course.dart +++ b/lib/community/community_course.dart @@ -129,8 +129,7 @@ class _CommunityCourse extends State refreshController.loadFailed(); } }); - - if (baseData.isSuccess) { + if (baseData != null && baseData.isSuccess) { if(categoryId == "") { refreshController.refreshCompleted(); refreshController.loadComplete(); @@ -198,6 +197,7 @@ class _CommunityCourse extends State _onRefresh(){ queryCourseBanner(); classListAsync(); + collectionList(); } @override @@ -211,10 +211,16 @@ class _CommunityCourse extends State child: SmartRefresher( controller: refreshController, enablePullDown: true, - enablePullUp: true, + enablePullUp: false, header: MyHeader(), - onRefresh: _onRefresh, - onLoading: () { + footer: CustomFooter( + builder: (context, mode) { + return MyFooter(mode); + }, + ), + onRefresh:(){ + setState(() {_onRefresh(); + }); }, physics: BouncingScrollPhysics(), scrollController: scrollController, diff --git a/lib/community/community_list.dart b/lib/community/community_list.dart index f147987b..128a49ac 100644 --- a/lib/community/community_list.dart +++ b/lib/community/community_list.dart @@ -149,8 +149,8 @@ class _CommunityList extends State { radius: BorderRadius.circular(2), width: MediaQuery.of(context).size.width / 1.5, height: MediaQuery.of(context).size.width/1.5, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", )), ); } else { @@ -184,8 +184,8 @@ class _CommunityList extends State { fit: BoxFit.cover, aspectRatio: 1, radius: BorderRadius.circular(1), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), ); @@ -207,8 +207,8 @@ class _CommunityList extends State { subjectInfo.video.replaceAll(".mp4", "_poster.jpg"), fit: BoxFit.cover, radius: BorderRadius.circular(2), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), Center( @@ -281,8 +281,8 @@ class _CommunityList extends State { height: 44, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), SizedBox( diff --git a/lib/community/community_page.dart b/lib/community/community_page.dart index 61ea508c..92124c1f 100644 --- a/lib/community/community_page.dart +++ b/lib/community/community_page.dart @@ -21,13 +21,15 @@ class _CommunityPage extends State TabController tabcontroller; CommunityChildPage guanzhu,tuijian ; + final GlobalKey tuijianKey = GlobalKey(); + final GlobalKey guanzhuKey = GlobalKey(); List lables = [ "关注", - "推荐", - "头条", - "课程", - "关于我们", + "分享健康", + "了解健康", + "学习健康", + "关于回乡", // "直播", ]; @@ -41,6 +43,13 @@ class _CommunityPage extends State _toRelease() async { await Navigator.of(context).pushNamed('/router/release_dynamic'); + if(tabcontroller.index == 0){ + CommunityChildPageState page = guanzhuKey.currentState; + page.onRefresh(); + }else if(tabcontroller.index == 1){ + CommunityChildPageState page = tuijianKey.currentState; + page.onRefresh(); + } } @override @@ -94,21 +103,21 @@ class _CommunityPage extends State child: TabBarView( physics: BouncingScrollPhysics(), children: lables.map((e) { - if (e == "关于我们") { + if (e == "关于回乡") { return BrandPage(); - }else if(e == "头条"){ + }else if(e == "了解健康"){ return ArticlePage(); - }else if(e == "课程"){ + }else if(e == "学习健康"){ return CommunityCourse(); } - else if(e == "推荐"){ + else if(e == "分享健康"){ if (tuijian == null){ - tuijian = CommunityChildPage("推荐"); + tuijian = CommunityChildPage(tuijianKey,"分享健康"); } return tuijian; }else if(e == "关注"){ if (guanzhu == null){ - guanzhu = CommunityChildPage("关注"); + guanzhu = CommunityChildPage(guanzhuKey,"关注"); } return guanzhu; } diff --git a/lib/community/community_view/class_details.dart b/lib/community/community_view/class_details.dart index 21b0cc94..fd307845 100644 --- a/lib/community/community_view/class_details.dart +++ b/lib/community/community_view/class_details.dart @@ -166,7 +166,7 @@ class _ClassDetails extends State with WidgetsBindingObserver { children: [ GestureDetector( child: Image.asset( - "assets/image/integral_return.png", + "assets/image/integral_return.webp", width: 24, height: 24, ), diff --git a/lib/community/community_view/class_details_video.dart b/lib/community/community_view/class_details_video.dart index 5c60c698..752880f8 100644 --- a/lib/community/community_view/class_details_video.dart +++ b/lib/community/community_view/class_details_video.dart @@ -97,8 +97,8 @@ class ClassDetailsVideoState extends State { Widget build(BuildContext context) { return Container( key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ?videoWidget( - MediaQuery.of(context).size.width, - (MediaQuery.of(context).size.width/videoPlayerController.value.aspectRatio)-43, + MediaQuery.of(context).size.height, + (MediaQuery.of(context).size.height/videoPlayerController.value.aspectRatio)-43, widget.coverImg, ):Container()); } @@ -166,8 +166,8 @@ class ClassDetailsVideoState extends State { child: MImage( src, fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), Center( diff --git a/lib/community/community_view/class_list_view.dart b/lib/community/community_view/class_list_view.dart index 1d98a33f..92f45945 100644 --- a/lib/community/community_view/class_list_view.dart +++ b/lib/community/community_view/class_list_view.dart @@ -100,8 +100,8 @@ class _ClassListView extends State { width: double.infinity, height: 120, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), borderRadius: BorderRadius.vertical( @@ -118,7 +118,7 @@ class _ClassListView extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - "assets/image/ketang_play.png", + "assets/image/ketang_play.webp", width: 16.w, height: 16.h, color: Colors.white, @@ -138,7 +138,7 @@ class _ClassListView extends State { // Row( // children: [ // Image.asset( - // "assets/image/ketang_message.png", + // "assets/image/ketang_message.webp", // width: 16.w, // height: 16.h, // color: Colors.white, diff --git a/lib/community/community_view/community_comment.dart b/lib/community/community_view/community_comment.dart index 1ea7bc0c..b364973f 100644 --- a/lib/community/community_view/community_comment.dart +++ b/lib/community/community_view/community_comment.dart @@ -40,8 +40,8 @@ class _CommunityComment extends State { isCircle: true, width: 40, height: 40, - fadeSrc: "assets/image/default_user.png", - errorSrc: "assets/image/default_user.png", + fadeSrc: "assets/image/default_user.webp", + errorSrc: "assets/image/default_user.webp", ), SizedBox( width: 12.w, @@ -104,12 +104,12 @@ class _CommunityComment extends State { likeBuilder: (bool isLiked) { return isLiked ? Image.asset( - "assets/image/icon_like.png", + "assets/image/icon_like.webp", width: 16, height: 16, ) : Image.asset( - "assets/image/icon_like_h.png", + "assets/image/icon_like_h.webp", width: 16, height: 16, ); diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 116c55ed..350c0365 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -143,6 +143,17 @@ class _CommunityDynamic extends State { } } + goPersonalPage()async{ + await Navigator.of(context) + .pushNamed('/router/personal_page', arguments: { + "memberId": + (widget.article.author == widget.userId) + ? "0" + : widget.article.author, + }); + widget.exitFull(); + } + @override Widget build(BuildContext context) { return Column( @@ -151,7 +162,7 @@ class _CommunityDynamic extends State { margin: EdgeInsets.only(top: 2), key: globalKey, alignment: Alignment.topCenter, - padding: EdgeInsets.all(16), + padding: EdgeInsets.only(left: 16,top: 16,right: 16), decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -188,13 +199,7 @@ class _CommunityDynamic extends State { // index: 0, //传入当前点击的图片的index // ), // )); - Navigator.of(context) - .pushNamed('/router/personal_page', arguments: { - "memberId": - (widget.article.author == widget.userId) - ? "0" - : widget.article.author, - }); + goPersonalPage(); }, child: MImage( (widget?.article?.authorHeadImg ?? @@ -203,8 +208,8 @@ class _CommunityDynamic extends State { height: 44, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), SizedBox( @@ -333,12 +338,16 @@ class _CommunityDynamic extends State { height: 5.h, ), if (!widget.isDetails) - Row( + Container( + // padding: EdgeInsets.only(bottom: 16), + child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( - child: Row( + child: Container( + padding: EdgeInsets.only(bottom: 16), + child:Row( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, children: [ @@ -361,33 +370,37 @@ class _CommunityDynamic extends State { ), ), ], - ), + )), ), Expanded( - child: Row( - // mainAxisAlignment: MainAxisAlignment.center, - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SvgPicture.asset( - "assets/svg/pinglun.svg", - width: 16, - height: 16, - ), - SizedBox( - width: 5, - ), - Text( - "${widget.article.comments ?? 0}", - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF1A1A1A), - ), - ), - ], - )), + child:Container( + padding: EdgeInsets.only(bottom: 16), + child:Row( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SvgPicture.asset( + "assets/svg/pinglun.svg", + width: 16, + height: 16, + ), + SizedBox( + width: 5, + ), + Text( + "${widget.article.comments ?? 0}", + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF1A1A1A), + ), + ), + ], + ))), Expanded( - child: Row( + child:Container( + padding: EdgeInsets.only(bottom: 16), + child:Row( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, children: [ @@ -408,29 +421,32 @@ class _CommunityDynamic extends State { ), ), ], - ), + )), ), - // Expanded( - // child: GestureDetector( - // behavior: HitTestBehavior.opaque, - // onTap: () { - // setState(() { - // choiceShowBottomSheet(); - // }); - // }, - // child: Container( - // alignment: Alignment.center, - // child: Text( - // "...", - // style: TextStyle( - // fontSize: 18.sp, - // fontWeight: MyFontWeight.medium, - // color: Colors.black, - // ), - // ), - // ))), + if (widget?.article?.author != widget.userId ?? "") + Expanded( + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + setState(() { + choiceShowBottomSheet(); + }); + }, + child: Container( + padding: EdgeInsets.only(top:3,bottom: 16), + alignment: Alignment.center, + // color: Colors.red, + child: Text( + "...", + style: TextStyle( + fontSize: 18.sp, + fontWeight: MyFontWeight.medium, + color: Colors.black, + ), + ), + ))), ], - ), + ),), ], ), ), @@ -525,8 +541,8 @@ class _CommunityDynamic extends State { fit: BoxFit.contain, radius: BorderRadius.circular(2), height: MediaQuery.of(context).size.width / 1.5, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", )), ); } else { @@ -563,8 +579,8 @@ class _CommunityDynamic extends State { fit: BoxFit.cover, aspectRatio: 1, radius: BorderRadius.circular(1), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), ); @@ -646,8 +662,8 @@ class _CommunityDynamic extends State { ? videoPlayerController.value.aspectRatio : (width / 7 * 5), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), Center( @@ -765,8 +781,8 @@ class _CommunityDynamic extends State { topLeft: const Radius.circular(25.0), topRight: const Radius.circular(25.0))), child: Container( - width: 100.w, - height: 100.h, + width: 130.w, + height: 130.h, child: Column( children: [ SizedBox( @@ -775,8 +791,8 @@ class _CommunityDynamic extends State { GestureDetector( onTap: () { setState(() { - Navigator.of(context).pop(); - share(); + // Navigator.of(context).pop(); + // share(); }); }, child: Container( @@ -786,7 +802,7 @@ class _CommunityDynamic extends State { width: 4, ), Image.asset( - "assets/image/icon_share.png", + "assets/image/icon_share.webp", fit: BoxFit.cover, width: 25, height: 25, @@ -815,7 +831,10 @@ class _CommunityDynamic extends State { onTap: () { setState(() { Navigator.of(context) - .popAndPushNamed('/router/report_page'); + .popAndPushNamed('/router/report_page',arguments: { + "userName":widget?.article?.authorName ?? "", + "authorId":widget?.article?.author ?? "", + }); }); }, child: Row( @@ -832,7 +851,7 @@ class _CommunityDynamic extends State { width: 15, ), Text( - "举报", + "举报该内容", style: TextStyle( fontSize: 17.sp, fontWeight: MyFontWeight.medium, diff --git a/lib/community/community_view/course_banner.dart b/lib/community/community_view/course_banner.dart index bf0241b9..ac9d4a8e 100644 --- a/lib/community/community_view/course_banner.dart +++ b/lib/community/community_view/course_banner.dart @@ -59,8 +59,8 @@ class _CourseBanner extends State { : "", fit: BoxFit.cover, radius: BorderRadius.circular(8), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/community/community_view/home_class.dart b/lib/community/community_view/home_class.dart index c7651740..ac7644a4 100644 --- a/lib/community/community_view/home_class.dart +++ b/lib/community/community_view/home_class.dart @@ -155,8 +155,8 @@ class _HomeClass extends State { width: double.infinity, height: 120, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), borderRadius: BorderRadius.vertical( @@ -173,7 +173,7 @@ class _HomeClass extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - "assets/image/ketang_play.png", + "assets/image/ketang_play.webp", width: 16.w, height: 16.h, color: Colors.white, @@ -193,7 +193,7 @@ class _HomeClass extends State { // Row( // children: [ // Image.asset( - // "assets/image/ketang_message.png", + // "assets/image/ketang_message.webp", // width: 16.w, // height: 16.h, // color: Colors.white, diff --git a/lib/community/headlines/activity_top_list.dart b/lib/community/headlines/activity_top_list.dart index 32e7bc3e..993bf420 100644 --- a/lib/community/headlines/activity_top_list.dart +++ b/lib/community/headlines/activity_top_list.dart @@ -94,8 +94,8 @@ class _ActivityTopList extends State { width: 340.w, height: 220.h, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), borderRadius: BorderRadius.vertical( @@ -109,7 +109,7 @@ class _ActivityTopList extends State { child: Row( children: [ Image.asset( - "assets/image/activity_hot.png", + "assets/image/activity_hot.webp", width: 20, height: 20, fit: BoxFit.fill, diff --git a/lib/community/headlines/article_list.dart b/lib/community/headlines/article_list.dart index 4bf58089..a7644f4c 100644 --- a/lib/community/headlines/article_list.dart +++ b/lib/community/headlines/article_list.dart @@ -23,7 +23,6 @@ class ArticleList extends StatefulWidget { class _ArticleList extends State { ApiService apiService; - int pageNum = 0; @override void initState() { @@ -134,7 +133,7 @@ class _ArticleList extends State { ), SizedBox(width: 8), Image.asset( - "assets/image/browse.png", + "assets/image/browse.webp", width: 14, height: 14, color: Color(0xFF808080), diff --git a/lib/community/headlines/article_page.dart b/lib/community/headlines/article_page.dart index 1154dab6..ebfeebc1 100644 --- a/lib/community/headlines/article_page.dart +++ b/lib/community/headlines/article_page.dart @@ -43,6 +43,7 @@ class _ArticlePage extends State List
articleTop = []; List headlines = []; int pageNum = 1; + bool isLoading = false; @override void initState() { @@ -94,6 +95,11 @@ class _ArticlePage extends State ///文章列表 queryArticleList(bool isHot) async { + if(!isHot && isLoading){ + return; + }else if(!isHot && !isLoading){ + isLoading = true; + } if (apiService == null) { SharedPreferences value = await SharedPreferences.getInstance(); apiService = ApiService( @@ -127,11 +133,13 @@ class _ArticlePage extends State articles.addAll(baseData.data.list); else articleTop.addAll(baseData.data.list); - if (baseData.data.pageNum == baseData.data.pages) { + if (baseData.data.pageNum == baseData.data.pages && !isHot) { refreshController.loadNoData(); } else { pageNum += 1; + refreshController.loadComplete(); } + isLoading = false; setState(() {}); } else { refreshController.refreshFailed(); @@ -164,6 +172,8 @@ class _ArticlePage extends State } _onRefresh() { + isLoading = true; + pageNum = 1; queryHeadlinesBanner(); queryHeadlinesList(); //分类列表 queryArticleList(false); @@ -180,7 +190,7 @@ class _ArticlePage extends State child: SmartRefresher( controller: refreshController, enablePullDown: true, - enablePullUp: true, + enablePullUp:true, header: MyHeader(), footer: CustomFooter( builder: (context, mode) { diff --git a/lib/community/headlines/headlines_banner.dart b/lib/community/headlines/headlines_banner.dart index 09a7401b..59e2e8c7 100644 --- a/lib/community/headlines/headlines_banner.dart +++ b/lib/community/headlines/headlines_banner.dart @@ -59,8 +59,8 @@ class _HeadlinesBanner extends State { : "", fit: BoxFit.cover, radius: BorderRadius.circular(8), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/community/headlines/headlines_collection.dart b/lib/community/headlines/headlines_collection.dart index 6b99e86c..bc7b91f9 100644 --- a/lib/community/headlines/headlines_collection.dart +++ b/lib/community/headlines/headlines_collection.dart @@ -87,8 +87,8 @@ class _HeadlinesCollection extends State { width: 225.w, height: 100.h, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), borderRadius: BorderRadius.vertical( diff --git a/lib/community/headlines/headlines_column_details.dart b/lib/community/headlines/headlines_column_details.dart index 1bf752f8..f249c8ae 100644 --- a/lib/community/headlines/headlines_column_details.dart +++ b/lib/community/headlines/headlines_column_details.dart @@ -153,8 +153,8 @@ class _HeadlinesColumnDetails extends State width: double.infinity, height: 260.h, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ) ) ) @@ -173,7 +173,7 @@ class _HeadlinesColumnDetails extends State children: [ GestureDetector( child: Image.asset( - "assets/image/integral_return.png", + "assets/image/integral_return.webp", width: 24, height: 24, ), @@ -375,7 +375,7 @@ class _HeadlinesColumnDetails extends State ), SizedBox(width: 8), Image.asset( - "assets/image/browse.png", + "assets/image/browse.webp", width: 14, height: 14, color: Color(0xFF808080), diff --git a/lib/community/new_community_details.dart b/lib/community/new_community_details.dart index 3c5afc10..6a07e675 100644 --- a/lib/community/new_community_details.dart +++ b/lib/community/new_community_details.dart @@ -184,8 +184,8 @@ class _NewCommunityDetails extends State with WidgetsBindin height: 44, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ), SizedBox( diff --git a/lib/community/report/report_notice.dart b/lib/community/report/report_notice.dart index 197fd882..58d8df21 100644 --- a/lib/community/report/report_notice.dart +++ b/lib/community/report/report_notice.dart @@ -2,7 +2,6 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; diff --git a/lib/community/report/report_page.dart b/lib/community/report/report_page.dart index fdebdfe7..0b10e0d9 100644 --- a/lib/community/report/report_page.dart +++ b/lib/community/report/report_page.dart @@ -1,12 +1,16 @@ import 'dart:ui'; +import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:shared_preferences/shared_preferences.dart'; class ReportPage extends StatefulWidget { final Map arguments; @@ -21,11 +25,37 @@ class ReportPage extends StatefulWidget { class _ReportPage extends State { ApiService apiService; - int checkIndex = 0; + int textLength = 0; + final TextEditingController editingController = TextEditingController(); + String textCon; + String userName; + String authorId; @override void initState() { super.initState(); + userName = widget.arguments['userName']; + authorId = widget.arguments['authorId']; + } + + report() async { + if (apiService == null) { + SharedPreferences value = await SharedPreferences.getInstance(); + apiService = ApiService( + Dio(), + context: context, + token: value.getString("token"), + ); + } + BaseData baseData = await apiService.complaint({ + "content": checkIndex == 9 ? editingController.text : textCon, + "informationId": authorId, + }).catchError((onError) {}); + if (baseData != null && baseData.isSuccess) { + Navigator.of(context).popAndPushNamed('/router/report_success'); + } else { + SmartDialog.showToast(baseData.msg, alignment: Alignment.center); + } } @override @@ -65,7 +95,7 @@ class _ReportPage extends State { ), ), TextSpan( - text: "@百花谷", + text: "@${userName.toString()}", style: TextStyle( fontSize: 16.sp, fontWeight: MyFontWeight.medium, @@ -84,7 +114,42 @@ class _ReportPage extends State { ), ), ), - report(), + reportContent(), + SizedBox(height: 12), + if (checkIndex == 9) + Container( + width: double.infinity, + height: 186.h, + margin: + EdgeInsets.only(right: 16, left: 40, bottom: 100), + decoration: new BoxDecoration( + color: Color(0xFFF7F7F7), + borderRadius: BorderRadius.circular(4.0), + ), + child: Container( + margin: EdgeInsets.fromLTRB(20.w, 5.h, 20.w, 0), + alignment: Alignment.topLeft, + child: TextField( + maxLines: 5, + controller: editingController, + onChanged: (value) { + setState(() { + textLength = value.length; + }); + }, + maxLength: 100, + decoration: InputDecoration( + border: InputBorder.none, + hintText: "请输入举报原因,以便我们更快定位问题,快速处理", + hintStyle: TextStyle( + fontSize: 12.sp, + height: 1.2, + fontWeight: MyFontWeight.regular, + color: Color(0xFF999999), + ), + ), + ), + )) ], ), ), @@ -92,7 +157,7 @@ class _ReportPage extends State { alignment: Alignment.bottomCenter, child: Container( width: double.infinity, - height:95, + height: 95, child: Column( children: [ GestureDetector( @@ -102,7 +167,7 @@ class _ReportPage extends State { }, child: Container( alignment: Alignment.bottomCenter, - margin: EdgeInsets.only(bottom:25), + margin: EdgeInsets.only(bottom: 25), child: Text( "投诉须知", style: TextStyle( @@ -112,15 +177,20 @@ class _ReportPage extends State { ), ), )), - Expanded(child: - GestureDetector( - onTap: (){ - Navigator.of(context) - .pushNamed('/router/report_success'); - }, - child: Container( + Expanded( + child: GestureDetector( + onTap: () { + if(checkIndex == 9 && editingController.text == ""){ + SmartDialog.showToast("请输入举报原因", alignment: Alignment.center); + return; + } + report(); + }, + child: Opacity( + opacity: checkIndex == 0 ? 0.3 : 0.9, + child: Container( width: double.infinity, - height:double.infinity, + height: double.infinity, color: Color(0xFF319E5F), alignment: Alignment.center, child: Text( @@ -131,7 +201,9 @@ class _ReportPage extends State { color: Color(0xFFFFFFFF), ), ), - ),)) + ), + ), + )) ], ), )) @@ -141,55 +213,95 @@ class _ReportPage extends State { ); } - Widget report() { - return Container( - padding: EdgeInsets.only(left: 16, right: 16), - child: - // (articles == null || articles.length == 0) - // ? NoDataView( - // src: "assets/image/dong_tai.png", - // isShowBtn: false, - // text: "目前暂无发布动态,要把开心的事讲出来哦~", - // fontSize: 16.sp, - // margin: EdgeInsets.only(left: 60.w, right: 60.w), - // ) : - ListView.builder( - physics: BouncingScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, position) { - return GestureDetector( - onTap: () {}, - child: reportList(), - ); - }, - itemCount: 9, - ), - ); - } - - Widget reportList() { + Widget reportContent() { return Container( - padding: EdgeInsets.only(top: 18, bottom: 20), - color: Color(0xFFFFFFFF), - child: Row( + width: double.infinity, + padding: EdgeInsets.only(left: 16, right: 16, top: 20), + child: Column( children: [ - Image.asset( - "assets/image/icon_radio_unselected.png", - width: 16, - height: 16, + content("色情低俗", 1), + SizedBox( + height: 18, ), + content("政治宗教", 2), SizedBox( - width: 8, + height: 18, ), - Expanded( - child: Text( - "色情低俗", - style: TextStyle( - color: Color(0xFF353535), - fontSize: 14.sp, - fontWeight: MyFontWeight.regular), - )) + content("广告骚扰", 3), + SizedBox( + height: 18, + ), + content("虚假欺骗", 4), + SizedBox( + height: 18, + ), + content("侵权(诽谤、抄袭、冒用)", 5), + SizedBox( + height: 18, + ), + content("不良封面/标题", 6), + SizedBox( + height: 18, + ), + content("赌博诈骗", 7), + SizedBox( + height: 18, + ), + content("违禁内容(暴利恐怖、令人不适、宣言仇恨)", 8), + SizedBox( + height: 18, + ), + content("其他", 9), ], )); } + + var checkIndex = 0; + + Widget checkView(var index) { + return Container( + padding: EdgeInsets.only(right: 16.w, left: 5), + alignment: Alignment.center, + // color: Colors.red, + child: Image.asset( + checkIndex != index + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", + width: 20.w, + height: 20.h, + ), + ); + } + + Widget content(textContext, var index) { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + setState(() { + checkIndex = index; + textCon = textContext; + }); + }, + child: Container( + alignment: Alignment.center, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + checkView(index), + Container(), + Expanded( + child: Text( + textContext, + style: TextStyle( + fontSize: 16.sp, + color: Color(0xFF353535), + fontWeight: MyFontWeight.regular, + ), + ), + ) + ], + ), + )); + } } diff --git a/lib/community/report/report_success.dart b/lib/community/report/report_success.dart index e6965ba3..8238476d 100644 --- a/lib/community/report/report_success.dart +++ b/lib/community/report/report_success.dart @@ -1,8 +1,8 @@ import 'dart:ui'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; @@ -40,9 +40,93 @@ class _ReportSuccess extends State { color: Color(0xFFFFFFFFF), padding: EdgeInsets.only(left: 16, top: 10, right: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ + Container( + margin: EdgeInsets.only(top: 36, bottom: 16), + alignment: Alignment.center, + child: Image.asset( + "assets/image/icon_order_success.webp", + fit: BoxFit.cover, + width: 76, + height: 76, + ), + ), + Align( + alignment: Alignment.center, + child: Text( + "提交成功", + style: TextStyle( + fontSize: 21.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF353535), + ), + ), + ), + SizedBox( + height: 11, + ), + RichText( + textAlign: TextAlign.center, + text: TextSpan( + text: "您的举报正在等待人工审核,我们会在7~15个工作日处理,处理结果可在", + style: TextStyle( + fontSize: 12.sp, + height: 1.5, + fontWeight: MyFontWeight.regular, + color: Color(0xFF727272), + ), + children: [ + TextSpan( + text: "系统消息", + recognizer: TapGestureRecognizer() + ..onTap = () { + Navigator.of(context) + .pushNamed('/router/system_msg_page'); + }, + style: TextStyle( + fontSize: 12.sp, + height: 1.5, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF32A060), + ), + ), + TextSpan( + text: "查看,请及时关注,谢谢!", + style: TextStyle( + fontSize: 12.sp, + height: 1.5, + fontWeight: MyFontWeight.regular, + color: Color(0xFF727272), + ), + ), + ]), + ), + SizedBox( + height: 43, + ), + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + }, + child: Container( + height: 54.h, + width: double.infinity, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Color(0xFF32A060), + borderRadius: BorderRadius.circular(8), + ), + child: Text( + "返回社群", + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Color(0xFFFFFFFF), + ), + ), + )), ], ), ), diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index bdde2d79..c535f77e 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -290,7 +290,7 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), @@ -337,7 +337,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 8848db4a..951e48f8 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index da25370b..a8740c47 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 635a3e71..f1e1e53d 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index d97896ed..bf3ff0f0 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 844a7a86..5dc61bfe 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -185,10 +185,10 @@ class S { ); } - /// `社群` + /// `发现` String get main_menu3 { return Intl.message( - '社群', + '发现', name: 'main_menu3', desc: '', args: [], @@ -225,10 +225,10 @@ class S { ); } - /// `积分商城` + /// `净弼积分商城` String get jifenshangcheng { return Intl.message( - '积分商城', + '净弼积分商城', name: 'jifenshangcheng', desc: '', args: [], diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart index 9fa55b6b..6d89ef10 100644 --- a/lib/home/activity_list_page.dart +++ b/lib/home/activity_list_page.dart @@ -156,8 +156,8 @@ class _ActivityListPage extends State topRight: Radius.circular(8), ), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), Container( padding: EdgeInsets.only( diff --git a/lib/home/founder_story_page.dart b/lib/home/founder_story_page.dart index aa91d452..d3680031 100644 --- a/lib/home/founder_story_page.dart +++ b/lib/home/founder_story_page.dart @@ -50,7 +50,7 @@ class _FounderStoryPage extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - "assets/image/icon_story_bj.png", + "assets/image/icon_story_bj.webp", alignment: Alignment.center, ), SizedBox( @@ -83,7 +83,7 @@ class _FounderStoryPage extends State { child: Align( alignment: Alignment.bottomRight, child: Image.asset( - "assets/image/icon_story_1.png", + "assets/image/icon_story_1.webp", width: 222.w, height: 52.h, ), @@ -107,14 +107,14 @@ class _FounderStoryPage extends State { height: 1.5.h), )), Image.asset( - "assets/image/icon_story_2.png", + "assets/image/icon_story_2.webp", alignment: Alignment.centerRight, ), SizedBox( height: 16.h, ), Image.asset( - "assets/image/laoban.png", + "assets/image/laoban.webp", fit: BoxFit.cover, width: double.infinity, height: 228.h, @@ -123,7 +123,7 @@ class _FounderStoryPage extends State { height: 50.h, ), Image.asset( - "assets/image/icon_story_bj.png", + "assets/image/icon_story_bj.webp", alignment: Alignment.center, ), SizedBox( @@ -160,7 +160,7 @@ class _FounderStoryPage extends State { "在山坡街拥有1200亩农业生产基地," "将台湾实践多年并有成功经验的生态农法, 天然食品加工技术, 农业旅游输出落地。"), Image.asset( - "assets/image/icon_story_bj.png", + "assets/image/icon_story_bj.webp", alignment: Alignment.center, ), SizedBox( @@ -175,7 +175,7 @@ class _FounderStoryPage extends State { height: 26.h, ), Image.asset( - "assets/image/icon_story_td.png", + "assets/image/icon_story_td.webp", fit: BoxFit.cover, width: double.infinity, height: 228.h, @@ -244,9 +244,9 @@ class _FounderStoryPage extends State { ), Row( children: [ - _ideaWidget("友爱", "assets/image/icon_idea_ya.png"), - _ideaWidget("纯净", "assets/image/icon_idea_cj.png"), - _ideaWidget("健康", "assets/image/icon_idea_jk.png"), + _ideaWidget("友爱", "assets/image/icon_idea_ya.webp"), + _ideaWidget("纯净", "assets/image/icon_idea_cj.webp"), + _ideaWidget("健康", "assets/image/icon_idea_jk.webp"), ], ), SizedBox( @@ -254,9 +254,9 @@ class _FounderStoryPage extends State { ), Row( children: [ - _ideaWidget("有机", "assets/image/icon_idea_yj.png"), - _ideaWidget("环保", "assets/image/icon_idea_hb.png"), - _ideaWidget("智慧", "assets/image/icon_idea_zh.png"), + _ideaWidget("有机", "assets/image/icon_idea_yj.webp"), + _ideaWidget("环保", "assets/image/icon_idea_hb.webp"), + _ideaWidget("智慧", "assets/image/icon_idea_zh.webp"), ], ), SizedBox( @@ -363,7 +363,7 @@ class _FounderStoryPage extends State { // color: Color(0XFF1A1A1A)), // ), // ), - // Image.asset("assets/image/icon_like_h.png") + // Image.asset("assets/image/icon_like_h.webp") // ], // ), // ), @@ -515,7 +515,7 @@ class _FounderStoryPage extends State { // child: Row( // children: [ // Image.asset( -// "assets/image/icon_like.png", +// "assets/image/icon_like.webp", // width: 16, // height: 16, // ), diff --git a/lib/home/guide_page.dart b/lib/home/guide_page.dart index b4860ee3..32a6031a 100644 --- a/lib/home/guide_page.dart +++ b/lib/home/guide_page.dart @@ -45,7 +45,7 @@ class _GuidePage extends State { Align( alignment: Alignment.center, child: Image.asset( - "assets/image/icon_guide_1.png", + "assets/image/icon_guide_1.webp", // height: 307, ), ), @@ -133,7 +133,7 @@ class _GuidePage extends State { Align( alignment: Alignment.center, child: Image.asset( - "assets/image/icon_guide_2.png", + "assets/image/icon_guide_2.webp", // height: 307, ), ), @@ -220,7 +220,7 @@ class _GuidePage extends State { Align( alignment: Alignment.center, child: Image.asset( - "assets/image/icon_guide_3.png", + "assets/image/icon_guide_3.webp", // height: 307, ), ), @@ -304,7 +304,7 @@ class _GuidePage extends State { Column( children: [ Image.asset( - "assets/image/icon_guide_4.png", + "assets/image/icon_guide_4.webp", width: double.infinity, fit: BoxFit.fill, ), diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 5c137aa4..5d187b72 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -526,7 +526,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_camera_permission_tips.png", + "assets/image/icon_camera_permission_tips.webp", S.of(context).ninxiangjiquanxianweikaiqi, S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, @@ -576,7 +576,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_camera_permission_tips.png", + "assets/image/icon_camera_permission_tips.webp", S.of(context).ninxiangjiquanxianweikaiqi, S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, diff --git a/lib/home/home_view/activity_list.dart b/lib/home/home_view/activity_list.dart index 826e916d..42132601 100644 --- a/lib/home/home_view/activity_list.dart +++ b/lib/home/home_view/activity_list.dart @@ -167,8 +167,8 @@ class _ActivityList extends State topRight: Radius.circular(8), ), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), Container( padding: EdgeInsets.only( diff --git a/lib/home/home_view/brand_view.dart b/lib/home/home_view/brand_view.dart index 76a51cea..7a0391b7 100644 --- a/lib/home/home_view/brand_view.dart +++ b/lib/home/home_view/brand_view.dart @@ -32,7 +32,7 @@ class _BrandView extends State { children: [ ItemTitle( text: S.of(context).pinpaijieshao, - imgPath: "assets/image/icon_brand_introduction.png", + imgPath: "assets/image/icon_brand_introduction.webp", ), brands(), ], @@ -68,8 +68,8 @@ class _BrandView extends State { widget.brandData != null ? widget.brandData[position].image : "", radius: BorderRadius.circular(8), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/home/home_view/coupon.dart b/lib/home/home_view/coupon.dart index 4eabcbf3..757c39f3 100644 --- a/lib/home/home_view/coupon.dart +++ b/lib/home/home_view/coupon.dart @@ -66,7 +66,7 @@ class _CouponView extends State { ), ItemTitle( text: S.of(context).chaojiyouhuiquan, - imgPath: "assets/image/icon_points_mall.png", + imgPath: "assets/image/icon_points_mall.webp", ), Container( height: 132, diff --git a/lib/home/home_view/featured_acticvity.dart b/lib/home/home_view/featured_acticvity.dart index 12324473..0e7b41d9 100644 --- a/lib/home/home_view/featured_acticvity.dart +++ b/lib/home/home_view/featured_acticvity.dart @@ -55,7 +55,7 @@ class _FeaturedActivity extends State { children: [ ItemTitle( text: "精选活动", - imgPath: "assets/image/home_activity.png", + imgPath: "assets/image/home_activity.webp", moreText: S.of(context).chakangengduo, onTap: () { Navigator.of(context).pushNamed('/router/activity_list'); diff --git a/lib/home/home_view/founder_store.dart b/lib/home/home_view/founder_store.dart index 43fa8663..a5346775 100644 --- a/lib/home/home_view/founder_store.dart +++ b/lib/home/home_view/founder_store.dart @@ -28,7 +28,7 @@ class _FounderStore extends State { children: [ ItemTitle( text: S.of(context).chuangshirendegushi1, - imgPath: "assets/image/icon_founder.png", + imgPath: "assets/image/icon_founder.webp", ), GestureDetector( onTap: () { @@ -64,8 +64,8 @@ class _FounderStore extends State { aspectRatio: 2, radius: BorderRadius.circular(4.w), // fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), Container( padding: EdgeInsets.all(8.w), diff --git a/lib/home/home_view/home_banner.dart b/lib/home/home_view/home_banner.dart index a677bc8d..4d3df053 100644 --- a/lib/home/home_view/home_banner.dart +++ b/lib/home/home_view/home_banner.dart @@ -55,8 +55,8 @@ class _HomeBanner extends State { : "", radius: BorderRadius.circular(8), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), ); diff --git a/lib/home/home_view/home_integral_store.dart b/lib/home/home_view/home_integral_store.dart index f264618c..7be9fe25 100644 --- a/lib/home/home_view/home_integral_store.dart +++ b/lib/home/home_view/home_integral_store.dart @@ -107,8 +107,8 @@ class _HomeIntegralStore extends State { aspectRatio: 5 / 3, radius: BorderRadius.circular(4), fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( height: 4.h, diff --git a/lib/home/home_view/hot_article.dart b/lib/home/home_view/hot_article.dart index 685f57e7..1c9b9e6d 100644 --- a/lib/home/home_view/hot_article.dart +++ b/lib/home/home_view/hot_article.dart @@ -26,7 +26,7 @@ class _HotArticle extends State { children: [ ItemTitle( text: S.of(context).huixiangtoutiao, - imgPath: "assets/image/icon_today_video.png", + imgPath: "assets/image/icon_today_video.webp", moreText: S.of(context).chakangengduo, onTap: () { Navigator.of(context) diff --git a/lib/home/home_view/quick_order.dart b/lib/home/home_view/quick_order.dart index 869dd058..1652d6aa 100644 --- a/lib/home/home_view/quick_order.dart +++ b/lib/home/home_view/quick_order.dart @@ -160,7 +160,7 @@ class _QuickOrder extends State { children: [ ItemTitle( text: "店铺推荐", - imgPath: "assets/image/icon_shop.png", + imgPath: "assets/image/icon_shop.webp", ), Container( height: 170, @@ -226,8 +226,8 @@ class _QuickOrder extends State { width: double.infinity, height: 100, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), borderRadius: BorderRadius.vertical( top: Radius.circular(4), @@ -261,8 +261,8 @@ class _QuickOrder extends State { height: 32, fit: BoxFit.cover, isCircle: true, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Padding( padding: EdgeInsets.only(left: 10, right: 10), @@ -378,7 +378,7 @@ class _QuickOrder extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_camera_permission_tips.png", + "assets/image/icon_camera_permission_tips.webp", S.of(context).ninxiangjiquanxianweikaiqi, S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, diff --git a/lib/home/home_view/shortcut_operation.dart b/lib/home/home_view/shortcut_operation.dart index 5f97060a..8d7fb5f7 100644 --- a/lib/home/home_view/shortcut_operation.dart +++ b/lib/home/home_view/shortcut_operation.dart @@ -81,7 +81,7 @@ class _ShortcutOperation extends State { ), SizedBox(height: 20), Expanded(child: Image.asset( - "assets/image/home_order.png", + "assets/image/home_order.webp", width:70, height:70, ),), @@ -130,7 +130,7 @@ class _ShortcutOperation extends State { ), SizedBox(height: 20), Expanded(child:Image.asset( - "assets/image/home_recharge.png", + "assets/image/home_recharge.webp", width:70, height:70, ),), @@ -178,7 +178,7 @@ class _ShortcutOperation extends State { ), SizedBox(height: 20), Expanded(child: Image.asset( - "assets/image/home_coupon.png", + "assets/image/home_coupon.webp", width:70, height:70, ), ), diff --git a/lib/home/home_view/sign_view.dart b/lib/home/home_view/sign_view.dart index 25b74d92..99dae84a 100644 --- a/lib/home/home_view/sign_view.dart +++ b/lib/home/home_view/sign_view.dart @@ -24,7 +24,7 @@ class SignView extends StatelessWidget { ), ItemTitle( text: S.of(context).jinrihuiyuanrenwu, - imgPath: "assets/image/icon_today_task.png", + imgPath: "assets/image/icon_today_task.webp", moreText: S.of(context).renwuzhongxin, onTap: () { SharedPreferences.getInstance().then((value) { @@ -86,7 +86,7 @@ class SignView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_calendar_today_sharp.png", + "assets/image/icon_calendar_today_sharp.webp", width: 20.w, height: 20.h, ), diff --git a/lib/home/huixiang_view/huixiang_banner.dart b/lib/home/huixiang_view/huixiang_banner.dart index 6aa42a5f..e4361723 100644 --- a/lib/home/huixiang_view/huixiang_banner.dart +++ b/lib/home/huixiang_view/huixiang_banner.dart @@ -50,8 +50,8 @@ class _HuiXiangBanner extends State { : "", fit: BoxFit.cover, radius: BorderRadius.circular(8), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/home/huixiang_view/origin_info.dart b/lib/home/huixiang_view/origin_info.dart index 1b4a114d..a825efa6 100644 --- a/lib/home/huixiang_view/origin_info.dart +++ b/lib/home/huixiang_view/origin_info.dart @@ -57,8 +57,8 @@ class _OriginInfo extends State { fit: BoxFit.cover, width: 60, height: 60, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), clipBehavior: Clip.hardEdge, ), @@ -199,9 +199,9 @@ class _OriginInfo extends State { children: [ Row( children: [ - _ideaWidget("友爱", "assets/image/icon_idea_ya.png"), - _ideaWidget("纯净", "assets/image/icon_idea_cj.png"), - _ideaWidget("健康", "assets/image/icon_idea_jk.png"), + _ideaWidget("友爱", "assets/image/icon_idea_ya.webp"), + _ideaWidget("纯净", "assets/image/icon_idea_cj.webp"), + _ideaWidget("健康", "assets/image/icon_idea_jk.webp"), ], ), SizedBox( @@ -209,9 +209,9 @@ class _OriginInfo extends State { ), Row( children: [ - _ideaWidget("有机", "assets/image/icon_idea_yj.png"), - _ideaWidget("环保", "assets/image/icon_idea_hb.png"), - _ideaWidget("智慧", "assets/image/icon_idea_zh.png"), + _ideaWidget("有机", "assets/image/icon_idea_yj.webp"), + _ideaWidget("环保", "assets/image/icon_idea_hb.webp"), + _ideaWidget("智慧", "assets/image/icon_idea_zh.webp"), ], ), ], diff --git a/lib/home/main_home_page.dart b/lib/home/main_home_page.dart index ff6efe0e..5dee3da6 100644 --- a/lib/home/main_home_page.dart +++ b/lib/home/main_home_page.dart @@ -63,7 +63,7 @@ class _MainHomePage extends State Navigator.of(context).pushNamed('/router/system_msg_page'); }, child: Image.asset( - "assets/image/icon_notices.png", + "assets/image/icon_notices.webp", width: 24, height: 24, ), diff --git a/lib/home/points_mall_view/point_mall_user.dart b/lib/home/points_mall_view/point_mall_user.dart index 6e3e78dc..7950c54b 100644 --- a/lib/home/points_mall_view/point_mall_user.dart +++ b/lib/home/points_mall_view/point_mall_user.dart @@ -40,8 +40,8 @@ class _PointMallUser extends State { height: 50, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + errorSrc: "assets/image/default_user.webp", + fadeSrc: "assets/image/default_user.webp", ), Expanded( child: Container( @@ -74,7 +74,7 @@ class _PointMallUser extends State { width: 4.w, ), Image.asset( - "assets/image/icon_user.png", + "assets/image/icon_user.webp", width: 18.w, height: 18.h, ), diff --git a/lib/home/points_mall_view/points_goods_title.dart b/lib/home/points_mall_view/points_goods_title.dart index e9b12d45..f3f9b44f 100644 --- a/lib/home/points_mall_view/points_goods_title.dart +++ b/lib/home/points_mall_view/points_goods_title.dart @@ -44,11 +44,11 @@ class _PointsGoodsTitle extends State { children: [ ItemTitle( text: S.of(context).jifenshangcheng, - imgPath: "assets/image/icon_points_mall.png", + imgPath: "assets/image/icon_points_mall.webp", ), // ItemTitle( // text: S.of(context).jifenshangcheng, - // imgPath: "assets/image/icon_points_mall.png", + // imgPath: "assets/image/icon_points_mall.webp", // moreText: _itemText, // moreType: 1, // items: sortString diff --git a/lib/home/points_mall_view/points_goods_view.dart b/lib/home/points_mall_view/points_goods_view.dart index 6859aa03..514dcd4c 100644 --- a/lib/home/points_mall_view/points_goods_view.dart +++ b/lib/home/points_mall_view/points_goods_view.dart @@ -83,8 +83,8 @@ class _PointGoods extends State { topRight: Radius.circular(4), ), fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Expanded( child: Container( @@ -164,7 +164,7 @@ class _PointGoods extends State { child: ClipRRect( borderRadius: BorderRadius.only(topRight: Radius.circular(4)), child: Image.asset( - "assets/image/icon_hot_right_top.png", + "assets/image/icon_hot_right_top.webp", width: 36, height: 36, fit: BoxFit.cover, diff --git a/lib/home/points_mall_view/points_mall_banner.dart b/lib/home/points_mall_view/points_mall_banner.dart index 3e9e6814..6ea77bdc 100644 --- a/lib/home/points_mall_view/points_mall_banner.dart +++ b/lib/home/points_mall_view/points_mall_banner.dart @@ -57,8 +57,8 @@ class _PointMallBanner extends State { : "", radius: BorderRadius.circular(8), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ), ); diff --git a/lib/integral/integral_detailed_page.dart b/lib/integral/integral_detailed_page.dart index 0f03ac05..0ca14c82 100644 --- a/lib/integral/integral_detailed_page.dart +++ b/lib/integral/integral_detailed_page.dart @@ -237,7 +237,7 @@ class _IntegralDetailedPage extends State crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - "assets/image/icon_intergral_sign.png", + "assets/image/icon_intergral_sign.webp", width: 36.w, height: 34.h, ), diff --git a/lib/integral/intergra_view/in_for_points.dart b/lib/integral/intergra_view/in_for_points.dart index 9bc5e9b5..1f7c7e65 100644 --- a/lib/integral/intergra_view/in_for_points.dart +++ b/lib/integral/intergra_view/in_for_points.dart @@ -164,7 +164,7 @@ class _InForPoints extends State { Container( alignment: Alignment.center, child: Image.asset( - "assets/image/icon_gold_blessing.png", + "assets/image/icon_gold_blessing.webp", width: 59, height: 59, ), diff --git a/lib/integral/intergra_view/integral_task.dart b/lib/integral/intergra_view/integral_task.dart index d573df6f..37ba1f0c 100644 --- a/lib/integral/intergra_view/integral_task.dart +++ b/lib/integral/intergra_view/integral_task.dart @@ -107,19 +107,19 @@ class _IntegralTask extends State { taskImg(String taskType) { switch (taskType) { case "bill_type_point_order": - return "assets/image/icon_integral_login.png"; + return "assets/image/icon_integral_login.webp"; break; case "bill_type_point_share": - return "assets/image/icon_integral_share.png"; + return "assets/image/icon_integral_share.webp"; break; case "bill_type_point_login": - return "assets/image/icon_integral_order.png"; + return "assets/image/icon_integral_order.webp"; break; case "bill_type_point_signin": - return "assets/image/icon_integral_sign.png"; + return "assets/image/icon_integral_sign.webp"; break; } - return "assets/image/icon_integral_login.png"; + return "assets/image/icon_integral_login.webp"; } Widget taskItem(Task task) { @@ -212,7 +212,7 @@ class _IntegralTask extends State { ? Color(0xFFF5F6FA) : Color(0xFF32A060), icons: Image.asset( - "assets/image/icon_gold_coin.png", + "assets/image/icon_gold_coin.webp", width: 16, height: 16, ), diff --git a/lib/integral/intergra_view/integral_vip.dart b/lib/integral/intergra_view/integral_vip.dart index 2295200e..ffd036ed 100644 --- a/lib/integral/intergra_view/integral_vip.dart +++ b/lib/integral/intergra_view/integral_vip.dart @@ -38,8 +38,8 @@ class _IntegralVip extends State { height: 50, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + errorSrc: "assets/image/default_user.webp", + fadeSrc: "assets/image/default_user.webp", ), Expanded( child: Container( diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart index 03755908..07d5a991 100644 --- a/lib/integral_store/integral_store_details_page.dart +++ b/lib/integral_store/integral_store_details_page.dart @@ -314,7 +314,7 @@ class _IntegralStoreDetailsPage extends State { margin: EdgeInsets.only(left: 16, top: 52), padding: EdgeInsets.all(5), child: Image.asset( - "assets/image/integral_return.png", + "assets/image/integral_return.webp", // alignment: Alignment.center, width: 24, height: 24, diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 44fb0779..4f9abdf0 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -14,11 +14,11 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", - "jifenshangcheng": "积分商城", + "jifenshangcheng": "净弼积分商城", "jinrihuiyuanrenwu": "今日会员任务", "renwuzhongxin": "任务中心", "qiandaolingqujinfen": "签到领取积分", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index da1879a7..3f1c6a8a 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -14,11 +14,11 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", - "jifenshangcheng": "积分商城", + "jifenshangcheng": "净弼积分商城", "jinrihuiyuanrenwu": "今日会员任务", "renwuzhongxin": "任务中心", "qiandaolingqujinfen": "签到领取积分", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index d6867924..e79f0be8 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -14,11 +14,11 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", - "jifenshangcheng": "积分商城", + "jifenshangcheng": "净弼积分商城", "jinrihuiyuanrenwu": "今日会员任务", "renwuzhongxin": "任务中心", "qiandaolingqujinfen": "签到领取积分", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 2bc3bc43..5cbc0481 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -14,11 +14,11 @@ "privacy_policy3": "《隱私服務》", "main_menu1": "淨弼", "main_menu2": "聯盟", - "main_menu3": "社群", + "main_menu3": "發現", "main_menu4": "我的", "shouye": "首頁", "huodongliebiao": "活動列表", - "jifenshangcheng": "積分商城", + "jifenshangcheng": "淨弼積分商城", "jinrihuiyuanrenwu": "今日會員任務", "renwuzhongxin": "任務中心", "qiandaolingqujinfen": "簽到領取積分", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 4ac15a9d..1ceeb963 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -14,11 +14,11 @@ "privacy_policy3": "《隱私服務》", "main_menu1": "淨弼", "main_menu2": "聯盟", - "main_menu3": "社群", + "main_menu3": "發現", "main_menu4": "我的", "shouye": "首頁", "huodongliebiao": "活動列表", - "jifenshangcheng": "積分商城", + "jifenshangcheng": "淨弼積分商城", "jinrihuiyuanrenwu": "今日會員任務", "renwuzhongxin": "任務中心", "qiandaolingqujinfen": "簽到領取積分", diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index f1cb287b..fd4098f3 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -88,7 +88,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { Image image; buildImageInfo(BuildContext context) async { - image = Image.asset("assets/image/laoban.png"); + image = Image.asset("assets/image/laoban.webp"); double screenWidth = MediaQuery.of(this.context).size.width; image.image .resolve(ImageConfiguration()) @@ -421,7 +421,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { firstChild: Container( color: Colors.white, child: Image.asset( - "assets/image/ic_splash_bg.png", + "assets/image/ic_splash_bg.webp", fit: BoxFit.fill, ), ), @@ -473,7 +473,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { alignment: Alignment.center, children: [ PhotoView( - imageProvider: AssetImage("assets/image/laoban.png"), + imageProvider: AssetImage("assets/image/laoban.webp"), initialScale: rota, basePosition: alignmentProgress, ), @@ -481,7 +481,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { top: 54.h, left: 28.w, child: Image.asset( - "assets/image/icon_founder_text.png", + "assets/image/icon_founder_text.webp", width: 20.w, height: 200.h, ), @@ -501,7 +501,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { opacity: (changeAlpha) / 255, child: Container( child: Image.asset( - "assets/image/icon_login_hide_bg.png", + "assets/image/icon_login_hide_bg.webp", fit: BoxFit.cover, ), ), @@ -513,7 +513,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { margin: EdgeInsets.only(top: 56.h), alignment: Alignment.topCenter, child:Image.asset( - "assets/image/icon_login_logo.png", + "assets/image/icon_login_logo.webp", width: 91.w, height: 91.h, ), @@ -1001,8 +1001,13 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { ), ), TextSpan( - text: S.of(context).privacy_policy2, - recognizer: tapGestureRecognizer, + // text: S.of(context).privacy_policy2, + text: "《一心回乡用户协议》", + recognizer: TapGestureRecognizer() + ..onTap = () { + Navigator.of(context) + .pushNamed('/router/user_service_page'); + }, style: TextStyle( fontSize: 11.sp, color: Color(0xFF32A060), diff --git a/lib/main.dart b/lib/main.dart index 9d660059..3b15b2c4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -60,6 +60,7 @@ import 'package:huixiang/store/shopping/shopping_home/group_details.dart'; import 'package:huixiang/store/shopping/shopping_home/group_page_details.dart'; import 'package:huixiang/store/shopping/shopping_home/search_page.dart'; import 'package:huixiang/store/shopping/shopping_mall_home.dart'; +import 'package:huixiang/setting/user_service_page.dart'; import 'package:huixiang/store/store_order.dart'; import 'package:huixiang/settlement/settlement.dart'; import 'package:huixiang/test_page.dart'; @@ -123,7 +124,7 @@ void main() async { locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); } ImgCachePath(); - initSdk(); + // initSdk(); bool isFirst = sharedPreferences.getBool("isFirst"); runApp(MyApp(locale, isFirst)); @@ -134,50 +135,11 @@ void main() async { final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin(); -initSdk() async { - ///ios 调用startXg前需要调用此方法 - xgFlutterPlugin.configureClusterDomainName("tpns.sh.tencent.com"); - xgFlutterPlugin.setEnableDebug(true); - ///此处配置为iOS的appID信息,Android信息在build.gradle文件中 - xgFlutterPlugin.startXg("1680005688", "IYIB3R2XRE22"); - - if (Platform.isAndroid) { - XgAndroidApi androidApi = xgFlutterPlugin.getXgAndroidApi(); - //小米 - androidApi.setMiPushAppId(appId: "2882303761520050452"); - androidApi.setMiPushAppKey(appKey: "5582005091452"); - - androidApi.enableOtherPush(); - androidApi.regPush(); - } - - ShareSDKRegister shareSDKRegister = ShareSDKRegister(); - shareSDKRegister.setupWechat( - "wx3b269e795ed23e5f", - "64020361b8ec4c99936c0e3999a9f249", - "https://hx.lotus-wallet.com/app/", - ); - shareSDKRegister.setupFacebook( - "523308712059457", - "d3a1b6377100871799d8973fbe84794a", - "一心回乡", - ); - SharesdkPlugin.regist(shareSDKRegister); - - if (Platform.isIOS) { - LocationFlutterPlugin.setApiKey("ylW2QPlsbERkho7jOgU4GQSeawmdUIoR"); - BMFMapSDK.setApiKeyAndCoordType( - 'ylW2QPlsbERkho7jOgU4GQSeawmdUIoR', - BMF_COORD_TYPE.COMMON, - ); - } else if (Platform.isAndroid) { - BMFMapSDK.setCoordType(BMF_COORD_TYPE.COMMON); - } -} EventBus eventBus = EventBus(sync: true); +Route lastRoutePage; class MyApp extends StatelessWidget { final Locale appLocale; final bool isFirst; @@ -233,6 +195,12 @@ class MyApp extends StatelessWidget { ), onGenerateRoute: (settings) { final String name = settings.name; + if(lastRoutePage?.settings?.name == name){ + if(lastRoutePage?.settings?.name == "/router/personal_page" + && lastRoutePage.navigator != null) + lastRoutePage.navigator.pop(); + + } final Function pageContentBuilder = routers[name]; if (pageContentBuilder != null) { final Route route = CupertinoPageRoute( @@ -242,6 +210,7 @@ class MyApp extends StatelessWidget { }, settings: settings, ); + lastRoutePage = route; return route; } return MaterialPageRoute( @@ -391,4 +360,6 @@ Map routers = { LogoutPage(), '/router/logout_ing': (context, {arguments}) => LogoutIng(), + '/router/user_service_page': (context, {arguments}) => + UserServicePage(), }; diff --git a/lib/main_page.dart b/lib/main_page.dart index d958f7e3..96ae17e0 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -2,6 +2,8 @@ import 'dart:convert'; import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; +import 'package:flutter_bmflocation/bdmap_location_flutter_plugin.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:huixiang/community/community_page.dart'; @@ -20,6 +22,9 @@ import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/native_event_handler.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:sharesdk_plugin/sharesdk_interface.dart'; +import 'package:sharesdk_plugin/sharesdk_register.dart'; +import 'package:tpns_flutter_plugin/android/xg_android_api.dart'; import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart'; import 'community/order_page.dart'; @@ -81,6 +86,9 @@ class _MainPage extends State with WidgetsBindingObserver { ..userInteractions = false ..dismissOnTap = false; + + initSdk(); + pushRoute(); String invite = ""; @@ -117,10 +125,10 @@ class _MainPage extends State with WidgetsBindingObserver { "assets/svg/wode.svg", ]; // iconn = [ - // "assets/image/icon_brand_n.png", - // "assets/image/icon_bi_n.png", - // "assets/image/icon_meng_n.png", - // "assets/image/icon_wo_n.png", + // "assets/image/icon_brand_n.webp", + // "assets/image/icon_bi_n.webp", + // "assets/image/icon_meng_n.webp", + // "assets/image/icon_wo_n.webp", // ]; eventBus.on().listen((event) { @@ -130,11 +138,53 @@ class _MainPage extends State with WidgetsBindingObserver { }); queryUserInfo(); + } + + initSdk() async { + ///ios 调用startXg前需要调用此方法 + xgFlutterPlugin.configureClusterDomainName("tpns.sh.tencent.com"); + xgFlutterPlugin.setEnableDebug(true); + + ///此处配置为iOS的appID信息,Android信息在build.gradle文件中 + xgFlutterPlugin.startXg("1680005688", "IYIB3R2XRE22"); + + if (Platform.isAndroid) { + XgAndroidApi androidApi = xgFlutterPlugin.getXgAndroidApi(); + //小米 + androidApi.setMiPushAppId(appId: "2882303761520050452"); + androidApi.setMiPushAppKey(appKey: "5582005091452"); + + androidApi.enableOtherPush(); + androidApi.regPush(); + } + + ShareSDKRegister shareSDKRegister = ShareSDKRegister(); + shareSDKRegister.setupWechat( + "wx3b269e795ed23e5f", + "64020361b8ec4c99936c0e3999a9f249", + "https://hx.lotus-wallet.com/app/", + ); + shareSDKRegister.setupFacebook( + "523308712059457", + "d3a1b6377100871799d8973fbe84794a", + "一心回乡", + ); + SharesdkPlugin.regist(shareSDKRegister); + + if (Platform.isIOS) { + LocationFlutterPlugin.setApiKey("ylW2QPlsbERkho7jOgU4GQSeawmdUIoR"); + BMFMapSDK.setApiKeyAndCoordType( + 'ylW2QPlsbERkho7jOgU4GQSeawmdUIoR', + BMF_COORD_TYPE.COMMON, + ); + } else if (Platform.isAndroid) { + BMFMapSDK.setCoordType(BMF_COORD_TYPE.COMMON); + } if (Platform.isAndroid) { xgFlutterPlugin.getXgAndroidApi().addNativeEventHandler( MyNativeEventHandler( - (String title, String message, String customContent, int type) { + (String title, String message, String customContent, int type) { print("xgPushClickAction2: $customContent"); SharedPreferences.getInstance().then((value) { value.setString("pushData", customContent); @@ -151,7 +201,7 @@ class _MainPage extends State with WidgetsBindingObserver { if (Platform.isAndroid ? (event["actionType"] == 0) : (event["xg"]["msgtype"] == 1) && - event[Platform.isAndroid ? "customMessage" : "custom"] != null) { + event[Platform.isAndroid ? "customMessage" : "custom"] != null) { SharedPreferences.getInstance().then((value) { value.setString("pushData", event[Platform.isAndroid ? "customMessage" : "custom"]); @@ -190,7 +240,8 @@ class _MainPage extends State with WidgetsBindingObserver { SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); if (sharedPreferences.getString("token") == null || sharedPreferences.getString("token") == "") return; - String startIntent = await Bridge.getStartIntent(); + String startIntent; + if(Platform.isAndroid) startIntent= await Bridge.getStartIntent(); print("intent:$startIntent"); String pushData = ""; if (startIntent != null && startIntent != "") { @@ -306,7 +357,7 @@ class _MainPage extends State with WidgetsBindingObserver { // bottomNavigationBigItem(S.of(context).pinpai, 0), bottomNavigationItem(S.of(context).main_menu1, 0), bottomNavigationItem(S.of(context).main_menu2, 1), - bottomNavigationItem(S.of(context).main_menu3, 2), + bottomNavigationItem(S.of(context).main_menu3 , 2), bottomNavigationItem(S.of(context).main_menu4, 3), ], ), diff --git a/lib/message/main_message_page.dart b/lib/message/main_message_page.dart index 5ad0a3f5..11603d28 100644 --- a/lib/message/main_message_page.dart +++ b/lib/message/main_message_page.dart @@ -72,7 +72,7 @@ class _MainMessagePage extends State // }); // }, // child: Image.asset( - // "assets/image/icon_delete.png", + // "assets/image/icon_delete.webp", // width: 24, // height: 24, // ), diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index c3593d90..8ff701a2 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -198,7 +198,7 @@ class _SystemDetails extends State { children: [ (messages == null || messages.length == 0) ? NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, @@ -240,10 +240,10 @@ class _SystemDetails extends State { children: [ Image.asset( (message.typed == 1) - ? "assets/image/icon_system_message.png" + ? "assets/image/icon_system_message.webp" : (message.typed == 2) - ? "assets/image/icon_system_message.png" - : "assets/image/c_z.png", + ? "assets/image/icon_system_message.webp" + : "assets/image/c_z.webp", width: 24.w, height: 24.h, ), @@ -323,7 +323,7 @@ class _SystemDetails extends State { children: [ (messages == null || messages.length == 0) ? NoDataView( - src:"assets/image/icon_empty.png", + src:"assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, @@ -365,10 +365,10 @@ class _SystemDetails extends State { children: [ Image.asset( (message.typed == 1) - ? "assets/image/icon_system_message.png" + ? "assets/image/icon_system_message.webp" : (message.typed == 2) - ? "assets/image/icon_system_message.png" - : "assets/image/c_z.png", + ? "assets/image/icon_system_message.webp" + : "assets/image/c_z.webp", width: 24.w, height: 24.h, ), @@ -459,7 +459,7 @@ class _SystemDetails extends State { children: [ (messages == null || messages.length == 0) ? NoDataView( - src:"assets/image/icon_empty.png", + src:"assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, @@ -606,7 +606,7 @@ class _SystemDetails extends State { children: [ (messages == null || messages.length == 0) ? NoDataView( - src:"assets/image/icon_empty.png", + src:"assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, @@ -850,7 +850,7 @@ class _SystemDetails extends State { children: [ (messages == null || messages.length == 0) ? NoDataView( - src:"assets/image/icon_empty.png", + src:"assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, diff --git a/lib/message/system_message.dart b/lib/message/system_message.dart index ff302caf..d6c2b593 100644 --- a/lib/message/system_message.dart +++ b/lib/message/system_message.dart @@ -215,7 +215,7 @@ class _SystemMessagePage extends State { Stack( children: [ Image.asset( - "assets/image/icon_z.png", + "assets/image/icon_z.webp", width: 40, height: 40, ), @@ -275,7 +275,7 @@ class _SystemMessagePage extends State { Stack( children: [ Image.asset( - "assets/image/icon_pl.png", + "assets/image/icon_pl.webp", width: 40, height: 40, ), @@ -334,7 +334,7 @@ class _SystemMessagePage extends State { Stack( children: [ Image.asset( - "assets/image/icon_gz.png", + "assets/image/icon_gz.webp", width: 40, height: 40, ), @@ -403,7 +403,7 @@ class _SystemMessagePage extends State { ), (messages == null || messages.length == 0) ? NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).haimeiyouxiaoxi, fontSize: 16.sp, @@ -467,10 +467,10 @@ class _SystemMessagePage extends State { children: [ Image.asset( (message.typed == 1) - ? "assets/image/icon_system_message.png" + ? "assets/image/icon_system_message.webp" : (message.typed == 2) - ? "assets/image/icon_system_message.png" - : "assets/image/c_z.png", + ? "assets/image/icon_system_message.webp" + : "assets/image/c_z.webp", width: 40.w, height: 40.h, ), @@ -580,10 +580,10 @@ class _SystemMessagePage extends State { // children: [ // Image.asset( // (message.typed == 1) - // ? "assets/image/icon_system_notices.png" + // ? "assets/image/icon_system_notices.webp" // : (message.typed == 2) - // ? "assets/image/icon_system_order.png" - // : "assets/image/icon_system_recharge.png", + // ? "assets/image/icon_system_order.webp" + // : "assets/image/icon_system_recharge.webp", // width: 24.w, // height: 24.h, // ), diff --git a/lib/mine/fans_page.dart b/lib/mine/fans_page.dart index d73f6595..9b769753 100644 --- a/lib/mine/fans_page.dart +++ b/lib/mine/fans_page.dart @@ -112,7 +112,7 @@ class _FansPage extends State { onRefresh: (){_queryFollowList();}, physics: BouncingScrollPhysics(), child: (list == null || list.length == 0)? NoDataView( - src: "assets/image/fen_si.png", + src: "assets/image/fen_si.webp", isShowBtn: false, text: "目前暂无粉丝,听说多发动态可以涨粉哦~", fontSize: 16.sp, @@ -154,8 +154,8 @@ class _FansPage extends State { height: 44, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 8, diff --git a/lib/mine/follow_page.dart b/lib/mine/follow_page.dart index 4142d91c..63ab8c60 100644 --- a/lib/mine/follow_page.dart +++ b/lib/mine/follow_page.dart @@ -113,7 +113,7 @@ class _FollowPage extends State { onRefresh: (){_queryFollowList();}, physics: BouncingScrollPhysics(), child:(list == null || list.length == 0)? NoDataView( - src: "assets/image/guan_zhu.png", + src: "assets/image/guan_zhu.webp", isShowBtn: false, text: "目前暂无添加关注,可在推荐中关注自己喜欢的人哦~", fontSize: 16.sp, @@ -149,8 +149,8 @@ class _FollowPage extends State { height: 44, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width:8, diff --git a/lib/mine/invitation_record.dart b/lib/mine/invitation_record.dart index c401ab63..4240fc96 100644 --- a/lib/mine/invitation_record.dart +++ b/lib/mine/invitation_record.dart @@ -305,7 +305,7 @@ class _InvitationRecord extends State Expanded(child: (invitationList.length == null || invitationList.length == 0) ? NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.webp", isShowBtn: false, text:"还没有邀请记录哦~", fontSize: 16.sp, diff --git a/lib/mine/manage_address_page.dart b/lib/mine/manage_address_page.dart index 2334148c..a89e1ae9 100644 --- a/lib/mine/manage_address_page.dart +++ b/lib/mine/manage_address_page.dart @@ -66,7 +66,7 @@ class _ManageAddressPage extends State { Expanded( child: (addressList == null || addressList.length == 0) ? NoDataView( - src: "assets/image/di_zhi.png", + src:"assets/image/di_zhi.png", isShowBtn: false, text: "目前暂无收货地址,请添加~", fontSize: 16.sp, diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index b4290805..318b9a89 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -298,7 +298,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { shape: BoxShape.circle, ), child: Image.asset( - "assets/image/icon_mine_motorcycle.png", + "assets/image/icon_mine_motorcycle.webp", width: 20.w, height: 20.h, fit: BoxFit.contain, diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index 978a9573..6a3502b4 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -35,6 +35,22 @@ class _MineItem extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + // InkWell( + // onTap: () { + // SharedPreferences.getInstance().then((value) { + // if (value.getString("token") == null || + // value.getString("token") == "") { + // LoginTipsDialog().show(context); + // return; + // } + // Navigator.of(context).pushNamed('/router/mine_wallet'); + // }); + // }, + // child: mineItem( + // S.of(context).wodeqianbao, + // "assets/image/icon_mine_wallet.webp", + // ), + // ), Container( padding: EdgeInsets.only(left: 16,top:16,bottom:4), child: Text( @@ -130,6 +146,8 @@ class _MineItem extends State { child: mineItem( "联系客服", "assets/image/icon_mine_online_service.png", + S.of(context).tuiguangma, + "assets/image/icon_mine_promotion_code.webp", ), ),), ], @@ -210,6 +228,11 @@ class _MineItem extends State { color: Color(0xFF353535), ), ), + // Icon( + // Icons.keyboard_arrow_right, + // size: 20, + // color: Colors.black, + // ) ], ), ); diff --git a/lib/mine/mine_view/mine_order.dart b/lib/mine/mine_view/mine_order.dart index bb874b09..a07842d2 100644 --- a/lib/mine/mine_view/mine_order.dart +++ b/lib/mine/mine_view/mine_order.dart @@ -92,10 +92,10 @@ class _MineOrderView extends State { } List orderStatusImg = [ - "assets/image/icon_mine_order_qb.png", - "assets/image/icon_mine_order_dfk.png", - "assets/image/icon_mine_order_wwc.png", - "assets/image/icon_mine_order_ywc.png", + "assets/image/icon_mine_order_qb.webp", + "assets/image/icon_mine_order_dfk.webp", + "assets/image/icon_mine_order_wwc.webp", + "assets/image/icon_mine_order_ywc.webp", ]; List orderStatusText = [ diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index d8012d70..030bbdc5 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -69,7 +69,7 @@ class _MineView extends State { child: Container( padding: EdgeInsets.all(8.h), child: Image.asset( - "assets/image/icon_scan_qr_code.png", + "assets/image/icon_scan_qr_code.webp", width:32.w, height: 32.h, ), @@ -83,7 +83,7 @@ class _MineView extends State { padding: EdgeInsets.all(8.h), margin: EdgeInsets.only(right: 12.w), child: Image.asset( - "assets/image/icon_mine_setting.png", + "assets/image/icon_mine_setting.webp", width: 32.w, height: 32.h, ), @@ -106,7 +106,7 @@ class _MineView extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_camera_permission_tips.png", + "assets/image/icon_camera_permission_tips.webp", S.of(context).ninxiangjiquanxianweikaiqi, S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, @@ -188,14 +188,14 @@ class _MineView extends State { width: 50, height: 50, fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + errorSrc: "assets/image/default_user.webp", + fadeSrc: "assets/image/default_user.webp", ), Positioned( bottom: 0, right: 2.w, child: Image.asset( - "assets/image/icon_mine_edit.png", + "assets/image/icon_mine_edit.webp", width: 17.w, height: 17.w, ), @@ -247,7 +247,7 @@ class _MineView extends State { ), if(widget.userInfo.level != 1) Image.asset( - "assets/image/icon_user.png", + "assets/image/icon_user.webp", width: 18.w, height: 18.h, ), @@ -303,7 +303,7 @@ class _MineView extends State { mainAxisAlignment: MainAxisAlignment.end, children: [ Image.asset( - "assets/image/ji_fen.png", + "assets/image/ji_fen.webp", width: 16.w, height: 16.h, ), diff --git a/lib/mine/mine_view/wallet_coupon_view.dart b/lib/mine/mine_view/wallet_coupon_view.dart index 8ea70420..5a76028e 100644 --- a/lib/mine/mine_view/wallet_coupon_view.dart +++ b/lib/mine/mine_view/wallet_coupon_view.dart @@ -46,7 +46,7 @@ class _WalletCoupon extends State { child: Row( children: [ Image.asset( - "assets/image/icon_mine_invoice_assistant.png", + "assets/image/icon_mine_invoice_assistant.webp", width: 48.h, height: 48.h, ), @@ -104,7 +104,7 @@ class _WalletCoupon extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_mine_invoice_assistant.png", + "assets/image/icon_mine_invoice_assistant.webp", width: 48.h, height: 48.h, ), @@ -151,7 +151,7 @@ class _WalletCoupon extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_mine_wallet.png", + "assets/image/icon_mine_wallet.webp", width: 48.h, height: 48.h, ), diff --git a/lib/mine/mine_vip/legal_right_details.dart b/lib/mine/mine_vip/legal_right_details.dart index e1498099..782bbdb6 100644 --- a/lib/mine/mine_vip/legal_right_details.dart +++ b/lib/mine/mine_vip/legal_right_details.dart @@ -466,8 +466,8 @@ class _LegalRightDetails extends State { width:51, height: 51, isCircle: true, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), if (!vipBenefitList.actived || !vipBenefitList.actived && !vipBenefitList.have) Container( @@ -558,7 +558,7 @@ class _LegalRightDetails extends State { ), ), child: Image.asset( - "assets/image/jian_j.png", + "assets/image/jian_j.webp", width: 33, height: 16, color: Color(0xFFFFF6E9), @@ -613,8 +613,8 @@ class _LegalRightDetails extends State { height: 50, isCircle: true, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), GestureDetector( onTap: () { @@ -623,7 +623,7 @@ class _LegalRightDetails extends State { }); }, child: Image.asset( - "assets/image/fuka_j.png", + "assets/image/fuka_j.webp", width: 24, height: 24, fit: BoxFit.cover, @@ -653,7 +653,7 @@ class _LegalRightDetails extends State { child: Column( children: [ Image.asset( - "assets/image/fuka_zj.png", + "assets/image/fuka_zj.webp", width: 50, height: 50, fit: BoxFit.cover, diff --git a/lib/mine/mine_vip/mine_attainment_page.dart b/lib/mine/mine_vip/mine_attainment_page.dart index 208c52b9..571f6fcc 100644 --- a/lib/mine/mine_vip/mine_attainment_page.dart +++ b/lib/mine/mine_vip/mine_attainment_page.dart @@ -127,7 +127,7 @@ class _MineAttainmentPage extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/attainment_bj.png"), + image: AssetImage("assets/image/attainment_bj.webp"), ), ), child: Scaffold( @@ -150,8 +150,8 @@ class _MineAttainmentPage extends State { width: 58, height: 58, fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + errorSrc: "assets/image/default_user.webp", + fadeSrc: "assets/image/default_user.webp", ), SizedBox(height: 8), Text( @@ -268,8 +268,8 @@ class _MineAttainmentPage extends State { width: 80, height: 80, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( height: 4.h, @@ -311,7 +311,7 @@ class _MineAttainmentPage extends State { children: [ Spacer(), Image.asset( - "assets/image/icon_order_cancel.png", + "assets/image/icon_order_cancel.webp", width: 24, height: 24, ), @@ -324,8 +324,8 @@ class _MineAttainmentPage extends State { width: 150, height: 150, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox(height: 10), Text( @@ -440,8 +440,8 @@ class _MineAttainmentPage extends State { width: checkPosition == position ? 50 : 30, height: checkPosition == position ? 50 : 30, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox(height: 10), Text( diff --git a/lib/mine/mine_vip/mine_vip_core.dart b/lib/mine/mine_vip/mine_vip_core.dart index 6d2546d4..89094041 100644 --- a/lib/mine/mine_vip/mine_vip_core.dart +++ b/lib/mine/mine_vip/mine_vip_core.dart @@ -450,8 +450,8 @@ class _MineVipCore extends State { vipRuleDetails?.contrast ?? "", width: double.infinity, height: 281, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( height: 16.h, @@ -664,8 +664,8 @@ class _MineVipCore extends State { width: 36, height: 36, // fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), if (!vipBenefitList.actived || !vipBenefitList.actived && !vipBenefitList.have ) Container( diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index eb9b2ee0..9b5ffa5f 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -172,7 +172,7 @@ class _MineWalletPage extends State { margin: EdgeInsets.only(top: 14.h), child: (userBills == null || userBills.length == 0) ? NoDataView( - src: "assets/image/xiao_fei.png", + src: "assets/image/xiao_fei.webp", isShowBtn: false, text: "目前暂未记录哦", fontSize: 16.sp, @@ -199,8 +199,8 @@ class _MineWalletPage extends State { children: [ Image.asset( userBill.pm == 0 - ? "assets/image/icon_wallet_withdrawal.png" - : "assets/image/icon_wallet_recharge.png", + ? "assets/image/icon_wallet_withdrawal.webp" + : "assets/image/icon_wallet_recharge.webp", width: 34.w, height: 34.h, ), @@ -400,7 +400,7 @@ class _MineWalletPage extends State { // crossAxisAlignment: CrossAxisAlignment.center, // children: [ // Image.asset( -// "assets/image/icon_wallet_recharge.png", +// "assets/image/icon_wallet_recharge.webp", // width: 40.w, // height: 40.h, // ), @@ -437,7 +437,7 @@ class _MineWalletPage extends State { // crossAxisAlignment: CrossAxisAlignment.center, // children: [ // Image.asset( -// "assets/image/icon_wallet_withdrawal.png", +// "assets/image/icon_wallet_withdrawal.webp", // width: 40.w, // height: 40.w, // ), diff --git a/lib/mine/personal_page.dart b/lib/mine/personal_page.dart index cbc87bd5..a6075b95 100644 --- a/lib/mine/personal_page.dart +++ b/lib/mine/personal_page.dart @@ -4,7 +4,6 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/community/community_view/community_dynamic.dart'; import 'package:huixiang/community/photo_view_gallery_screen.dart'; @@ -14,7 +13,6 @@ import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/comunity_comment.dart'; import 'package:huixiang/retrofit/data/member_Infor.dart'; import 'package:huixiang/retrofit/data/page.dart'; -import 'package:huixiang/retrofit/data/social_info.dart'; import 'package:huixiang/retrofit/data/upload_result.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -329,9 +327,9 @@ class _PersonalPage extends State with WidgetsBindingObserver { height: 260.h, fit: BoxFit.cover, errorSrc: - "assets/image/default_1.png", + "assets/image/default_1.webp", fadeSrc: - "assets/image/default_1.png", + "assets/image/default_1.webp", ))), Container( margin: EdgeInsets.only( @@ -348,7 +346,7 @@ class _PersonalPage extends State with WidgetsBindingObserver { children: [ GestureDetector( child: Image.asset( - "assets/image/integral_return.png", + "assets/image/integral_return.webp", width: 24, height: 24, ), @@ -647,8 +645,8 @@ class _PersonalPage extends State with WidgetsBindingObserver { width: 66, height: 66, fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + errorSrc: "assets/image/default_user.webp", + fadeSrc: "assets/image/default_user.webp", ), ), SizedBox(width: 10.w), @@ -663,7 +661,7 @@ class _PersonalPage extends State with WidgetsBindingObserver { ), SizedBox(width: 4.w), Image.asset( - "assets/image/vip_yk.png", + "assets/image/vip_yk.webp", width: 20, height: 20, ), @@ -704,7 +702,7 @@ class _PersonalPage extends State with WidgetsBindingObserver { Widget dynamicList() { return Container( child: (articles == null || articles.length == 0)? NoDataView( - src: "assets/image/dong_tai.png", + src: "assets/image/dong_tai.webp", isShowBtn: false, text: "目前暂无发布动态,要把开心的事讲出来哦~", fontSize: 16.sp, diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index 863a5f7a..158b0141 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -9,10 +9,13 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:fluwx/fluwx.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; +import 'package:huixiang/retrofit/data/recharge_list.dart'; +import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/vip_benefit_list.dart'; import 'package:huixiang/retrofit/data/vip_rule_details.dart'; import 'package:huixiang/retrofit/data/wx_pay.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/min.dart'; import 'package:huixiang/view_widget/item_input_widget.dart'; @@ -35,6 +38,10 @@ class _RechargePage extends State { List vipBenefitList = []; Color color = Colors.black; double discount = 100; + List rechargeA; + int selectIndex = 0; + UserInfo userInfo; + dynamic mBalance; @override void initState() { @@ -45,11 +52,13 @@ class _RechargePage extends State { context: context, token: value.getString("token"), pay: true); queryBenefitList(); queryRuleDetails(); + queryRechargeList(); + queryUserBalance(); }); weChatResponseEventHandler.listen((event) async { print("payCallback: ${event.errCode}"); - if(event.errCode == 0){ - Navigator.of(context).pop(); + if (event.errCode == 0) { + queryUserBalance(); SmartDialog.showToast("充值成功", alignment: Alignment.center); } // else{ @@ -59,29 +68,40 @@ class _RechargePage extends State { }); } - ///会员权益列表 queryBenefitList() async { - BaseData> baseData = await apiService.benefitList().catchError((onError) {}); + BaseData> baseData = + await apiService.benefitList().catchError((onError) {}); if (baseData != null && baseData.isSuccess) { setState(() { vipBenefitList.clear(); vipBenefitList.addAll(baseData.data); vipBenefitList.forEach((element) { - if(element.have && element.config != null && element.code == "RECHARGE"){ + if (element.have && + element.config != null && + element.code == "RECHARGE") { discount = double.parse(element.config); } - }); }); } EasyLoading.dismiss(); } + queryUserBalance() async { + BaseData baseData = + await apiService.queryInfo().catchError((onError) {}); + if (baseData != null && baseData.isSuccess) { + userInfo = baseData.data; + mBalance = double.tryParse(userInfo?.money ?? "0"); + if (mounted) setState(() {}); + } + } + ///会员权益介绍/规则/说明/储值说明 queryRuleDetails() async { BaseData baseData = - await apiService.vipBenefit().catchError((onError) {}); + await apiService.vipBenefit().catchError((onError) {}); if (baseData != null && baseData.isSuccess) { setState(() { vipRuleDetails = baseData.data; @@ -90,6 +110,25 @@ class _RechargePage extends State { EasyLoading.dismiss(); } + ///充值列表 + queryRechargeList() async { + if (apiService == null) { + SharedPreferences value = await SharedPreferences.getInstance(); + apiService = ApiService( + Dio(), + context: context, + token: value.getString("token"), + ); + } + BaseData> baseData = await apiService.rechargeAct().catchError((onError) {}); + if (baseData != null && baseData.isSuccess) { + setState(() { + rechargeA = baseData.data; + }); + } + EasyLoading.dismiss(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -100,274 +139,392 @@ class _RechargePage extends State { background: Color(0xFFFFFFFF), leadingColor: Colors.black, ), - body:Stack( - children: [ - SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Container( - child: Column( - children: [ - Container( - child: Column(children: [ - ItemInputWidget( - S.of(context).qingshuruchongzhijine, - hintText: "", - controller: controller, - padding: EdgeInsets.all(20), - errorText: S.of(context).chongzhizuixiaojine(100), - titleColor: Color(0xFF727272), - errorTextColor: Color(0xFF32A060), - radius: 8, - discount: discount/10, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 27.sp, - color: color, - ), - inputLimit: 6, - textInputType: TextInputType.number, - textInputFormatter: FilteringTextInputFormatter.digitsOnly, - onChanged: (value) { - if (value != null && - value != "" && - double.tryParse(value) < 100) { - color = Colors.red; - } else { - color = Colors.black; - } - setState(() {}); - }, - ), - Row( + body: Container( + color: Color(0xFFFFFFFF), + child: Stack( + children: [ + Column(children: [ + SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 16, right: 16), + child: Column( + children: [ + Column( crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.start, children: [ - if (vipRuleDetails?.recharge != null && - vipRuleDetails.recharge != "") - Expanded(child:Container( - color: Colors.white, - padding: EdgeInsets.only(left: 8), - child: Html( - data: "注意:${vipRuleDetails?.recharge??""}", - customImageRenders: { - networkSourceMatcher(): networkImageRender( - loadingWidget: () { - return Container(); - }, - ), - }, - ), - ),) - ], - ), - ],), - ), - Container( - width: double.infinity, - margin: EdgeInsets.only( - left: 0.w, - right: 0.w, - top: 16.h, - bottom: 4.h, - ), - padding: EdgeInsets.only( - left: 20.w, - right: 16.w, - top: 20.h, - bottom: 20.h, - ), - decoration: BoxDecoration( - color: Colors.white, - // borderRadius: BorderRadius.circular(4), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - S.of(context).zhifufangshi, - style: TextStyle( - fontSize: 16.sp, - color: Colors.black, - fontWeight: FontWeight.bold, - ), - ), - ), - GestureDetector( - onTap: () { - setState(() { - checkIndex = 1; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, + // ItemInputWidget( + // S.of(context).qingshuruchongzhijine, + // hintText: "", + // controller: controller, + // padding: EdgeInsets.all(20), + // errorText: S.of(context).chongzhizuixiaojine(100), + // titleColor: Color(0xFF727272), + // errorTextColor: Color(0xFF32A060), + // radius: 8, + // discount: discount / 10, + // style: TextStyle( + // fontWeight: FontWeight.bold, + // fontSize: 27.sp, + // color: color, + // ), + // inputLimit: 6, + // textInputType: TextInputType.number, + // textInputFormatter: + // FilteringTextInputFormatter.digitsOnly, + // onChanged: (value) { + // if (value != null && + // value != "" && + // double.tryParse(value) < 100) { + // color = Colors.red; + // } else { + // color = Colors.black; + // } + // setState(() {}); + // }, + // ), + SizedBox(height:20,), + Row( children: [ - Image.asset("assets/image/icon_we_chat.png"), Expanded( - flex: 1, - child: Padding( - padding: EdgeInsets.only(left: 8.w), child: Text( - S.of(context).weixinzhifu, + S.of(context).zhanghuyue, style: TextStyle( - fontSize: 14.sp, - color: Color(0xff353535), - ), + fontSize: 15.sp, + color: Color(0xFF181818), + fontWeight: MyFontWeight.semi_bold), + )), + Text.rich( + TextSpan(children: [ + TextSpan( + text: "$mBalance", + style: TextStyle( + fontSize: 26.sp, + color: Color(0xFF181818), + fontWeight: MyFontWeight.semi_bold), ), - ), + TextSpan( + text: "元", + style: TextStyle( + fontSize: 15.sp, + color: Color(0xFF181818), + fontWeight: MyFontWeight.semi_bold), + ), + ]), ), - checkView(1), ], ), - ), - ], - ), - ), - // InkWell( - // onTap: () { - // recharge(); - // }, - // child: Container( - // // margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 26.h), - // child: Column( - // mainAxisAlignment: MainAxisAlignment.spaceAround, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // RoundButton( - // width: double.infinity, - // height: 46.h, - // text: S.of(context).querenchongzhi, - // textColor: Colors.white, - // fontSize: 14.sp, - // backgroup: Color(0xff32A060), - // fontWeight: FontWeight.bold, - // ), - // ], - // ), - // ), - // ), - ], - ), - ), - ), - Align(alignment: Alignment.bottomCenter,child: - Container( - height: 56.h, - color: Colors.white, - child: Row( - children: [ - Expanded(child:Container( - padding:EdgeInsets.only(top: 7.h,left:16), - child:Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - S.of(context).heji, - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.regular, - color: Colors.black, + SizedBox(height: 28), + rechargeList(), + SizedBox(height:22), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + if (vipRuleDetails?.recharge != null && + vipRuleDetails.recharge != "") + Expanded( + child: Container( + color: Colors.white, + child: Html( + data: "注意:${vipRuleDetails?.recharge ?? ""}", + customImageRenders: { + networkSourceMatcher(): networkImageRender( + loadingWidget: () { + return Container(); + }, + ), + }, + ), + ), + ) + ], ), + ], + ), + Container( + width: double.infinity, + margin: EdgeInsets.only( + top: 16.h, + bottom: 4.h, ), - Text( - controller.text, - style: TextStyle( - fontSize: 16.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF32A060), - ), + padding: EdgeInsets.only( + top: 20.h, + bottom: 20.h, ), - ], - ), - if(controller.text != "") - Text.rich( - TextSpan( + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.circular(4), + // ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - TextSpan( - text: "充值", - style: TextStyle( - fontSize:12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFFADADAD), - ), - ), - TextSpan( - text:"¥${controller.text}", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color:Color(0xff3541C9), - ), - ), - TextSpan( - text: "赠送", - style: TextStyle( - fontSize:12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFFADADAD), + Padding( + padding: EdgeInsets.only(bottom: 16.h), + child: Text( + S.of(context).zhifufangshi, + style: TextStyle( + fontSize: 16.sp, + color: Colors.black, + fontWeight: FontWeight.bold, + ), ), ), - TextSpan( - text:"¥${((double.tryParse(controller.text)??0) - ((double.tryParse(controller.text)??0) * (discount/100))).toStringAsFixed(2)}", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xff3541C9), - ), - ),TextSpan( - text: "元", - style: TextStyle( - fontSize:12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFFADADAD), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 1; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset("assets/image/icon_we_chat.webp"), + Expanded( + flex: 1, + child: Padding( + padding: EdgeInsets.only(left: 8.w), + child: Text( + S.of(context).weixinzhifu, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + ), + ), + ), + ), + checkView(1), + ], ), ), ], ), ), - ], - )) + ], + ), ), - GestureDetector( - onTap: () { - recharge(); - }, - child: RoundButton( - width: 103.w, - height: 54.h, - text: S.of(context).chongzhi, - textColor: Colors.white, - fontWeight: MyFontWeight.regular, - backgroup: Color(0xFF32A060), - radius: 0, - fontSize: 16.sp, - padding: EdgeInsets.symmetric(vertical: 5.h), + ) + ],), + Align( + alignment: Alignment.bottomCenter, + child: GestureDetector( + onTap: (){ + recharge(); + }, + child: Container( + height: 56.h, + width: double.infinity, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Color(0xFF32A060), + borderRadius: BorderRadius.circular(27), + ), + margin: EdgeInsets.only(left: 16,right: 16,bottom: 21), + child: Text( + S.of(context).querenchongzhi, + style: TextStyle( + fontSize: 16.sp, + fontWeight: MyFontWeight.medium, + color: Colors.white, + ), ), ), - ], - ), - )) - ], - ), + ), + // Container( + // height: 56.h, + // color: Colors.white, + // child: Row( + // children: [ + // Expanded(child:Container( + // padding:EdgeInsets.only(top: 7.h,left:16), + // child:Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // children: [ + // Text( + // S.of(context).heji, + // style: TextStyle( + // fontSize: 14.sp, + // fontWeight: MyFontWeight.regular, + // color: Colors.black, + // ), + // ), + // Text( + // controller.text, + // style: TextStyle( + // fontSize: 16.sp, + // fontWeight: MyFontWeight.medium, + // color: Color(0xFF32A060), + // ), + // ), + // ], + // ), + // if(controller.text != "") + // Text.rich( + // TextSpan( + // children: [ + // TextSpan( + // text: "充值", + // style: TextStyle( + // fontSize:12.sp, + // fontWeight: MyFontWeight.regular, + // color: Color(0xFFADADAD), + // ), + // ), + // TextSpan( + // text:"¥${controller.text}", + // style: TextStyle( + // fontSize: 12.sp, + // fontWeight: MyFontWeight.regular, + // color:Color(0xff3541C9), + // ), + // ), + // TextSpan( + // text: "赠送", + // style: TextStyle( + // fontSize:12.sp, + // fontWeight: MyFontWeight.regular, + // color: Color(0xFFADADAD), + // ), + // ), + // TextSpan( + // text:"¥${((double.tryParse(controller.text)??0) - ((double.tryParse(controller.text)??0) * (discount/100))).toStringAsFixed(2)}", + // style: TextStyle( + // fontSize: 12.sp, + // fontWeight: MyFontWeight.regular, + // color: Color(0xff3541C9), + // ), + // ),TextSpan( + // text: "元", + // style: TextStyle( + // fontSize:12.sp, + // fontWeight: MyFontWeight.regular, + // color: Color(0xFFADADAD), + // ), + // ), + // ], + // ), + // ), + // ], + // )) + // ), + // GestureDetector( + // onTap: () { + // recharge(); + // }, + // child: RoundButton( + // width: 103.w, + // height: 54.h, + // text: S.of(context).chongzhi, + // textColor: Colors.white, + // fontWeight: MyFontWeight.regular, + // backgroup: Color(0xFF32A060), + // radius: 0, + // fontSize: 16.sp, + // padding: EdgeInsets.symmetric(vertical: 5.h), + // ), + // ), + // ], + // ), + // ) + ) + ], + ), + ), ); } var checkIndex = 1; + Widget rechargeList() { + return GridView.builder( + itemCount: rechargeA == null ? 0 : rechargeA.length, + shrinkWrap: true, + physics: BouncingScrollPhysics(), + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + //一行的Widget数量 + crossAxisCount: 3, + //水平子Widget之间间距 + crossAxisSpacing:11, + //垂直子Widget之间间距 + mainAxisSpacing: 0, + childAspectRatio: 1.5, + ), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () { + setState(() { + selectIndex = index; + }); + }, + child: rechargeItem(rechargeA[index],index), + ); + }, + ); + } + + Widget rechargeItem(RechargeList rechargeA,index) { + return Container( + child: Stack( + alignment: Alignment.bottomRight, + children: [ + Container( + alignment: Alignment.center, + height: 69.h, + decoration: BoxDecoration( + color: selectIndex == index ?Color(0x2432A060) : Color(0xFFFAFAFA), + borderRadius: BorderRadius.circular(4), + ), + // margin: EdgeInsets.only(right: 11,bottom: 16), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "${AppUtils.calculateDouble(double.tryParse(rechargeA.rechargeMoney)??0)}元", + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFF868686), + fontWeight: MyFontWeight.medium, + fontSize:18.sp, + ), + ), + SizedBox(height:2,), + Text( + "实际到账:${AppUtils.calculateDouble((double.tryParse(rechargeA.rechargeMoney)??0) + (double.tryParse(rechargeA.giftdMoney)??0) +((double.tryParse(rechargeA.rechargeMoney)??0) - ((double.tryParse(rechargeA.rechargeMoney)??0) * (discount/100))))}元", + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFF868686), + fontWeight: MyFontWeight.regular, + fontSize:10.sp, + ), + ), + ], + ), + ), + if(selectIndex == index) + Image.asset( + "assets/image/recharge.webp", + width: 20, + height:20, + ), + ], + )); + } + Widget checkView(var index) { return Container( padding: EdgeInsets.only(right: 16.w), alignment: Alignment.center, child: Image.asset( checkIndex != index - ? "assets/image/icon_radio_unselected.png" - : "assets/image/icon_radio_selected.png", + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", width: 15.w, height: 15.h, ), @@ -375,30 +532,31 @@ class _RechargePage extends State { } recharge() async { - String money = controller.text; - if (money == null || money == "") { - SmartDialog.showToast(S.of(context).qingshuruchongzhijine, - alignment: Alignment.center); - return; - } - int amount = int.tryParse(money); - if (checkIndex == 1) { - if (amount < 100) { - SmartDialog.showToast(S.of(context).chongzhizuixiaojine(100), - alignment: Alignment.center); - return; - } + // String money = controller.text; + // if (money == null || money == "") { + // SmartDialog.showToast(S.of(context).qingshuruchongzhijine, + // alignment: Alignment.center); + // return; + // } + // int amount = int.tryParse(money); + // if (checkIndex == 1) { + // if (amount < 100) { + // SmartDialog.showToast(S.of(context).chongzhizuixiaojine(100), + // alignment: Alignment.center); + // return; + // } - if(Platform.isAndroid){ - if (!(await Min.isInitialize())) { - // 小程序的微信支付和app的充值支付使用同一个WXPayEntryActivity回调, - // 然而充值时小程序未初始化会导致回调内部代码调用getPackage空指针, - // 故而在此初始化一下 - await Min.initialize(); - }} + if (Platform.isAndroid) { + if (!(await Min.isInitialize())) { + // 小程序的微信支付和app的充值支付使用同一个WXPayEntryActivity回调, + // 然而充值时小程序未初始化会导致回调内部代码调用getPackage空指针, + // 故而在此初始化一下 + await Min.initialize(); + } + } - BaseData baseData = - await apiService.recharge({"amount": amount, "rechargeType": 2}).catchError((error) {}); + BaseData baseData = await apiService.recharge( + {"amount": 0,"rechargeActId":rechargeA[selectIndex].id, "rechargeType": 2}).catchError((error) {}); if (baseData != null && baseData.isSuccess) { WxPay wxPay = WxPay.fromJson(baseData.data); await registerWxApi( @@ -415,10 +573,9 @@ class _RechargePage extends State { timeStamp: int.tryParse(wxPay.timeStamp), sign: wxPay.sign, ); - } - else{ + } else { SmartDialog.showToast(baseData.msg, alignment: Alignment.center); } } - } + // } } diff --git a/lib/mine/roll_center_page.dart b/lib/mine/roll_center_page.dart index 582a5291..c5567f85 100644 --- a/lib/mine/roll_center_page.dart +++ b/lib/mine/roll_center_page.dart @@ -95,7 +95,7 @@ class _RollCenterPage extends State { children: [ ItemTitle( text: S.of(context).kelingqudeyouhuiquan, - imgPath: "assets/image/icon_card_coupon.png", + imgPath: "assets/image/icon_card_coupon.webp", moreText: S.of(context).chakanwodekaquan, onTap: () { Navigator.of(context).pushNamed('/router/mine_card'); @@ -152,7 +152,7 @@ class _RollCenterPage extends State { itemCount: (coupons != null && coupons.length > 0) ? coupons.length : 0, ) : NoDataView( - src: "assets/image/ka.png", + src: "assets/image/ka.webp", isShowBtn: false, text: S.of(context).haimeiyouyouhuiquankeyilingqu, fontSize: 16.sp, diff --git a/lib/mine/user_info_page.dart b/lib/mine/user_info_page.dart index 53e495c0..47da532b 100644 --- a/lib/mine/user_info_page.dart +++ b/lib/mine/user_info_page.dart @@ -438,7 +438,7 @@ class _UserInfoPage extends State { fit: BoxFit.cover, ) : Image.asset( - "assets/image/default_1.png", + "assets/image/default_1.webp", width: 42, height: 42, fit: BoxFit.cover, diff --git a/lib/mine/vip_balance_page.dart b/lib/mine/vip_balance_page.dart index 6715b87b..6fd28c3a 100644 --- a/lib/mine/vip_balance_page.dart +++ b/lib/mine/vip_balance_page.dart @@ -92,7 +92,7 @@ class _VipBalancePage extends State { body: Container( child: (userBills == null || userBills.length == 0) ? NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.webp", isShowBtn: false, text: S.of(context).nihaimeiyouchongzhihuoxiaofeijilu, fontSize: 16.sp, @@ -124,8 +124,8 @@ class _VipBalancePage extends State { alignment: Alignment.center, child: Image.asset( userBill.pm == 0 - ? "assets/image/icon_store_c.png" - : "assets/image/icon_wallet_recharge.png", + ? "assets/image/icon_store_c.webp" + : "assets/image/icon_wallet_recharge.webp", ), ), Expanded( diff --git a/lib/mine/vip_card_page.dart b/lib/mine/vip_card_page.dart index 4055c93b..9ddf3ae6 100644 --- a/lib/mine/vip_card_page.dart +++ b/lib/mine/vip_card_page.dart @@ -88,7 +88,7 @@ class _VipCardPage extends State { itemCount: coupons != null ? coupons.length : 0, ) : NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.png", isShowBtn: false, text: "还没有会员卡~", fontSize: 16.sp, diff --git a/lib/mine/vip_detail_page.dart b/lib/mine/vip_detail_page.dart index d6f96e15..b04a1d6a 100644 --- a/lib/mine/vip_detail_page.dart +++ b/lib/mine/vip_detail_page.dart @@ -137,7 +137,7 @@ class _VipDetailPage extends State { width: 8.w, ), Image.asset( - "assets/image/icon_shop.png", + "assets/image/icon_shop.webp", ), ], ), @@ -192,7 +192,7 @@ class _VipDetailPage extends State { // alignment: Alignment.center, children: [ Image.asset( - "assets/image/icon_vip_bj.png", + "assets/image/icon_vip_bj.webp", fit: BoxFit.fill, //填充剩余空间 height: 220.h, ), @@ -212,8 +212,8 @@ class _VipDetailPage extends State { height: 40, radius: BorderRadius.circular(4), fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 8.w, @@ -242,7 +242,7 @@ class _VipDetailPage extends State { flex: 1, ), Image.asset( - "assets/image/icon_vip.png", + "assets/image/icon_vip.webp", ), ], ), @@ -568,8 +568,8 @@ class _VipDetailPage extends State { width: 75.w, height: 75.h, fit: BoxFit.contain, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( height: 4.h, diff --git a/lib/order/exchange_history_page.dart b/lib/order/exchange_history_page.dart index 3d8f8c51..3b00cb07 100644 --- a/lib/order/exchange_history_page.dart +++ b/lib/order/exchange_history_page.dart @@ -192,7 +192,7 @@ class _ExchangeHistoryList extends State { onLoading: queryHistory, child: orders == null || orders.length == 0 ? NoDataView( - src: "assets/image/ding_dan.png", + src: "assets/image/ding_dan.webp", isShowBtn: false, text: "目前暂无记录,手上那么多积分要赶紧用掉哦~", fontSize: 16.sp, @@ -366,8 +366,8 @@ class _ExchangeHistoryList extends State { exchangeOrder.creditOrderDetailList != null) ? exchangeOrder.creditOrderDetailList[0].goodsMainImg : "", - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", width: 66, height: 66, fit: BoxFit.cover, @@ -460,7 +460,7 @@ class _ExchangeHistoryList extends State { children: [ IconText( "${S.of(context).dingdanbianhao}: ${exchangeOrder.orderCode}", - leftImage: "assets/image/bianhao.png", + leftImage: "assets/image/bianhao.webp", iconSize: 16, textStyle: TextStyle( fontSize: 12.sp, diff --git a/lib/order/exchange_order_detail_page.dart b/lib/order/exchange_order_detail_page.dart index 0cb151c3..c34c5ac0 100644 --- a/lib/order/exchange_order_detail_page.dart +++ b/lib/order/exchange_order_detail_page.dart @@ -58,7 +58,7 @@ class _ExchangeOrderDetailPage extends State { Row( children: [ Image.asset( - "assets/image/icon_location_address.png", + "assets/image/icon_location_address.webp", width: 28, height: 28, ), diff --git a/lib/order/exchange_order_page.dart b/lib/order/exchange_order_page.dart index d2857d10..0311222d 100644 --- a/lib/order/exchange_order_page.dart +++ b/lib/order/exchange_order_page.dart @@ -103,7 +103,7 @@ class _ExchangeOrderPage extends State { Row( children: [ Image.asset( - "assets/image/icon_order_exchange_info.png", + "assets/image/icon_order_exchange_info.webp", width: 24, height: 24, ), @@ -298,7 +298,7 @@ class _ExchangeOrderPage extends State { // Row( // children: [ // Image.asset( - // "assets/image/icon_order_exchange_info.png", + // "assets/image/icon_order_exchange_info.webp", // width: 24, // height: 24, // ), @@ -376,7 +376,7 @@ class _ExchangeOrderPage extends State { Row( children: [ Image.asset( - "assets/image/icon_order_exchange_info.png", + "assets/image/icon_order_exchange_info.webp", width: 24, height: 24, ), @@ -532,7 +532,7 @@ class _ExchangeOrderPage extends State { Row( children: [ Image.asset( - "assets/image/icon_order_commodity_info.png", + "assets/image/icon_order_commodity_info.webp", width: 24, height: 24, ), @@ -560,8 +560,8 @@ class _ExchangeOrderPage extends State { width: 80, height: 80, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Expanded( child: Container( @@ -723,7 +723,7 @@ class _ExchangeOrderPage extends State { }); }, child: Image.asset( - "assets/image/reduce.png", + "assets/image/reduce.webp", width: 22, height: 22, ), @@ -763,7 +763,7 @@ class _ExchangeOrderPage extends State { }); }, child: Image.asset( - "assets/image/add.png", + "assets/image/add.webp", width: 22, height: 22, ), @@ -910,7 +910,7 @@ class _ExchangeOrderPage extends State { children: [ checkPayView(3), Spacer(), - Image.asset("assets/image/icon_we_chat.png"), + Image.asset("assets/image/icon_we_chat.webp"), Padding( padding: EdgeInsets.only(left: 8.w), child: Text( @@ -1026,8 +1026,8 @@ class _ExchangeOrderPage extends State { alignment: Alignment.center, child: Image.asset( checkIndex != index - ? "assets/image/icon_radio_unselected.png" - : "assets/image/icon_radio_selected.png", + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", width: 15.w, height: 15.h, ), diff --git a/lib/order/exchange_order_success_page.dart b/lib/order/exchange_order_success_page.dart index 0f2a4228..50f4d462 100644 --- a/lib/order/exchange_order_success_page.dart +++ b/lib/order/exchange_order_success_page.dart @@ -63,7 +63,7 @@ class _ExchangeOrderSuccessPage extends State { height: 46.h, ), Image.asset( - "assets/image/icon_order_success.png", + "assets/image/icon_order_success.webp", width: 76.w, height: 76.h, fit: BoxFit.contain, diff --git a/lib/order/exchange_write_off_page.dart b/lib/order/exchange_write_off_page.dart index baccb983..028f5be6 100644 --- a/lib/order/exchange_write_off_page.dart +++ b/lib/order/exchange_write_off_page.dart @@ -47,7 +47,7 @@ class _ExchangeWriteOffPage extends State { alignment: Alignment.topCenter, children: [ Image.asset( - "assets/image/icon_write_off_bg.png", + "assets/image/icon_write_off_bg.webp", width: MediaQuery.of(context).size.width * 0.912, fit: BoxFit.fill, ), diff --git a/lib/order/logistics_information_page.dart b/lib/order/logistics_information_page.dart index 8af795c2..6708df0a 100644 --- a/lib/order/logistics_information_page.dart +++ b/lib/order/logistics_information_page.dart @@ -153,7 +153,7 @@ class _LogisticsInformationPage extends State { position, logistics.length); }) : NoDataView( - src: "assets/image/ding_dan.png", + src: "assets/image/ding_dan.webp", isShowBtn: false, text: "暂无物流信息~", fontSize: 16.sp, @@ -199,8 +199,8 @@ class _LogisticsInformationPage extends State { width: 95, height: 95, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Container( padding: EdgeInsets.only( @@ -428,17 +428,17 @@ class _LogisticsInformationPage extends State { } String tripStatus(String type) { - String tripStatus = "assets/image/icon_sign.png"; + String tripStatus = "assets/image/icon_sign.webp"; if (type.contains("已签收")) { - tripStatus = "assets/image/icon_sign.png"; + tripStatus = "assets/image/icon_sign.webp"; } else if (type.contains("派送中") || type.contains("派件中")) { - tripStatus = "assets/image/icon_delivery.png"; + tripStatus = "assets/image/icon_delivery.webp"; } else if (type.contains("运输中") || type.contains("发往")) { - tripStatus = "assets/image/icon_transport.png"; + tripStatus = "assets/image/icon_transport.webp"; } else if (type.contains("已发货") || type.contains("分配")) { - tripStatus = "assets/image/icon_deliver_goods.png"; + tripStatus = "assets/image/icon_deliver_goods.webp"; } else if (type.contains("已下单")) { - tripStatus = "assets/image/icon_place_ order.png"; + tripStatus = "assets/image/icon_place_ order.webp"; } return tripStatus; } diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index bab21ef5..6d703001 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -419,7 +419,7 @@ class _OrderDetailPage extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ checkView(0), - // Image.asset("assets/image/icon_alipay.png"), + // Image.asset("assets/image/icon_alipay.webp"), Text( S.of(context).pingtaiyue, style: TextStyle( @@ -437,7 +437,7 @@ class _OrderDetailPage extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ checkView(1), - // Image.asset("assets/image/icon_alipay.png"), + // Image.asset("assets/image/icon_alipay.webp"), Text( S.of(context).dianpuyue, style: TextStyle( @@ -457,7 +457,7 @@ class _OrderDetailPage extends State { checkView(2), IconText( S.of(context).weixinzhifu, - leftImage: "assets/image/icon_we_chat.png", + leftImage: "assets/image/icon_we_chat.webp", iconSize: 14.w, space: 8.w, textStyle: TextStyle( @@ -486,8 +486,8 @@ class _OrderDetailPage extends State { alignment: Alignment.center, child: Image.asset( checkIndex != index - ? "assets/image/icon_radio_unselected.png" - : "assets/image/icon_radio_selected.png", + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", width: 15, height: 15, )), diff --git a/lib/order/order_view/order_address.dart b/lib/order/order_view/order_address.dart index 363fd09f..1be9afcd 100644 --- a/lib/order/order_view/order_address.dart +++ b/lib/order/order_view/order_address.dart @@ -67,7 +67,7 @@ class _OrderAddress extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Image.asset( - "assets/image/shop_logo.png", + "assets/image/shop_logo.webp", width: 24.w, height: 24.h, ), @@ -144,7 +144,7 @@ class _OrderAddress extends State { } else if (widget.payStatus < 4) { SmartDialog.show( widget: TextImageWidget( - "assets/image/icon_empty.png", + "assets/image/icon_empty.webp", S.of(context).ruxutuikuanqingyumendianlianxi, "", S.of(context).zhidianmendian, @@ -173,8 +173,8 @@ class _OrderAddress extends State { children: [ Image.asset( widget.payStatus == 0 - ? "assets/image/icon_order_cancel.png" - : "assets/image/icon_request_refund.png", + ? "assets/image/icon_order_cancel.webp" + : "assets/image/icon_request_refund.webp", width: 24.w, height: 24.h, fit: BoxFit.contain, @@ -217,8 +217,8 @@ class _OrderAddress extends State { children: [ Image.asset( widget.payStatus == 0 - ? "assets/image/icon_order_renminbi.png" - : "assets/image/icon_order_agin.png", + ? "assets/image/icon_order_renminbi.webp" + : "assets/image/icon_order_agin.webp", width: 24.w, height: 24.h, fit: BoxFit.contain, diff --git a/lib/order/order_view/order_commodity.dart b/lib/order/order_view/order_commodity.dart index 8ceae95e..ec16f24b 100644 --- a/lib/order/order_view/order_commodity.dart +++ b/lib/order/order_view/order_commodity.dart @@ -160,8 +160,8 @@ class _OrderCommodity extends State { width: 44.w, height: 44, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Expanded( flex: 1, diff --git a/lib/order/order_view/order_pay_selected.dart b/lib/order/order_view/order_pay_selected.dart index adaa02e5..6565854b 100644 --- a/lib/order/order_view/order_pay_selected.dart +++ b/lib/order/order_view/order_pay_selected.dart @@ -105,7 +105,7 @@ class _OrderPaySelected extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset("assets/image/icon_we_chat.png"), + Image.asset("assets/image/icon_we_chat.webp"), Padding( padding: EdgeInsets.only(left: 8.w), child: Text( @@ -135,8 +135,8 @@ class _OrderPaySelected extends State { alignment: Alignment.center, child: Image.asset( /*checkIndex != index - ? */"assets/image/icon_radio_unselected.png", - // : "assets/image/icon_radio_selected.png", + ? */"assets/image/icon_radio_unselected.webp", + // : "assets/image/icon_radio_selected.webp", width: 15.w, height: 15.h, ), diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart index db9ff816..55cbfa7d 100644 --- a/lib/order/order_view/order_status.dart +++ b/lib/order/order_view/order_status.dart @@ -42,7 +42,7 @@ class _OrderStatus extends State { // child: Container( // child: IconText( // (widget.center != null && widget.center != "") ? widget.center : "", - // // leftImage: "assets/image/icon_order_ok.png", + // // leftImage: "assets/image/icon_order_ok.webp", // // iconSize: 40.w, // textStyle: TextStyle( // fontSize: 18.sp, @@ -241,21 +241,21 @@ class _OrderStatus extends State { } statusPicture(String status) { - String tripStatus = "assets/image/wait_meal.png"; + String tripStatus = "assets/image/wait_meal.webp"; if (status.contains(S.of(context).dingdanyiwancheng)) { - tripStatus = "assets/image/order_ok.png"; + tripStatus = "assets/image/order_ok.webp"; } else if (status.contains(S.of(context).dingdanyituikuan)) { - tripStatus = "assets/image/order_refund.png"; + tripStatus = "assets/image/order_refund.webp"; } else if (status.contains(S.of(context).yiquxiao)) { - tripStatus = "assets/image/oeder_cancel.png"; + tripStatus = "assets/image/oeder_cancel.webp"; } else if (status.contains(S.of(context).dengdaiyonghuqucan)) { - tripStatus = "assets/image/wait_meal.png"; + tripStatus = "assets/image/wait_meal.webp"; }else if (status.contains(S.of(context).zhengzaihujiaoqishou)) { - tripStatus = "assets/image/distribution.png"; + tripStatus = "assets/image/distribution.webp"; }else if (status.contains(S.of(context).qishouyijiedanquhuozhong)) { - tripStatus = "assets/image/closed_bill.png"; + tripStatus = "assets/image/closed_bill.webp"; } else if (status.contains(S.of(context).dingdanyisongda)) { - tripStatus = "assets/image/service.png"; + tripStatus = "assets/image/service.webp"; } return tripStatus; } diff --git a/lib/order/store_selector_page.dart b/lib/order/store_selector_page.dart index 3adafc4f..e5492a01 100644 --- a/lib/order/store_selector_page.dart +++ b/lib/order/store_selector_page.dart @@ -143,7 +143,7 @@ class _StoreSelectorPage extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweigongnengweikaiqi, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).dakaidingwei, @@ -167,7 +167,7 @@ class _StoreSelectorPage extends State { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweiquanxianweiyunxu, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).kaiqiquanxian, diff --git a/lib/order/write_off_page.dart b/lib/order/write_off_page.dart index 94626289..26ec1c5e 100644 --- a/lib/order/write_off_page.dart +++ b/lib/order/write_off_page.dart @@ -85,7 +85,7 @@ class _WriteOffPage extends State { alignment: Alignment.topCenter, children: [ Image.asset( - "assets/image/icon_write_off_bg.png", + "assets/image/icon_write_off_bg.webp", width: MediaQuery.of(context).size.width * 0.912, fit: BoxFit.fill, ), diff --git a/lib/order/write_off_success_page.dart b/lib/order/write_off_success_page.dart index 4c08e336..a1cff206 100644 --- a/lib/order/write_off_success_page.dart +++ b/lib/order/write_off_success_page.dart @@ -33,7 +33,7 @@ class _WriteOffSuccessPage extends State { height: 46.h, ), Image.asset( - "assets/image/icon_order_success.png", + "assets/image/icon_order_success.webp", width: 76.w, height: 76.h, fit: BoxFit.contain, diff --git a/lib/qr/qr_share.dart b/lib/qr/qr_share.dart index 7fd13b48..8d5ea55f 100644 --- a/lib/qr/qr_share.dart +++ b/lib/qr/qr_share.dart @@ -81,7 +81,7 @@ class _QrSharePage extends State { children: [ Positioned( child: Image.asset( - "assets/image/qr_share_bg.png", + "assets/image/qr_share_bg.webp", fit: BoxFit.fill, ), top: 0, @@ -101,7 +101,7 @@ class _QrSharePage extends State { children: [ Positioned( child: Image.asset( - "assets/image/qr_share_info_bg.png", + "assets/image/qr_share_info_bg.webp", fit: BoxFit.fill, ), top: 0, @@ -219,7 +219,7 @@ class _QrSharePage extends State { double height; buildImageInfo() async { - image = Image.asset("assets/image/qr_share_bg_yq.png"); + image = Image.asset("assets/image/qr_share_bg_yq.webp"); image.image .resolve(ImageConfiguration()) .addListener(ImageStreamListener((ImageInfo info, bool _) { diff --git a/lib/qr/qr_share_image.dart b/lib/qr/qr_share_image.dart index 445c66a4..28c0feab 100644 --- a/lib/qr/qr_share_image.dart +++ b/lib/qr/qr_share_image.dart @@ -39,7 +39,7 @@ class _QrShareImagePage extends State { child: Column( children: [ Image.asset( - "assets/image/share_image_bg_yq.png", + "assets/image/share_image_bg_yq.webp", height: (MediaQuery.of(context).size.width * 0.8) * 0.47, width: (MediaQuery.of(context).size.width * 0.8), ), @@ -211,7 +211,7 @@ class _QrShareImagePage extends State { } else { filePath = (await getApplicationDocumentsDirectory()).path; } - filePath = "$filePath/${DateTime.now().millisecondsSinceEpoch}.png"; + filePath = "$filePath/${DateTime.now().millisecondsSinceEpoch}.webp"; File file = File(filePath); if (!file.existsSync()) { diff --git a/lib/retrofit/data/achievement_detail_list.dart b/lib/retrofit/data/achievement_detail_list.dart index 2677c888..5f4cbcff 100644 --- a/lib/retrofit/data/achievement_detail_list.dart +++ b/lib/retrofit/data/achievement_detail_list.dart @@ -6,7 +6,7 @@ /// categoryId : "1460904379451179008" /// name : "青铜" /// level : 0 -/// icon : "https://pos.upload.gznl.top/MDAwMA==/2021/11/dd1bd6f1-6079-46ab-8d0f-6a946048db9d.png" +/// icon : "https://pos.upload.gznl.top/MDAwMA==/2021/11/dd1bd6f1-6079-46ab-8d0f-6a946048db9d.webp" /// score : 1 /// actived : true /// sort : 0 diff --git a/lib/retrofit/data/chapter.dart b/lib/retrofit/data/chapter.dart index f4111ac1..430d1917 100644 --- a/lib/retrofit/data/chapter.dart +++ b/lib/retrofit/data/chapter.dart @@ -5,7 +5,7 @@ /// updateUser : "1" /// courseId : "1452472611438067712" /// name : "111" -/// content : {"coverImg":"https://pos.upload.gznl.top/0000/2021/11/3e014154-57cc-441e-9d02-aa53975979f5.png","remark":"11111111","fileUrl":"https://pos.upload.gznl.top/0000/2021/11/d87dd996-e269-46eb-b7ef-f8ceddfabef2.mp4"} +/// content : {"coverImg":"https://pos.upload.gznl.top/0000/2021/11/3e014154-57cc-441e-9d02-aa53975979f5.webp","remark":"11111111","fileUrl":"https://pos.upload.gznl.top/0000/2021/11/d87dd996-e269-46eb-b7ef-f8ceddfabef2.mp4"} /// sort : 0 /// isDelete : 0 @@ -86,7 +86,7 @@ class Chapter { } -/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/3e014154-57cc-441e-9d02-aa53975979f5.png" +/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/3e014154-57cc-441e-9d02-aa53975979f5.webp" /// remark : "11111111" /// fileUrl : "https://pos.upload.gznl.top/0000/2021/11/d87dd996-e269-46eb-b7ef-f8ceddfabef2.mp4" diff --git a/lib/retrofit/data/coupon.dart b/lib/retrofit/data/coupon.dart index b8aef9eb..8da93e46 100644 --- a/lib/retrofit/data/coupon.dart +++ b/lib/retrofit/data/coupon.dart @@ -21,6 +21,7 @@ class Coupon { String useEndTime; String promotionId; bool centreDisplay; + bool allProduct; String tenantCode; String tenantName; int isDelete; @@ -52,6 +53,7 @@ class Coupon { ..useEndTime = json['useEndTime'] as String ..promotionId = json['promotionId'] as String ..centreDisplay = json['centreDisplay'] as bool + ..allProduct = json['allProduct'] as bool ..tenantCode = json['tenantCode'] as String ..tenantName = json['tenantName'] as String ..isDelete = json['isDelete'] as int @@ -84,6 +86,7 @@ class Coupon { 'useEndTime': this.useEndTime, 'promotionId': this.promotionId, 'centreDisplay': this.centreDisplay, + 'allProduct' : this.allProduct, 'tenantCode': this.tenantCode, 'tenantName': this.tenantName, 'isDelete': this.isDelete, diff --git a/lib/retrofit/data/findMiNiGroupList.dart b/lib/retrofit/data/findMiNiGroupList.dart index 54e65c27..f43552ed 100644 --- a/lib/retrofit/data/findMiNiGroupList.dart +++ b/lib/retrofit/data/findMiNiGroupList.dart @@ -1,9 +1,9 @@ /// id : "1435148069191548928" /// storeId : "1333246101343436800" /// groupName : "��Ʒ�人" -/// groupImg : "https://pos.upload.gznl.top/1175/2021/09/c9abb054-4509-4f22-9671-6f712ab7e493.png" +/// groupImg : "https://pos.upload.gznl.top/1175/2021/09/c9abb054-4509-4f22-9671-6f712ab7e493.webp" /// sort : 0 -/// productList : [{"id":"1440501052276211712","supplierName":"����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"����","productName":"֧������","sellDesc":"","productCode":"PRO202109221019480000000000001","weight":"0","applyPrice":"0.00","price":"0.01","stock":-48,"sellCount":48,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/ade72b41-23a2-4f29-ae50-4e620b7e9011.png","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null},{"id":"1435893909921202176","supplierName":"����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"����","productName":"������","sellDesc":"","productCode":"PRO202109091712400000000000003","weight":"0","applyPrice":"0.00","price":"9999.00","stock":-10,"sellCount":10,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/1d212bc1-b952-4aba-a870-8538009da680.png","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null},{"id":"1435781813317402624","supplierName":"��Ͽ����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"ƴ�̲���","productName":"ƴ�̲���(��ѡ��)","sellDesc":"","productCode":"PRO202109090947140000000000001","weight":"0","applyPrice":"0.00","price":"2.00","stock":-15,"sellCount":17,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/c1412e9a-2c5a-4658-9850-8dde8d1e9321.png","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null}] +/// productList : [{"id":"1440501052276211712","supplierName":"����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"����","productName":"֧������","sellDesc":"","productCode":"PRO202109221019480000000000001","weight":"0","applyPrice":"0.00","price":"0.01","stock":-48,"sellCount":48,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/ade72b41-23a2-4f29-ae50-4e620b7e9011.webp","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null},{"id":"1435893909921202176","supplierName":"����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"����","productName":"������","sellDesc":"","productCode":"PRO202109091712400000000000003","weight":"0","applyPrice":"0.00","price":"9999.00","stock":-10,"sellCount":10,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/1d212bc1-b952-4aba-a870-8538009da680.webp","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null},{"id":"1435781813317402624","supplierName":"��Ͽ����","storeId":"1333246101343436800","categoryId":"1300688133322440704","groupId":"1435148069191548928","shortName":"ƴ�̲���","productName":"ƴ�̲���(��ѡ��)","sellDesc":"","productCode":"PRO202109090947140000000000001","weight":"0","applyPrice":"0.00","price":"2.00","stock":-15,"sellCount":17,"needLogistics":1,"oversold":1,"status":1,"posShow":true,"attrStyle":0,"isDelete":0,"productAttrValues":null,"skuList":null,"imgPathList":null,"buyNum":0,"imgPath":"https://pos.upload.gznl.top/1175/2021/09/c1412e9a-2c5a-4658-9850-8dde8d1e9321.webp","setMeal":1,"printerFlag":"DEFAULT","markProductNone":null}] /// productPageVO : null class FindMiNiGroupList { @@ -65,7 +65,7 @@ class FindMiNiGroupList { /// skuList : null /// imgPathList : null /// buyNum : 0 -/// imgPath : "https://pos.upload.gznl.top/1175/2021/09/ade72b41-23a2-4f29-ae50-4e620b7e9011.png" +/// imgPath : "https://pos.upload.gznl.top/1175/2021/09/ade72b41-23a2-4f29-ae50-4e620b7e9011.webp" /// setMeal : 1 /// printerFlag : "DEFAULT" /// markProductNone : null diff --git a/lib/retrofit/data/founder.dart b/lib/retrofit/data/founder.dart index 69280e72..7601294a 100644 --- a/lib/retrofit/data/founder.dart +++ b/lib/retrofit/data/founder.dart @@ -1,8 +1,8 @@ /// name : "李旭清" /// position : "集团创始人" /// description : "1993年,台湾同胞李旭清在台湾创建“一心回乡”" -/// imgUrl : "https://pos.upload.gznl.top/MDAwMA==/2021/07/3f169d8c-5cb8-4789-a8f6-f2ce17277106.png" -/// profile : "

" +/// imgUrl : "https://pos.upload.gznl.top/MDAwMA==/2021/07/3f169d8c-5cb8-4789-a8f6-f2ce17277106.webp" +/// profile : "

" class Founder { String _name; diff --git a/lib/retrofit/data/goods.dart b/lib/retrofit/data/goods.dart index 983278a5..e19934b4 100644 --- a/lib/retrofit/data/goods.dart +++ b/lib/retrofit/data/goods.dart @@ -22,8 +22,8 @@ /// canDelivery : true /// isDelete : 0 /// categoryName : null -/// mainImgPath : "https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png" -/// viceImgPaths : ["https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png","https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png"] +/// mainImgPath : "https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.webp" +/// viceImgPaths : ["https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.webp","https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.webp"] class Goods { Goods({ diff --git a/lib/retrofit/data/headlines_list.dart b/lib/retrofit/data/headlines_list.dart index 55bef87f..faa9cdbc 100644 --- a/lib/retrofit/data/headlines_list.dart +++ b/lib/retrofit/data/headlines_list.dart @@ -5,8 +5,8 @@ /// updateUser : "1" /// name : "一心回乡" /// introduce : "22" -/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.png" -/// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.png" +/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.webp" +/// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.webp" /// sort : 0 /// isDelete : 0 /// tenantCode : "admin" diff --git a/lib/retrofit/data/headlines_list_details.dart b/lib/retrofit/data/headlines_list_details.dart index eebed291..9d53e690 100644 --- a/lib/retrofit/data/headlines_list_details.dart +++ b/lib/retrofit/data/headlines_list_details.dart @@ -5,8 +5,8 @@ /// updateUser : "1" /// name : "一心回乡" /// introduce : "22" -/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.png" -/// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.png" +/// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.webp" +/// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.webp" /// sort : 0 /// isDelete : 0 /// tenantCode : "admin" diff --git a/lib/retrofit/data/miNiDetail.dart b/lib/retrofit/data/miNiDetail.dart index 3a855f87..e5c02685 100644 --- a/lib/retrofit/data/miNiDetail.dart +++ b/lib/retrofit/data/miNiDetail.dart @@ -27,8 +27,8 @@ /// isDelete : 0 /// printerFlag : "DEFAULT" /// materialId : null -/// imgs : ["https://pos.upload.gznl.top/1175/2021/09/b87e91a4-fe36-4268-803a-94e5bfaea3eb.png"] -/// storeDTO : {"id":"1333246101343436800","storeName":"��Ͽ���ò��(���ֵ�)","nickName":"","logo":"https://pos.upload.gznl.top/1175/2021/07/ae873881-b3ab-4332-b863-f3055b200e07.png","productCount":31,"soldNum":1518} +/// imgs : ["https://pos.upload.gznl.top/1175/2021/09/b87e91a4-fe36-4268-803a-94e5bfaea3eb.webp"] +/// storeDTO : {"id":"1333246101343436800","storeName":"��Ͽ���ò��(���ֵ�)","nickName":"","logo":"https://pos.upload.gznl.top/1175/2021/07/ae873881-b3ab-4332-b863-f3055b200e07.webp","productCount":31,"soldNum":1518} /// attrList : [{"productId":"1433994980233314304","attrName":"�¶�","sortOrder":null,"needImg":false,"isDelete":0,"attrCode":null,"id":"1433994980644356096","attrValueList":[{"id":"1434076666832879616","attrId":"1433994980644356096","attrValue":"ȥ��","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null},{"id":"1433994980849876992","attrId":"1433994980644356096","attrValue":"�ٱ�","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null},{"id":"1434076667034206208","attrId":"1433994980644356096","attrValue":"������","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null}]},{"productId":"1433994980233314304","attrName":"����","sortOrder":0,"needImg":false,"isDelete":0,"attrCode":null,"id":"1434076668170862592","attrValueList":[{"id":"1434076668615458816","attrId":"1434076668170862592","attrValue":"�б�","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null},{"id":"1434076668376383488","attrId":"1434076668170862592","attrValue":"��","attrValueImg":"","sortOrder":0,"isDelete":0,"attrValueCode":null}]},{"productId":"1433994980233314304","attrName":"���","sortOrder":0,"needImg":false,"isDelete":0,"attrCode":null,"id":"1434076667252310016","attrValueList":[{"id":"1434076667919204352","attrId":"1434076667252310016","attrValue":"����","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null},{"id":"1434076667696906240","attrId":"1434076667252310016","attrValue":"�����","attrValueImg":"","sortOrder":null,"isDelete":0,"attrValueCode":null},{"id":"1434076667478802432","attrId":"1434076667252310016","attrValue":"������","attrValueImg":"","sortOrder":0,"isDelete":0,"attrValueCode":null}]}] /// productSkuVOList : [{"id":"1446382612795883520","createTime":"2021-09-04 16:51:38","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:38","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651376","skuNameStr":"ȥ�� �б� ����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382613043347456","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382612795883520","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382613278228480","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382612795883520","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382613479555072","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382612795883520","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382613697658880","createTime":"2021-09-04 16:51:37","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:37","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651374","skuNameStr":"ȥ�� �б� �����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382613911568384","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382613697658880","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382614112894976","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382613697658880","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382614330998784","createTime":"2021-10-08 15:51:02","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:02","updateUser":"1333246101196636160","skuId":"1446382613697658880","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382614553296896","createTime":"2021-09-04 16:51:37","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:37","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651362","skuNameStr":"ȥ�� �б� ������","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382614788177920","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382614553296896","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382615002087424","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382614553296896","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382615199219712","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382614553296896","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382615413129216","createTime":"2021-09-04 16:51:38","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:38","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651375","skuNameStr":"ȥ�� �� ����","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-4,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382615639621632","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382615413129216","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382615845142528","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382615413129216","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382616050663424","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382615413129216","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382616281350144","createTime":"2021-09-04 16:51:37","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:37","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651373","skuNameStr":"ȥ�� �� �����","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382616516231168","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382616281350144","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382616734334976","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382616281350144","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382616935661568","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382616281350144","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382617149571072","createTime":"2021-09-04 16:51:37","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:37","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651361","skuNameStr":"ȥ�� �� ������","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382617363480576","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382617149571072","attrId":"1433994980644356096","attrValueId":"1434076666832879616","sortOrder":null,"isDelete":0},{"id":"1446382617573195776","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382617149571072","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382617787105280","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382617149571072","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382618005209088","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �б� ����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382618231701504","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382618005209088","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382618458193920","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382618005209088","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382618676297728","createTime":"2021-10-08 15:51:03","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:03","updateUser":"1333246101196636160","skuId":"1446382618005209088","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382618890207232","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �б� �����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382619104116736","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382618890207232","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382619318026240","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382618890207232","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382619531935744","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382618890207232","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382619737456640","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �б� ������","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382619951366144","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382619737456640","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382620148498432","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382619737456640","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382620362407936","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382619737456640","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382620626649088","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �� ����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382620907667456","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382620626649088","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382621121576960","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382620626649088","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382621335486464","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382620626649088","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382621549395968","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �� �����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382621759111168","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382621549395968","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382621968826368","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382621549395968","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382622178541568","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382621549395968","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382622400839680","createTime":"2021-09-04 11:27:00","createUser":"1333246101196636160","updateTime":"2021-09-04 11:27:00","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041127002","skuNameStr":"�ٱ� �� ������","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":"","weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382622610554880","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382622400839680","attrId":"1433994980644356096","attrValueId":"1433994980849876992","sortOrder":null,"isDelete":0},{"id":"1446382622828658688","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382622400839680","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382623038373888","createTime":"2021-10-08 15:51:04","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:04","updateUser":"1333246101196636160","skuId":"1446382622400839680","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382623277449216","createTime":"2021-09-04 16:51:39","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:39","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651394","skuNameStr":"������ �б� ����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382623491358720","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382623277449216","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382623709462528","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382623277449216","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382623919177728","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382623277449216","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382624149864448","createTime":"2021-09-04 16:51:39","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:39","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651382","skuNameStr":"������ �б� �����","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-1,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382624393134080","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382624149864448","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382624607043584","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382624149864448","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382624816758784","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382624149864448","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382625043251200","createTime":"2021-09-04 16:51:38","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:38","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651388","skuNameStr":"������ �б� ������","productId":"1433994980233314304","skuPrice":"5.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-2,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382625252966400","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625043251200","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382625462681600","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625043251200","attrId":"1434076668170862592","attrValueId":"1434076668615458816","sortOrder":null,"isDelete":0},{"id":"1446382625701756928","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625043251200","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382625907277824","createTime":"2021-09-04 16:51:39","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:39","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651383","skuNameStr":"������ �� ����","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-5,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382626125381632","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625907277824","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382626335096832","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625907277824","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382626553200640","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382625907277824","attrId":"1434076667252310016","attrValueId":"1434076667919204352","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382626800664576","createTime":"2021-09-04 16:51:39","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:39","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651389","skuNameStr":"������ �� �����","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-1,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382627006185472","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382626800664576","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382627211706368","createTime":"2021-10-08 15:51:05","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:05","updateUser":"1333246101196636160","skuId":"1446382626800664576","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382627413032960","createTime":"2021-10-08 15:51:06","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:06","updateUser":"1333246101196636160","skuId":"1446382626800664576","attrId":"1434076667252310016","attrValueId":"1434076667696906240","sortOrder":null,"isDelete":0}],"setMealDTOList":null},{"id":"1446382627631136768","createTime":"2021-09-04 16:51:38","createUser":"1333246101196636160","updateTime":"2021-09-04 16:51:38","updateUser":"1333246101196636160","storeId":"1333246101343436800","skuCode":"P202109041651387","skuNameStr":"������ �� ������","productId":"1433994980233314304","skuPrice":"10.00","applyPrice":"0.00","vipPrice":null,"skuImg":null,"skuStock":-3,"sort":null,"setMeal":null,"weight":0.0,"volume":0.0,"isDelete":0,"material":null,"version":null,"skuAttrCodeDTOList":null,"skuAttrList":[{"id":"1446382627866017792","createTime":"2021-10-08 15:51:06","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:06","updateUser":"1333246101196636160","skuId":"1446382627631136768","attrId":"1433994980644356096","attrValueId":"1434076667034206208","sortOrder":null,"isDelete":0},{"id":"1446382628092510208","createTime":"2021-10-08 15:51:06","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:06","updateUser":"1333246101196636160","skuId":"1446382627631136768","attrId":"1434076668170862592","attrValueId":"1434076668376383488","sortOrder":null,"isDelete":0},{"id":"1446382628306419712","createTime":"2021-10-08 15:51:06","createUser":"1333246101196636160","updateTime":"2021-10-08 15:51:06","updateUser":"1333246101196636160","skuId":"1446382627631136768","attrId":"1434076667252310016","attrValueId":"1434076667478802432","sortOrder":null,"isDelete":0}],"setMealDTOList":null}] /// shipAddress : "����·��Ͽ�����̲�" diff --git a/lib/retrofit/data/recharge_list.dart b/lib/retrofit/data/recharge_list.dart new file mode 100644 index 00000000..4e6c5d71 --- /dev/null +++ b/lib/retrofit/data/recharge_list.dart @@ -0,0 +1,78 @@ +/// id : "1494622230208839681" +/// rechargeMoney : "100.00" +/// giftdMoney : "0.00" +/// gitfdCouponId : null +/// tenantCode : "admin" +/// createTime : "2022-03-23 10:53:37" +/// isDeleted : 0 +/// rechargeType : 0 +/// remark : "充充充" + +class RechargeList { + RechargeList({ + String id, + String rechargeMoney, + String giftdMoney, + dynamic gitfdCouponId, + String tenantCode, + String createTime, + int isDeleted, + int rechargeType, + String remark,}){ + _id = id; + _rechargeMoney = rechargeMoney; + _giftdMoney = giftdMoney; + _gitfdCouponId = gitfdCouponId; + _tenantCode = tenantCode; + _createTime = createTime; + _isDeleted = isDeleted; + _rechargeType = rechargeType; + _remark = remark; +} + + RechargeList.fromJson(dynamic json) { + _id = json['id']; + _rechargeMoney = json['rechargeMoney']; + _giftdMoney = json['giftdMoney']; + _gitfdCouponId = json['gitfdCouponId']; + _tenantCode = json['tenantCode']; + _createTime = json['createTime']; + _isDeleted = json['isDeleted']; + _rechargeType = json['rechargeType']; + _remark = json['remark']; + } + String _id; + String _rechargeMoney; + String _giftdMoney; + dynamic _gitfdCouponId; + String _tenantCode; + String _createTime; + int _isDeleted; + int _rechargeType; + String _remark; + + String get id => _id; + String get rechargeMoney => _rechargeMoney; + String get giftdMoney => _giftdMoney; + dynamic get gitfdCouponId => _gitfdCouponId; + String get tenantCode => _tenantCode; + String get createTime => _createTime; + int get isDeleted => _isDeleted; + int get rechargeType => _rechargeType; + String get remark => _remark; + + Map toJson() { + final map = {}; + map['id'] = _id; + map['rechargeMoney'] = _rechargeMoney; + map['giftdMoney'] = _giftdMoney; + map['gitfdCouponId'] = _gitfdCouponId; + map['tenantCode'] = _tenantCode; + map['createTime'] = _createTime; + map['isDeleted'] = _isDeleted; + map['rechargeType'] = _rechargeType; + map['remark'] = _remark; + return map; + } + +} \ No newline at end of file diff --git a/lib/retrofit/data/vip_benefit_list.dart b/lib/retrofit/data/vip_benefit_list.dart index 7ef9304f..5e8bee85 100644 --- a/lib/retrofit/data/vip_benefit_list.dart +++ b/lib/retrofit/data/vip_benefit_list.dart @@ -5,8 +5,8 @@ /// updateUser : "1" /// code : "DEPUTY" /// name : "副卡" -/// icon : "https://pos.upload.gznl.top/MDAwMA==/2021/11/fb1e46d2-6213-4164-abbc-9aa24da24faf.png" -/// iconGrey : "https://pos.upload.gznl.top/MDAwMA==/2021/11/f50d211a-3d52-4663-bf8a-c4dff4f79310.png" +/// icon : "https://pos.upload.gznl.top/MDAwMA==/2021/11/fb1e46d2-6213-4164-abbc-9aa24da24faf.webp" +/// iconGrey : "https://pos.upload.gznl.top/MDAwMA==/2021/11/f50d211a-3d52-4663-bf8a-c4dff4f79310.webp" /// introduce : "

用户在成为金卡会员/共创会员之后, 即可经行副卡绑定。点击添加新副卡,输入需要绑定的用户手机号,输入需要绑定用户的手机号,输入验证码,验证通过后,即可绑定成功。点击头像右下方的解除,出现提示弹窗,点击确认即可解除绑定。

" /// describes : "
    \n
  • 副卡用户必须为平台注册用户
  • \n
  • 每位主卡用户只可绑定5位副卡用户,同时,只能解绑3次
  • \n
  • 副卡享受主卡的部分权益,主卡会员失效之后,副卡也失效
  • \n
  • 副卡成为金卡会员后,自动与主卡解绑
  • \n
" /// actived : false diff --git a/lib/retrofit/data/vip_card.dart b/lib/retrofit/data/vip_card.dart index 44b2a331..aec7f59b 100644 --- a/lib/retrofit/data/vip_card.dart +++ b/lib/retrofit/data/vip_card.dart @@ -27,7 +27,7 @@ /// vipRegStore : null /// tenantName : "稻田里的书店" /// tenantLogo : "" -/// storeList : [{"id":"1381798825072525312","createTime":"2021-04-13 10:38:07","createUser":"1","updateTime":"2021-06-12 21:20:22","updateUser":"1381798824988639232","tenantCode":"1\nI/flutter ( 6658): 180","useErp":false,"openStartTime":"09:30:00","openEndTime":"18:30:00","storeName":"稻田里的书店","nickName":"","logo":"https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png","shipAddress":"上海市崇明区东风农场东风公路833弄1-22号C2-C3","remark":"","mobile":"13554204268","longitude":"121.4789730000","latitude":"31.7092220000","refundAddress":null,"refundTel":null,"refundContact":null,"isAutoSendRefundAddress":1,"province":"上海市","city":"上海市","district":"崇明区","address":"上海市崇明区稻田里的书店咖啡茶饮区东平镇东风公路833号东风农场C2","headName":"","headMobile":"18672789329","businessService":"WIFI,免费停车","businessType":"书","deliveryInfo":null,"miniParam":null,"is_delete":0,"posType":{"desc":"快消餐饮","code":"FASTSTORE"}}] +/// storeList : [{"id":"1381798825072525312","createTime":"2021-04-13 10:38:07","createUser":"1","updateTime":"2021-06-12 21:20:22","updateUser":"1381798824988639232","tenantCode":"1\nI/flutter ( 6658): 180","useErp":false,"openStartTime":"09:30:00","openEndTime":"18:30:00","storeName":"稻田里的书店","nickName":"","logo":"https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.webp","shipAddress":"上海市崇明区东风农场东风公路833弄1-22号C2-C3","remark":"","mobile":"13554204268","longitude":"121.4789730000","latitude":"31.7092220000","refundAddress":null,"refundTel":null,"refundContact":null,"isAutoSendRefundAddress":1,"province":"上海市","city":"上海市","district":"崇明区","address":"上海市崇明区稻田里的书店咖啡茶饮区东平镇东风公路833号东风农场C2","headName":"","headMobile":"18672789329","businessService":"WIFI,免费停车","businessType":"书","deliveryInfo":null,"miniParam":null,"is_delete":0,"posType":{"desc":"快消餐饮","code":"FASTSTORE"}}] class VipCard { String id; @@ -141,7 +141,7 @@ class VipCard { /// openEndTime : "18:30:00" /// storeName : "稻田里的书店" /// nickName : "" -/// logo : "https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png" +/// logo : "https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.webp" /// shipAddress : "上海市崇明区东风农场东风公路833弄1-22号C2-C3" /// remark : "" /// mobile : "13554204268" diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 1a323135..4897edac 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -35,8 +35,8 @@ part 'min_api.g.dart'; // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 -// const base_url = "http://192.168.10.236:8765/app/";///费韬 -// const baseUrl = "http://192.168.10.236:8765/app/";///费韬 +// const base_url = "http://192.168.10.236:8775/app/";///费韬 +// const baseUrl = "http://192.168.10.236:8775/app/";///费韬 const base_url = "http://192.168.10.96:8765/app/";///詹云久 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index f3b2c7b5..0587366a 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -43,6 +43,7 @@ import 'data/message.dart'; import 'data/msg_stats.dart'; import 'data/page.dart'; import 'data/rank.dart'; +import 'data/recharge_list.dart'; import 'data/second_card_list.dart'; import 'data/sign_info.dart'; import 'data/social_info.dart'; @@ -64,15 +65,15 @@ part 'retrofit_api.g.dart'; // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 -// const base_url = "http://192.168.10.236:8766/app/"; ///费韬 -// const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 +// const base_url = "http://192.168.10.236:8776/app/"; ///费韬 +// const baseUrl = "http://192.168.10.236:8776/app/"; ///费韬 // const base_url = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/"; -const base_url = "http://192.168.10.96:8766/app/";///詹云久 -const baseUrl = "http://192.168.10.96:8766/app/";///詹云久 +const base_url = "http://192.168.10.139:8766/app/";///詹云久 +const baseUrl = "http://192.168.10.139:8766/app/";///詹云久 @RestApi(baseUrl: baseUrl) abstract class ApiService { @@ -219,6 +220,10 @@ abstract class ApiService { @POST("/wallet/recharge") Future> recharge(@Body() Map param); + ///充值活动列表 + @GET("/wallet/rechargeAct") + Future>> rechargeAct(); + ///领取优惠券 @GET("/coupon/receive?couponId={couponId}") Future receiveCoupon(@Path("couponId") String couponId); @@ -381,13 +386,13 @@ abstract class ApiService { @Path("shipperCode") String shipperCode, @Path("logisticCode") String logisticCode); - ///反馈 - @POST("/other/report") - Future> report(@Body() Map map); + // ///反馈 + // @POST("/other/report") + // Future> report(@Body() Map map); ///取消订单 @GET("/order/cancel/{id}") - Future> orderCancel(@Path("id") String id); + Future> orderCancel(@Path("id") String id); ///继续付款? @POST("/order/settlement") @@ -513,4 +518,8 @@ abstract class ApiService { @GET("/member/deleteMine") Future deleteMine(); + ///投诉资讯/动态 + @POST("/information/complaint") + Future complaint(@Body() Map param); + } diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index c8cf94eb..16a722d9 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.96:8766/app/'; + baseUrl ??= 'http://192.168.10.139:8766/app/'; } final Dio _dio; @@ -298,6 +298,27 @@ class _ApiService implements ApiService { return value; } + @override + Future>> rechargeAct() async { + const _extra = {}; + final queryParameters = {}; + final _data = {}; + final _result = await _dio.request>('/wallet/rechargeAct', + queryParameters: queryParameters, + options: RequestOptions( + method: 'GET', + headers: {}, + extra: _extra, + baseUrl: baseUrl), + data: _data); + final value = BaseData>.fromJson( + _result.data, + (json) => (json as List) + .map((i) => RechargeList.fromJson(i as Map)) + .toList()); + return value; + } + @override Future> receiveCoupon(couponId) async { ArgumentError.checkNotNull(couponId, 'couponId'); @@ -1166,30 +1187,30 @@ class _ApiService implements ApiService { return value; } - @override - Future> report(map) async { - ArgumentError.checkNotNull(map, 'map'); - const _extra = {}; - final queryParameters = {}; - final _data = {}; - _data.addAll(map ?? {}); - final _result = await _dio.request>('/other/report', - queryParameters: queryParameters, - options: RequestOptions( - method: 'POST', - headers: {}, - extra: _extra, - baseUrl: baseUrl), - data: _data); - final value = BaseData.fromJson( - _result.data, - (json) => json as bool, - ); - return value; - } - - @override - Future> orderCancel(id) async { + // @override + // Future> report(map) async { + // ArgumentError.checkNotNull(map, 'map'); + // const _extra = {}; + // final queryParameters = {}; + // final _data = {}; + // _data.addAll(map ?? {}); + // final _result = await _dio.request>('/other/report', + // queryParameters: queryParameters, + // options: RequestOptions( + // method: 'POST', + // headers: {}, + // extra: _extra, + // baseUrl: baseUrl), + // data: _data); + // final value = BaseData.fromJson( + // _result.data, + // (json) => json as bool, + // ); + // return value; + // } + + @override + Future> orderCancel(id) async { ArgumentError.checkNotNull(id, 'id'); const _extra = {}; final queryParameters = {}; @@ -1203,9 +1224,9 @@ class _ApiService implements ApiService { extra: _extra, baseUrl: baseUrl), data: _data); - final value = BaseData.fromJson( + final value = BaseData.fromJson( _result.data, - (json) => json as bool, + (json) => json as dynamic, ); return value; } @@ -1915,4 +1936,26 @@ class _ApiService implements ApiService { return value; } + @override + Future> complaint(param) async { + ArgumentError.checkNotNull(param, 'param'); + const _extra = {}; + final queryParameters = {}; + final _data = {}; + _data.addAll(param ?? {}); + final _result = await _dio.request>('/information/complaint', + queryParameters: queryParameters, + options: RequestOptions( + method: 'POST', + headers: {}, + extra: _extra, + baseUrl: baseUrl), + data: _data); + final value = BaseData.fromJson( + _result.data, + (json) => json as dynamic, + ); + return value; + } + } diff --git a/lib/setting/about_page.dart b/lib/setting/about_page.dart index bf3459be..7e62ff2f 100644 --- a/lib/setting/about_page.dart +++ b/lib/setting/about_page.dart @@ -50,10 +50,12 @@ class _AboutPage extends State { ), padding: EdgeInsets.only(top: 25.h), alignment: Alignment.center, - child: Column( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child:Column( children: [ Image.asset( - "assets/image/icon_about_logo.png", + "assets/image/icon_about_logo.webp", width: 130, height: 130, ), @@ -101,6 +103,7 @@ class _AboutPage extends State { alignment: Alignment.center); } }); + // showAlertDialog(version); }, ), GestureDetector( @@ -109,6 +112,12 @@ class _AboutPage extends State { Navigator.of(context).pushNamed('/router/treaty_page'); }, ), + GestureDetector( + child: settingSingleItem("用户协议"), + onTap: () { + Navigator.of(context).pushNamed('/router/user_service_page'); + }, + ), Padding( padding: EdgeInsets.only(left: 20.w, right: 20.w), child: Divider( @@ -117,8 +126,11 @@ class _AboutPage extends State { color: Colors.grey, ), ), + SizedBox( + height:100.h, + ), ], - ), + ),) ), Container( margin: EdgeInsets.only(bottom: 23.h), diff --git a/lib/setting/help_feedback_page.dart b/lib/setting/help_feedback_page.dart index b45d46b1..62128a1e 100644 --- a/lib/setting/help_feedback_page.dart +++ b/lib/setting/help_feedback_page.dart @@ -140,6 +140,10 @@ class _HelpFeedbackPage extends State { ), InkWell( onTap: () { + if(phoneController.text == ""){ + SmartDialog.showToast("请输入有效手机号码", alignment: Alignment.center); + return; + } report(); }, child: Container( @@ -162,17 +166,23 @@ class _HelpFeedbackPage extends State { } report() async { - var content = editingController.text; - var phone = phoneController.text; - BaseData baseData = await apiService.report({ - "mobile": phone, - "reportContent": content, + if (apiService == null) { + SharedPreferences value = await SharedPreferences.getInstance(); + apiService = ApiService( + Dio(), + context: context, + token: value.getString("token"), + ); + } + BaseData baseData = await apiService.complaint({ + "content": phoneController.text, + "informationId":0, }).catchError((onError) {}); if (baseData != null && baseData.isSuccess) { SmartDialog.showToast("反馈成功"); Navigator.of(context).pop(); } else { - SmartDialog.showToast("反馈失败"); + SmartDialog.showToast(baseData.msg,alignment: Alignment.center); } } @@ -180,6 +190,7 @@ class _HelpFeedbackPage extends State { final TextEditingController phoneController = TextEditingController(); int textLength = 0; + ///反馈 _feedback() { return Container( width: double.infinity, @@ -239,6 +250,7 @@ class _HelpFeedbackPage extends State { ); } + ///联系电话 _contactPhoneNumber() { return Container( width: double.infinity, @@ -279,6 +291,7 @@ class _HelpFeedbackPage extends State { ); } + ///常见问题 _commonProblem(var title, var cnt, var index) { return Container( alignment: Alignment.center, diff --git a/lib/setting/logout_ing.dart b/lib/setting/logout_ing.dart index 76ca6dd2..66f0935a 100644 --- a/lib/setting/logout_ing.dart +++ b/lib/setting/logout_ing.dart @@ -336,7 +336,7 @@ class _LogoutIng extends State { return AlertDialog( content:Container( width: double.infinity, - height: 350.h, + height: 400.h, child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -348,7 +348,7 @@ class _LogoutIng extends State { child: Container( alignment: Alignment.topRight, child:Image.asset( - "assets/image/yq_qx.png", + "assets/image/yq_qx.webp", width: 20, height: 20, color: Color(0xFF353535), @@ -356,13 +356,13 @@ class _LogoutIng extends State { ),), (balance == "0.00" && money == "0.00")? Image.asset( - "assets/image/logout.png", + "assets/image/logout.webp", width: 80, height: 80, ) : Image.asset( - "assets/image/logout_s.png", + "assets/image/logout_s.webp", width: 80, height: 80, ), diff --git a/lib/setting/permission_setting_page.dart b/lib/setting/permission_setting_page.dart index 56ec21dd..5b720738 100644 --- a/lib/setting/permission_setting_page.dart +++ b/lib/setting/permission_setting_page.dart @@ -31,10 +31,10 @@ class _PermissionSettingPage extends State { ]; List icons = [ - "assets/image/icon_permission_location.png", - "assets/image/icon_permission_notices.png", - "assets/image/icon_permission_camera.png", - "assets/image/icon_permission_storage.png", + "assets/image/icon_permission_location.webp", + "assets/image/icon_permission_notices.webp", + "assets/image/icon_permission_camera.webp", + "assets/image/icon_permission_storage.webp", ]; List contents = [ @@ -45,10 +45,10 @@ class _PermissionSettingPage extends State { ]; List tipIcons = [ - "assets/image/icon_location_permission_tips.png", - "assets/image/icon_notification_permission_tips.png", - "assets/image/icon_camera_permission_tips.png", - "assets/image/icon_storage_permission_tips.png", + "assets/image/icon_location_permission_tips.webp", + "assets/image/icon_notification_permission_tips.webp", + "assets/image/icon_camera_permission_tips.webp", + "assets/image/icon_storage_permission_tips.webp", ]; List titleTips = [ diff --git a/lib/setting/treaty_page.dart b/lib/setting/treaty_page.dart index 019e5b32..4adba3f5 100644 --- a/lib/setting/treaty_page.dart +++ b/lib/setting/treaty_page.dart @@ -1,12 +1,13 @@ +import 'dart:io'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; - -// import 'package:webview_flutter/webview_flutter.dart'; -// import 'package:webview_flutter/src/webview_cupertino.dart'; +import 'package:webview_flutter/webview_flutter.dart'; +import 'package:webview_flutter/src/webview_cupertino.dart'; class TreatyPage extends StatefulWidget { @override @@ -17,6 +18,7 @@ class TreatyPage extends StatefulWidget { class _TreatyPage extends State { var controller = new ScrollController(); + String userType; @override void initState() { @@ -29,159 +31,161 @@ class _TreatyPage extends State { Widget build(BuildContext context) { return Scaffold( appBar: MyAppBar( - title: S.of(context).yinsishengming, + title:S.of(context).yinsishengming, titleColor: Colors.black, background: Colors.transparent, leadingColor: Colors.black, ), body: Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height, - margin: EdgeInsets.only(left: 20, right: 20, top: 10), - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - // child: Column( - // children: [ - // WebView( - // initialUrl: 'http://huixiang.lotus-wallet.com/user.html', - // ), - // ], - // ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(top: 5), - child: Align( - alignment: Alignment.center, - child: Text( - "用戶註冊及使用App隱私協議", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xff00A359), - ), - ), - ), - ), - SizedBox( - height: 32.h, - ), - _textRich("    在此特別提醒您(用戶)在註冊成為用戶之前,請認真閱讀本《用戶註冊及使用App隱私協議》" - "(以下簡稱「協議」),確保您充分理解本協議中各條款。請您審慎閱讀並選擇接受或不接受本協議。除非您接受本協議所有條款," - "否則您無權註冊、登錄或使用本協議所涉服務。您的註冊、登錄、使用等行為將視為對本協議的接受,並同意接受本協議各項條款" - "的約束。本協議約定知理知己(武漢)文化科技有限公司(以下簡稱「一心回鄉」)與用戶之間關於一心回鄉軟件服務(以下簡稱" - "「服務」)的權利義務。用戶,是指註冊、登錄、使用本服務的個人或組織。本協議可由一心回鄉隨時更新,更新後的協議條款一旦" - "公佈即代替原來的協議條款,恕不再另行通知,用戶可在本App中查閱最新版協議條款。在修改協議條款後,如果用戶不接受修改後" - "的條款,請立即停止使用一心回鄉提供的服務,用戶繼續使用一心回鄉提供的服務將被視為接受修改後的協議。"), - Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - "一、賬號註冊", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - height: 1.2, - color: Color(0xff32A060)), - ), - ), - _textRich("    1、用戶在使用本服務前需要註冊一個一心回鄉App賬號。一心回鄉App賬號應當使用手機號碼綁定註冊," - "請用戶使用尚未與一心回鄉App賬號綁定的手機號碼,以及未被一心回鄉根據本協議封禁的手機號碼註冊一心回鄉App賬號。" - "一心回鄉可以根據用戶需求或產品需要對賬號註冊和綁定的方式進行變更,而無須事先通知用戶。" - "\n    2、鑒於一心回鄉App賬號的綁定註冊方式,您同意一心回鄉在註冊時將允許您的手機號碼及手機設備識別碼等信息用於註冊。" - "\n    3、在用戶註冊及使用本服務時,一心回鄉需要蒐集能識別用戶身份的個人信息以便一心回鄉可以在必要時聯繫用戶," - "或為用戶提供更好的使用體驗。一心回鄉蒐集的信息包括但不限於用戶的姓名、地址;一心回鄉同意對這些信息的使用將受限於第三條用戶個人隱私信息保護的約束。"), - Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - "二、用戶個人隱私信息保護", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - height: 1.2, - color: Color(0xff32A060)), - ), - ), - _textRich("    1、如果一心回鄉發現或收到他人舉報或投訴用戶違反本協議約定的,一心回鄉" - "有權不經通知隨時對相關內容,包括但不限於用戶資料、發佈記錄進行審查、刪除,並視情節輕重對違" - "規賬號處以包括但不限於警告、賬號封禁、設備封禁、功能封禁的處罰,且通知用戶處理結果。" - "\n    2、因違反用戶協議被封禁的用戶,可以自行與一心回鄉聯繫。其中,被實施功能封禁的用戶會在" - "封禁期屆滿後自動恢復被封禁功能。被封禁用戶可提交申訴,一心回鄉將對申訴進行審查,並自行合理判斷決定是否變更處罰措施。" - "\n    3、用戶理解並同意,一心回鄉有權依合理判斷對違反有關法律法規或本協議規定的行為進行處罰," - "對違法違規的任何用戶採取適當的法律行動,並依據法律法規保存有關信息向有關部門報告等,用戶應承擔由此而產生的一切法律責任。" - "\n    4、用戶理解並同意,因用戶違反本協議約定,導致或產生的任何第三方主張的任何索賠、要求或損失," - "包括合理的律師費,用戶應當賠償一心回鄉與合作公司、關聯公司,並使之免受損害。"), - Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - "三、用戶發佈內容規範", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - height: 1.2, - color: Color(0xff32A060)), - ), - ), - _textRich("   1、本條所述內容是指用戶使用一心回鄉App的過程中所製作、上載、複製、發佈、傳播的任何內容,包括但不限" - "於賬號頭像、名稱、用戶說明等註冊信息及認證資料,或文字、語音、圖片、視頻、圖文等發送、回復或自動回復消息和" - "相關鏈接頁面,以及其他使用賬號或本服務所產生的內容。" - "\n    2、用戶不得利用一心回鄉App賬號或本服務製作、上傳、複製、發佈、傳播如下法律、法規和政策禁止的內容:" - "\n    (1) 反對憲法所確定的基本原則的;\n    (2) 危害國家安全,洩露國家秘密,顛覆國家政權,破壞國家統一的;" - "\n    (3) 損害國家榮譽和利益的;\n    (4) 煽動民族仇恨、民族歧視,破壞民族團結的;" - "\n    (5) 破壞國家宗教政策,宣揚邪教和封建迷信的;\n    (6) 散布謠言,擾亂社會秩序,破壞社會穩定的;" - "\n    (7) 散布淫穢、色情、賭博、暴力、凶殺、恐怖或者教唆犯罪的;\n    (8) 侮辱或者誹謗他人,侵害他人合法權益的;" - "\n    (9) 含有法律、行政法規禁止的其他內容的信息。" - "\n    3、用戶不得利用一心回鄉App賬號或本服務製作、上載、複製、發佈、傳播如下干擾一心回鄉App正常運營,以及侵犯其他用戶或第三方合法權益的內容:" - "\n    (1) 含有任何性或性暗示的;" - "\n    (2) 含有辱罵、恐嚇、威脅內容的;\n    (3) 含有騷擾、垃圾廣告、惡意信息、誘騙信息的;" - "\n    (4) 涉及他人隱私、個人信息或資料的;\n    (5) 侵害他人名譽權、肖像權、知識產權、商業秘密等合法權利的;" - "\n    (6) 含有其他干擾本服務正常運營和侵犯其他用戶或第三方合法權益內容的信息。"), - Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - "四、使用規則", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - height: 1.2, - color: Color(0xff32A060)), - ), - ), - _textRich( - "   1、用戶在本服務中或通過本服務所傳送、發佈的任何內容並不反映或代表,也不得被視為反映或代表一心回鄉的觀點、立場或政策,一心回鄉對此不承擔任何責任。" - "\n    2、用戶不得利用一心回鄉App賬號或本服務進行如下行為:\n    (1) 提交、發佈虛假信息,或盜用他人頭像或資料,冒充、利用他人名義的;" - "\n    (2) 強制、誘導其他用戶關注、點擊鏈接頁面或分享信息的;\n    (3) 虛構事實、隱瞞真相以誤導、欺騙他人的;" - "\n    (4) 利用技術手段批量建立虛假賬號的;\n    (5) 利用一心回鄉App賬號或本服務從事任何違法犯罪活動的;" - "\n    (6) 製作、發佈與以上行為相關的方法、工具,或對此類方法、工具進行運營或傳播,無論這些行為是否為商業目的;" - "\n    (7) 其他違反法律法規規定、侵犯其他用戶合法權益、干擾一心回鄉App正常運營或腳印未明示授權的行為。" - "\n    3、用戶須對利用一心回鄉App賬號或本服務傳送信息的真實性、合法性、無害性、準確性、有效性等全權負責," - "與用戶所傳播的信息相關的任何法律責任由用戶自行承擔,與一心回鄉無關。如因此給一心回鄉或第三方造成損害的,用戶應當依法予以賠償。" - "\n    4、一心回鄉提供的服務中可能包括廣告,用戶同意在使用過程中顯示一心回鄉和第三方供應商、合作夥伴提供的廣告。" - "除法律法規明確規定外,用戶應自行對依該廣告信息進行的交易負責,對用戶因依該廣告信息進行的交易或前述廣告商提供的內容而遭受的損失或損害,一心回鄉不承擔任何責任。"), - Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - "五、其他", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.semi_bold, - height: 1.2, - color: Color(0xff32A060)), - ), - ), - _textRich("   1、一心回鄉鄭重提醒用戶注意本協議中免除腳印責任和限制用戶權利的條款,請用戶仔細閱讀,自主考慮風險。" - "未成年人應在法定監護人的陪同下閱讀本協議。\n    2、本協議的效力、解釋及糾紛的解決,適用於中華人民共和國法律。" - "若用戶和腳印之間發生任何糾紛或爭議,首先應友好協商解決,協商不成的,用戶同意將糾紛或爭議提交腳印住所地有管轄權的人民法院管轄。" - "\n    3、本協議的任何條款無論因何種原因無效或不具可執行性,其餘條款仍有效,對雙方具有約束力。\n    4、本協議最終解釋" - "權歸腳印所有,據知理知己(武漢)有限責任公司免責條款特此聲明:該應用註冊及隱私協議與知理知己(武漢)有限責任公司無關。政策认为合适的披露。"), - SizedBox( - height: 50.h, - ), - ], - ), - ), - ), + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + alignment: Alignment.center, + child: + WebView( + initialUrl: "http://huixiang.lotus-wallet.com/Privacy.html", + javascriptMode: JavascriptMode.unrestricted, + )), + // Container( + // width: MediaQuery.of(context).size.width, + // height: MediaQuery.of(context).size.height, + // margin: EdgeInsets.only(left: 20, right: 20, top: 10), + // child: SingleChildScrollView( + // physics: BouncingScrollPhysics(), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceEvenly, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: EdgeInsets.only(top: 5), + // child: Align( + // alignment: Alignment.center, + // child: Text( + // "用户注册及使用App隐私协议", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // color: Color(0xff00A359), + // ), + // ), + // ), + // ), + // SizedBox( + // height: 32.h, + // ), + // _textRich("    在此特别提醒您(用户)在注册成为用户之前,请认真阅读本《用户注册及使用App隐私协议》" + // "(以下简称「协议」),确保您充分理解本协议中各条款。请您审慎阅读并选择接受或不接受本协议。除非您接受本协议所有条款," + // "否则您无权注册、登录或使用本协议所涉服务。您的注册、登录、使用等行为将视为对本协议的接受,并同意接受本协议各项条款" + // "的约束。本协议约定知理知己(武汉)文化科技有限公司(以下简称「一心回乡」)与用户之间关于一心回乡软件服务(以下简称" + // "「服务」)的权利义务。用户,是指注册、登录、使用本服务的个人或组织。本协议可由一心回乡随时更新,更新后的协议条款一旦" + // "公布即代替原来的协议条款,恕不再另行通知,用户可在本App中查阅最新版协议条款。在修改协议条款后,如果用户不接受修改后" + // "的条款,请立即停止使用一心回乡提供的服务,用户继续使用一心回乡提供的服务将被视为接受修改后的协议。"), + // Padding( + // padding: EdgeInsets.only(bottom: 25), + // child: Text( + // "一、账号注册", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // height: 1.2, + // color: Color(0xff32A060)), + // ), + // ), + // _textRich("    1、用户在使用本服务前需要注册一个一心回乡App账号。一心回乡App账号应当使用手机号码绑定注册," + // "请用户使用尚未与一心回乡App账号绑定的手机号码,以及未被一心回乡根据本协议封禁的手机号码注册一心回乡App账号。" + // "一心回乡可以根据用户需求或产品需要对账号注册和绑定的方式进行变更,而无须事先通知用户。" + // "\n    2、鉴于一心回乡App账号的绑定注册方式,您同意一心回乡在注册时将允许您的手机号码及手机设备识别码等信息用于注册。" + // "\n    3、在用户注册及使用本服务时,一心回乡需要搜集能识别用户身份的个人信息以便一心回乡可以在必要时联系用户," + // "或为用户提供更好的使用体验。一心回乡搜集的信息包括但不限于用户的姓名、地址;一心回乡同意对这些信息的使用将受限于第三条用户个人隐私信息保护的约束。"), + // Padding( + // padding: EdgeInsets.only(bottom: 25), + // child: Text( + // "二、用户个人隐私信息保护", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // height: 1.2, + // color: Color(0xff32A060)), + // ), + // ), + // _textRich("    1、如果一心回乡发现或收到他人举报或投诉用户违反本协议约定的,一心回乡" + // "有权不经通知随时对相关内容,包括但不限于用户资料、发布记录进行审查、删除,并视情节轻重对违" + // "规账号处以包括但不限于警告、账号封禁、设备封禁、功能封禁的处罚,且通知用户处理结果。" + // "\n    2、因违反用户协议被封禁的用户,可以自行与一心回乡联系。其中,被实施功能封禁的用户会在" + // "封禁期届满后自动恢复被封禁功能。被封禁用户可提交申诉,一心回乡将对申诉进行审查,并自行合理判断决定是否变更处罚措施。" + // "\n    3、用户理解并同意,一心回乡有权依合理判断对违反有关法律法规或本协议规定的行为进行处罚," + // "对违法违规的任何用户采取适当的法律行动,并依据法律法规保存有关信息向有关部门报告等,用户应承担由此而产生的一切法律责任。" + // "\n    4、用户理解并同意,因用户违反本协议约定,导致或产生的任何第三方主张的任何索赔、要求或损失," + // "包括合理的律师费,用户应当赔偿一心回乡与合作公司、关联公司,并使之免受损害。"), + // Padding( + // padding: EdgeInsets.only(bottom: 25), + // child: Text( + // "三、用户发布内容规范", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // height: 1.2, + // color: Color(0xff32A060)), + // ), + // ), + // _textRich("   1、本条所述内容是指用户使用一心回乡App的过程中所制作、上传、复制、发布、传播的任何内容,包括但不限" + // "于账号头像、名称、用户说明等注册信息及认证资料,或文字、语音、图片、视频、图文等发送、回复或自动回复消息和" + // "相关链接页面,以及其他使用账号或本服务所产生的内容。" + // "\n    2、用户不得利用一心回乡App账号或本服务制作、上传、复制、发布、传播如下法律、法规和政策禁止的内容:" + // "\n    (1) 反对宪法所确定的基本原则的\n    (2) 危害国家安全,泄露国家秘密,颠覆国家政权,破坏国家统一的;" + // "\n    (3)损害国家荣誉和利益的;\n    (4) 煽动民族仇恨、民族歧视,破坏民族团结的;" + // "\n    (5) 破坏国家宗教政策,宣扬邪教和封建迷信的;\n    (6) 散布谣言,扰乱社会秩序,破坏社会稳定的;" + // "\n    (7) 散布淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的;\n    (8) 侮辱或者诽谤他人,侵害他人合法权益的;" + // "\n    (9) 含有法律、行政法规禁止的其他内容的信息。" + // "\n    3、用户不得利用一心回乡App账号或本服务制作、上传、复制、发布、传播如下干扰一心回乡App正常运营,以及侵犯其他用户或第三方合法权益的内容:" + // "\n    (1) 含有任何性或性暗示的;" + // "\n    (2) 含有辱骂、恐吓、威胁内容的;\n    (3) 含有骚扰、垃圾广告、恶意信息、诱骗信息的;" + // "\n    (4) 涉及他人隐私、个人信息或数据的;\n    (5) 侵害他人名誉权、肖像权、知识产权、商业秘密等合法权利的;" + // "\n    (6) 含有其他干扰本服务正常运营和侵犯其他用户或第三方合法权益内容的信息。"), + // Padding( + // padding: EdgeInsets.only(bottom: 25), + // child: Text( + // "四、使用规则", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // height: 1.2, + // color: Color(0xff32A060)), + // ), + // ), + // _textRich( + // "   1、用户在本服务中或通过本服务所传送、发布的任何内容并不反映或代表,也不得被视为反映或代表一心回乡的观点、立场或政策,一心回乡对此不承担任何责任。" + // "\n    2、用户不得利用一心回乡App账号或本服务进行如下行为:\n    (1) 提交、发布虚假信息,或盗用他人头像或数据,冒充、利用他人名义的;" + // "\n    (2) 强制、诱导其他用户关注、点击连接页面或分享信息的;\n    (3) 虚构事实、隐瞒真相以误导、欺骗他人的;" + // "\n    (4) 利用技术手段批量建立虚假账号的;\n    (5)利用一心回乡App账号或本服务从事任何违法犯罪活动的;" + // "\n    (6) 制作、发布与以上行为相关的方法、工具,或对此类方法、工具进行运营或传播,无论这些行为是否为商业目的;" + // "\n    (7) 其他违反法律法规规定、侵犯其他用户合法权益、干扰一心回乡App正常运营或脚印未明示授权的行为。" + // "\n    3、用户须对利用一心回乡App账号或本服务传送信息的真实性、合法性、无害性、准确性、有效性等全权负责," + // "与用户所传播的信息相关的任何法律责任由用户自行承担,与一心回乡无关。如因此给一心回乡或第三方造成损害的,用户应当依法予以赔偿。" + // "\n    4、一心回乡提供的服务中可能包括广告,用户同意在使用过程中显示一心回乡和第三方供应商、合作伙伴提供的广告。" + // "除法律法规明确规定外,用户应自行对依该广告信息进行的交易负责,对用户因依该广告信息进行的交易或前述广告商提供的内容而遭受的损失或损害,一心回乡不承担任何责任。"), + // Padding( + // padding: EdgeInsets.only(bottom: 25), + // child: Text( + // "五、其他", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.semi_bold, + // height: 1.2, + // color: Color(0xff32A060)), + // ), + // ), + // _textRich("   1、一心回乡郑重提醒用户注意本协议中免除脚印责任和限制用户权利的条款,请用户仔细阅读,自主考虑风险。" + // "未成年人应在法定监护人的陪同下阅读本协议。\n    2、本协议的效力、解释及纠纷的解决,适用于中华人民共和国法律。" + // "若用户和脚印之间发生任何纠纷或争议,首先应友好协商解决,协商不成的,用户同意将纠纷或争议提交脚印住所地有管辖权的人民法院管辖。" + // "\n    3、本协议的任何条款无论因何种原因无效或不具可执行性,其余条款仍有效,对双方具有约束力。\n    4、本协议最终解释" + // "权归脚印所有,据知理知己(武汉)有限责任公司免责条款特此声明:该应用注册及隐私协议与知理知己(武汉)有限责任公司无关。政策认为合适的披露。"), + // SizedBox( + // height: 50.h, + // ), + // ], + // ), + // ), + // ), ); } diff --git a/lib/setting/user_service_page.dart b/lib/setting/user_service_page.dart new file mode 100644 index 00000000..1dc6fc05 --- /dev/null +++ b/lib/setting/user_service_page.dart @@ -0,0 +1,49 @@ +import 'dart:io'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:webview_flutter/webview_flutter.dart'; +import 'package:webview_flutter/src/webview_cupertino.dart'; + +class UserServicePage extends StatefulWidget { + @override + State createState() { + return _UserServicePage(); + } +} + +class _UserServicePage extends State with WidgetsBindingObserver { + var controller = new ScrollController(); + + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addObserver(this); + if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView(); + if (Platform.isIOS) WebView.platform = CupertinoWebView(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: MyAppBar( + title:"用户协议", + titleColor: Colors.black, + background: Color(0xFFFFFFFF), + leadingColor: Colors.black, + ), + body: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + alignment: Alignment.center, + child: + WebView( + initialUrl: "http://huixiang.lotus-wallet.com/user.html", + javascriptMode: JavascriptMode.unrestricted, + )), + ); + } +} diff --git a/lib/settlement/settlement_view/activity.dart b/lib/settlement/settlement_view/activity.dart index 199f2346..4f17b455 100644 --- a/lib/settlement/settlement_view/activity.dart +++ b/lib/settlement/settlement_view/activity.dart @@ -52,8 +52,8 @@ class _ActivityWidget extends State { : "", fit: BoxFit.cover, aspectRatio: 1, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 12.w, diff --git a/lib/settlement/settlement_view/coupon.dart b/lib/settlement/settlement_view/coupon.dart index 2eb17ba3..f8998f46 100644 --- a/lib/settlement/settlement_view/coupon.dart +++ b/lib/settlement/settlement_view/coupon.dart @@ -171,8 +171,8 @@ class _CouponWidget extends State { }, child: Image.asset( widget.selected - ? "assets/image/icon_radio_selected.png" - : "assets/image/icon_radio_unselected.png", + ? "assets/image/icon_radio_selected.webp" + : "assets/image/icon_radio_unselected.webp", width: 24, height: 24, ), diff --git a/lib/settlement/settlement_view/edit_phone.dart b/lib/settlement/settlement_view/edit_phone.dart index 9d3ea619..c9bf175a 100644 --- a/lib/settlement/settlement_view/edit_phone.dart +++ b/lib/settlement/settlement_view/edit_phone.dart @@ -137,7 +137,7 @@ class _EditPhoneWidget extends State { color: Color(0xFF32A060), ) : Image.asset( - "assets/image/pen.png", + "assets/image/pen.webp", height: 14.h, width: 14.w, ), diff --git a/lib/settlement/settlement_view/pay_method.dart b/lib/settlement/settlement_view/pay_method.dart index 84b90b7f..13b874f7 100644 --- a/lib/settlement/settlement_view/pay_method.dart +++ b/lib/settlement/settlement_view/pay_method.dart @@ -170,7 +170,7 @@ class _PayMethod extends State { children: [ checkView(3), Spacer(), - Image.asset("assets/image/icon_we_chat.png"), + Image.asset("assets/image/icon_we_chat.webp"), Padding( padding: EdgeInsets.only(left: 8.w), child: Text( @@ -198,8 +198,8 @@ class _PayMethod extends State { alignment: Alignment.center, child: Image.asset( checkIndex != index - ? "assets/image/icon_radio_unselected.png" - : "assets/image/icon_radio_selected.png", + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", width: 15.w, height: 15.h, ), diff --git a/lib/settlement/settlement_view/settlement_activity.dart b/lib/settlement/settlement_view/settlement_activity.dart index 088a4844..3ccf1836 100644 --- a/lib/settlement/settlement_view/settlement_activity.dart +++ b/lib/settlement/settlement_view/settlement_activity.dart @@ -91,7 +91,7 @@ class _SettlementActivity extends State { Navigator.of(context).pop(); }, child: Image.asset( - "assets/image/cancel.png", + "assets/image/cancel.webp", width: 24, height: 24, ), diff --git a/lib/settlement/settlement_view/settlement_coupon.dart b/lib/settlement/settlement_view/settlement_coupon.dart index a8469317..427e277e 100644 --- a/lib/settlement/settlement_view/settlement_coupon.dart +++ b/lib/settlement/settlement_view/settlement_coupon.dart @@ -93,7 +93,7 @@ class _SettlementCoupon extends State { Navigator.of(context).pop(); }, child: Image.asset( - "assets/image/cancel.png", + "assets/image/cancel.webp", width: 24, height: 24, ), diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index 93e8a0f5..d9b5e8c1 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -127,8 +127,8 @@ class _SettlementOrderCommodity extends State { width: 44, height: 44, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Expanded( flex: 1, diff --git a/lib/store/scan.dart b/lib/store/scan.dart index 406ee977..3f399995 100644 --- a/lib/store/scan.dart +++ b/lib/store/scan.dart @@ -12,7 +12,7 @@ class Scan { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_camera_permission_tips.png", + "assets/image/icon_camera_permission_tips.webp", S.of(context).ninxiangjiquanxianweikaiqi, S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index f891dc1d..b3fe6f5e 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -461,7 +461,7 @@ class _StoreOrderPage extends State showShoppingCart(); }, child: Image.asset( - "assets/image/shopp.png", + "assets/image/shopp.webp", width: 88, height: 88, fit: BoxFit.fitWidth, @@ -603,8 +603,8 @@ class _StoreOrderPage extends State : "", fit: BoxFit.cover, radius: BorderRadius.zero, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/store/store_view/product_sku.dart b/lib/store/store_view/product_sku.dart index f0500274..16f971ca 100644 --- a/lib/store/store_view/product_sku.dart +++ b/lib/store/store_view/product_sku.dart @@ -121,8 +121,8 @@ class _ProductSku extends State { width: 75, height: 75, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 10, @@ -180,7 +180,7 @@ class _ProductSku extends State { SmartDialog.dismiss(); }, child: Image.asset( - "assets/image/icon_order_cancel.png", + "assets/image/icon_order_cancel.webp", width: 22, height: 22, ), @@ -238,7 +238,7 @@ class _ProductSku extends State { widget.reduce(widget.miNiDetail, selectSkus); }, child: Image.asset( - "assets/image/reduce.png", + "assets/image/reduce.webp", width: 22, height: 22, ), @@ -262,7 +262,7 @@ class _ProductSku extends State { widget.add(widget.miNiDetail, selectSkus); }, child: Image.asset( - "assets/image/add.png", + "assets/image/add.webp", width: 22, height: 22, ), diff --git a/lib/store/store_view/shop_car.dart b/lib/store/store_view/shop_car.dart index 8d96a8f5..565f783d 100644 --- a/lib/store/store_view/shop_car.dart +++ b/lib/store/store_view/shop_car.dart @@ -84,7 +84,7 @@ class _ShopCar extends State { widget.clearShopCar(); }, child: Image.asset( - "assets/image/delete.png", + "assets/image/delete.webp", width: 22, height: 22, ), @@ -203,7 +203,7 @@ class _ShopCar extends State { SmartDialog.dismiss(); }, child: Image.asset( - "assets/image/shopp.png", + "assets/image/shopp.webp", width: 88, height: 88, ), diff --git a/lib/store/store_view/shop_goods.dart b/lib/store/store_view/shop_goods.dart index d8051136..682e941d 100644 --- a/lib/store/store_view/shop_goods.dart +++ b/lib/store/store_view/shop_goods.dart @@ -58,8 +58,8 @@ class _ShopGoods extends State { width: 70, height: 70, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 10, @@ -179,7 +179,7 @@ class _ShopGoods extends State { widget.reduce(widget.shoppingCartSkuItemListBean); }, child: Image.asset( - "assets/image/reduce.png", + "assets/image/reduce.webp", width: 22, height: 22, ), @@ -203,7 +203,7 @@ class _ShopGoods extends State { widget.add(widget.shoppingCartSkuItemListBean); }, child: Image.asset( - "assets/image/add.png", + "assets/image/add.webp", width: 22, height: 22, ), diff --git a/lib/store/store_view/store_activity.dart b/lib/store/store_view/store_activity.dart index 7739e695..1fecac2e 100644 --- a/lib/store/store_view/store_activity.dart +++ b/lib/store/store_view/store_activity.dart @@ -30,7 +30,7 @@ class _StoreActivity extends State { ), color: Colors.white, child: NoDataView( - src: "assets/image/icon_empty.png", + src: "assets/image/icon_empty.webp", isShowBtn: false, text: "还没有活动~", iconWidth: 220, @@ -98,8 +98,8 @@ class _StoreActivity extends State { top: Radius.circular(8), ), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), Container( padding: EdgeInsets.all(8), diff --git a/lib/store/store_view/store_header.dart b/lib/store/store_view/store_header.dart index 964ea4e3..baebe3d0 100644 --- a/lib/store/store_view/store_header.dart +++ b/lib/store/store_view/store_header.dart @@ -20,7 +20,7 @@ class StoreHeader extends SliverPersistentHeaderDelegate { child: Column( children: [ Image.asset( - "assets/image/share_image_bg.png", + "assets/image/share_image_bg.webp", fit: BoxFit.cover, width: MediaQuery.of(context).size.width, height: 180.h, diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart index 4409c874..19dbd3a6 100644 --- a/lib/store/store_view/store_info.dart +++ b/lib/store/store_view/store_info.dart @@ -112,8 +112,8 @@ class _StoreInfoView extends State { width: 70, height: 70, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), ], mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -156,7 +156,7 @@ class _StoreInfoView extends State { ); }, child: Image.asset( - "assets/image/icon_union_location.png", + "assets/image/icon_union_location.webp", width: 24.w, height: 24.h, ), @@ -169,7 +169,7 @@ class _StoreInfoView extends State { showCallMobile(); }, child: Image.asset( - "assets/image/icon_union_call.png", + "assets/image/icon_union_call.webp", width: 24, height: 24, ), diff --git a/lib/union/location_map_page.dart b/lib/union/location_map_page.dart index cc456925..caa3aa1e 100644 --- a/lib/union/location_map_page.dart +++ b/lib/union/location_map_page.dart @@ -117,7 +117,7 @@ class _LocationMap extends State { accuracyCircleFillColor: Colors.red, accuracyCircleStrokeColor: Colors.blue, isAccuracyCircleShow: true, - locationViewImage: 'assets/image/icon_my_location.png', + locationViewImage: 'assets/image/icon_my_location.webp', locationViewHierarchy: BMFLocationViewHierarchy.LOCATION_VIEW_HIERARCHY_BOTTOM, ); @@ -137,7 +137,7 @@ class _LocationMap extends State { position: latLng, centerOffset: BMFPoint(0.5, 0.7), enabled: false, - icon: "assets/image/icon_map_marker.png", + icon: "assets/image/icon_map_marker.webp", draggable: false, ); _mapController.addMarker(bmfMarker); diff --git a/lib/union/union_view/store_activity.dart b/lib/union/union_view/store_activity.dart index 29d9b780..5cded5d9 100644 --- a/lib/union/union_view/store_activity.dart +++ b/lib/union/union_view/store_activity.dart @@ -31,7 +31,7 @@ class _StoreActivity extends State { margin: EdgeInsets.only(top: 20.h, bottom: 20.h), child: ItemTitle( text: S.of(context).xindianhuodong, - imgPath: "assets/image/icon_union_start_store.png", + imgPath: "assets/image/icon_union_start_store.webp", ), ), (widget.activitys != null && widget.activitys.length > 0) @@ -111,8 +111,8 @@ class _StoreActivity extends State { top: Radius.circular(8), ), fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), Container( padding: EdgeInsets.all(8), diff --git a/lib/union/union_view/store_info.dart b/lib/union/union_view/store_info.dart index b193b4ba..6035babe 100644 --- a/lib/union/union_view/store_info.dart +++ b/lib/union/union_view/store_info.dart @@ -127,8 +127,8 @@ class _StoreInfos extends State { width: 69, height: 69, fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( height: 21.h, @@ -152,7 +152,7 @@ class _StoreInfos extends State { }); }, child: Image.asset( - "assets/image/icon_union_location.png", + "assets/image/icon_union_location.webp", width: 24.w, height: 24.h, ), @@ -165,7 +165,7 @@ class _StoreInfos extends State { showCallMobile(); }, child: Image.asset( - "assets/image/icon_union_call.png", + "assets/image/icon_union_call.webp", width: 24, height: 24, ), @@ -317,7 +317,7 @@ class _StoreInfos extends State { // }); // }, // child: Image.asset( - // "assets/image/icon_union_location.png", + // "assets/image/icon_union_location.webp", // width: 24.w, // height: 24.h, // ), @@ -330,7 +330,7 @@ class _StoreInfos extends State { // showCallMobile(); // }, // child: Image.asset( - // "assets/image/icon_union_call.png", + // "assets/image/icon_union_call.webp", // width: 24, // height: 24, // ), @@ -372,8 +372,8 @@ class _StoreInfos extends State { : "", fit: BoxFit.cover, radius: BorderRadius.circular(4), - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), ); }, diff --git a/lib/union/union_view/union_coupon.dart b/lib/union/union_view/union_coupon.dart index 55c9f7be..ea545bfa 100644 --- a/lib/union/union_view/union_coupon.dart +++ b/lib/union/union_view/union_coupon.dart @@ -37,7 +37,7 @@ class _UnionCoupon extends State { margin: EdgeInsets.only(top: 10.h, bottom: 10.h), child: ItemTitle( text: S.of(context).youhuiquan, - imgPath: "assets/image/icon_union_coupons.png", + imgPath: "assets/image/icon_union_coupons.webp", ), ), (widget.storeInfo != null && @@ -78,7 +78,7 @@ class _UnionCoupon extends State { child: Stack( children: [ Image.asset( - "assets/image/icon_union_coupons_bg.png", + "assets/image/icon_union_coupons_bg.webp", fit: BoxFit.fill, width: double.infinity, height: double.infinity, diff --git a/lib/union/union_view/vip.dart b/lib/union/union_view/vip.dart index 1b408321..0b669f7d 100644 --- a/lib/union/union_view/vip.dart +++ b/lib/union/union_view/vip.dart @@ -27,7 +27,7 @@ class _Vip extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/icon_vip_bg.png"), + image: AssetImage("assets/image/icon_vip_bg.webp"), ), ), child: (widget.storeInfo != null && widget.storeInfo.isVip) @@ -122,7 +122,7 @@ class _Vip extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - "assets/image/icon_vip.png", + "assets/image/icon_vip.webp", width: 36.w, height: 20.h, ), diff --git a/lib/utils/flutter_utils.dart b/lib/utils/flutter_utils.dart index 3c070a05..11ddb4f8 100644 --- a/lib/utils/flutter_utils.dart +++ b/lib/utils/flutter_utils.dart @@ -15,6 +15,20 @@ class AppUtils { return "${numberFormat.format(mi / 1000)}"; } + static String trimEnd(String resString,String char){ + while(resString.endsWith(char)){ + resString = resString.substring(0,resString.length - 1); + } + return resString; + } + + ///金额保留整数/后两位 + static String calculateDouble(double res){ + String resString = res.toStringAsFixed(2); + resString = trimEnd(resString, "0"); + resString = trimEnd(resString, "."); + return resString; + } static Future coordConvert(BMFCoordinate latLng) async { return BMFCalculateUtils.coordConvert( diff --git a/lib/utils/location.dart b/lib/utils/location.dart index 316e5775..5f7eb972 100644 --- a/lib/utils/location.dart +++ b/lib/utils/location.dart @@ -78,7 +78,7 @@ class Location { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweigongnengweikaiqi, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).dakaidingwei, @@ -102,7 +102,7 @@ class Location { context: context, builder: (context) { return RequestPermission( - "assets/image/icon_permission_location_bg.png", + "assets/image/icon_permission_location_bg.webp", S.of(context).nindingweiquanxianweiyunxu, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).kaiqiquanxian, diff --git a/lib/view_widget/activity_coupons.dart b/lib/view_widget/activity_coupons.dart index eeb6357b..a5be7841 100644 --- a/lib/view_widget/activity_coupons.dart +++ b/lib/view_widget/activity_coupons.dart @@ -75,7 +75,7 @@ class _ActivityCoupons extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/activity_q.png"), + image: AssetImage("assets/image/activity_q.webp"), ), ), child: Column( @@ -127,7 +127,7 @@ class _ActivityCoupons extends State { }); }, child: Image.asset( - "assets/image/yq_qx.png", + "assets/image/yq_qx.webp", width: 34, height: 34, ), @@ -162,7 +162,7 @@ class _ActivityCoupons extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/xin_rq.png"), + image: AssetImage("assets/image/xin_rq.webp"), ), ), margin: EdgeInsets.symmetric(horizontal: 60, vertical: 5), diff --git a/lib/view_widget/activity_poster.dart b/lib/view_widget/activity_poster.dart index c4baf746..2899b944 100644 --- a/lib/view_widget/activity_poster.dart +++ b/lib/view_widget/activity_poster.dart @@ -46,8 +46,8 @@ class _ActivityPoster extends State { height: MediaQuery.of(context).size.height / 2, fit: BoxFit.cover, radius: BorderRadius.all(Radius.circular(12)), - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ),), ), Container( @@ -60,7 +60,7 @@ class _ActivityPoster extends State { child: Row(children: [ Spacer(), Image.asset( - "assets/image/cancel.png", + "assets/image/cancel.webp", width: 24, height: 24, color: Colors.white, diff --git a/lib/view_widget/badge_attainment_dialog.dart b/lib/view_widget/badge_attainment_dialog.dart index e093c7c5..4bca4f64 100644 --- a/lib/view_widget/badge_attainment_dialog.dart +++ b/lib/view_widget/badge_attainment_dialog.dart @@ -43,12 +43,12 @@ class _BadgeAttainmentDialog extends State { ), ), MImage( - "assets/image/by_badge.png", + "assets/image/by_badge.webp", width: 248, height: 248, // fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), Text( "累计消费¥500", @@ -81,7 +81,7 @@ class _BadgeAttainmentDialog extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_gold_coin.png", + "assets/image/icon_gold_coin.webp", width: 20, height: 20, ), diff --git a/lib/view_widget/coupon_widget.dart b/lib/view_widget/coupon_widget.dart index 17f0f21d..5923cd1c 100644 --- a/lib/view_widget/coupon_widget.dart +++ b/lib/view_widget/coupon_widget.dart @@ -36,8 +36,8 @@ class CouponWidget extends StatelessWidget { children: [ Image.asset( coupon.status != 3 - ? "assets/image/ic_coupon_bg.png" - : "assets/image/ic_coupon_invalid_bg.png", + ? "assets/image/ic_coupon_bg.webp" + : "assets/image/ic_coupon_invalid_bg.webp", fit: BoxFit.cover, width: double.infinity, height: double.infinity, @@ -85,7 +85,7 @@ class CouponWidget extends StatelessWidget { // fit: BoxFit.cover, // errorBuilder: (context, error, e) { // return Image.asset( - // "assets/image/default_1.png"); + // "assets/image/default_1.webp"); // }, // ), ), @@ -305,7 +305,7 @@ class CouponWidget extends StatelessWidget { ), ), Image.asset( - "assets/image/icon_order_success.png", + "assets/image/icon_order_success.webp", fit: BoxFit.cover, width: 80, height: 80, diff --git a/lib/view_widget/custom_image.dart b/lib/view_widget/custom_image.dart index 4caaa7b9..1b1cc66b 100644 --- a/lib/view_widget/custom_image.dart +++ b/lib/view_widget/custom_image.dart @@ -19,8 +19,8 @@ class MImage extends StatelessWidget { MImage( this.src, { - this.errorSrc = "assets/image/default_2_1.png", - this.fadeSrc = "assets/image/default_2_1.png", + this.errorSrc = "assets/image/default_2_1.webp", + this.fadeSrc = "assets/image/default_2_1.webp", this.aspectRatio, this.width, this.height, @@ -61,7 +61,7 @@ class MImage extends StatelessWidget { if (imageUrl == null || imageUrl == "") { return Image.asset( - "assets/image/default_2_1.png", + "assets/image/default_2_1.webp", fit: fit, ); } diff --git a/lib/view_widget/hot_item.dart b/lib/view_widget/hot_item.dart index ea02621b..2397d28b 100644 --- a/lib/view_widget/hot_item.dart +++ b/lib/view_widget/hot_item.dart @@ -97,8 +97,8 @@ class _HotArticleItem extends State { // height: 44, // isCircle: true, // fit: BoxFit.cover, - // errorSrc: "assets/image/default_1.png", - // fadeSrc: "assets/image/default_1.png", + // errorSrc: "assets/image/default_1.webp", + // fadeSrc: "assets/image/default_1.webp", // ), // SizedBox( // width: 8, @@ -299,7 +299,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/browse.png", + "assets/image/browse.webp", width: 16.w, height: 16.h, ), @@ -323,7 +323,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/leaving_message.png", + "assets/image/leaving_message.webp", width: 16.w, height: 16.h, ), @@ -347,7 +347,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/follow.png", + "assets/image/follow.webp", width: 16.w, height: 16.h, ), @@ -466,7 +466,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/browse.png", + "assets/image/browse.webp", width: 16.w, height: 16.h, ), @@ -490,7 +490,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/leaving_message.png", + "assets/image/leaving_message.webp", width: 16.w, height: 16.h, ), @@ -514,7 +514,7 @@ class _HotArticleItem extends State { child: Row( children: [ Image.asset( - "assets/image/follow.png", + "assets/image/follow.webp", width: 16.w, height: 16.h, ), diff --git a/lib/view_widget/invite_success_dialog.dart b/lib/view_widget/invite_success_dialog.dart index a1f8f722..6457b525 100644 --- a/lib/view_widget/invite_success_dialog.dart +++ b/lib/view_widget/invite_success_dialog.dart @@ -46,7 +46,7 @@ class _InviteSuccessDialog extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/yq.png", + "assets/image/yq.webp", width: 61, height: 65, ), @@ -107,7 +107,7 @@ class _InviteSuccessDialog extends State { Navigator.of(context).pop(); }); },child:Image.asset( - "assets/image/yq_qx.png", + "assets/image/yq_qx.webp", width: 34, height: 34, ),) diff --git a/lib/view_widget/keyboard/custom_keyboard_button.dart b/lib/view_widget/keyboard/custom_keyboard_button.dart index dd9a9f96..61d79e01 100644 --- a/lib/view_widget/keyboard/custom_keyboard_button.dart +++ b/lib/view_widget/keyboard/custom_keyboard_button.dart @@ -44,7 +44,7 @@ class ButtonState extends State { onPressed: back, child: Center( child: Image.asset( - "assets/image/icon_del.png", + "assets/image/icon_del.webp", width: 24, height: 18, fit: BoxFit.contain, diff --git a/lib/view_widget/login_tips.dart b/lib/view_widget/login_tips.dart index 62aa0c07..8cd8a292 100644 --- a/lib/view_widget/login_tips.dart +++ b/lib/view_widget/login_tips.dart @@ -35,7 +35,7 @@ class LoginTips extends StatelessWidget { mainAxisSize: MainAxisSize.max, children: [ Image.asset( - "assets/image/icon_login_tips.png", + "assets/image/icon_login_tips.webp", // width: 0.7867.sw * 0.6, // height: 0.7867.sw * 0.6 * 0.7, fit: BoxFit.fill, diff --git a/lib/view_widget/message_item.dart b/lib/view_widget/message_item.dart index ff840734..8a4e8cda 100644 --- a/lib/view_widget/message_item.dart +++ b/lib/view_widget/message_item.dart @@ -115,8 +115,8 @@ class _MessageItemState extends State { alignment: Alignment.center, child: Image.asset( _isCheck - ? "assets/image/icon_radio_unselected.png" - : "assets/image/icon_radio_selected.png", + ? "assets/image/icon_radio_unselected.webp" + : "assets/image/icon_radio_selected.webp", width: 16.w, height: 16.h, )), diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 7cc2e01b..ce714903 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -193,7 +193,7 @@ class MineVipView extends StatelessWidget { Container( margin: EdgeInsets.only(right: 11.w, bottom: 9.h), child: Image.asset( - "assets/image/icon_mine_huixiang_logo.png", + "assets/image/icon_mine_huixiang_logo.webp", width: 86.w, height: 86.w, fit: BoxFit.contain, diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index afc6e94c..1f16bb3a 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -120,7 +120,8 @@ class NewCouponWidget extends StatelessWidget { children: [ Visibility( child: Text( - S.of(context).quanchangtongyong, + // S.of(context).quanchangtongyong, + (coupon?.allProduct ?? false) ? S.of(context).quanchangtongyong :"", style: TextStyle( color: Color(0xFF353535), fontSize: 12.sp, diff --git a/lib/view_widget/new_people_reward.dart b/lib/view_widget/new_people_reward.dart index 6fb311ec..3fcfc0e0 100644 --- a/lib/view_widget/new_people_reward.dart +++ b/lib/view_widget/new_people_reward.dart @@ -30,7 +30,7 @@ class _NewPeopleReward extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/xin_ren.png"), + image: AssetImage("assets/image/xin_ren.webp"), ), ), child: Column( @@ -80,7 +80,7 @@ class _NewPeopleReward extends State { }); }, child: Image.asset( - "assets/image/yq_qx.png", + "assets/image/yq_qx.webp", width: 34, height: 34, ), @@ -113,7 +113,7 @@ class _NewPeopleReward extends State { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, - image: AssetImage("assets/image/xin_rq.png"), + image: AssetImage("assets/image/xin_rq.webp"), ), ), margin: EdgeInsets.symmetric(horizontal: 60, vertical: 5), diff --git a/lib/view_widget/receive_success.dart b/lib/view_widget/receive_success.dart index 81d600b9..0cf7b0f9 100644 --- a/lib/view_widget/receive_success.dart +++ b/lib/view_widget/receive_success.dart @@ -96,7 +96,7 @@ class ReceiveSuccess extends StatelessWidget { ), ), Image.asset( - "assets/image/icon_order_success.png", + "assets/image/icon_order_success.webp", fit: BoxFit.cover, width: 80, height: 80, diff --git a/lib/view_widget/selector_store_dialog.dart b/lib/view_widget/selector_store_dialog.dart index ea8582a5..d1902a47 100644 --- a/lib/view_widget/selector_store_dialog.dart +++ b/lib/view_widget/selector_store_dialog.dart @@ -154,8 +154,8 @@ class _SelectorStoreWidget extends State { height: 28.h, fit: BoxFit.cover, radius: BorderRadius.circular(2), - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), SizedBox( width: 12.w, diff --git a/lib/view_widget/share_dialog.dart b/lib/view_widget/share_dialog.dart index 73dc0eaa..53755b8b 100644 --- a/lib/view_widget/share_dialog.dart +++ b/lib/view_widget/share_dialog.dart @@ -17,10 +17,10 @@ class ShareDialog extends StatefulWidget { class _ShareDialog extends State { List platformNames = ["line", "微信好友", "朋友圈", "facebook"]; List platformIcons = [ - "assets/image/icon_line.png", - "assets/image/icon_weixin.png", - "assets/image/icon_pengyouquan.png", - "assets/image/icon_facebook.png" + "assets/image/icon_line.webp", + "assets/image/icon_weixin.webp", + "assets/image/icon_pengyouquan.webp", + "assets/image/icon_facebook.webp" ]; List platforms = [ ShareSDKPlatforms.line, diff --git a/lib/view_widget/sign_in_widget.dart b/lib/view_widget/sign_in_widget.dart index 2d88fe30..a8747388 100644 --- a/lib/view_widget/sign_in_widget.dart +++ b/lib/view_widget/sign_in_widget.dart @@ -48,7 +48,7 @@ class _SignInWidget extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_sign_success.png", + "assets/image/icon_sign_success.webp", width: 80, height: 80, ), @@ -73,7 +73,7 @@ class _SignInWidget extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_gold_coin.png", + "assets/image/icon_gold_coin.webp", width: 16, height: 16, ), @@ -120,7 +120,7 @@ class _SignInWidget extends State { // top: 0, // child: Container( // child: Image.asset( - // "assets/image/icon_sign_ok.png", + // "assets/image/icon_sign_ok.webp", // fit: BoxFit.contain, // width: 223.w, // height: 110.h * AppUtils.textScale(context), diff --git a/lib/view_widget/store_title_tab.dart b/lib/view_widget/store_title_tab.dart index 81a891a0..9d6b393e 100644 --- a/lib/view_widget/store_title_tab.dart +++ b/lib/view_widget/store_title_tab.dart @@ -184,7 +184,7 @@ class _StoreTitleTab extends State { return IconText( text.name, isMax: false, - rightImage: text.icon ?? "assets/image/icon_xuanzhong.png", + rightImage: text.icon ?? "assets/image/icon_xuanzhong.webp", iconSize: 16, iconColor: Colors.red, textStyle: TextStyle( diff --git a/lib/view_widget/update_dialog.dart b/lib/view_widget/update_dialog.dart index 3102e1b5..95f58d36 100644 --- a/lib/view_widget/update_dialog.dart +++ b/lib/view_widget/update_dialog.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/utils/bridge.dart'; @@ -23,7 +25,7 @@ class _UpdateDialog extends State { child: Center( child: Container( width: MediaQuery.of(context).size.width - 80.w, - height: 150.h, + height: 180.h, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8), @@ -32,7 +34,7 @@ class _UpdateDialog extends State { children: [ Container( width: double.infinity, - height: 90.h, + height: 110.h, alignment: Alignment.center, padding: EdgeInsets.all(20), child: Column( @@ -61,7 +63,7 @@ class _UpdateDialog extends State { height: 1.h, ), Container( - height: 55.h, + height: 69.h, child: Row( mainAxisSize: MainAxisSize.max, children: [ @@ -94,7 +96,6 @@ class _UpdateDialog extends State { child: InkWell( onTap: () { Bridge.toAppStore().then((value) { - }); Navigator.of(context).pop(); }, diff --git a/lib/view_widget/vip_dialog.dart b/lib/view_widget/vip_dialog.dart index ec08d23a..e107b306 100644 --- a/lib/view_widget/vip_dialog.dart +++ b/lib/view_widget/vip_dialog.dart @@ -171,7 +171,7 @@ class _VipDialog extends State { ), ), Image.asset( - "assets/image/vip_yk.png", + "assets/image/vip_yk.webp", fit: BoxFit.cover, width: 76, height: 76, @@ -220,8 +220,8 @@ class _VipDialog extends State { width: 36, height: 36, // fit: BoxFit.cover, - errorSrc: "assets/image/default_1.png", - fadeSrc: "assets/image/default_1.png", + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), if (!vipBenefitList.actived || !vipBenefitList.actived && !vipBenefitList.have ) Container( diff --git a/lib/web/web_turntable_activity.dart b/lib/web/web_turntable_activity.dart index edc642d8..6fe1cf8c 100644 --- a/lib/web/web_turntable_activity.dart +++ b/lib/web/web_turntable_activity.dart @@ -8,6 +8,7 @@ import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:webview_flutter/webview_flutter.dart'; +import 'package:webview_flutter/src/webview_cupertino.dart'; import 'package:flutter/cupertino.dart'; class WebTurntableActivity extends StatefulWidget { @@ -35,6 +36,7 @@ class _WebTurntableActivity extends State with WidgetsBind token = value.getString('token'), }); if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView(); + if (Platform.isIOS) WebView.platform = CupertinoWebView(); } diff --git a/lib/web/web_view/comment_list.dart b/lib/web/web_view/comment_list.dart index 68d92bb6..df78bc0c 100644 --- a/lib/web/web_view/comment_list.dart +++ b/lib/web/web_view/comment_list.dart @@ -261,8 +261,8 @@ class CommentListState extends State { isCircle: true, width: 40, height: 40, - fadeSrc: "assets/image/default_user.png", - errorSrc: "assets/image/default_user.png", + fadeSrc: "assets/image/default_user.webp", + errorSrc: "assets/image/default_user.webp", ), SizedBox( width: 12.w, @@ -325,12 +325,12 @@ class CommentListState extends State { likeBuilder: (bool isLiked) { return isLiked ? Image.asset( - "assets/image/icon_like.png", + "assets/image/icon_like.webp", width: 16, height: 16, ) : Image.asset( - "assets/image/icon_like_h.png", + "assets/image/icon_like_h.webp", width: 16, height: 16, ); diff --git a/lib/web/web_view/input_comment.dart b/lib/web/web_view/input_comment.dart index 41e696a3..96e6d003 100644 --- a/lib/web/web_view/input_comment.dart +++ b/lib/web/web_view/input_comment.dart @@ -118,7 +118,7 @@ class _InputComment extends State { child: Container( padding: EdgeInsets.only(left: 20.w, right: 10.w), child: Image.asset( - "assets/image/icon_comment.png", + "assets/image/icon_comment.webp", width: 24, height: 24, ), @@ -144,12 +144,12 @@ class _InputComment extends State { likeBuilder: (bool isLiked) { return isLiked ? Image.asset( - "assets/image/icon_like.png", + "assets/image/icon_like.webp", width: 24, height: 24, ) : Image.asset( - "assets/image/icon_like_h.png", + "assets/image/icon_like_h.webp", width: 24, height: 24, ); diff --git a/pubspec.lock b/pubspec.lock index aa938ef1..a3579962 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -307,7 +307,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.8.1+1" + version: "3.8.1" font_awesome_flutter: dependency: "direct main" description: @@ -377,7 +377,7 @@ packages: name: keframe url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.4" + version: "2.0.3" like_button: dependency: "direct main" description: @@ -701,10 +701,12 @@ packages: tpns_flutter_plugin: dependency: "direct main" description: - name: tpns_flutter_plugin - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.0" + path: "." + ref: "V1.1.2" + resolved-ref: b814d62f4b82422459f786671f23dd535062d503 + url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin" + source: git + version: "1.1.2" transformer_page_view: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index dbb27aff..410d54b1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - fluwx: ^3.5.0 + fluwx: ^3.8.2 gradient_widgets: ^0.6.0