 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 |
|
哈哈哈
|
f58b687c38
|
coupon
|
4 years ago |
|
fmk
|
0bd887d305
|
修改bug
|
4 years ago |
|
w-R
|
cec874ed9c
|
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/generated/l10n.dart
# lib/l10n/intl_en.arb
# lib/l10n/intl_zh_CN.arb
# lib/l10n/intl_zh_TW.arb
|
4 years ago |
|
哈哈哈
|
008bcb9949
|
coupon
|
4 years ago |
|
fmk
|
dd38ae835f
|
修改bug
|
4 years ago |
|
w-R
|
9cb696832c
|
语言更改
|
4 years ago |
|
w-R
|
1491075cfe
|
Merge branch 'master' into dev
# Conflicts:
# lib/generated/intl/messages_zh_CN.dart
# lib/retrofit/data/coupon.dart
|
4 years ago |
|
fmk
|
c0e2fd6f37
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/generated/intl/messages_zh_CN.dart
lib/retrofit/data/coupon.dart
|
4 years ago |
|
fmk
|
61900a8b41
|
修改bug
|
4 years ago |
|
w-R
|
ce01c846e6
|
繁體更改
|
4 years ago |
|
fmk
|
aabf5f2490
|
修改bug
|
4 years ago |
|
fmk
|
c112b364f7
|
修改bug
|
4 years ago |
|
w-R
|
5bf2ac071b
|
帮助与反馈修改
|
4 years ago |
|
w-R
|
8f48824d16
|
Merge branch 'master' into dev
# Conflicts:
# assets/image/2x/icon_vip.png
# assets/image/3x/icon_vip.png
# assets/image/icon_vip.png
# lib/generated/intl/messages_en.dart
# lib/generated/intl/messages_zh_CN.dart
# lib/generated/intl/messages_zh_TW.dart
# lib/generated/l10n.dart
# lib/l10n/intl_en.arb
# lib/login/login_page.dart
# lib/main.dart
# lib/mine/mine_card_page.dart
# lib/mine/roll_center_page.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
fmk
|
658da282fe
|
修改bug
|
4 years ago |
|
w-R
|
f88ce0040e
|
页面更改
|
4 years ago |
|
fmk
|
45daa492f4
|
小程序
|
4 years ago |
|
fmk
|
251869435e
|
小程序
|
4 years ago |
|
fmk
|
93fa275aa9
|
小程序
|
4 years ago |
|
w-R
|
86f72b9f42
|
页面更新
|
4 years ago |
|
fmk
|
6a2059f602
|
修改
|
4 years ago |
|
fmk
|
cb9ef2ca74
|
修改
|
4 years ago |
|
fmk
|
f7752eac19
|
修改
|
4 years ago |
|
fmk
|
7ff5ed5de2
|
修改
|
4 years ago |
|
fmk
|
4e03a5cfb8
|
ios 小程序
|
4 years ago |
|
哈哈哈
|
92e25271ca
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
哈哈哈
|
f53c34cf54
|
ios
|
4 years ago |
|
w-R
|
e43a569bed
|
Merge branch 'master' into dev
# Conflicts:
# pubspec.lock
|
4 years ago |
|
fmk
|
adea5c1205
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
lib/main.dart
pubspec.lock
|
4 years ago |
|
fmk
|
67d904cbd8
|
g文件
|
4 years ago |
|
哈哈哈
|
106966e7cd
|
ios
|
4 years ago |
|
fmk
|
8400787611
|
修改
|
4 years ago |
|
w-R
|
0f264a87cc
|
Merge branch 'master' into dev
# Conflicts:
# pubspec.lock
|
4 years ago |
|
w-R
|
9bdb545039
|
详情更改
|
4 years ago |
|
fmk
|
a4b5e7dbcf
|
Merge branch 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
pubspec.lock
|
4 years ago |
|
哈哈哈
|
3620545de2
|
登陆动画
|
4 years ago |
|
哈哈哈
|
76cd410649
|
ios打包上传
|
4 years ago |
|
哈哈哈
|
4f1cdda3c9
|
ios打包上传
|
4 years ago |
|
fmk
|
e0c3b1ec6c
|
Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app
Conflicts:
pubspec.lock
|
4 years ago |
|
fmk
|
b3e2083d12
|
修改
|
4 years ago |
