Skip to content

Commit 52fde00

Browse files
author
cuijiankang
committed
店铺注册完成！
1 parent 9d5c9ad commit 52fde00

File tree

13 files changed

+338
-614
lines changed

13 files changed

+338
-614
lines changed

‎DjangoShop/.idea/workspace.xml‎

Lines changed: 142 additions & 165 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DjangoShop/Store/__pycache__/models.cpython-35.pyc‎

-46 Bytes
Binary file not shown.

‎DjangoShop/Store/__pycache__/urls.cpython-35.pyc‎

70 Bytes
Binary file not shown.

‎DjangoShop/Store/__pycache__/views.cpython-35.pyc‎

1.71 KB
Binary file not shown.

‎DjangoShop/Store/migrations/0001_initial.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 2.1.1 on 2019-07-22 11:03
1+
# Generated by Django 2.1.1 on 2019-07-23 03:45
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -52,12 +52,11 @@ class Migration(migrations.Migration):
5252
name='Store',
5353
fields=[
5454
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
55-
('stor_ename', models.CharField(max_length=32, verbose_name='店铺名称')),
55+
('stor_name', models.CharField(max_length=32, verbose_name='店铺名称')),
5656
('store_address', models.CharField(max_length=32, verbose_name='店铺地址')),
5757
('store_description', models.TextField(verbose_name='店铺描述')),
5858
('store_logo', models.ImageField(blank=True, null=True, upload_to='store/images', verbose_name='店铺logo')),
5959
('store_phone', models.CharField(max_length=32, verbose_name='店铺电话')),
60-
('username', models.CharField(max_length=32, verbose_name='用户名')),
6160
('store_money', models.FloatField(verbose_name='店铺注册资金')),
6261
('user_id', models.IntegerField(verbose_name='店主')),
6362
],

‎DjangoShop/Store/migrations/__pycache__/0001_initial.cpython-35.pyc‎

-30 Bytes
Binary file not shown.

‎DjangoShop/Store/models.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ class StoreType(models.Model):
1818

1919

2020
class Store(models.Model):
21-
stor_ename = models.CharField(max_length=32, verbose_name="店铺名称")
21+
stor_name = models.CharField(max_length=32, verbose_name="店铺名称")
2222
store_address = models.CharField(max_length=32, verbose_name="店铺地址")
2323
store_description = models.TextField(verbose_name="店铺描述")
2424
store_logo = models.ImageField(upload_to="store/images", verbose_name="店铺logo", null=True, blank=True)
2525
store_phone = models.CharField(max_length=32, verbose_name="店铺电话")
26-
username = models.CharField(max_length=32, verbose_name="用户名")
2726
store_money = models.FloatField(verbose_name="店铺注册资金")
2827

2928
user_id = models.IntegerField(verbose_name="店主")

‎DjangoShop/Store/templates/store/base.html‎

Lines changed: 60 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@
99
<meta name="description" content="">
1010
<meta name="author" content="">
1111

12-
{% block title %}
13-
{% endblock %}
12+
<title>
13+
{% block title %}
14+
{% endblock %}
15+
</title>
1416

1517
<!-- Custom fonts for this template-->
1618
<link href="/static/store/vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
1719
<link href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
1820

1921
<!-- Custom styles for this template-->
2022
<link href="/static/store/css/sb-admin-2.min.css" rel="stylesheet">
21-
23+
{% block style %}
24+
{% endblock %}
2225
</head>
2326

2427
<body id="page-top">
@@ -34,38 +37,44 @@
3437
<div class="sidebar-brand-icon rotate-n-15">
3538
<i class="fas fa-laugh-wink"></i>
3639
</div>
37-
<div class="sidebar-brand-text mx-3">SB Admin <sup>2</sup></div>
40+
<div class="sidebar-brand-text mx-3">小康平台<sup>2周年</sup></div>
3841
</a>
3942

4043
<!-- Divider -->
4144
<hr class="sidebar-divider my-0">
4245

4346
<!-- Nav Item - Dashboard -->
4447
<li class="nav-item">
45-
<a class="nav-link" href="index.html">
48+
{% if is_store %}
49+
<a class="nav-link" href="/Store/regs/">
50+
<i class="fas fa-fw fa-tachometer-alt"></i>
51+
<span>进入店铺管理</span></a>
52+
{% else %}
53+
<a class="nav-link" href="/Store/regs/">
4654
<i class="fas fa-fw fa-tachometer-alt"></i>
47-
<span>Dashboard</span></a>
55+
<span>没有店铺，去注册</span></a>
56+
{% endif %}
4857
</li>
4958

5059
<!-- Divider -->
5160
<hr class="sidebar-divider">
5261

5362
<!-- Heading -->
5463
<div class="sidebar-heading">
55-
Interface
64+
操作
5665
</div>
5766

