ZHUJB-PC\Administrator
|
cecb256bcf
|
修改
|
2021-01-25 17:38:33 +08:00 |
|
ZHUJB-PC\Administrator
|
52bcb6669f
|
Merge branch 'master' of https://gitee.com/tottimctj/Hope-Mall
# Conflicts:
# hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java
# hope-winery/src/main/java/com/ruoyi/winery/controller/NewsContentController.java
|
2021-01-25 17:34:27 +08:00 |
|
ZHUJB-PC\Administrator
|
1216e561b7
|
完善了评论功能
|
2021-01-25 17:33:05 +08:00 |
|
mactj
|
e56374cbdd
|
删掉直播行
|
2021-01-25 09:04:51 +08:00 |
|
mactj
|
d1e5f465ee
|
头部动态根据手机调整
|
2021-01-22 19:47:58 +08:00 |
|
mactj
|
e25001b942
|
样式
|
2021-01-22 19:14:24 +08:00 |
|
mactj
|
44d8a0c9c1
|
新商户证书
|
2021-01-22 18:55:34 +08:00 |
|
mactj
|
25f19576a3
|
修正部署
|
2021-01-22 15:11:13 +08:00 |
|
mactj
|
19cb76bcb4
|
微调整
|
2021-01-22 13:28:21 +08:00 |
|
mactj
|
0e7d0de1ba
|
基本完成
|
2021-01-22 13:25:06 +08:00 |
|
mactj
|
be8f6b7576
|
增加了退款流程
|
2021-01-22 10:54:01 +08:00 |
|
mactj
|
6a1931ae80
|
收货地址
|
2021-01-21 19:06:58 +08:00 |
|
mactj
|
f5f13295bb
|
上线前最终调整
|
2021-01-21 19:04:31 +08:00 |
|
mactj
|
805dcebb81
|
修正
|
2021-01-21 16:14:44 +08:00 |
|
mactj
|
db6d973592
|
一些修改
|
2021-01-21 11:29:21 +08:00 |
|
mactj
|
3f74f12301
|
修正订单
|
2021-01-21 10:10:44 +08:00 |
|
mactj
|
0296a57895
|
用户地址信息入库
|
2021-01-21 09:32:25 +08:00 |
|
mactj
|
1b8572d75d
|
暂且这样
|
2021-01-20 19:10:04 +08:00 |
|
mactj
|
97db9ec003
|
小程序访问首页活动资讯
|
2021-01-20 19:08:32 +08:00 |
|
mactj
|
720185aef0
|
bug修正
|
2021-01-20 18:08:35 +08:00 |
|
kino
|
017632c1a6
|
Merge remote-tracking branch 'origin/master'
|
2021-01-20 17:53:58 +08:00 |
|
kino
|
ce3627ce11
|
活动管理
|
2021-01-20 17:51:47 +08:00 |
|
mactj
|
8af6287c39
|
增加一个根据部门id查询商户信息的接口
|
2021-01-20 17:32:20 +08:00 |
|
mactj
|
b38b66a217
|
更新
|
2021-01-20 17:25:41 +08:00 |
|
mactj
|
a423661c5e
|
修正样式
|
2021-01-20 16:05:22 +08:00 |
|
mactj
|
25ada6fdb9
|
部署放开编译
|
2021-01-20 15:31:14 +08:00 |
|
mactj
|
e19b458211
|
复数图片上传bug
|
2021-01-20 15:28:25 +08:00 |
|
kino
|
2f84db9e31
|
部署
|
2021-01-20 14:53:41 +08:00 |
|
kino
|
21bec38537
|
上传图片
|
2021-01-20 14:21:27 +08:00 |
|
mactj
|
c80e33f87d
|
过滤商品列表，小程序用户可看到全部商品
|
2021-01-20 11:51:07 +08:00 |
|
mactj
|
9b8824842d
|
修正
|
2021-01-20 11:32:44 +08:00 |
|
mactj
|
2e09cd299b
|
一些修改
|
2021-01-20 10:39:13 +08:00 |
|
mactj
|
51d6220271
|
装修样式
|
2021-01-20 09:00:22 +08:00 |
|
mactj
|
fdb2b76691
|
细节
|
2021-01-19 16:28:42 +08:00 |
|
mactj
|
15b7221dc0
|
从远程获取头像，用户信息等
|
2021-01-19 15:46:14 +08:00 |
|
kino
|
17451b235b
|
回调更新订单
|
2021-01-19 15:16:20 +08:00 |
|
mactj
|
ce0886afc2
|
Merge branch 'master' of https://gitee.com/tottimctj/RuoYi-Vue-Plus
|
2021-01-19 15:06:37 +08:00 |
|
mactj
|
d59efdfd6b
|
支付回调bug
|
2021-01-19 15:06:27 +08:00 |
|
kino
|
5b1913482e
|
商户管理
|
2021-01-19 15:05:16 +08:00 |
|
mactj
|
fecca933bb
|
购物车 订单完成
|
2021-01-19 14:02:55 +08:00 |
|
kino
|
d8edac4483
|
回调
|
2021-01-19 13:52:28 +08:00 |
|
kino
|
d5c30399e2
|
商户
|
2021-01-19 10:39:33 +08:00 |
|
kino
|
6359692ea0
|
商户
|
2021-01-19 10:33:40 +08:00 |
|
kino
|
c05c65a4e2
|
富文本工具类
|
2021-01-19 10:07:07 +08:00 |
|
kino
|
87a0a83461
|
验证码
|
2021-01-18 17:57:11 +08:00 |
|
kino
|
93f0abc7e6
|
Merge remote-tracking branch 'origin/master'
|
2021-01-18 17:56:04 +08:00 |
|
kino
|
332e8116f8
|
微信统一下单 退款
|
2021-01-18 17:55:49 +08:00 |
|
mactj
|
743c06d3e4
|
订单付款
|
2021-01-18 16:10:59 +08:00 |
|
mactj
|
05d46a3adf
|
购物车
|
2021-01-18 09:01:56 +08:00 |
|
mactj
|
6a34870466
|
页面调整
|
2021-01-17 02:43:05 +08:00 |
|