Commit Graph

Select branches

Hide Pull Requests

dev

dev_m2

feature/bpm

feature/im

feature/iot

im

master

master-vxe

#1

#1

#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

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#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

#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

#219

#219

#22

#22

#220

#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

#300

#300

#301

#301

#302

#302

#303

#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

#32

#320

#320

#321

#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

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#374

#375

#375

#376

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#390

#391

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#4

#40

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#43

#430

#430

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#481

#481

#482

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#5

#50

#50

#500

#500

#501

#501

#502

#502

#503

#503

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#51

#51

#510

#510

#511

#511

#512

#512

#513

#513

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#52

#520

#520

#521

#521

#522

#522

#523

#523

#524

#524

#525

#525

#526

#526

#527

#527

#528

#528

#529

#529

#53

#53

#530

#530

#531

#531

#532

#532

#533

#533

#534

#534

#535

#535

#536

#536

#537

#537

#538

#539

#539

#54

#54

#540

#540

#541

#541

#542

#542

#543

#543

#544

#544

#545

#545

#546

#546

#547

#547

#548

#548

#549

#549

#55

#55

#550

#550

#551

#552

#552

#553

#553

#554

#554

#555

#555

#556

#556

#557

#557

#558

#558

#559

#559

#56

#56

#560

#560

#561

#561

#562

#562

#563

#563

#564

#564

#565

#565

#566

#566

#567

#567

#568

#568

#569

#569

#57

#570

#570

#571

#571

#572

#572

#573

#573

#574

#574

#575

#575

#576

#576

#577

#577

#578

#578

#579

#579

#58

#58

#580

#581

#582

#583

#583

#584

#584

#585

#585

#586

#586

#587

#587

#588

#588

#589

#589

#59

#59

#590

#590

#591

#591

#592

#592

#593

#593

#594

#594

#595

#595

#596

#597

#597

#598

#598

#599

#599

#6

#6

#60

#60

#600

#600

#601

#601

#602

#603

#603

#604

#604

#605

#605

#606

#606

#607

#607

#608

#608

#609

#609

#61

#610

#610

#611

#611

#612

#612

#613

#613

#614

#614

#615

#615

#616

#616

#617

#617

#618

#618

#619

#619

#62

#62

#620

#620

#621

#621

#622

#622

#623

#623

#624

#624

#625

#625

#626

#626

#627

#627

#628

#628

#629

#629

#63

#63

#630

#630

#631

#631

#632

#632

#633

#633

#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

v1.7.1

v1.7.2

v1.7.3

v1.8.0

v1.8.1

v1.8.2

v1.8.3

v1.9.0

v2.0.0

v2.0.1

v2.1.0

v2.2.0

v2.3.0

v2.4.0

Mono Color

• 2d88367e61 fix: review puhui999 2023-06-06 16:22:58 +0800
• 274d85010f add trade order 20230606 shizhong 2023-07-27 19:01:41 +0800
• 45bf152dd2 sync dev-20230606 shizhong 2023-07-27 19:00:31 +0800
• b9ba1d36c2 20230606 add trade-order and details xiaobai 2023-06-06 01:08:38 +0800
• f641785df9 code review：优惠劵管理 YunaiV 2023-06-03 23:15:11 +0800
• 0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev shizhong 2023-07-27 18:53:17 +0800
• ce62362982 fix: 优化 spu 相关路由配置 puhui999 2023-06-03 21:21:43 +0800
• 79a4aa5189 code review：商品管理 YunaiV 2023-06-03 20:50:07 +0800
• 16c518e18a code review：门店自提、快递运费 YunaiV 2023-06-03 19:52:14 +0800
• a29421dd41 临时提交 xiaobai 2023-06-02 16:10:33 +0800
• e2faf6a2a4 style: 添加VO dhb52 2023-06-01 18:08:23 +0800
• b28bfc4081 fix: 修复善品测试发现的问题 puhui999 2023-06-01 11:54:39 +0800
• c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 shizhong 2023-07-27 18:36:06 +0800
• 144be6ef44 fix: 完善 SPU 选择快递模版的功能 puhui999 2023-05-31 15:37:26 +0800
• d35ac547ac fix: 完善 SPU 查看详情 puhui999 2023-05-31 14:42:45 +0800
• 9e7fe34ae8 新增门店自提管理 jason 2023-05-30 21:21:04 +0800
• cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 puhui999 2023-05-30 18:14:40 +0800
• 40a93caf89 发布 1.8.0 版本 v1.8.0 YunaiV 2023-07-27 07:59:57 +0800
• b41d8f06ce
  !184 同步最新商城实现 Merge pull request !184 from 芋道源码/dev 芋道源码 2023-07-26 23:32:27 +0000
• 442bb6bb2b
  Pre Merge pull request !184 from 芋道源码/dev 芋道源码 2023-07-26 23:32:16 +0000
