Merge branch 'dev_feature' into dev

ui调整 # Conflicts: # ln_jq_app/lib/pages/b_page/reservation/controller.dart # ln_jq_app/lib/pages/b_page/site/controller.dart # ln_jq_app/lib/pages/b_page/site/view.dart # ln_jq_app/lib/pages/c_page/mine/view.dart # ln_jq_app/lib/pages/c_page/reservation/controller.dart # ln_jq_app/lib/pages/c_page/reservation/view.dart # ln_jq_app/lib/pages/login/view.dart
2026-01-29 11:45:17 +08:00
parent 5722e3ace0 79fe3257b5
commit e59b89c225
51 changed files with 3728 additions and 2121 deletions
--- a/ln_jq_app/assets/images/android_apk_img.png
+++ b/ln_jq_app/assets/images/android_apk_img.png
--- a/ln_jq_app/assets/images/bg_login.png
+++ b/ln_jq_app/assets/images/bg_login.png
--- a/ln_jq_app/assets/images/bg_map@2x.png
+++ b/ln_jq_app/assets/images/bg_map@2x.png
--- a/ln_jq_app/assets/images/ic_car@2x.png
+++ b/ln_jq_app/assets/images/ic_car@2x.png
--- a/ln_jq_app/assets/images/ic_car_bg@2x.png
+++ b/ln_jq_app/assets/images/ic_car_bg@2x.png
--- a/ln_jq_app/assets/images/ic_car_select@2x.png
+++ b/ln_jq_app/assets/images/ic_car_select@2x.png
--- a/ln_jq_app/assets/images/ic_h2@2x.png
+++ b/ln_jq_app/assets/images/ic_h2@2x.png
--- a/ln_jq_app/assets/images/ic_h2_my@2x.png
+++ b/ln_jq_app/assets/images/ic_h2_my@2x.png
--- a/ln_jq_app/assets/images/ic_h2_my_select@2x.png
+++ b/ln_jq_app/assets/images/ic_h2_my_select@2x.png
--- a/ln_jq_app/assets/images/ic_h2_select@2x.png
+++ b/ln_jq_app/assets/images/ic_h2_select@2x.png
--- a/ln_jq_app/assets/images/ic_jqz@2x.png
+++ b/ln_jq_app/assets/images/ic_jqz@2x.png
--- a/ln_jq_app/assets/images/ic_label@2x.png
+++ b/ln_jq_app/assets/images/ic_label@2x.png
--- a/ln_jq_app/assets/images/ic_login_bg@2x.png
+++ b/ln_jq_app/assets/images/ic_login_bg@2x.png
--- a/ln_jq_app/assets/images/ic_logo@2x.png
+++ b/ln_jq_app/assets/images/ic_logo@2x.png
--- a/ln_jq_app/assets/images/ic_logo_unbg@2x.png
+++ b/ln_jq_app/assets/images/ic_logo_unbg@2x.png
--- a/ln_jq_app/assets/images/ic_mall@2x.png
+++ b/ln_jq_app/assets/images/ic_mall@2x.png
--- a/ln_jq_app/assets/images/ic_mall_select@2x.png
+++ b/ln_jq_app/assets/images/ic_mall_select@2x.png
--- a/ln_jq_app/assets/images/ic_map@2x.png
+++ b/ln_jq_app/assets/images/ic_map@2x.png
--- a/ln_jq_app/assets/images/ic_map_select@2x.png
+++ b/ln_jq_app/assets/images/ic_map_select@2x.png
--- a/ln_jq_app/assets/images/ic_no_data@2x.png
+++ b/ln_jq_app/assets/images/ic_no_data@2x.png
--- a/ln_jq_app/assets/images/ic_pj@2x.png
+++ b/ln_jq_app/assets/images/ic_pj@2x.png
--- a/ln_jq_app/assets/images/ic_px@2x.png
+++ b/ln_jq_app/assets/images/ic_px@2x.png
--- a/ln_jq_app/assets/images/ic_user@2x.png
+++ b/ln_jq_app/assets/images/ic_user@2x.png
--- a/ln_jq_app/assets/images/ic_user_logo@2x.png
+++ b/ln_jq_app/assets/images/ic_user_logo@2x.png
--- a/ln_jq_app/assets/images/ic_user_select@2x.png
+++ b/ln_jq_app/assets/images/ic_user_select@2x.png
--- a/ln_jq_app/assets/images/ic_wz@2x.png
+++ b/ln_jq_app/assets/images/ic_wz@2x.png
--- a/ln_jq_app/assets/images/welcome.png
+++ b/ln_jq_app/assets/images/welcome.png