 哈哈哈
|
7fc536a743
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/generated/l10n.dart
# lib/home/founder_story_page.dart
# lib/home/home_page.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_TW.arb
# lib/login/login_page.dart
|
4 years ago |
|
哈哈哈
|
807d29ea9b
|
denglu
|
4 years ago |
|
fmk
|
90e1e4b210
|
修改
|
4 years ago |
|
fmk
|
dab34b53d6
|
修改
|
4 years ago |
 w-R
|
ed192fa063
|
更改
|
4 years ago |
|
w-R
|
e8be5ad31f
|
物流页更改
|
4 years ago |
|
哈哈哈
|
f362c21d99
|
Merge branch 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/generated/l10n.dart
lib/home/home_page.dart
lib/l10n/intl_en.arb
lib/l10n/intl_zh_CN.arb
lib/l10n/intl_zh_TW.arb
pubspec.lock
|
4 years ago |
|
哈哈哈
|
f825606462
|
coupon
|
4 years ago |
|
fmk
|
ff3dbcc8a2
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
pubspec.lock
|
4 years ago |
|
fmk
|
4ec7704ee2
|
修改ui
|
4 years ago |
|
w-R
|
c3d6bde1cb
|
ui更改;
|
4 years ago |
|
fmk
|
23142db76f
|
修改ui
|
4 years ago |
|
fmk
|
c19b90fdf4
|
修改ui
|
4 years ago |
|
fmk
|
7bb3a6515e
|
修改ui
|
4 years ago |
|
fmk
|
5983a77d37
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/generated/l10n.dart
lib/home/huixiang_brand_page.dart
lib/l10n/intl_zh_CN.arb
lib/l10n/intl_zh_TW.arb
|
4 years ago |
|
fmk
|
f811226c45
|
訂單按鈕
|
4 years ago |
|
w-R
|
5fd7edd8aa
|
关于ui,隐私声明ui更改;
|
4 years ago |
|
w-R
|
46275f6381
|
Merge branch 'master' into dev
# Conflicts:
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_TW.arb
|
4 years ago |
|
w-R
|
a2bebddbb1
|
关于ui,隐私声明ui更改;
|
4 years ago |
|
w-R
|
89194aff0b
|
更改
|
4 years ago |
|
fmk
|
baddf94a9f
|
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_TW.arb
|
4 years ago |
|
fmk
|
e45d0269a2
|
會員信息
|
4 years ago |
|
fmk
|
3ca417a568
|
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_TW.arb
|
4 years ago |
|
w-R
|
df55268f4a
|
首页理念ui更改
|
4 years ago |
|
fmk
|
792b85d7ee
|
會員信息
|
4 years ago |
|
w-R
|
f340e2b779
|
Merge branch 'master' into dev
# Conflicts:
# lib/generated/l10n.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_TW.arb
|
4 years ago |
|
w-R
|
d1ed3d7d3d
|
隐私协议更改
|
4 years ago |
|
w-R
|
770500d204
|
隐私协议增加;
|
4 years ago |
|
fmk
|
ce6c185754
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
|
4 years ago |
|
fmk
|
c116c26f2e
|
會員信息
|
4 years ago |
|
w-R
|
16b95060ea
|
首页界面更改
|
4 years ago |
|
fmk
|
f4e11151f5
|
订单详情,
|
4 years ago |
|
fmk
|
9878e8af56
|
订单详情,
|
4 years ago |
|
fmk
|
679eac57ba
|
订单详情, 修改
|
4 years ago |
|
fmk
|
d56f6b6888
|
Merge branch 'dev' of https://git.lotus-wallet.com/fmk/huixiang_app
|
4 years ago |
|
fmk
|
104e2904f5
|
订单详情, 修改
|
4 years ago |
|
w-R
|
1af43ecca4
|
首页更新
|
4 years ago |
|
fmk
|
0d869a7701
|
订单详情
|
4 years ago |
|
fmk
|
01618842d2
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/main.dart
lib/retrofit/data/member_rank.dart
lib/retrofit/data/store_info.dart
lib/retrofit/data/task.dart
|
4 years ago |
|
fmk
|
176f7c22ab
|
订单
|
4 years ago |
|
w-R
|
2c4e0ff73c
|
首页故事更改
|
4 years ago |
|
fmk
|
d31124346d
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/generated/intl/messages_en.dart
lib/generated/intl/messages_zh_CN.dart
lib/generated/intl/messages_zh_TW.dart
lib/main.dart
lib/mine/coupons_page.dart
lib/retrofit/data/member_rank.dart
lib/retrofit/data/page.dart
lib/retrofit/data/sign_in.dart
lib/retrofit/data/sign_info.dart
lib/retrofit/data/store.dart
lib/retrofit/data/store_info.dart
lib/retrofit/data/store_type.dart
lib/retrofit/data/upload_result.dart
lib/retrofit/data/user_entity.dart
lib/retrofit/data/user_info.dart
lib/view_widget/new_coupon_widget.dart
pubspec.lock
|
4 years ago |
|
fmk
|
7400e640a1
|
订单
|
4 years ago |
|
w-R
|
0a42403da2
|
Merge branch 'master' into dev
# Conflicts:
# lib/generated/intl/messages_en.dart
# lib/generated/intl/messages_zh_CN.dart
# lib/generated/intl/messages_zh_TW.dart
# lib/main.dart
# lib/mine/coupons_page.dart
# lib/retrofit/data/member_rank.dart
# lib/view_widget/new_coupon_widget.dart
# pubspec.lock
|
4 years ago |
|
fmk
|
e20a4aecc5
|
订单
|
4 years ago |
|
w-R
|
eb946b494a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
w-R
|
7139ef6b7a
|
创始人故事ui更改
|
4 years ago |
|
fmk
|
7e13644abf
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/union/union_details_page.dart
|
4 years ago |
|
fmk
|
1ad5d473cc
|
订单
|
4 years ago |
|
w-R
|
943cce49e2
|
更改
|
4 years ago |