• a003b59e39 review 秒杀、拼团活动的 CRUD YunaiV 2023-07-26 19:22:26 +0800
• d7f0554f97
  !179 完成拼团活动和秒杀活动相关表单操作和列表展示 Merge pull request !179 from puhui999/dev-to-dev 芋道源码 2023-07-26 04:59:47 +0000
• f908c12963
  !183 同步商城实现 Merge pull request !183 from 芋道源码/dev 芋道源码 2023-07-26 04:56:22 +0000
• dd5149ef1e
  Pre Merge pull request !183 from 芋道源码/dev 芋道源码 2023-07-26 04:56:10 +0000
• e4d6b4301b
  !181 所有菜单的 name 都加上模块的前缀，避免冲突，并且和菜单数据能对上 Merge pull request !181 from clockdotnet/master-vxe 芋道源码 2023-07-26 04:53:33 +0000
• b02e57b7f8
  Pre Merge pull request !179 from puhui999/dev-to-dev puhui999 2023-07-26 04:52:38 +0000
• 59de1d68ba
  !182 update src/views/Login/components/MobileForm.vue. Merge pull request !182 from water/N/A 芋道源码 2023-07-26 04:52:34 +0000
• 399d8af0b1
  !180 定时任务，删除功能报错 Merge pull request !180 from 死歌/master 芋道源码 2023-07-26 04:50:22 +0000
• dc39ad0cd1 fix: 完善拼团活动 CRUD puhui999 2023-07-14 17:35:35 +0800
• 3227408bc3
  Pre Merge pull request !182 from water/N/A water 2023-07-12 07:35:50 +0000
• b061c8f32b
  update src/views/Login/components/MobileForm.vue. 我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下 water 2023-07-12 07:35:48 +0000
• 52a0e914ca
  Pre Merge pull request !181 from clockdotnet/master-vxe clockdotnet 2023-07-11 05:14:47 +0000
• 9af3734b78 逻辑问题 shizhong 2023-07-11 12:46:39 +0800
• c6a9c0c5fb 所有菜单的 name 都加上模块的前缀，避免冲突 shizhong 2023-07-10 19:11:15 +0800
• a45c24ee55
  Pre Merge pull request !180 from 死歌/master 死歌 2023-07-10 09:53:10 +0000
• 51198e12a2 fix: 修复src/views.infra/job/index中删除按钮因为传参错误导致删除功能报错 蔚文纲 2023-07-10 17:51:10 +0800
• 3fd9f1b43e fix: mall SeckillConfig puhui999 2023-07-10 16:39:22 +0800
• 44efb13c0e fix: login error xingyu 2023-07-10 11:16:42 +0800
• ba1254f397 fix: eslint xingyu 2023-07-08 11:13:36 +0800
• 540d8496b3 chore: update deps xingyu 2023-07-08 11:13:28 +0800
• b67fabcf1f fix: mall SeckillActivity puhui999 2023-07-05 22:26:18 +0800
• 4057130275 fix: mall SeckillActivity and CombinationActivity puhui999 2023-07-05 18:24:32 +0800
• ce3ca7c6ce fix: mall SeckillActivity puhui999 2023-07-05 17:12:53 +0800
• 36c0bce184 fix: mall SeckillActivity puhui999 2023-07-05 11:32:32 +0800
• b98149f1a7 fix: mall SeckillActivity puhui999 2023-07-03 12:07:19 +0800
• a5330958ba Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-07-03 07:59:34 +0800
• c85c57ce9a Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 YunaiV 2023-07-02 23:27:19 +0800
• 13e0ede788
  !155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 Merge pull request !155 from OlyLis/master 芋道源码 2023-07-02 15:23:12 +0000
• 4571f893ed review 积分配置 YunaiV 2023-07-02 23:18:45 +0800
• 032d5a0a06
  !178 会员中心(积分、签到)优化 Merge pull request !178 from QingX/dev 芋道源码 2023-07-02 13:48:08 +0000
• 8a160401ba
  Pre Merge pull request !178 from QingX/dev QingX 2023-07-02 13:46:08 +0000
• b1ce2672e4 review 秒杀活动 YunaiV 2023-07-02 21:46:04 +0800
• a6fc5f775a
  !176 mall seckillActivity Merge pull request !176 from puhui999/dev-to-dev 芋道源码 2023-07-02 12:40:33 +0000
• 49db8447e8
  Pre Merge pull request !155 from OlyLis/master OlyLis 2023-07-02 12:40:06 +0000
• c0bf357d7a
  !177 修复useTable在total为0时的bug Merge pull request !177 from nullcache/bug/add-fix-useTable 芋道源码 2023-07-02 12:40:04 +0000
• 9f8e12de51
  Merge pull request #10 from nullcache/bug/add-fix-useTable 芋道源码 2023-07-02 20:38:29 +0800
