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 |
zhangmeng
|
8295d73fb0
|
1.提交订单时 若包含保税仓或海外商品添加提示
|
4 years ago |
|
laiiihz
|
802533c237
|
详情页标题右侧的分享按钮，点击无反应(由于只有一张图片)
|
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
|
6f729e4dee
|
upgrade fluwx version
|
4 years ago |
|
laiiihz
|
2f689f9c29
|
add import sort dev package and sort all import
|
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
|
28c75bba9c
|
merge
|
4 years ago |
|
laiiihz
|
cb03d57df2
|
隐藏抽奖功能
|
4 years ago |
|
laiiihz
|
dad841a0c3
|
merge vip_3.1_patch
|
4 years ago |
|
laiiihz
|
9719c78720
|
change downgrade dialog asset
|
4 years ago |
|
laiiihz
|
55c7f75b0c
|
首页弹窗修复
|
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
|
6e3b93587d
|
角色卡变动
|
4 years ago |
|
laiiihz
|
ace574a5ef
|
preview order page loading dialog migrate to retoast
|
4 years ago |
|
laiiihz
|
563168d745
|
hide shop manager grid items
|
4 years ago |
|
laiiihz
|
0c5bc0e3c2
|
修改升级卡片
|
4 years ago |
|
laiiihz
|
61259793ab
|
Merge branch 'master' into new_vip
* master:
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封装，重写新建话题点击页面
# Conflicts:
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
46d184e865
|
fix search page search result display.
|
4 years ago |
|
laiiihz
|
ed2b1d511e
|
update
|
4 years ago |
|
laiiihz
|
e2ebec883c
|
fix home page boxshadow
|
4 years ago |
|
laiiihz
|
72ee3b675a
|
[migrate] migrate gsdialog to retoast on home page & live report view
|
4 years ago |
|
laiiihz
|
de9a41c495
|
保税仓和国外仓商品订单不能使用余额支付
|
4 years ago |
|
laiiihz
|
aedd9886eb
|
下单页面保税仓类型2，3 不能使用瑞币抵扣
|
4 years ago |
|
laiiihz
|
f923f2e2c0
|
merge 'master' issue fix
|
4 years ago |
|
laiiihz
|
e2d5214cd8
|
Merge branch 'master' into new_vip
* master: (42 commits)
首页按钮重构
首页分类按钮重构
add power_logger support
fix null clipboard data
开始直播页面点击返回无法返回
change git path
update path
drone change path
x
test drone git
test
rename yaml file
add drone yaml
video_trimmer version 0.2.7
fix rui code cant clear clipboard data .
update grinder script
分类加载页面
瑞口令自己分享的口令不需要显示
瑞口令图片无法显示的问题
修复直播页面下单崩溃的问题
...
# Conflicts:
# lib/manager/http_manager.dart
# lib/pages/tabBar/TabbarWidget.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
laiiihz
|
c994d85724
|
首页按钮重构
|
4 years ago |
|
laiiihz
|
1c4d27c43f
|
首页分类按钮重构
|
4 years ago |
|
laiiihz
|
c3689900ac
|
店主升级到黄金没有弹窗
|
4 years ago |
|
laiiihz
|
1aeb3a042c
|
修复我的页面首次不刷新的问题
|
4 years ago |
|
laiiihz
|
2530296b59
|
分类加载页面
|
4 years ago |
|
laiiihz
|
f34f2de840
|
修复直播页面下单崩溃的问题
|
4 years ago |
|
laiiihz
|
481345d684
|
瑞口令监听
|
4 years ago |
|
laiiihz
|
c7223d0bd1
|
Revert "更换首页图标[新年限定]" This reverts commit 266356a11a.
|
4 years ago |
|
laiiihz
|
51d80ddf52
|
完成瑞口令
|
4 years ago |
|
laiiihz
|
a31158e063
|
店铺激活状态修复
|
4 years ago |
|
laiiihz
|
d3430dbd46
|
Merge branch 'master' into new_vip
* master:
开启云闪付功能
热销榜单去除销售数量UI
关闭彩票下单相关内容
恢复彩票功能
更换首页图标[新年限定]
修复测试环境中已登陆用户下单会直接跳转到登陆页且无法点击。
# Conflicts:
# lib/pages/home/home_page.dart
|
4 years ago |
|
laiiihz
|
3582366bb6
|
开启云闪付功能
|
5 years ago |
|
laiiihz
|
6aef51cd58
|
热销榜单去除销售数量UI
|
5 years ago |
|
laiiihz
|
1aaf38500b
|
恢复彩票功能
|
5 years ago |
|
laiiihz
|
266356a11a
|
更换首页图标[新年限定]
|
5 years ago |
|
laiiihz
|
758371b52e
|
修复测试环境中已登陆用户下单会直接跳转到登陆页且无法点击。
|
5 years ago |
|
laiiihz
|
33856a0b0c
|
压缩首页自页面背景图片 移除多余组件
|
5 years ago |
|
laiiihz
|
081766a92a
|
修复首次进入应用角色升级为店主失败的问题
|
5 years ago |
|
laiiihz
|
a49964e124
|
user level tool fix.
|
5 years ago |
|
laiiihz
|
32ffc9cae2
|
恢复彩票入口
|
5 years ago |
|
laiiihz
|
dbb5d6a0de
|
开启云闪付功能
|
5 years ago |
|
laiiihz
|
264377903c
|
Merge branch 'master' into new_vip
* master:
test commit.
修复搜索页面点击搜索按钮的加载样式
优化海报二维码识别效率
小程序分享添加邀请码
搜索页面加载样式变更
搜索页面加载改成full screen dialog
修复复制验证码时验证订单的问题
修复搜索背景颜色
update pod file
1.4.0-dev+240
海报样式变更
海报二维码样式变更
change to dev env on master branch
重置支付密码时，验证码粘贴功能
提现页面，支付宝、银行卡切换时，提现账户的填写内容也要切换
搜索后增加加载中的图
fix builds
revert lib/pages/user/order/order_center_page.dart
添加安全边距
fix build issue 首次打开app的隐私政策弹窗，调整留白大小
# Conflicts:
# lib/pages/user/user_set_password_varcode.dart
# pubspec.yaml
|
5 years ago |
|
laiiihz
|
be83424bdd
|
修复搜索页面点击搜索按钮的加载样式
|
5 years ago |
|
laiiihz
|
bb2b8fdd0e
|
搜索页面加载样式变更
|
5 years ago |
|
laiiihz
|
98b2409199
|
搜索页面加载改成full screen dialog
|
5 years ago |
|
laiiihz
|
9971566f9b
|
修复复制验证码时验证订单的问题
|
5 years ago |
|
laiiihz
|
9de900196e
|
修复搜索背景颜色
|
5 years ago |
|
laiiihz
|
a44187b20d
|
remove shop files
|
5 years ago |
|
laiiihz
|
a1ec9653cf
|
update power_logger
添加用户升降级弹框
|
5 years ago |
|
laiiihz
|
aee654e1bf
|
搜索后增加加载中的图
|
5 years ago |
|
laiiihz
|
9cd8f98952
|
Merge branch 'master' into new_vip
* master:
安卓返回桌面的弹窗，按钮文案与功能不一致 手机号输入不做号段限制 售后详情页，“查看退货地址”改为“上传退货单号” 恢复开发票功能 1.3.38-dev+231
|
5 years ago |
|
laiiihz
|
b131af23ce
|
add power_logger
goods page not call live api when liveId is 0.
|
5 years ago |
|
laiiihz
|
23f56c2b2d
|
安卓返回桌面的弹窗，按钮文案与功能不一致
手机号输入不做号段限制
售后详情页，“查看退货地址”改为“上传退货单号”
恢复开发票功能
1.3.38-dev+231
|
5 years ago |
|
laiiihz
|
284ed13050
|
Merge branch 'master' into new_vip
* master: (21 commits)
set midSdkVersion to 22 change location package
分享文案变更
返回弹框界面修改 1.3.35-dev+228
remove about us old page
更新分享图标 物品页面添加额外的图片 更新关于我们页面
隐藏云闪付入口
1.3.31-dev+224
goods item :migrate gridView to waterfallView
1.3.30+223
修复店铺页面组件崩溃的问题
修改分享按钮排序
微信分享小程序
add DeviceType header
update first enter app logic fix jingtong goods img display issue
更新隐私政策相关
support arm64-v8a,armeabi-v7a
update readme update grind
添加打包脚本
update readme file remove pem keys
add privacy doc
...
# Conflicts:
# android/app/build.gradle
# lib/pages/user/about_us_page.dart
|
5 years ago |
|
laiiihz
|
7bf054b2be
|
set midSdkVersion to 22
change location package
|
5 years ago |
|
laiiihz
|
46eafcc2ae
|
返回弹框界面修改
1.3.35-dev+228
|
5 years ago |
|
laiiihz
|
845a93ea96
|
更新分享图标
物品页面添加额外的图片
更新关于我们页面
|
5 years ago |
|
laiiihz
|
11253a0bad
|
隐藏云闪付入口
|
5 years ago |
|
laiiihz
|
11715a9ec5
|
goods item :migrate gridView to waterfallView
|
5 years ago |
|
laiiihz
|
b66db06e42
|
修改分享按钮排序
|
5 years ago |
|
laiiihz
|
504c327656
|
remove unused image
update image usage
|
5 years ago |
|
laiiihz
|
9b744beeae
|
remove unused import
|
5 years ago |
|
laiiihz
|
554d004a32
|
update a lot
|
5 years ago |
|
laiiihz
|
5784b55d27
|
1.3.22-20201221+215
|
5 years ago |
|
laiiihz
|
47c41bd310
|
Merge branch 'union_pay'
* union_pay:
完成云闪付对接
add union pay support
|
5 years ago |
|
laiiihz
|
9c1e74534e
|
搜索页猜你喜欢
|
5 years ago |
|
laiiihz
|
346522f2b1
|
完成云闪付对接
|
5 years ago |
|
laiiihz
|
abd9cc4c25
|
搜索页结果为空时添加排行榜
|
5 years ago |
|
zhang
|
7fe946a3b6
|
修复问题若干
|
5 years ago |
|
zhang
|
daaa0563ef
|
修改商品详情页进口税显示逻辑
|
5 years ago |
|
zhang
|
d661d299d4
|
修复若干问题
|
5 years ago |
|
zhang
|
9a3a8e19a1
|
修改服务信息显示逻辑
|
5 years ago |
|
zhang
|
b8732a39de
|
修复若干问题
|
5 years ago |
|
zhang
|
063d67086d
|
商品详情页购物弹窗添加包税信息
|
5 years ago |
|
laiiihz
|
f15165d6de
|
进口商品下单页面需要同意才能下单
|
5 years ago |
|
laiiihz
|
a9349517d5
|
fix tax price display
|
5 years ago |
|
laiiihz
|
78fec8238f
|
Merge branch 'master' of http://test.akuhotel.com:8099/laiiihz/recook
* 'master' of http://test.akuhotel.com:8099/laiiihz/recook:
购物车样式修改
|
5 years ago |
|
laiiihz
|
c4eaf7db12
|
Goods detail fix
|
5 years ago |
|
zhang
|
fe48a0b7c2
|
Merge branch 'master' of http://192.168.2.201:8099/laiiihz/recook
|
5 years ago |
|
zhang
|
a5d1bc0da9
|
购物车样式修改
|
5 years ago |
|
laiiihz
|
bb7abe8e76
|
订单页面添加海外商品修改
|
5 years ago |
|
laiiihz
|
11425269a2
|
Merge branch 'master' of http://test.akuhotel.com:8099/laiiihz/recook
* 'master' of http://test.akuhotel.com:8099/laiiihz/recook:
进口标签添加判断条件
修改首页、品牌列表、格子列表、品类列表、热销榜单等样式
|
5 years ago |
|
zhang
|
050528f38d
|
进口标签添加判断条件
|
5 years ago |
|
zhang
|
7d1f86fb69
|
修改首页、品牌列表、格子列表、品类列表、热销榜单等样式
|
5 years ago |
|
laiiihz
|
2b38078f59
|
更新订单页面提示语
|
5 years ago |
|
zhang
|
78add3f5f5
|
重写参数详情界面
|
5 years ago |
|
zhang
|
70abc8cc11
|
修复问题：1.卡片背景图与我的改成一样
2.订单页部分样式修改
3.部分文案修改
4.推荐好友页修改
|
5 years ago |
|
zhang
|
b6cd28d387
|
3.产品列表商品标题字体改小一号
4.店铺页面链接到发现页了
修复
|
5 years ago |
|
zhang
|
7e51ed239c
|
修复： 1.首页公历在上，农历在下
2.订单页面防诈骗提示语
|
5 years ago |
|
zhang
|
b6c384a543
|
会员角色隐藏品牌概念
|
5 years ago |
|
laiiihz
|
651e5af14d
|
修复华为设备无法下单的问题
|
5 years ago |
|
laiiihz
|
e59a513313
|
revert 725a272816 order_preview_page change
|
5 years ago |
|
laiiihz
|
725a272816
|
海外商品添加政策提醒
|
5 years ago |
