Labels Milestones

fuzzy-expert #4

Open

p2ap8co46 wants to merge 91 commits from master into sunjiahong_branch

pull from: master

merge into: pu6ej7yq9:sunjiahong_branch

pu6ej7yq9:develop

pu6ej7yq9:wbb_branch

pu6ej7yq9:mll_branch

pu6ej7yq9:zzy_branch

pu6ej7yq9:sunjiahong_branch

pu6ej7yq9:wujiayi_branch

pu6ej7yq9:zzy_brach

Conversation 0 Commits 91 Files Changed 191

p2ap8co46 commented 2 years ago

Collaborator

There is no content yet.

p2ap8co46 added 34 commits 2 years ago

e37dee744a 123

00dfca7ab8 mll.txt

6d01f981b3 doc/1.txt ...

model/2.txt
other/3.txt
scr/2.txt

ff3d3b755d Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

23c774e898 Delete 'wujiayi.txt'

eff7c44bc0 Delete 'wonderful.txt'

914ba17ec1 Delete 'mll.txt'

0c42142c5a Delete 'README.md'

40cd019818 前端代码第二次修改

bf30d45df0 模糊专家系统源码

4cffb5d51d 论坛

3ae5644578 修改，添加转盘

dac19b9307 修改，添加转盘

679202168e 1

b007ffd943 论坛

60105eef91 11

6cd9305a24 论坛修改

f4f71bcba8 更新论坛

ec80a7373b Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

353225e8ea 修改

67244568ad 2022.11.10

962fa72523 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git ...

# Conflicts:
#	scr/miniprogram-2/project.config.json
#	scr/论坛/project.config.json

c438087ed8 个人中心修改

fd95818be3 合并论坛 增加登录

628059f780 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

21b40c1e5f 购物车

57fb48c63a 修改

5857d90855 修改

cc4c93a569 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git ...

# Conflicts:
#	scr/food/pages/login/login.js

3008cba563 turning

4fcfe7135e Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

59d012b022 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

56646892c7 购物车数据传输

3602f7d731 订单页

pu6ej7yq9 added 1 commit 2 years ago

b7fb4b4510 购物车渲染成功显示，个人主页更新

pu6ej7yq9 added 1 commit 2 years ago

12173f49fc 购物车已通

pu6ej7yq9 added 1 commit 2 years ago

adce0f5120 定义全局变量，全局可调用openid

pp3avk64l added 1 commit 2 years ago

2ebc67070f 更新

pu6ej7yq9 added 1 commit 2 years ago

ebd507a83b 绑定openid

pp3avk64l added 1 commit 2 years ago

c438f1d167 转盘

pp3avk64l added 1 commit 2 years ago

8f3f10406e 更新

pu6ej7yq9 added 2 commits 2 years ago

0d3fc6f24e 收货地址

170d0265f0 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git ...

# Conflicts:
#	scr/food/app.json

pu6ej7yq9 added 1 commit 2 years ago

f497da6eb4 1

pu6ej7yq9 added 1 commit 2 years ago

7f1a3d870b 付款界面，订单界面

pu6ej7yq9 added 1 commit 2 years ago

326cb959a5 确认订单

pu6ej7yq9 added 1 commit 2 years ago

0c872d31dc 完善

pu6ej7yq9 added 1 commit 2 years ago

ee98635253 订单完成

pu6ej7yq9 added 1 commit 2 years ago

79dda39119 wxss优化

pu6ej7yq9 added 1 commit 2 years ago

d37a522905 分类和搜索功能完善

pu6ej7yq9 added 1 commit 2 years ago

f168aa95d2 11

pu6ej7yq9 added 1 commit 2 years ago

597a544653 转盘修改

pu6ej7yq9 added 1 commit 2 years ago

c9c3a20268 完善

pu6ej7yq9 added 1 commit 2 years ago

e88999738c 完善

pu6ej7yq9 added 1 commit 2 years ago

62dfcdad82 wbb的实践报告

pu6ej7yq9 added 1 commit 2 years ago

02dcb5ecaf 代码最最最终版

pp3avk64l added 1 commit 2 years ago

2e60c43993 Delete 'doc/1.txt'

pp3avk64l added 1 commit 2 years ago

ee0efce9e9 Delete 'model/2.txt'

pp3avk64l added 1 commit 2 years ago

286b4bbd61 Delete 'scr/miniprogram-2/project.private.config.json'

pp3avk64l added 1 commit 2 years ago

fa0c96ee6b Delete 'scr/模糊专家系统/README.md'

pp3avk64l added 1 commit 2 years ago

11ae31feae Delete 'scr/模糊专家系统/.gitignore'

pp3avk64l added 1 commit 2 years ago

7c4dedbedf Delete 'scr/模糊专家系统/README.pdf'

pp3avk64l added 1 commit 2 years ago

543a9d43cb Delete 'scr/模糊专家系统/frontend/src/translateTag.js'

pp3avk64l added 2 commits 2 years ago

99b4a0b153 更新

6c81ad339d Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

pp3avk64l added 1 commit 2 years ago

a18e6f83d8 更新

pp3avk64l added 1 commit 2 years ago

0762f8160f Add doc

pp3avk64l added 1 commit 2 years ago

2e757da71a Delete 'doc'

pp3avk64l added 1 commit 2 years ago

bb372ef132 Delete 'other/~$0340029-翁冰冰-实践总结报告.docx'

pu6ej7yq9 added 3 commits 2 years ago

74510c9c74 1

3834f7a243 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

1f90d7b002 文档

pp3avk64l added 1 commit 2 years ago

8202ac1a4f 修改

p2ap8co46 added 1 commit 2 years ago

e821834d73 Update README.md

p2ap8co46 added 1 commit 2 years ago

3bd6bcdd0b Update README.md

p2ap8co46 added 1 commit 2 years ago

4f3c891861 Update README.md

p2ap8co46 added 1 commit 2 years ago

7cc44e84c1 Update README.md

p2ap8co46 added 1 commit 2 years ago

9010fcd280 Update README.md

p2ap8co46 added 1 commit 2 years ago

85f5907625 Update README.md

p2ap8co46 added 1 commit 2 years ago

c7bc479342 Update README.md

pp3avk64l added 1 commit 2 years ago

61292c1dc6 文档

pu6ej7yq9 added 5 commits 2 years ago

e6167419fc 图片

b6ff27a67f 视频

3d5c9af3b9 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

0d21abda61 Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git

267eb1078b 团队自评

pp3avk64l added 1 commit 2 years ago

26b3dcca1a 文档

pp3avk64l added 1 commit 2 years ago

db5672e391 文档

pu6ej7yq9 added 1 commit 2 years ago

8dd116c1f9 11

pu6ej7yq9 added 1 commit 2 years ago

171b577d04 1

pu6ej7yq9 added 1 commit 2 years ago

c146a86071 1

This pull request can be merged automatically.

You are not authorized to merge this pull request.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

3 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: pu6ej7yq9/git#4

Write Preview

Loading…

Cancel

Save

There is no content yet.