liangyuyan
|
e9e4a7dbbd
|
Merge branch 'order_delivery_report_1105'
# Conflicts:
# app/Admin/routes.php
|
5 years ago |
|
liangyuyan
|
a52fe23e02
|
配送统计--导出功能完
|
5 years ago |
|
liangyuyan
|
2a592ad6a9
|
配送统计-列表和详情完成，还差导出
|
5 years ago |
|
liangyuyan
|
ccf7d77273
|
配送员--统计-详情列表
|
5 years ago |
|
liangyuyan
|
c19d21b8ef
|
配送员--明细列表
|
5 years ago |
|
liangyuyan
|
ca7a0d0f6e
|
配送统计--列表完成-还差详情和导出
|
5 years ago |
lanzu_qinsheng
|
b48dce26d3
|
订单列表增加取消接单
|
5 years ago |
|
liangyuyan
|
30c6239696
|
Merge branch 'goods_activity_report_1116'
|
5 years ago |
|
liangyuyan
|
1f95c441aa
|
活动商品--导出功能联表区分字段
|
5 years ago |
|
liangyuyan
|
ad3eaded53
|
Merge branch 'goods_activity_1114'
|
5 years ago |
|
liangyuyan
|
d8f2085537
|
活动商品统计-修复bug，市场和店铺没有区分表
|
5 years ago |
|
liangyuyan
|
160d488add
|
Merge branch 'index_share_1113'
|
5 years ago |
|
liangyuyan
|
f2771f7ea4
|
小程序分享--修改保存失败问题，和加删除源文件
|
5 years ago |
|
liangyuyan
|
a04db07faa
|
Merge branch 'goods_activity_1112'
|
5 years ago |
|
liangyuyan
|
680bae71f8
|
活动商品统计--修改采购价从活动商品表拿
|
5 years ago |
|
liangyuyan
|
5a73adac0e
|
Merge branch 'goods_activity_1112'
|
5 years ago |
|
liangyuyan
|
59a4b4a797
|
活动商品添加采购价--相关地方进行修改，订单商品也得添加采购价
|
5 years ago |
|
liangyuyan
|
d762d832d6
|
Merge branch 'goods_copy_bug_1111'
|
5 years ago |
|
liangyuyan
|
178eea66a9
|
活动商品复制--修复旧图片复制问题
|
5 years ago |
|
liangyuyan
|
3db7511e55
|
商品复制--如果商品包含http即绝对路径，则上传，相对路径则复制
|
5 years ago |
|
lanzu_qinsheng
|
52a569e934
|
活动商品表单增加 限购种数
|
5 years ago |
|
liangyuyan
|
25d71cc64f
|
Merge branch 'store_balance_1110'
|
5 years ago |
|
liangyuyan
|
60a71a66fe
|
查询店铺余额--添加条件和类型
|
5 years ago |
|
liangyuyan
|
de462e540c
|
Merge branch 'goods_setting_1103'
|
5 years ago |
|
liangyuyan
|
1d9af54049
|
Merge branch 'index_share_1104'
|
5 years ago |
|
liangyuyan
|
9a023f2484
|
公众号设置--添加判断是否存在key
|
5 years ago |
|
liangyuyan
|
3e41abf443
|
商品活动设置-添加判断是否存在key
|
5 years ago |
|
liangyuyan
|
3e2e24b3e0
|
Merge branch 'index_share_1104'
# Conflicts:
# app/Admin/routes.php
# app/Libs/Redis/RedisKey.php
|
5 years ago |
|
liangyuyan
|
fb079797e4
|
Merge branch 'goods_setting_1103'
# Conflicts:
# app/Admin/routes.php
|
5 years ago |
|
liangyuyan
|
0c1a464176
|
Merge branch 'goods_copy_bug_1106'
|
5 years ago |
|
liangyuyan
|
b60cb17d88
|
自定义上传图片路由-暂时不用
|
5 years ago |
|
liangyuyan
|
5a597b56e7
|
商品复制--复制商品时，图片也重新复制。因为复制商品图片oss同源问题会导致一个商品的图片删除会导致其他商品的图片也被删除。
|
5 years ago |
|
liangyuyan
|
3b39cdd51e
|
自定义上传文件
|
5 years ago |
|
liangyuyan
|
d412a5691a
|
商品活动设置-保存路径修改
|
5 years ago |
|
lanzu_qinsheng
|
849964acf7
|
Merge branch 'master' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat
|
5 years ago |
|
lanzu_qinsheng
|
fc4ebd6144
|
Merge branch '11_02_marster'
|
5 years ago |
|
lanzu_qinsheng
|
012b40294d
|
增加社区禁用按钮
|
5 years ago |
|
liangyuyan
|
abc4a35644
|
Merge branch 'goods_copy_bug_1106'
|
5 years ago |
|
liangyuyan
|
cfe452b39e
|
商品封面图--禁止删除服务器的图片
|
5 years ago |
|
liangyuyan
|
29cc48ab89
|
Merge branch 'goods_copy_bug_1106'
|
5 years ago |
|
liangyuyan
|
0eb01b067f
|
商品复制功能-修改重复复制轮播图问题
|
5 years ago |
|
liangyuyan
|
5987827733
|
配送统计
|
5 years ago |
|
liangyuyan
|
06442111c4
|
Merge branch 'goods_cover_img_1105'
|
5 years ago |
|
liangyuyan
|
48534cd57a
|
店铺更换市场
|
5 years ago |
|
liangyuyan
|
6329ed2df4
|
商品图片上传--增加判断过长
|
5 years ago |
|
liangyuyan
|
6080a77a45
|
商品-上传图片名称使用uniqueName()
|
5 years ago |
|
liangyuyan
|
bf93fddb3c
|
商品活动设置--同步限制购买数量限制
|
5 years ago |
|
liangyuyan
|
6a6a1bd933
|
商品活动设置--添加验证
|
5 years ago |
|
liangyuyan
|
17f3c5d806
|
公众号-关注设置和分享卡片设置-添加必须验证
|
5 years ago |
|
liangyuyan
|
23cc906dea
|
公众号关注-修改
|
5 years ago |
