Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

2022-01-19 14:34:08 +07:00 · 2022-01-19 14:34:08 +07:00 · 8138624cb0
commit 8138624cb0
parent 56e3ebb80a b1744e1726
72 changed files with 723 additions and 408 deletions
--- a/image/page2/bn_protein.png
+++ b/image/page2/bn_protein.png
--- a/image/page2/bp_protein.png
+++ b/image/page2/bp_protein.png
--- a/image/page_doing/txt_15_en.png
+++ b/image/page_doing/txt_15_en.png
--- a/image/page_doing/txt_37.png
+++ b/image/page_doing/txt_37.png
--- a/image/page_doing/txt_46.png
+++ b/image/page_doing/txt_46.png
--- a/image/page_doing/txt_46_en.png
+++ b/image/page_doing/txt_46_en.png
--- a/image/page_doing/txt_47.png
+++ b/image/page_doing/txt_47.png
--- a/image/page_drink/bn_Congee.png
+++ b/image/page_drink/bn_Congee.png
--- a/image/page_drink/bn_protein_Blueberry.png
+++ b/image/page_drink/bn_protein_Blueberry.png
--- a/image/page_drink/bn_protein_Chocolate.png
+++ b/image/page_drink/bn_protein_Chocolate.png
--- a/image/page_drink/bn_protein_Mango.png
+++ b/image/page_drink/bn_protein_Mango.png
--- a/image/page_drink/bn_protein_Matcha.png
+++ b/image/page_drink/bn_protein_Matcha.png
--- a/image/page_drink/bn_protein_Strawberry.png
+++ b/image/page_drink/bn_protein_Strawberry.png
--- a/image/page_drink/bn_protein_Taiwantea.png
+++ b/image/page_drink/bn_protein_Taiwantea.png
--- a/image/page_drink/bn_protein_Thaitea.png
+++ b/image/page_drink/bn_protein_Thaitea.png
--- a/image/page_drink/bn_protein_caramel.png
+++ b/image/page_drink/bn_protein_caramel.png
--- a/image/page_drink/bn_protein_espresso.png
+++ b/image/page_drink/bn_protein_espresso.png
--- a/image/page_drink/bn_protein_isolated.png
+++ b/image/page_drink/bn_protein_isolated.png
--- a/image/page_drink/bn_protein_kokuto.png
+++ b/image/page_drink/bn_protein_kokuto.png
--- a/image/page_drink/bn_protein_milk.png
+++ b/image/page_drink/bn_protein_milk.png
--- a/image/page_drink/bn_protein_oreo.png
+++ b/image/page_drink/bn_protein_oreo.png
--- a/image/page_drink_disable/bn_Congee.png
+++ b/image/page_drink_disable/bn_Congee.png
--- a/image/page_drink_disable/bn_dirty_light__peacher.png
+++ b/image/page_drink_disable/bn_dirty_light__peacher.png
--- a/image/page_drink_disable/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_disable/bn_hot_americano_light_peacher.png
--- a/image/page_drink_disable/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_disable/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_disable/bn_iced_americano_light_peacher.png
+++ b/image/page_drink_disable/bn_iced_americano_light_peacher.png
--- a/image/page_drink_press/bn_Congee.png
+++ b/image/page_drink_press/bn_Congee.png
--- a/image/page_drink_press/bn_protein_Blueberry.png
+++ b/image/page_drink_press/bn_protein_Blueberry.png
--- a/image/page_drink_press/bn_protein_Chocolate.png
+++ b/image/page_drink_press/bn_protein_Chocolate.png
--- a/image/page_drink_press/bn_protein_Mango.png
+++ b/image/page_drink_press/bn_protein_Mango.png
--- a/image/page_drink_press/bn_protein_Matcha.png
+++ b/image/page_drink_press/bn_protein_Matcha.png
--- a/image/page_drink_press/bn_protein_Strawberry.png
+++ b/image/page_drink_press/bn_protein_Strawberry.png
--- a/image/page_drink_press/bn_protein_Taiwantea.png
+++ b/image/page_drink_press/bn_protein_Taiwantea.png
--- a/image/page_drink_press/bn_protein_Thaitea.png
+++ b/image/page_drink_press/bn_protein_Thaitea.png
--- a/image/page_drink_press/bn_protein_caramel.png
+++ b/image/page_drink_press/bn_protein_caramel.png
--- a/image/page_drink_press/bn_protein_espresso.png
+++ b/image/page_drink_press/bn_protein_espresso.png
--- a/image/page_drink_press/bn_protein_isolated.png
+++ b/image/page_drink_press/bn_protein_isolated.png
--- a/image/page_drink_press/bn_protein_kokuto.png
+++ b/image/page_drink_press/bn_protein_kokuto.png
--- a/image/page_drink_press/bn_protein_milk.png
+++ b/image/page_drink_press/bn_protein_milk.png
--- a/image/page_drink_press/bn_protein_oreo.png
+++ b/image/page_drink_press/bn_protein_oreo.png
--- a/image/page_drink_select/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_select/bn_dirty_light__snowwhite.png
--- a/image/page_drink_select/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_select/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_select/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_select/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_select/bn_iced_americano_light_snowwhite.png
+++ b/image/page_drink_select/bn_iced_americano_light_snowwhite.png
--- a/image/page_drink_select/bn_protein_Matcha.png
+++ b/image/page_drink_select/bn_protein_Matcha.png