Commit Graph

Select branches

Hide Pull Requests

b2c

dev

master

pg

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#320

#320

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

v4.1

v4.2

v4.2.0

v4.2.1

v4.2.2

v4.2.3

v4.2.4

v4.2.5

v4.3

v4.4

Mono Color

• 8a74c52a9d 更新推送脚本 Chopper 2021-05-24 15:37:48 +08:00
• 903cf0b28a 输出脚本进程 Chopper 2021-05-24 15:32:20 +08:00
• f12d0d1be0 调整推送脚本 Chopper 2021-05-24 15:28:00 +08:00
• ad9cd78b44 一键推送至github Chopper 2021-05-24 15:23:07 +08:00
• c1a3bbcc28 修改readme Chopper 2021-05-24 14:55:25 +08:00
• 5c32fd9d7c 优惠券有效期时间判定，如果是1则是当天 lifenlong 2021-05-24 14:06:22 +08:00
• 639435ec45 新增优惠券有限期设置类型 lifenlong 2021-05-24 14:00:07 +08:00
• 777226dc95 优惠券活动发送/触发 lifenlong 2021-05-24 11:09:21 +08:00
• 8924981556 创建优惠券活动 lifenlong 2021-05-21 19:54:25 +08:00
• 16498a6850 Merge branch 'master' into Bulbasaur lifenlong 2021-05-21 17:25:15 +08:00
• 5cae710304 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-21 17:24:15 +08:00
• ae69d8a11b 检测APP版本是否可以添加 lifenlong 2021-05-21 17:24:09 +08:00
• 2c58b91c45 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-21 17:06:04 +08:00
• 8f9c262124 购物车渲染性能优化 Chopper 2021-05-21 17:05:46 +08:00
• 2728cb1843 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-21 16:43:53 +08:00
• c9eb018abc 评价修改商品的好评率 lifenlong 2021-05-21 16:42:49 +08:00
• 6e9ab070da Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-21 16:07:11 +08:00
• 559dc0d29f 运费计算问题处理 Chopper 2021-05-21 16:07:06 +08:00
• 4c200595a5 设置 app版本白名单 lifenlong 2021-05-21 14:18:07 +08:00
• 9fa54109b8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-21 14:07:39 +08:00
• 77cbebb118 remdme增加升级计划 lifenlong 2021-05-21 14:07:34 +08:00
• 4b1205c3d3 APP版本升级 lifenlong 2021-05-21 11:59:31 +08:00
• 3b21fede61 系统设置使用缓存代理，不再直接读取数据库 Chopper 2021-05-21 11:11:41 +08:00
• 1c95a56f44 短信发送模版问题优化 Chopper 2021-05-21 11:11:27 +08:00
• 1f1e57645c 短信发送 Chopper 2021-05-21 10:44:33 +08:00
• 64add7e63f Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-21 10:43:51 +08:00
• 1b5a715695 修改readme框架列表展示 lifenlong 2021-05-21 10:43:29 +08:00
• f119416a7b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-21 09:52:21 +08:00
• 5c01e131d9 库存确认部分异常问题 Chopper 2021-05-21 09:52:18 +08:00
• 368d02aa1a 显示评价图片 lifenlong 2021-05-21 09:42:53 +08:00
• 13b950f0a7 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-21 09:22:22 +08:00
• a16809c77a 设置分销佣金解冻时间为1天。 lifenlong 2021-05-21 09:22:14 +08:00
• 3c64d21bfd !1 修复商品搜索多选问题和定时任务取消过期促销活动时，没有删除es索引中的过期信息问题 Merge pull request !1 from OceansDeep/feature/pg chopper711 2021-05-21 09:15:48 +08:00
• fa59c9ca73 优惠券活动 lifenlong 2021-05-21 09:11:40 +08:00
• c729726dd6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg OceansDeep 2021-05-20 20:00:38 +08:00
• eaf3aa2b2f 修复优惠券价格计算分摊问题 paulGao 2021-05-20 19:59:10 +08:00
• aa024c87b2 修复延时任务无效问题 paulGao 2021-05-20 17:03:08 +08:00
• a15d5d7c36 Merge branch 'master' into Bulbasaur lifenlong 2021-05-20 16:42:06 +08:00
• f941841a99 分销商品绑定 lifenlong 2021-05-20 16:34:48 +08:00
• abc6d90820 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-20 16:20:26 +08:00
• e73d189022 解决分销绑定问题 lifenlong 2021-05-20 16:20:18 +08:00
• c245265fd1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-20 15:55:26 +08:00
• 0f0f480b24 订单中的商品数量累加问题处理。 延时任务日志增加 Chopper 2021-05-20 15:55:12 +08:00
• b427daab02 添加平台审核售后单功能 lifenlong 2021-05-20 15:38:22 +08:00
• e5783fcd67 Merge branch 'feature/pg' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-05-20 15:29:27 +08:00
• 8f61b69f04 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-20 14:57:21 +08:00
• a8a6506516 同步直播状态、直播间新增商品数量 lifenlong 2021-05-20 14:56:15 +08:00
• 2326a5963f Merge branch 'master' into Bulbasaur lifenlong 2021-05-20 11:36:09 +08:00
• d50388001f 管理后台商品数量去除已删除商品 lifenlong 2021-05-20 11:35:54 +08:00
• 095cf81ce8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-20 10:57:26 +08:00
• 2fc9f5bbfb 无引用代码删除，代码格式化 Chopper 2021-05-20 10:57:10 +08:00
• 9bd1e6344a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-20 10:14:13 +08:00
• 683e47425c 会员评价更改商品索引中的数量 lifenlong 2021-05-20 10:14:02 +08:00
• 5c41b06381 订单日志中，名称展示问题处理 Chopper 2021-05-20 10:09:12 +08:00
• 4873d4bda3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 商品参数问题merge Chopper 2021-05-20 09:51:33 +08:00
• 1eee2eb5b1 商品数量增加已删除过滤 Chopper 2021-05-20 09:50:29 +08:00
• cd60eba7a4 微信媒体工具类（临时图片上传） lifenlong 2021-05-20 09:00:46 +08:00
• bb2a28aae0 去掉参数类型 pikachu 2021-05-20 08:32:02 +08:00
• d3fdeef0c3 修复商品搜索多选问题和定时任务取消过期促销活动时，没有删除es索引中的过期信息问题 paulGao 2021-05-19 22:16:05 +08:00
• b839bd7b77 抛出的错误吗规范 Chopper 2021-05-19 20:21:59 +08:00
• 273d0abbc7 解决冲突 lifenlong 2021-05-19 19:38:17 +08:00
• 250fffab77 merge master lifenlong 2021-05-19 19:29:51 +08:00
• 120189ef99 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-19 19:13:53 +08:00
• 64c095f20e 分销订单 lifenlong 2021-05-19 19:11:57 +08:00
• 97defc8a12 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-19 16:36:35 +08:00
• 5ab2865f0d 购物车物流规则匹配问题处理 Chopper 2021-05-19 16:35:27 +08:00
• edfd75d31b 商品es问题处理 Chopper 2021-05-19 16:35:14 +08:00
• 3a6ce0b22c 如果商品开启审核，并且商品设置为立即上架，则将商品的上架状态修改为已上架 Chopper 2021-05-19 14:47:17 +08:00
• 48f24b675b merge master lifenlong 2021-05-19 14:26:35 +08:00
• a10110e1f0 调整异常机制 Chopper 2021-05-19 14:11:12 +08:00
• 4b7be309b2 运营后台首页，展示的待审核商品数量不正确 lifenlong 2021-05-19 09:33:14 +08:00
• 8d156f01e6 会员积分历史 lifenlong 2021-05-19 09:07:56 +08:00
• 37a6455e56 会员积分历史 lifenlong 2021-05-19 09:05:44 +08:00
• 02827a2f8b 微信小程序直播V0.2 lifenlong 2021-05-18 23:34:05 +08:00
• 0173ba814e Merge branch 'master' into Bulbasaur lifenlong 2021-05-18 17:35:48 +08:00
• 3925422b3e 批量发送短信任务 lifenlong 2021-05-18 17:27:43 +08:00
• 0528a1e1ca 错误消息机制问题重新处理 Chopper 2021-05-18 15:40:26 +08:00
• 09cb489dc9 修改买家端店铺申请参数 Chopper 2021-05-18 15:21:54 +08:00
• ea203d69a4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-05-18 14:21:34 +08:00
• e9f02cfe94 商品索引初始化没办法根据属性查询问题处理 Chopper 2021-05-18 14:19:34 +08:00
• 0b1fce5803 调整移动端效果展示图尺寸 lifenlong 2021-05-18 10:38:01 +08:00
• 48293299e0 调整移动端效果展示图尺寸 lifenlong 2021-05-18 10:22:55 +08:00
• 90d03a05a2 增加店铺入驻文章类型。添加修改文章状态方法 lifenlong 2021-05-18 08:57:43 +08:00
• 0c3a1928ff merge master lifenlong 2021-05-18 08:17:14 +08:00
• a1924b609c Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-05-17 18:19:34 +08:00
• f824164139 开启短信功能 lifenlong 2021-05-17 18:19:28 +08:00
• 9f63d5a164 调整店铺与会员关系问题 Chopper 2021-05-17 17:21:45 +08:00
• 089bf02144 增加star入口 Chopper 2021-05-17 17:21:22 +08:00
• 910b665d8a 微信小程序直播V0.2 lifenlong 2021-05-17 17:03:28 +08:00
• 9a7d5b62b1 会员是否有店铺字段处理 Chopper 2021-05-17 16:36:32 +08:00
• c049552fc7 去除冗余代码 lifenlong 2021-05-17 12:55:40 +08:00
• b0f46a78a6 微信小程序直播间创建、微信小程序直播商品添加、删除、查询状态 lifenlong 2021-05-17 12:00:45 +08:00
• 0465fb48d8 readme移动端图片宽度问题处理 Chopper 2021-05-17 12:00:35 +08:00
• e89d201559 格式问题处理 Chopper 2021-05-17 11:56:34 +08:00
• 5297cbd09a readme更新 Chopper 2021-05-17 11:54:47 +08:00
• d0d827ccfe 调整readme Chopper 2021-05-17 11:50:29 +08:00
• ff4de96f2a 去除一个无效的项目 Chopper 2021-05-17 10:46:38 +08:00
• 4cea9038eb 增加注释 Chopper 2021-05-17 10:42:06 +08:00
• 591ce04e42 会员经验值设置 lifenlong 2021-05-17 09:24:58 +08:00
• c8a43573fd 会员积分设置，会员下单赠送积分（非积分订单），订单售后扣除积分 lifenlong 2021-05-17 09:04:10 +08:00