 哈哈哈
|
f8c2de7cf0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
哈哈哈
|
55fece3090
|
修改
|
3 years ago |
 w-R
|
bcee1cc64c
|
Merge branch 'master' into dev
# Conflicts:
# lib/home/points_mall_page.dart
|
3 years ago |
|
w-R
|
3175ebdec6
|
部分更改
|
3 years ago |
|
fmk
|
721ae790c5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
|
3 years ago |
|
fmk
|
508c1369e0
|
image
|
3 years ago |
|
哈哈哈
|
2bd9a1aefe
|
修改
|
3 years ago |
|
哈哈哈
|
84b2f167ce
|
修改
|
3 years ago |
|
w-R
|
5e050b5867
|
Merge branch 'master' into dev
# Conflicts:
# lib/mine/mine_page.dart
# lib/order/logistics_information_page.dart
|
3 years ago |
|
w-R
|
d9f84fed32
|
Merge branch 'master' into dev
# Conflicts:
# assets/image/3x/default_user.png
# assets/image/default_user.png
# lib/mine/mine_page.dart
# lib/order/logistics_information_page.dart
|
3 years ago |
|
哈哈哈
|
b61a5cba96
|
修改
|
4 years ago |
|
哈哈哈
|
8f8c80fa26
|
修改
|
4 years ago |
|
哈哈哈
|
3043144d87
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
assets/image/3x/default_user.png
assets/image/default_user.png
lib/mine/mine_page.dart
lib/order/logistics_information_page.dart
|
4 years ago |
|
w-R
|
ba34df38c8
|
部分微调;
|
4 years ago |
|
fmk
|
a68b83e1e7
|
image
|
4 years ago |
|
fmk
|
6bedee90f3
|
image
|
4 years ago |
|
w-R
|
fdb86fd9ac
|
Merge branch 'master' into dev
# Conflicts:
# lib/mine/mine_page.dart
|
4 years ago |
|
w-R
|
b8c78da94c
|
部分微调;
|
4 years ago |
|
w-R
|
5d4ad13eb4
|
部分微调;
|
4 years ago |
|
fmk
|
7c63fbc499
|
image
|
4 years ago |
|
fmk
|
df857982a6
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/mine/mine_page.dart
|
4 years ago |
|
fmk
|
6da1ad39af
|
image
|
4 years ago |
|
fmk
|
72eb19a580
|
ui 修改
|
4 years ago |
|
w-R
|
71f668d2b9
|
Merge branch 'master' into dev
|
4 years ago |
|
fmk
|
9bc49c764c
|
Merge branch 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
|
4 years ago |
|
哈哈哈
|
2779deae48
|
修改
|
4 years ago |
|
fmk
|
3511a93f66
|
mine
|
4 years ago |
|
w-R
|
a4fbf66b82
|
部分字体间距等微调;
|
4 years ago |
|
w-R
|
0cf13ca71b
|
Merge branch 'master' into dev
# Conflicts:
# lib/mine/mine_page.dart
|
4 years ago |
|
fmk
|
e4071b0323
|
ui 修改
|
4 years ago |
|
w-R
|
154877e964
|
Merge branch 'master' into dev
# Conflicts:
# lib/generated/intl/messages_en.dart
# lib/generated/l10n.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_Hans_CN.arb
# lib/l10n/intl_zh_Hant_CN.arb
# lib/l10n/intl_zh_TW.arb
|
4 years ago |
|
fmk
|
bb37afa0ae
|
ui 修改
|
4 years ago |
|
w-R
|
5095392f9d
|
Merge branch 'master' into dev
# Conflicts:
# lib/address/edit_address_page.dart
# lib/generated/intl/messages_en.dart
# lib/generated/l10n.dart
# lib/home/points_mall_page.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_Hans_CN.arb
# lib/l10n/intl_zh_Hant_CN.arb
# lib/l10n/intl_zh_TW.arb
# lib/mine/mine_page.dart
|
4 years ago |
|
w-R
|
f4daf40708
|
Merge branch 'master' into dev
# Conflicts:
# lib/address/edit_address_page.dart
# lib/generated/intl/messages_en.dart
# lib/generated/intl/messages_zh_CN.dart
# lib/generated/intl/messages_zh_Hans_CN.dart
# lib/generated/intl/messages_zh_Hant_CN.dart
# lib/generated/intl/messages_zh_TW.dart
# lib/generated/l10n.dart
# lib/home/points_mall_page.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_Hans_CN.arb
# lib/l10n/intl_zh_Hant_CN.arb
# lib/l10n/intl_zh_TW.arb
# lib/mine/mine_page.dart
|
4 years ago |
|
fmk
|
5d99380bc8
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/address/edit_address_page.dart
lib/generated/intl/messages_en.dart
lib/generated/intl/messages_zh_CN.dart
lib/generated/intl/messages_zh_Hans_CN.dart
lib/generated/intl/messages_zh_Hant_CN.dart
lib/generated/intl/messages_zh_TW.dart
lib/generated/l10n.dart
lib/home/points_mall_page.dart
lib/l10n/intl_en.arb
lib/l10n/intl_zh_CN.arb
lib/l10n/intl_zh_Hans_CN.arb
lib/l10n/intl_zh_Hant_CN.arb
lib/l10n/intl_zh_TW.arb
lib/mine/mine_page.dart
|
4 years ago |
|
w-R
|
207c5680bb
|
部分字体间距等微调;
|
4 years ago |
|
fmk
|
26f0d72a68
|
ui 修改
|
4 years ago |
|
w-R
|
9c4a11c8b3
|
部分ui调整,字体间距等微调;
|
4 years ago |
|
fmk
|
514664871d
|
ui 修改
|
4 years ago |
|
w-R
|
5916f06893
|
部分ui调整,字体间距等微调;
|
4 years ago |
|
fmk
|
a6b3a1e531
|
修改UI， bug
|
4 years ago |
|
哈哈哈
|
4843976ddf
|
修改
|
4 years ago |
|
fmk
|
707c2d0a2b
|
修改UI， bug
|
4 years ago |
|
fmk
|
1fff0bc096
|
修改UI， bug
|
4 years ago |
|
fmk
|
a6ece1fa33
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
fmk
|
e9b407bbd1
|
修改UI， bug
|
4 years ago |
|
fmk
|
44aed9850b
|
修改UI， bug
|
4 years ago |
|
哈哈哈
|
b85edb43b4
|
修改
|
4 years ago |
|
哈哈哈
|
a8ab5fa6e7
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
|
4 years ago |
|
fmk
|
ea27190547
|
修改UI， bug
|
4 years ago |
