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

#634

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#64

#64

#640

#640

#641

#641

#642

#642

#643

#643

#644

#644

#645

#645

#646

#646

#647

#647

#648

#648

#649

#649

#65

#65

#650

#651

#651

#652

#652

#653

#654

#654

#655

#655

#656

#656

#657

#657

#658

#658

#659

#659

#66

#66

#660

#660

#661

#661

#662

#662

#663

#663

#664

#664

#665

#665

#666

#666

#667

#667

#668

#668

#669

#669

#67

#67

#670

#670

#671

#671

#672

#672

#673

#673

#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

• d74f96fe17
  update src/components/Dialog/src/Dialog.vue. 解决了弹窗默认top为0的问题 AKING 2023-09-04 03:31:35 +0000
• 73f8cef3b4 member: 佣金记录 owen 2023-09-03 23:04:20 +0800
• 5a9764c08c member: 分销配置 owen 2023-09-03 21:14:44 +0800
• 881ec67236 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 v1.8.1 YunaiV 2023-09-03 19:25:33 +0800
• 067f89f1d4
  !226 update src/hooks/web/useCrudSchemas.ts. Merge pull request !226 from AKING/N/A 芋道源码 2023-09-03 10:56:36 +0000
• 620d330113
  Pre Merge pull request !202 from yingming006/feat_tagsView yingming006 2023-09-03 10:55:36 +0000
• 130208959d
  !231 优惠券优化 Merge pull request !231 from 疯狂的世界/coupon 芋道源码 2023-09-03 10:55:35 +0000
• 46fd154e3a 完善订单详情和售后退款日志展示样式重构 puhui999 2023-09-03 01:44:22 +0800
• b42ff44a1d
  Pre Merge pull request !231 from 疯狂的世界/coupon 疯狂的世界 2023-09-02 02:42:59 +0000
• 7887be6e92 mall：修复优惠券模板，固定日期范围保存失败 owen 2023-09-02 10:42:55 +0800
• 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues owen 2023-09-02 09:53:36 +0800
• a68acb096f mall：修复优惠券发券弹窗样式 owen 2023-09-02 08:39:53 +0800
• d10530c9f5 code review：优惠劵逻辑 YunaiV 2023-09-02 00:34:45 +0800
• 9aa7ba3578
  !230 mall：优惠券发送优化 Merge pull request !230 from 疯狂的世界/mall_coupon_send 芋道源码 2023-09-01 16:33:43 +0000
• 5983329eef
  Pre Merge pull request !230 from 疯狂的世界/mall_coupon_send 疯狂的世界 2023-09-01 16:12:27 +0000
• 4f7d6793fd code review：优惠劵逻辑 YunaiV 2023-09-02 00:12:21 +0800
• 76c4644b4b mall：优惠券发送优化 owen 2023-09-01 23:50:26 +0800
• 190c6e384c
  !225 优惠券 Merge pull request !225 from 疯狂的世界/owen_dev 芋道源码 2023-09-01 14:55:30 +0000
• 65b61b1217
  Pre Merge pull request !225 from 疯狂的世界/owen_dev 疯狂的世界 2023-09-01 12:03:13 +0000
• 0743e4941c code review：订单列表 YunaiV 2023-09-01 20:03:08 +0800
• 22d95fa0ac
  !229 完善订单管理和售后管理相关问题 Merge pull request !229 from puhui999/dev-to-dev 芋道源码 2023-09-01 11:41:17 +0000
• 20a891adb1
  Pre Merge pull request !229 from puhui999/dev-to-dev puhui999 2023-09-01 04:04:40 +0000
• f0249e94a5 订单管理：完善订单详情 puhui999 2023-09-01 12:04:33 +0800
• 07a0530fc9 售后退款：完善售后管理（列表、详情） puhui999 2023-09-01 10:32:05 +0800
• 3e7945e437 fix: 修正合并差异 puhui999 2023-09-01 01:24:46 +0800
• 5035fc77e7 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-09-01 01:20:08 +0800
• 3918fab1ec code review YunaiV 2023-09-01 00:49:42 +0800
• dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-08-31 21:13:46 +0800
• f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 puhui999 2023-08-31 21:13:20 +0800
• cc51025e57
  Pre Merge pull request !226 from AKING/N/A AKING 2023-08-31 12:38:07 +0000
• 5c7b2c8c5d
  !228 同步商城最新代码 Merge pull request !228 from 芋道源码/dev 芋道源码 2023-08-31 12:38:05 +0000
