Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5df66e5

Browse files
committed
根据使用实际,修改了部分前端模板和后端模板代码
1 parent 9869bde commit 5df66e5

File tree

4 files changed

+78
-97
lines changed

4 files changed

+78
-97
lines changed

‎api/app/Http/Controllers/Admin/Template.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use Illuminate\Support\Facades\DB;
77
use Rap2hpoutre\FastExcel\FastExcel;
88
use Illuminate\Support\Facades\Validator;
9+
use Illuminate\Validation\Rule;
10+
use Illuminate\Http\Request;
911

1012
class ##name##Controller extends Controller
1113
{

‎element/src/model/template.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ export const rules = {
55

66
export function Model(
77
name = "",
8+
desc = null,
89
status = true
910
) {
1011
this.name = name;
11-
this.status = status;
12+
this.desc = desc;
13+
this.status = status
1214
}
1315

1416
export function SearchModel() {}

‎element/src/views/template/index.vue

Lines changed: 40 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,75 +18,55 @@
1818
</el-form-item>
1919
</el-form>
2020
<div class="toolbar">
21-
<el-button type="primary" plain @click="add">添加店铺</el-button>
21+
<el-button type="primary" plain @click="add">添加</el-button>
2222
</div>
2323
<div class="table">
24-
<el-table :data="tableData"
25-
size="small"
26-
stripe
27-
border
28-
style="width: 100%">
24+
<el-table :data="tableData" size="small" stripe border style="width: 100%">
2925
<el-table-column prop="id" label="标识" width="50" align="center" />
30-
<el-table-column prop="seller_name"
31-
label="店铺名称"
32-
width="150"
33-
align="center" />
34-
<el-table-column prop="client_id" label="店铺Client_id" width="200" />
35-
<el-table-column prop="api_key" label="店铺api_key" min-width="200" />
36-
<el-table-column prop="seller_desc" label="店铺说明" width="120">
26+
<el-table-column prop="name" label="名称" width="150" align="center" />
27+
28+
<el-table-column prop="desc" label="说明" width="200">
29+
</el-table-column>
30+
<el-table-column label="状态" width="200">
31+
<template v-slot="{row}">
32+
<span v-if="row.status">是</span>
33+
<span v-else>否</span>
34+
</template>
3735
</el-table-column>
38-
<el-table-column label="操作" width="300">
36+
<el-table-column label="操作" min-width="300">
3937
<template slot-scope="scope">
40-
<el-button plain @click="edit(scope.row.id)">修改</el-button>
41-
<el-button plain type="danger" @click="del(scope.row.id)"
42-
>删除</el-button
43-
>
44-
</template>
38+
<el-button plain @click="edit(scope.row.id)">修改</el-button>
39+
<el-button plain type="danger" @click="del(scope.row.id)">删除</el-button>
40+
</template>
4541
</el-table-column>
4642
</el-table>
4743
</div>
4844
<div class="page">
49-
<el-pagination :current-page="page.current_page"
50-
:page-sizes="page.sizes"
51-
:page-size="page.per_page"
52-
layout="total, sizes, prev, pager, next"
53-
:total="page.total"
54-
@size-change="sizeChange"
55-
@current-change="currentChange" />
45+
<el-pagination :current-page="page.current_page" :page-sizes="page.sizes" :page-size="page.per_page"
46+
layout="total, sizes, prev, pager, next" :total="page.total" @size-change="sizeChange"
47+
@current-change="currentChange" />
5648
</div>
57-
<el-dialog :title="title"
58-
:visible.sync="dialogFormVisible"
59-
:close-on-click-modal="false"
60-
width="40%">
61-
<el-form v-if="dialogFormVisible"
62-
ref="ruleForm"
63-
:model="formData"
64-
:rules="rules">
49+
<el-dialog :title="title" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="40%">
50+
<el-form v-if="dialogFormVisible" ref="ruleForm" :model="formData" :rules="rules">
6551
<!-- 这里面开始 -->
6652
<el-row :gutter="20">
6753
<el-col :span="12">
68-
<el-form-item label="店铺名称" prop="seller_name">
69-
<el-input v-model="formData.seller_name" :disabled="isEdit" />
54+
<el-form-item label="名称" prop="name">
55+
<el-input v-model="formData.name" :disabled="isEdit" />
7056
</el-form-item>
7157
</el-col>
7258
<el-col :span="12">
73-
<el-form-item label="店铺说明"prop="seller_desc">
74-
<el-input v-model="formData.seller_desc" type="text" />
59+
<el-form-item label="说明">
60+
<el-input v-model="formData.desc" type="text" />
7561
</el-form-item>
7662
</el-col>
7763
</el-row>
7864
<el-row :gutter="20">
7965
<el-col :span="12">
80-
<el-form-item label="店铺Client_Id" prop="client_id">
81-
<el-input v-model="formData.client_id" type="text" />
82-
</el-form-item>
83-
</el-col>
84-
<el-col :span="12">
85-
<el-form-item label="店铺Api_Key"
86-
type="text"
87-
prop="api_key">
88-
<el-input v-model="formData.api_key" />
89-
</el-form-item>
66+
<el-select v-model="formData.status" placeholder="请选择状态">
67+
<el-option :value='true' label='是'></el-option>
68+
<el-option :value='false' label='否'></el-option>
69+
</el-select>
9070
</el-col>
9171
</el-row>
9272
</el-form>
@@ -100,7 +80,6 @@
10080
</template>
10181

10282
<script>
103-
10483
import CURD from '@/mixin/CURD'
10584
export default {
10685
name: '##component##',
@@ -114,11 +93,9 @@
11493
},
11594
methods: {}
11695
}
117-
11896
</script>
11997

12098
<style>
121-
12299
.table,
123100
.toolbar,
124101
.page {
@@ -130,18 +107,23 @@
130107
border: 1px solid #ccc;
131108
padding: 5px;
132109
}
110+
133111
.table {
134112
margin-bottom: 10px;
135113
}
114+
136115
.page {
137116
margin-top: 10px;
138117
}
118+
139119
.page {
140120
text-align: center;
141121
}
122+
142123
.el-form table tbody {
143124
width: 100%;
144125
}
126+
145127
.el-form .header {
146128
box-sizing: border-box;
147129
border: 1px solid #ccc;
@@ -151,10 +133,12 @@
151133
display: flex;
152134
flex-direction: row;
153135
}
136+
154137
.el-form .header .title {
155138
margin: auto;
156139
font-weight: bold;
157140
}
141+
158142
.el-form .content {
159143
display: flex;
160144
box-sizing: border-box;
@@ -164,20 +148,24 @@
164148
height: 44px;
165149
flex-direction: row;
166150
}
151+
167152
.el-form .content div {
168153
margin: auto;
169154
border-radius: 0px;
170155
}
156+
171157
.avatar-uploader .el-upload {
172158
border: 1px dashed #d9d9d9;
173159
border-radius: 6px;
174160
cursor: pointer;
175161
position: relative;
176162
overflow: hidden;
177163
}
164+
178165
.avatar-uploader .el-upload:hover {
179166
border-color: #409eff;
180167
}
168+
181169
.avatar-uploader-icon {
182170
font-size: 28px;
183171
color: #8c939d;
@@ -186,10 +174,10 @@
186174
line-height: 178px;
187175
text-align: center;
188176
}
177+
189178
.avatar {
190179
width: 178px;
191180
height: 178px;
192181
display: block;
193182
}
194-
195183
</style>

‎element/src/views/template/simple.vue

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,50 @@
11
<template>
2-
32
<div class="warpper">
43
<div class="toolbar">
5-
<el-button type="primary" plain @click="add">添加店铺</el-button>
4+
<el-button type="primary" plain @click="add">添加</el-button>
65
</div>
76
<div class="table">
8-
<el-table :data="tableData"
9-
size="small"
10-
stripe
11-
border
12-
style="width: 100%">
7+
<el-table :data="tableData" size="small" stripe border style="width: 100%">
138
<el-table-column prop="id" label="标识" width="50" align="center" />
14-
<el-table-column prop="seller_name"
15-
label="店铺名称"
16-
width="150"
17-
align="center" />
18-
<el-table-column prop="client_id" label="店铺Client_id" width="200" />
19-
<el-table-column prop="api_key" label="店铺api_key" min-width="200" />
20-
<el-table-column prop="seller_desc" label="店铺说明" width="120">
9+
<el-table-column prop="name" label="名称" width="150" align="center" />
10+
<el-table-column prop="desc" label="说明" width="200">
11+
</el-table-column>
12+
<el-table-column label="状态" width="200">
13+
<template v-slot="{row}">
14+
<span v-if="row.status">是</span>
15+
<span v-else>否</span>
16+
</template>
2117
</el-table-column>
22-
<el-table-column label="操作" width="300">
18+
<el-table-column label="操作" min-width="300">
2319
<template slot-scope="scope">
24-
<el-button plain @click="edit(scope.row.id)">修改</el-button>
25-
<el-button plain type="danger" @click="del(scope.row.id)"
26-
>删除</el-button
27-
>
28-
</template>
20+
<el-button plain @click="edit(scope.row.id)">修改</el-button>
21+
<el-button plain type="danger" @click="del(scope.row.id)">删除</el-button>
22+
</template>
2923
</el-table-column>
3024
</el-table>
3125
</div>
32-
<el-dialog :title="title"
33-
:visible.sync="dialogFormVisible"
34-
:close-on-click-modal="false"
35-
width="40%">
36-
<el-form v-if="dialogFormVisible"
37-
ref="ruleForm"
38-
:model="formData"
39-
:rules="rules">
26+
<el-dialog :title="title" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="40%">
27+
<el-form v-if="dialogFormVisible" ref="ruleForm" :model="formData" :rules="rules">
4028
<!-- 这里面开始 -->
4129
<el-row :gutter="20">
4230
<el-col :span="12">
43-
<el-form-item label="店铺名称" prop="seller_name">
31+
<el-form-item label="名称" prop="name">
4432
<el-input v-model="formData.seller_name" :disabled="isEdit" />
4533
</el-form-item>
4634
</el-col>
4735
<el-col :span="12">
48-
<el-form-item label="店铺说明"prop="seller_desc">
49-
<el-input v-model="formData.seller_desc" type="text" />
36+
<el-form-item label="说明">
37+
<el-input v-model="formData.desc" type="text" />
5038
</el-form-item>
5139
</el-col>
5240
</el-row>
5341
<el-row :gutter="20">
5442
<el-col :span="12">
55-
<el-form-item label="店铺Client_Id" prop="client_id">
56-
<el-input v-model="formData.client_id" type="text" />
57-
</el-form-item>
58-
</el-col>
59-
<el-col :span="12">
60-
<el-form-item label="店铺Api_Key"
61-
type="text"
62-
prop="api_key">
63-
<el-input v-model="formData.api_key" />
43+
<el-form-item label="状态">
44+
<el-select v-model="formData.status" placeholder="请选择状态">
45+
<el-option :value='true' label='是'></el-option>
46+
<el-option :value='false' label='否'></el-option>
47+
</el-select>
6448
</el-form-item>
6549
</el-col>
6650
</el-row>
@@ -75,7 +59,6 @@
7559
</template>
7660

7761
<script>
78-
7962
import CURD from '@/mixin/simple'
8063
export default {
8164
name: '##component##',
@@ -89,11 +72,9 @@
8972
},
9073
methods: {}
9174
}
92-
9375
</script>
9476

