Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2024-06-10 21:22:06 +07:00 · 2024-06-10 21:22:06 +07:00 · 3d157b039a
commit 3d157b039a
parent b7d1392027 4455bca3f4
32 changed files with 1706 additions and 687 deletions
--- a/image/new_vending_info/0.png
+++ b/image/new_vending_info/0.png
--- a/image/new_vending_info/1.png
+++ b/image/new_vending_info/1.png
--- a/image/new_vending_info/2.png
+++ b/image/new_vending_info/2.png
--- a/image/new_vending_info/3.png
+++ b/image/new_vending_info/3.png
--- a/image/new_vending_info/4.png
+++ b/image/new_vending_info/4.png
--- a/image/new_vending_info/5.png
+++ b/image/new_vending_info/5.png
--- a/image/new_vending_info/6.png
+++ b/image/new_vending_info/6.png
--- a/image/new_vending_info/7.png
+++ b/image/new_vending_info/7.png
--- a/image/new_vending_info/8.png
+++ b/image/new_vending_info/8.png
--- a/image/new_vending_info/9.png
+++ b/image/new_vending_info/9.png
--- a/image/new_vending_info/Backspace.png
+++ b/image/new_vending_info/Backspace.png
--- a/image/new_vending_info/Enter
+++ b/image/new_vending_info/Enter
--- a/image/new_vending_info/Left
+++ b/image/new_vending_info/Left
--- a/image/new_vending_info/QuickTest.png
+++ b/image/new_vending_info/QuickTest.png
--- a/image/new_vending_info/arrow_back.png
+++ b/image/new_vending_info/arrow_back.png
--- a/image/new_vending_info/cancel.png
+++ b/image/new_vending_info/cancel.png
--- a/image/new_vending_info/confirm.png
+++ b/image/new_vending_info/confirm.png
--- a/image/new_vending_info/exit_button.png
+++ b/image/new_vending_info/exit_button.png
--- a/image/new_vending_info/get_acc_btn.png
+++ b/image/new_vending_info/get_acc_btn.png
--- a/image/new_vending_info/info_table_template.png
+++ b/image/new_vending_info/info_table_template.png
--- a/image/new_vending_info/nav-bar-mid.png
+++ b/image/new_vending_info/nav-bar-mid.png
--- a/image/new_vending_info/password_prompt.png
+++ b/image/new_vending_info/password_prompt.png
--- a/image/new_vending_info/password_prompt_ext.png
+++ b/image/new_vending_info/password_prompt_ext.png