• 6cdfc410ed
  Pre Merge pull request !228 from 芋道源码/dev 芋道源码 2023-08-31 12:37:51 +0000
• 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-08-31 20:37:20 +0800
• 2e945d29cc
  !227 商品列表：修复添加属性时会返回已存在属性值的问题 Merge pull request !227 from puhui999/dev-to-dev 芋道源码 2023-08-31 11:52:12 +0000
• 1b6d037ba7
  Pre Merge pull request !227 from puhui999/dev-to-dev puhui999 2023-08-31 08:39:57 +0000
• 264a29e451 更新订单和售后退款详情页面路由 puhui999 2023-08-31 16:39:48 +0800
• 688dad319e 订单列表：添加配送方式筛选 puhui999 2023-08-31 16:26:24 +0800
• 5c7796ca6f 商品列表：修复添加属性时会返回已存在属性值的问题 puhui999 2023-08-31 15:58:34 +0800
• f5a1772464 订单售后列表：完善部分 TODO puhui999 2023-08-31 15:39:13 +0800
• 3e67f3bc4c
  update src/hooks/web/useCrudSchemas.ts. 解决了当使用默认的dict选项时，form中事件不能触发的问题 AKING 2023-08-31 03:50:51 +0000
• 29b8d06ff2 code review：售后详情 YunaiV 2023-08-30 21:18:46 +0800
• 27219e1833 mall：优惠券 商品适用范围，增加商品分类 owen 2023-08-30 20:54:20 +0800
• 60d2e3114b mall：优惠券 商品选择组件 owen 2023-08-30 11:50:21 +0800
• 09d216394e
  !224 订单售后退款：完善列表、详情、售后相关操作 Merge pull request !224 from puhui999/dev-to-dev 芋道源码 2023-08-29 01:55:37 +0000
• df6705678a
  Pre Merge pull request !224 from puhui999/dev-to-dev puhui999 2023-08-29 01:53:14 +0000
• eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-08-29 09:49:34 +0800
• ed739aec55 订单售后列表：完善售后详情及相关操作 puhui999 2023-08-29 09:48:33 +0800
• 8d026f0837 重构：商品详情界面的路由、文件路径 YunaiV 2023-08-28 18:56:37 +0800
• e6a9dd0e4c fix: 个人中心头像为空时不能修改 xingyu 2023-08-28 17:53:45 +0800
• e8dce93d66 perf: add ep include xingyu 2023-08-28 17:44:59 +0800
• 54c41b4445 fix: router xingyu 2023-08-28 17:44:47 +0800
• 5724539caf docs: update deps xingyu 2023-08-28 17:41:09 +0800
• 547b1741fc fix: router xingyu 2023-08-28 17:40:15 +0800
• bd2d6adafa chore: update deps xingyu 2023-08-28 17:40:07 +0800
• 8a51c9c771 订单售后列表：初始化售后详情 puhui999 2023-08-28 17:18:42 +0800
• 4f81468695 订单售后列表：重构列表 puhui999 2023-08-28 14:00:09 +0800
• 8239ca474f 订单列表： 修复差异 puhui999 2023-08-28 10:05:49 +0800
• ce84b14d15
  !223 同步最新商城的代码 Merge pull request !223 from 芋道源码/dev 芋道源码 2023-08-27 13:03:31 +0000
• ee9e9da45c
  Pre Merge pull request !223 from 芋道源码/dev 芋道源码 2023-08-27 13:03:19 +0000
• 9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-08-27 21:02:52 +0800
• df69c035e6
  !213 update src/components/Dialog/src/Dialog.vue. Merge pull request !213 from AKING/N/A 芋道源码 2023-08-27 03:25:00 +0000
• aac377a338
  Pre Merge pull request !213 from AKING/N/A AKING 2023-08-27 03:24:06 +0000
• a9bfa36584
  !216 update src/components/Pagination/index.vue. Merge pull request !216 from AKING/N/A 芋道源码 2023-08-27 03:24:04 +0000
• beef6a0a94 mall: 完善后台发送优惠券 owen 2023-08-26 22:29:55 +0800
• 5cd01903e4 code review：商品评论 YunaiV 2023-08-26 21:23:10 +0800
• d09366b9bd
  !222 优化商品评论 Merge pull request !222 from 疯狂的世界/owen_dev 芋道源码 2023-08-26 12:58:49 +0000
• 5542d12b9c
  Pre Merge pull request !222 from 疯狂的世界/owen_dev 疯狂的世界 2023-08-26 12:57:27 +0000
• 2d8d323767 code review：会员中心 YunaiV 2023-08-26 20:57:22 +0800
• a4841accc2
  !221 账户信息组件 增加等级、成长值和积分的显示 Merge pull request !221 from 风狗/dev 芋道源码 2023-08-26 12:47:33 +0000
• b483a13cff
  Pre Merge pull request !221 from 风狗/dev 风狗 2023-08-26 05:59:25 +0000
• 76e37a3ee7 Merge remote-tracking branch 'origin/dev' into dev-gitee 绮梦 2023-08-26 13:58:11 +0800
• 45a6b3bcc7 账户信息组件 增加等级、成长值和积分的显示。 增加一些配套的svg 图标。 增加tab 的懒加载。 绮梦 2023-08-26 13:48:43 +0800
• afaf7749c2 调整icon的大小 绮梦 2023-08-26 13:45:59 +0800
• 3a15390090 商品评论：回复表单提取到单独的组件中 owen 2023-08-26 13:34:07 +0800
• 4d9ae73211 调整icon的对齐方式为中间居中 绮梦 2023-08-26 13:24:23 +0800
• 15971b6feb 商品评论： 1.移除scores，由后端自动计算 2.SPU、SKU选择组件，放到SPU组件目录下 owen 2023-08-26 13:09:14 +0800
• ec412f7a7f Merge remote-tracking branch 'origin/dev' into owen_dev owen 2023-08-26 13:05:30 +0800
• b8ca5800c6 code review：订单列表 YunaiV 2023-08-26 11:41:43 +0800
• 2605cb7de5
  !217 完善 TODO 提到的问题，优化订单列表相关页面结构 Merge pull request !217 from puhui999/dev-to-dev 芋道源码 2023-08-26 03:21:35 +0000
• be12c0018f
  Pre Merge pull request !217 from puhui999/dev-to-dev puhui999 2023-08-26 03:19:34 +0000
• 84c5eb9942 code review：商品评论 YunaiV 2023-08-26 11:19:29 +0800
• 343b6bbf18
  !220 商品：完善商品评论功能 Merge pull request !220 from 疯狂的世界/owen_dev 芋道源码 2023-08-26 02:59:07 +0000
• bce427f702 Merge remote-tracking branch 'origin/dev' into owen_dev owen 2023-08-26 07:31:38 +0800
• 5e17f733eb
  Pre Merge pull request !220 from 疯狂的世界/owen_dev 疯狂的世界 2023-08-25 17:59:44 +0000
• 1b6c9b2e29 code review：用户详情 YunaiV 2023-08-26 01:59:36 +0800
• 415309469c Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev YunaiV 2023-08-26 01:24:30 +0800
• 8a96412026
  Pre Merge pull request !219 from 疯狂的世界/member_dev 疯狂的世界 2023-08-25 13:14:35 +0000
• 2c56345875 Merge remote-tracking branch 'origin/dev' into member_dev owen 2023-08-25 21:03:38 +0800
• 814b4631c9 商品：完善后台商品评论功能 owen 2023-08-25 21:02:48 +0800
• 28951fb31d 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 绮梦 2023-08-25 11:27:47 +0800
• 6b487c7e68 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-08-24 14:39:09 +0800
• 58502b1241 订单列表：优化订单列表页面结构 puhui999 2023-08-24 14:34:35 +0800
• a15d777afb
  !214 增加部门和菜单的详情，解决个人中心无法上传图片的问题 Merge pull request !214 from clockdotnet/master-vxe 芋道源码 2023-08-23 16:58:45 +0000
• 5fb5c6cbcf
  !215 会员: 会员等级功能调整 Merge pull request !215 from 疯狂的世界/member_dev 芋道源码 2023-08-23 16:46:34 +0000
• 7db6c121bb 完善 code review 提到的问题 puhui999 2023-08-23 15:04:46 +0800
• 87b88d6856
  Pre Merge pull request !216 from AKING/N/A AKING 2023-08-23 05:51:25 +0000
• ff8a8e7243
  update src/components/Pagination/index.vue. 解决了当全局size为small的时候分页组件样式太大的问题，当组件为small时，则会显示小的分页组件，具体请参照ep官网：https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD AKING 2023-08-23 05:51:24 +0000
• 9e3f37e225
  Pre Merge pull request !214 from clockdotnet/master-vxe clockdotnet 2023-08-23 05:51:08 +0000
• 4d798c82df 密码提示问题 周建 2023-08-23 13:51:04 +0800
• f17bb9a7eb 重命名组件名称 绮梦 2023-08-23 13:40:57 +0800