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 |
fmk
|
a2672450ed
|
修改UI, bug
|
4 years ago |
w-R
|
da0f797184
|
更改
|
4 years ago |
fmk
|
a027d04061
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
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
|
9deec598b8
|
修改UI, bug
|
4 years ago |
w-R
|
8036db1200
|
更改
|
4 years ago |
w-R
|
b164168e8f
|
协议弹窗,vip详情更改
|
4 years ago |
哈哈哈
|
679a5f8d52
|
修改
|
4 years ago |
fmk
|
4ed5abfc26
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
pubspec.lock
|
4 years ago |
fmk
|
1293093d8a
|
修改UI, bug
|
4 years ago |
w-R
|
43b756354f
|
Merge branch 'master' into dev
# Conflicts:
# pubspec.lock
|
4 years ago |
w-R
|
d577c774a2
|
更改
|
4 years ago |
fmk
|
84dd7b07f9
|
修改UI, bug
|
4 years ago |
fmk
|
4bdad87eff
|
修改UI, bug
|
4 years ago |
fmk
|
eaf2c5e2fa
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/generated/l10n.dart
lib/home/main_home_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_wallet_page.dart
pubspec.lock
|
4 years ago |
fmk
|
878df42af8
|
修改UI, bug
|
4 years ago |
w-R
|
86ac4c958d
|
部分修改
|
4 years ago |
w-R
|
5c09dc4642
|
部分修改
|
4 years ago |
w-R
|
9238317254
|
充值更改,部分修改
|
4 years ago |
哈哈哈
|
7cc8931877
|
修改
|
4 years ago |
哈哈哈
|
9f24573d67
|
修改
|
4 years ago |
哈哈哈
|
8bbf1f350e
|
修改
|
4 years ago |
哈哈哈
|
a547520fe6
|
修改
|
4 years ago |