5867
<!-- Nav Item - Pages Collapse Menu -->
5968
<li class="nav-item">
6069
<a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
6170
<i class="fas fa-fw fa-cog"></i>
62-
<span>Components</span>
71+
<span>平台操作</span>
6372
</a>
6473
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
6574
<div class="bg-white py-2 collapse-inner rounded">
66-
<h6 class="collapse-header">Custom Components:</h6>
67-
<a class="collapse-item" href="buttons.html">Buttons</a>
68-
<a class="collapse-item" href="cards.html">Cards</a>
75+
<h6 class="collapse-header">定制组件:</h6>
76+
<a class="collapse-item" href="buttons.html">按钮功能</a>
77+
<a class="collapse-item" href="cards.html">卡片</a>
6978
</div>
7079
</div>
7180
</li>
@@ -74,15 +83,15 @@ <h6 class="collapse-header">Custom Components:</h6>
7483
<li class="nav-item">
7584
<a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseUtilities" aria-expanded="true" aria-controls="collapseUtilities">
7685
<i class="fas fa-fw fa-wrench"></i>
77-
<span>Utilities</span>
86+
<span>设置功能</span>
7887
</a>
7988
<div id="collapseUtilities" class="collapse" aria-labelledby="headingUtilities" data-parent="#accordionSidebar">
8089
<div class="bg-white py-2 collapse-inner rounded">
81-
<h6 class="collapse-header">Custom Utilities:</h6>
82-
<a class="collapse-item" href="utilities-color.html">Colors</a>
83-
<a class="collapse-item" href="utilities-border.html">Borders</a>
84-
<a class="collapse-item" href="utilities-animation.html">Animations</a>
85-
<a class="collapse-item" href="utilities-other.html">Other</a>
90+
<h6 class="collapse-header">定制程序:</h6>
91+
<a class="collapse-item" href="utilities-color.html">颜色</a>
92+
<a class="collapse-item" href="utilities-border.html">边框</a>
93+
<a class="collapse-item" href="utilities-animation.html">动画</a>
94+
<a class="collapse-item" href="utilities-other.html">其他</a>
8695
</div>
8796
</div>
8897
</li>
@@ -92,23 +101,23 @@ <h6 class="collapse-header">Custom Utilities:</h6>
92101

93102
<!-- Heading -->
94103
<div class="sidebar-heading">
95-
Addons
104+
插件
96105
</div>
97106

98107
<!-- Nav Item - Pages Collapse Menu -->
99108
<li class="nav-item active">
100109
<a class="nav-link" href="#" data-toggle="collapse" data-target="#collapsePages" aria-expanded="true" aria-controls="collapsePages">
101110
<i class="fas fa-fw fa-folder"></i>
102-
<span>Pages</span>
111+
<span>网页</span>
103112
</a>
104113
<div id="collapsePages" class="collapse show" aria-labelledby="headingPages" data-parent="#accordionSidebar">
105114
<div class="bg-white py-2 collapse-inner rounded">
106-
<h6 class="collapse-header">Login Screens:</h6>
107-
<a class="collapse-item" href="login.html">Login</a>
108-
<a class="collapse-item" href="register.html">Register</a>
109-
<a class="collapse-item" href="forgot-password.html">Forgot Password</a>
115+
<h6 class="collapse-header">登录功能区:</h6>
116+
<a class="collapse-item" href="login.html">登录</a>
117+
<a class="collapse-item" href="register.html">注册</a>
118+
<a class="collapse-item" href="forgot-password.html">忘记密码</a>
110119
<div class="collapse-divider"></div>
111-
<h6 class="collapse-header">Other Pages:</h6>
120+
<h6 class="collapse-header">其他页面:</h6>
112121
<a class="collapse-item" href="404.html">404 Page</a>
113122
<a class="collapse-item active" href="blank.html">Blank Page</a>
114123
</div>
@@ -119,14 +128,14 @@ <h6 class="collapse-header">Other Pages:</h6>
119128
<li class="nav-item">
120129
<a class="nav-link" href="charts.html">
121130
<i class="fas fa-fw fa-chart-area"></i>
122-
<span>Charts</span></a>
131+
<span>图表</span></a>
123132
</li>
124133

125134
<!-- Nav Item - Tables -->
126135
<li class="nav-item">
127136
<a class="nav-link" href="tables.html">
128137
<i class="fas fa-fw fa-table"></i>
129-
<span>Tables</span></a>
138+
<span>表</span></a>
130139
</li>
131140