• 2e96b1c984 feat: mall CombinationActivity puhui999 2023-07-02 19:22:57 +0800
• 4251dc5d61 会员中心代码 1.合并积分模块只member module 3.添加会员中/会员积分、会员签到/xxx层级目录 4.删除无用的接口代码 xiaqing 2023-06-28 22:50:31 +0800
• 68c0b8fdb4
  Pre Merge pull request !177 from nullcache/bug/add-fix-useTable nullcache 2023-06-27 04:07:01 +0000
• 073679875b
  修复useTable在total为0时的bug nullcache 2023-06-27 04:06:01 +0000
• 69c4995b52
  修复useTable在total为0时的bug nullcache 2023-06-27 11:54:59 +0800
• 5bcc39e5e8
  Pre Merge pull request !176 from puhui999/dev-to-dev puhui999 2023-06-25 09:17:20 +0000
• 341303b014 fix: 完善 mall seckillActivity add puhui999 2023-06-25 17:16:26 +0800
• 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 puhui999 2023-06-25 16:43:49 +0800
• 3b2d308ccc 补充 周建 2023-06-25 14:06:14 +0800
• 7ca76a5304 修复一些命名和拼写错误问题，修复一些BUG 周建 2023-06-25 13:34:27 +0800
• 76ccc54a35 fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式 puhui999 2023-06-25 09:35:20 +0800
• 5d613e69b3 review 营销活动 YunaiV 2023-06-24 18:53:57 +0800
• fa71d3e7dd
  !175 mall seckill Merge pull request !175 from puhui999/dev-to-dev 芋道源码 2023-06-24 04:57:14 +0000
• 875f52b67c
  Pre Merge pull request !175 from puhui999/dev-to-dev puhui999 2023-06-23 17:49:45 +0000
• c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-06-24 01:48:36 +0800
• b1e7f14963 fix：完善秒杀活动管理① puhui999 2023-06-24 01:48:07 +0800
• 0395b8f138 review 订单 YunaiV 2023-06-23 21:28:41 +0800
• 70a6d28edd
  !174 订单列表和详情 页面 Merge pull request !174 from 矿泉水/dev 芋道源码 2023-06-23 13:23:02 +0000
• 661b91e8f2
  Pre Merge pull request !174 from 矿泉水/dev 矿泉水 2023-06-23 06:08:16 +0000
• e1b1c134d9 合并 master 代码的冲突 YunaiV 2023-06-23 14:08:09 +0800
• b159240824 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-06-23 13:54:43 +0800
• 3d47d6744e feat：添加秒杀活动管理 puhui999 2023-06-22 17:31:36 +0800
• c1a4edf7b1 refactor: 统一 setup 格式 xingyu 2023-06-21 19:35:11 +0800
• 9ac17b3ce2 chore: build size xingyu 2023-06-21 19:27:27 +0800
• 82c51e0c3e fix: eslint xingyu 2023-06-21 19:27:16 +0800
• d639401646 fix: style lint xingyu 2023-06-21 19:26:14 +0800
• 64dbcdabe0 docs: version xingyu 2023-06-21 19:24:14 +0800
• 33c460ad55 chore: remove vueSetupExtend xingyu 2023-06-21 19:24:09 +0800
• f2992ce8e8 fix: eslint xingyu 2023-06-21 19:18:05 +0800
• 922f83d99c refactor: vue3.3 defineOptions xingyu 2023-06-21 19:14:34 +0800
• f3622d423a fix: 使 Table 组件支持列宽和固定列配置 puhui999 2023-06-21 15:27:35 +0800
• 5064845d4e fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 puhui999 2023-06-21 15:26:43 +0800
• 9456a6f31c 命名问题 周建 2023-06-21 13:36:59 +0800
• b07cc98619 接口命名统一 周建 2023-06-21 13:22:47 +0800
• a5c7c886ee chore: stylelint xingyu 2023-06-21 11:15:30 +0800
• c05fbd7fdc fix: locales xingyu 2023-06-21 11:10:15 +0800
• 952f7b6268 chore: vscode setting xingyu 2023-06-21 11:07:46 +0800
• 37c41aeecc chore: eslint xingyu 2023-06-21 11:07:33 +0800
• 3d39b42e96 chore: eslint xingyu 2023-06-21 10:55:37 +0800
• 2df15acb26 chore: vscode setting use pnpm xingyu 2023-06-21 10:50:03 +0800
• 458bb22163 docs: readme xingyu 2023-06-21 10:48:18 +0800
• ca8238a84b chore: packageManager use pnpm xingyu 2023-06-21 10:45:35 +0800
• 91a015828d chore: update deps xingyu 2023-06-21 10:44:39 +0800
• c545c3008f 工作流bug 周建 2023-06-20 15:51:45 +0800