zhangmeng
|
849bc16c3a
|
修复问题：
4.若订单含保税仓或海外直邮商品，确认订单页面，点击瑞币开关时，提示“订单含跨境商品，无法使用瑞币抵扣”
5.选择支付方式页面，默认选中微信支付，若订单含保税仓或海外直邮商品，选择余额支付时，提示“订单含跨境商品，无法使用余额支付”
|
4 years ago |
laiiihz
|
7dab8a73a3
|
Merge branch 'vip_3.1_null_safety' of http://159.75.73.143:8080/laiiihz/recook into vip_3.1_null_safety
* 'vip_3.1_null_safety' of http://159.75.73.143:8080/laiiihz/recook:
1.提交订单时 若包含保税仓或海外商品添加提示
|
4 years ago |
|
laiiihz
|
c51ce34692
|
update txugcupload version
|
4 years ago |
|
zhangmeng
|
8295d73fb0
|
1.提交订单时 若包含保税仓或海外商品添加提示
|
4 years ago |
|
laiiihz
|
802533c237
|
详情页标题右侧的分享按钮，点击无反应(由于只有一张图片)
|
4 years ago |
|
laiiihz
|
e2e0f04def
|
use new constructor for list
|
4 years ago |
|
laiiihz
|
a5c357e95d
|
update flustar package
|
4 years ago |
|
laiiihz
|
dcddc6bc90
|
修复扫描没有声音的问题
|
4 years ago |
|
laiiihz
|
06fd828697
|
1.10.0-nullsafety+300
|
4 years ago |
|
laiiihz
|
d6295626b1
|
update flutter_ffmpeg podfile
|
4 years ago |
|
laiiihz
|
eb17fdcd08
|
Merge branch 'master' into vip_3.1_null_safety
* master:
直播页面弹窗切换按钮位置
隐私开关显示错误，文案变更
更新关于我们页面
更新按钮位置切换
手机号显示开关添加提示
添加历史累计收益
fix live room can not log out
1.6.13-master+282
更新商务合作页面
店铺补贴描述文字修改
iOS 解决wechat冲突
upgrade fluwx version
更新我的页面
更换彩票图片
修复余额页面请求失败的问题,修改错误页面
remove drone.yml
add import sort dev package and sort all import
1.6.6-vip+276
使用webp优化splash显示效果
# Conflicts:
# android/build.gradle
# lib/main.dart
# lib/pages/home/home_page.dart
# lib/pages/live/video/crop_video_page.dart
# lib/pages/user/user_set_password_varcode.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
ec7e9e5a0f
|
直播页面弹窗切换按钮位置
|
4 years ago |
|
laiiihz
|
f7ef7f2d54
|
隐私开关显示错误，文案变更
|
4 years ago |
|
laiiihz
|
938ee222dc
|
更新关于我们页面
|
4 years ago |
|
laiiihz
|
86f6a2aae4
|
更新按钮位置切换
|
4 years ago |
|
laiiihz
|
6a84d9fdd5
|
手机号显示开关添加提示
|
4 years ago |
|
laiiihz
|
c4fe7d6cf6
|
添加历史累计收益
|
4 years ago |
|
laiiihz
|
4017afce18
|
fix live room can not log out
|
4 years ago |
|
laiiihz
|
ecb83cd095
|
1.6.13-master+282
|
4 years ago |
|
laiiihz
|
838c44e69d
|
Merge branch 'wechat_conflict'
* wechat_conflict:
iOS 解决wechat冲突
upgrade fluwx version
|
4 years ago |
|
laiiihz
|
f242c514b4
|
更新商务合作页面
|
4 years ago |
|
laiiihz
|
a30a503173
|
店铺补贴描述文字修改
|
4 years ago |
|
laiiihz
|
c50b06b82c
|
iOS 解决wechat冲突
|
4 years ago |
|
laiiihz
|
6f729e4dee
|
upgrade fluwx version
|
4 years ago |
|
laiiihz
|
b30331a470
|
更新我的页面
|
4 years ago |
|
laiiihz
|
174e57b42c
|
更换彩票图片
|
4 years ago |
|
laiiihz
|
6a923e64ac
|
修复余额页面请求失败的问题,修改错误页面
|
4 years ago |
|
laiiihz
|
6a1c0935b5
|
remove drone.yml
|
4 years ago |
|
laiiihz
|
2f689f9c29
|
add import sort dev package and sort all import
|
4 years ago |
|
laiiihz
|
bc9297cb91
|
Merge branch 'splash_patch_1'
* splash_patch_1:
使用webp优化splash显示效果
# Conflicts:
# lib/pages/welcome/launch_widget.dart
|
4 years ago |
|
laiiihz
|
d1fd935ba0
|
Merge branch 'vip_3.1_patch'
* vip_3.1_patch: (138 commits)
1.6.6-vip+276
1.6.5-vip+275
我的店铺添加我的销售额
隐藏抽奖功能
赠送卡片列表修复，我的团队添加本人数据
change downgrade dialog asset
首页弹窗修复
修复我的店铺标题显示
update powerlogger version,用户手机号显示开关对接，我的店铺成员手机号、微信号和销售额显示
使用店铺角色卡后的CheckProgressBar显示完全
1.6.0-vip+270
角色卡变动
店铺补贴dialog
对接店铺考核，瑞币添加选项
我的店铺卡片添加备注名
添加权益卡数量
对接赠送权益卡接口
对接使用角色卡接口
对接已使用卡片
upgrade power_logger,已使用卡片页面
...
# Conflicts:
# lib/pages/home/classify/order_preview_page.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
0e77357463
|
1.6.6-vip+276
|
4 years ago |
|
laiiihz
|
28c75bba9c
|
merge
|
4 years ago |
|
laiiihz
|
ede2c0685a
|
1.6.5-vip+275
|
4 years ago |
|
laiiihz
|
8ad0587eac
|
我的店铺添加我的销售额
|
4 years ago |
|
laiiihz
|
cb03d57df2
|
隐藏抽奖功能
|
4 years ago |
|
laiiihz
|
b276ec8a65
|
1.7.0-vip+280
|
4 years ago |
|
laiiihz
|
dad841a0c3
|
merge vip_3.1_patch
|
4 years ago |
|
laiiihz
|
6176673c52
|
赠送卡片列表修复，我的团队添加本人数据
|
4 years ago |
|
laiiihz
|
9719c78720
|
change downgrade dialog asset
|
4 years ago |
|
laiiihz
|
55c7f75b0c
|
首页弹窗修复
|
4 years ago |
|
laiiihz
|
7764e4e724
|
修复我的店铺标题显示
|
4 years ago |
|
laiiihz
|
46d4e6bd36
|
Merge branch 'vip_3.1_patch' into vip_3.1_null_safety
|
4 years ago |
|
laiiihz
|
25de741b86
|
update powerlogger version,用户手机号显示开关对接，我的店铺成员手机号、微信号和销售额显示
|
4 years ago |
|
laiiihz
|
3e4f92c624
|
使用店铺角色卡后的CheckProgressBar显示完全
|
4 years ago |
|
laiiihz
|
6949b79cb8
|
Merge branch 'vip_3.1_patch' into vip_3.1_null_safety
# Conflicts:
# .fvm/fvm_config.json
# lib/manager/http_manager.dart
# lib/pages/home/classify/order_preview_page.dart
# lib/pages/home/home_page.dart
# lib/pages/live/video/crop_video_page.dart
# lib/pages/shop/shop_page.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
af169ff22b
|
完成依赖迁移到空安全
|
4 years ago |
|
laiiihz
|
9b3df0ec31
|
更新空安全相关依赖：video_player, chewie, cupertino_icons, json_annotation, path_provider ,dio ,extended_text ,extended_image, flutter_svg, flutter_datetime_picker, photo, package_signature, hive, hive_flutter ,power_logger [需要解决 video_trimmer 内部依赖]
|
4 years ago |
|
laiiihz
|
2cbc46b512
|
Merge branch 'refactor_live_patch' into flutter_2.0
* refactor_live_patch: (28 commits)
优化powerlogger初始化
update power_logger version
preview order page loading dialog migrate to retoast
重构直播验证
add get GetMaterialApp
fix search page search result display.
update
video crop loading dialog fix
直播页面举报按钮
修复没登录的时候看直播，点了购买，会提示 登录，登录了以后，回到首页，但是直播的声音还是会有，再进直播间，会有2个声音
fix home page boxshadow
[migrate] migrate gsdialog to retoast on home page & live report view
重写GSDialog ，使用BotToast封装，重写新建话题点击页面
订单详情页，有商品在售后中时，确认收货按钮需隐藏
首页按钮重构
首页分类按钮重构
add power_logger support
fix null clipboard data
开始直播页面点击返回无法返回
change git path
...
# Conflicts:
# lib/pages/live/functions/live_function.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
5924ab1643
|
优化powerlogger初始化
|
4 years ago |
