liangyuyan
|
c67750e9e6
|
Merge branch 'phoenix' into develop
|
6 years ago |
|
liangyuyan
|
01318bbeb4
|
线上商品数据清洗--添加店铺搜索
|
6 years ago |
|
liangyuyan
|
1d91e5742b
|
Merge branch 'develop' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into develop
|
6 years ago |
|
liangyuyan
|
4db2509c60
|
Merge branch 'phoenix' into develop
|
6 years ago |
|
liangyuyan
|
3159717485
|
线上商品数据清洗--添加快速编辑功能
|
6 years ago |
lanzu_qsy
|
1acbf14c35
|
Merge branch 'qs_local_order' into develop
# Conflicts:
# app/Admin/Controllers/Test.php
# app/Admin/routes.php
|
6 years ago |
|
lanzu_qsy
|
60df32efde
|
订单详情页
|
6 years ago |
|
liangyuyan
|
ebc45ca9a7
|
Merge branch 'phoenix' into develop
|
6 years ago |
|
liangyuyan
|
c5ff8db836
|
线上商品清洗功能和迁移数据功能
|
6 years ago |
|
lanzu_qsy
|
f37821060d
|
框架更新
|
6 years ago |
|
lanzu_qsy
|
1212f1685b
|
订单详情页
|
6 years ago |
|
lanzu_qsy
|
5d5e9955b2
|
订单详情
|
6 years ago |
|
liangyuyan
|
970a3667e1
|
店铺数据迁移功能完成
|
6 years ago |
|
desion
|
b932fcee12
|
框架升级
|
6 years ago |
|
liangyuyan
|
77526dede3
|
迁移店铺数据
|
6 years ago |
|
liangyuyan
|
4420f87f2e
|
控制器首字母大写
|
6 years ago |
|
liangyuyan
|
064fbb3f70
|
迁移线上店铺数据
|
6 years ago |
|
liangyuyan
|
e02f976469
|
正式服商品表数据清洗
|
6 years ago |
|
liangyuyan
|
07ac0fe8c1
|
活动商品设置商品类目
|
6 years ago |
|
liangyuyan
|
5d1a2453c8
|
添加商品类目，在商品添加时选择类目
|
6 years ago |
|
desion
|
ec05042734
|
Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop
|
6 years ago |
|
liangyuyan
|
54e20e48be
|
Merge branch 'phoenix' into develop
# Conflicts:
# app/Admin/bootstrap.php
|
6 years ago |
|
liangyuyan
|
39b2890c56
|
复制商品功能
|
6 years ago |
|
lanzu_qsy
|
3e116ce8d4
|
拒绝退款
|
6 years ago |
|
lanzu_qsy
|
6e2ed43f0f
|
Merge branch 'qs_local_order' into develop
# Conflicts:
# app/Admin/Controllers/Test.php
# composer.lock
|
6 years ago |
|
lanzu_qsy
|
a39115a304
|
订单分账
|
6 years ago |
|
liangyuyan
|
fbcd46d63b
|
复制商品功能
|
6 years ago |
|
liangyuyan
|
a5ca325dbf
|
店铺添加账号，优惠券迁移（未完成）
|
6 years ago |
|
lanzu_qsy
|
7dca541eb6
|
订单状态变更
|
6 years ago |
|
liangyuyan
|
7f3bebbd3c
|
Merge branch 'coupon_remove' into phoenix
# Conflicts:
# app/Admin/Controllers/CouponTieController.php
# app/Admin/bootstrap.php
# dcat_admin_ide_helper.php
|
6 years ago |
|
lanzu_qsy
|
0ecfbfaabd
|
Merge branch 'qs_local_order' into develop
# Conflicts:
# app/Admin/Controllers/Test.php
# app/Admin/routes.php
# dcat_admin_ide_helper.php
|
6 years ago |
|
liangyuyan
|
12d2fcf791
|
优惠券迁移修改
|
6 years ago |
|
lanzu_qsy
|
1bbc14ee81
|
订单迁移
|
6 years ago |
|
lanzu_qsy
|
549e2322de
|
框架升级
|
6 years ago |
|
liangyuyan
|
c7ab9c6213
|
洗ims_cjdc_account表账号的店铺id和role到新表
|
6 years ago |
|
lanzu_qsy
|
510ad38e56
|
Merge branch 'qs_local_mp' into develop
|
6 years ago |
|
lanzu_qsy
|
dd765c509a
|
健壮服务商提现申请
|
6 years ago |
|
lanzu_qsy
|
c865b302f4
|
测试RPC
|
6 years ago |
|
lanzu_qsy
|
4a94ecf845
|
测试RPC
|
6 years ago |
|
liangyuyan
|
a3ab794468
|
店铺时间段验证
|
6 years ago |
|
lanzu_qsy
|
eda476e7c2
|
Merge branch 'qs_local_mp' into develop
# Conflicts:
# app/Admin/routes.php
|
6 years ago |
|
lanzu_qsy
|
72b303e00d
|
增加服务商提现申请短信通知
|
6 years ago |
|
liangyuyan
|
20a2323fde
|
Merge branch 'phoenix' into develop
|
6 years ago |
|
liangyuyan
|
09f83f808c
|
添加活动商品，分类绑定到首页加排序
|
6 years ago |
|
liangyuyan
|
9bc765ff3e
|
Merge branch 'phoenix' into develop
|
6 years ago |
|
liangyuyan
|
e3a5cd3f46
|
修改分类是否已在首页显示提示
|
6 years ago |
Mike
|
6c1daeb826
|
Merge branch 'onlineOrderStatis' into develop
* onlineOrderStatis:
取消google字体
# Conflicts:
# app/Admin/bootstrap.php
# app/Admin/routes.php
|
6 years ago |
|
Mike
|
0ac2bcb1ca
|
取消google字体
|
6 years ago |
|
liangyuyan
|
02c6d10d3b
|
添加旧商户钱包数据
|
6 years ago |
|
liangyuyan
|
d6beca388d
|
添加旧商户钱包数据
|
6 years ago |