9577
<style>
96-
9778
.table,
9879
.toolbar,
9980
.page {
@@ -105,13 +86,15 @@
10586
border: 1px solid #ccc;
10687
padding: 5px;
10788
}
89+
10890
.table {
10991
margin-bottom: 10px;
11092
}
11193
11294
.el-form table tbody {
11395
width: 100%;
11496
}
97+
11598
.el-form .header {
11699
box-sizing: border-box;
117100
border: 1px solid #ccc;
@@ -121,10 +104,12 @@
121104
display: flex;
122105
flex-direction: row;
123106
}
107+
124108
.el-form .header .title {
125109
margin: auto;
126110
font-weight: bold;
127111
}
112+
128113
.el-form .content {
129114
display: flex;
130115
box-sizing: border-box;
@@ -134,20 +119,24 @@
134119
height: 44px;
135120
flex-direction: row;
136121
}
122+
137123
.el-form .content div {
138124
margin: auto;
139125
border-radius: 0px;
140126
}
127+
141128
.avatar-uploader .el-upload {
142129
border: 1px dashed #d9d9d9;
143130
border-radius: 6px;
144131
cursor: pointer;
145132
position: relative;
146133
overflow: hidden;
147134
}
135+
148136
.avatar-uploader .el-upload:hover {
149137
border-color: #409eff;
150138
}
139+
151140
.avatar-uploader-icon {
152141
font-size: 28px;
153142
color: #8c939d;
@@ -156,10 +145,10 @@
156145
line-height: 178px;
157146
text-align: center;
158147
}
148+
159149
.avatar {
160150
width: 178px;
161151
height: 178px;
162152
display: block;
163153
}
164-
165154
</style>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /