Commits · 7502278f965fc9f2f6b0b436bd48ae690a7d1638 · lanbaoming / jiedao-app-customer-new-master

21 Oct, 2024 4 commits
- Merge branch 'feature/order_edit' into release · 7502278f
  dragondean@qq.com authored Oct 21, 2024
  
  7502278f
- 修改创建订单运输部分联动异常 · e10c6941
  dragondean@qq.com authored Oct 21, 2024
  
  e10c6941
- 代收货款文案错误 · f6559c8c
  dragondean@qq.com authored Oct 21, 2024
  
  f6559c8c
- 代收货款文案错误 · f09bcf6d
  dragondean@qq.com authored Oct 21, 2024
  
  f09bcf6d
19 Oct, 2024 7 commits
- Merge branch 'feature/order_edit' into release · 88a3b8fa
  dragondean@qq.com authored Oct 19, 2024
```
# Conflicts:
#	src/pages/create_order/create_order.vue
#	src/static/lang/zh/create.js
```
  88a3b8fa
- 订单下单校验收货人手机区号是否与目的国一致 · 25985162
  dragondean@qq.com authored Oct 19, 2024
  
  25985162
- 完善订单创建重构 · f975bcb8
  dragondean@qq.com authored Oct 19, 2024
  
  f975bcb8
- 完善订单创建重构 · b82ae6bf
  dragondean@qq.com authored Oct 19, 2024
  
  b82ae6bf
- Merge remote-tracking branch 'origin/release' into release · 82d45e6e
  dragondean@qq.com authored Oct 19, 2024
  
  82d45e6e
- Merge branch 'feature/order_edit' into release · 8fa1bb58
  dragondean@qq.com authored Oct 19, 2024
  
  8fa1bb58
- 修复订单部分Bug · 4cadf59e
  dragondean@qq.com authored Oct 19, 2024
  
  4cadf59e
18 Oct, 2024 2 commits
- Merge branch 'feature' into 'release' · 6c87a36b
  chenwei authored Oct 18, 2024
```
新增分享注册逻辑也页面

See merge request !27
```
  6c87a36b
- 新增分享注册逻辑也页面 · 3c13d787
  chenwei authored Oct 18, 2024
  
  3c13d787
12 Oct, 2024 2 commits
- Merge branch 'feature' into 'release' · 1251755b
  chenwei authored Oct 12, 2024
```
修改积分记录兑换记录时间展示的格式

See merge request !24
```
  1251755b
- 修改积分记录兑换记录时间展示的格式 · 1b53d301
  chenwei authored Oct 12, 2024
  
  1b53d301
11 Oct, 2024 4 commits
- Merge branch 'feature' into 'release' · f8377d04
  chenwei authored Oct 11, 2024
```
兑换操作添加网点提示

See merge request !23
```
  f8377d04
- 兑换操作添加网点提示 · 80b01c69
  chenwei authored Oct 11, 2024
  
  80b01c69
- Merge branch 'feature' into 'release' · a22d5574
  chenwei authored Oct 11, 2024
```
fixed defect | 501 |  APP确认兑换提交成功后，应返回兑换礼品页面，不是返回首页

See merge request !18
```
  a22d5574
- fixed defect | 501 | APP确认兑换提交成功后，应返回兑换礼品页面，不是返回首页 · 02ca041d
  chenwei authored Oct 11, 2024
  
  02ca041d
10 Oct, 2024 2 commits
- Merge branch 'feature' into 'release' · d12c9c50
  chenwei authored Oct 10, 2024
```
fexed defect | 590 509 | APP与web端 个人设置页面 & 海运拼柜的订单v值活动详情中积分说明单位错误

See merge request !17
```
  d12c9c50
- fexed defect | 590 509 | APP与web端个人设置页面 & 海运拼柜的订单v值活动详情中积分说明单位错误 · ec9b5cf6
  chenwei authored Oct 10, 2024
  
  ec9b5cf6
19 Sep, 2024 3 commits
- Merge branch 'dev' into 'release' · fa9c7981
  chenwei authored Sep 19, 2024
```
# Conflicts:
#   src/static/lang/en.js
#   src/static/lang/zh.js
```
  fa9c7981
- Merge branch 'feature' into 'release' · 93fd3fb1
  chenwei authored Sep 19, 2024
```
提货点

See merge request !13
```
  93fd3fb1
- 提货点 · 19fb9f79
  chenwei authored Sep 19, 2024
  
  19fb9f79
13 Sep, 2024 8 commits
- Merge branch 'feature' into 'release' · 00b6fdca
  chenwei authored Sep 13, 2024
```
组件引入有问题

See merge request !12
```
  00b6fdca
- 组件引入有问题 · 37cc114f
  chenwei authored Sep 13, 2024
  
  37cc114f
- Merge branch 'feature' into 'release' · 9473bfd4
  chenwei authored Sep 13, 2024
```
分享页面更换

See merge request !11
```
  9473bfd4
- 分享页面更换 · a9e87406
  chenwei authored Sep 13, 2024
  
  a9e87406
- Merge branch 'feature' into 'release' · 076fabe4
  chenwei authored Sep 13, 2024
```
修复9/13的问题

See merge request !9
```
  076fabe4
- 修复9/13的问题 · 52e3d4a9
  chenwei authored Sep 13, 2024
  
  52e3d4a9
- Merge branch 'feature' into 'release' · be3dbdc9
  chenwei authored Sep 13, 2024
```
fenxiang

See merge request !8
```
  be3dbdc9
- fenxiang · 34046dae
  chenwei authored Sep 13, 2024
  
  34046dae
12 Sep, 2024 6 commits
- Merge branch 'feature/order_edit' into release · 5eb1bd53
  dragondean@qq.com authored Sep 12, 2024
  
  5eb1bd53
- 文案优化 · 3ffd2fc5
  dragondean@qq.com authored Sep 12, 2024
  
  3ffd2fc5
- Merge branch 'feature/order_edit' into release · 8d5fadc9
  dragondean@qq.com authored Sep 12, 2024
  
  8d5fadc9
- 文案优化 · 07154721
  dragondean@qq.com authored Sep 12, 2024
  
  07154721
- Merge branch 'feature/order_edit' into release · 36fe1f67
  dragondean@qq.com authored Sep 12, 2024
  
  36fe1f67
- 部分bug和优化 · 989781cf
  dragondean@qq.com authored Sep 12, 2024
  
  989781cf
06 Sep, 2024 2 commits
- Merge branch 'release' into dev · 46c261b7
  dragondean@qq.com authored Sep 06, 2024
  
  46c261b7
- Merge branch 'feature/order_edit' into release · d190c17f
  dragondean@qq.com authored Sep 06, 2024
```
# Conflicts:
#	src/static/lang/en/orderInfo.js
#	src/static/lang/zh/orderInfo.js
```
  d190c17f