132141
<!-- Divider -->
@@ -157,7 +166,7 @@ <h6 class="collapse-header">Other Pages:</h6>
157166
<!-- Topbar Search -->
158167
<form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
159168
<div class="input-group">
160-
<input type="text" class="form-control bg-light border-0 small" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
169+
<input type="text" class="form-control bg-light border-0 small" placeholder="搜索喜欢的东西。。。" aria-label="Search" aria-describedby="basic-addon2">
161170
<div class="input-group-append">
162171
<button class="btn btn-primary" type="button">
163172
<i class="fas fa-search fa-sm"></i>
@@ -199,7 +208,7 @@ <h6 class="collapse-header">Other Pages:</h6>
199208
<!-- Dropdown - Alerts -->
200209
<div class="dropdown-list dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="alertsDropdown">
201210
<h6 class="dropdown-header">
202-
Alerts Center
211+
举报中心
203212
</h6>
204213
<a class="dropdown-item d-flex align-items-center" href="#">
205214
<div class="mr-3">
@@ -234,7 +243,7 @@ <h6 class="dropdown-header">
234243
Spending Alert: We've noticed unusually high spending for your account.
235244
</div>
236245
</a>
237-
<a class="dropdown-item text-center small text-gray-500" href="#">Show All Alerts</a>
246+
<a class="dropdown-item text-center small text-gray-500" href="#">展示更多消息</a>
238247
</div>
239248
</li>
240249

@@ -248,7 +257,7 @@ <h6 class="dropdown-header">
248257
<!-- Dropdown - Messages -->
249258
<div class="dropdown-list dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="messagesDropdown">
250259
<h6 class="dropdown-header">
251-
Message Center
260+
消息中心
252261
</h6>
253262
<a class="dropdown-item d-flex align-items-center" href="#">
254263
<div class="dropdown-list-image mr-3">
@@ -290,7 +299,7 @@ <h6 class="dropdown-header">
290299
<div class="small text-gray-500">Chicken the Dog · 2w</div>
291300
</div>
292301
</a>
293-
<a class="dropdown-item text-center small text-gray-500" href="#">Read More Messages</a>
302+
<a class="dropdown-item text-center small text-gray-500" href="#">阅读更多信息</a>
294303
</div>
295304
</li>
296305

@@ -306,20 +315,20 @@ <h6 class="dropdown-header">
306315
<div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">
307316
<a class="dropdown-item" href="#">
308317
<i class="fas fa-user fa-sm fa-fw mr-2 text-gray-400"></i>
309-
Profile
318+
状态
310319
</a>
311320
<a class="dropdown-item" href="#">
312321
<i class="fas fa-cogs fa-sm fa-fw mr-2 text-gray-400"></i>
313-
Settings
322+
设置中心
314323
</a>
315324
<a class="dropdown-item" href="#">
316325
<i class="fas fa-list fa-sm fa-fw mr-2 text-gray-400"></i>
317-
Activity Log
326+
活动状态
318327
</a>
319328
<div class="dropdown-divider"></div>
320-
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#logoutModal">
329+
<a class="dropdown-item" href="/Store/login/" data-toggle="modal" data-target="#logoutModal">
321330
<i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
322-
Logout
331+
退出
323332
</a>
324333
</div>
325334
</li>
@@ -330,20 +339,24 @@ <h6 class="dropdown-header">
330339
<!-- End of Topbar -->
331340

332341
<!-- Begin Page Content -->
333-
{% block content %}
334-
{% endblock %}
342+
<div class="container-fluid">
335343

344+
<!-- Page Heading -->
345+
{# <h1 class="h3 mb-4 text-gray-800">空白页面</h1>#}
346+
{% block content %}
347+
{% endblock %}
336348

349+
</div>
337350
<!-- /.container-fluid -->
338351

339-
352+
</div>
340353
<!-- End of Main Content -->
341354

342355
<!-- Footer -->
343356
<footer class="sticky-footer bg-white">
344357
<div class="container my-auto">
345358
<div class="copyright text-center my-auto">
346-
<span>Copyright &copy; Your Website 2019</span>
359+
<span>小康写着玩 &copy; 在线水果网站 2019</span>
347360
</div>
348361
</div>
349362
</footer>
@@ -365,15 +378,15 @@ <h6 class="dropdown-header">
365378
<div class="modal-dialog" role="document">
366379
<div class="modal-content">
367380
<div class="modal-header">
368-
<h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
381+
<h5 class="modal-title" id="exampleModalLabel">亲，确实要离开吗？</h5>
369382
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
370383
<span aria-hidden="true">×</span>
371384
</button>
372385
</div>
373-
<div class="modal-body">Select "Logout" below if you are ready to end your current session.</div>
386+
<div class="modal-body">分别是短暂的，期待下次你的到来，我们会更加努力的</div>
374387
<div class="modal-footer">
375-
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancel</button>
376-
<a class="btn btn-primary" href="login.html">Logout</a>
388+
<button class="btn btn-secondary" type="button" data-dismiss="modal">在逛会</button>
389+
<a class="btn btn-primary" href="/Store/login/">离开</a>
377390
</div>
378391
</div>
379392
</div>
@@ -388,8 +401,9 @@ <h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
388401

389402
<!-- Custom scripts for all pages-->
390403
<script src="/static/store/js/sb-admin-2.min.js"></script>
391-
{% block scripe %}
392-
{% endblock %}
404+
{% block script %}
405+
{% endblock %}
393406
</body>
394407

395408
</html>
409+

0 commit comments

Comments
 (0)