Skip to content

Commit 326a2e1

Browse files
SmallRuralDogSmallRuralDog
committed
权限功能完善
1 parent 4727fc3 commit 326a2e1

File tree

20 files changed

+571
-295
lines changed

20 files changed

+571
-295
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"Vue"
1616
],
1717
"require": {
18-
"illuminate/support": "~5|~6"
18+
"illuminate/support": "~5|~6|~7"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "^8.0",

‎package-lock.json

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

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
1111
},
1212
"devDependencies": {
13-
"@chenfengyuan/vue-qrcode": "^1.0.1",
14-
"axios": "^0.19.1",
13+
"@chenfengyuan/vue-qrcode": "^1.0.2",
14+
"axios": "^0.19.2",
1515
"babel-plugin-component": "^1.1.1",
1616
"babel-plugin-import": "^1.13.0",
1717
"cross-env": "^5.1",
@@ -26,10 +26,10 @@
2626
"vue-happy-scroll": "^2.1.1",
2727
"vue-template-compiler": "^2.6.10",
2828
"element-ui": "^2.13.0",
29-
"view-design": "^4.1.0-rc.3",
29+
"view-design": "^4.1.3",
3030
"vue-bus": "^1.2.1",
3131
"vue-dplayer": "0.0.10",
32-
"vue-router": "^3.1.3",
32+
"vue-router": "^3.1.6",
3333
"vue-waterfall2": "^1.9.6",
3434
"wangeditor": "^3.1.1"
3535
},

‎public/app.js

Lines changed: 100 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,50 @@ __webpack_require__.r(__webpack_exports__);
118118
//
119119
//
120120
//
121+
//
122+
//
123+
//
124+
//
125+
//
126+
//
127+
//
128+
//
129+
//
130+
//
131+
//
132+
//
133+
//
134+
//
135+
//
136+
//
137+
//
138+
//
139+
//
140+
//
141+
//
142+
//
121143
/* harmony default export */ __webpack_exports__["default"] = ({
122144
props: {
123145
page_data: Object
124146
},
125147
data: function data() {
126148
return {
127149
form: {
128-
username: 'admin',
129-
password: 'admin',
150+
username: "admin",
151+
password: "admin",
130152
remember: true
131153
},
132154
loading: false,
133155
ruleValidate: {
134156
username: [{
135157
required: true,
136-
message: '请输入用户名',
137-
trigger: 'blur'
158+
message: "请输入用户名",
159+
trigger: "blur"
138160
}],
139161
password: [{
140162
required: true,
141-
message: '请输入密码',
142-
trigger: 'blur'
163+
message: "请输入密码",
164+
trigger: "blur"
143165
}]
144166
}
145167
};
@@ -1096,6 +1118,32 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
10961118
//
10971119
//
10981120
//
1121+
//
1122+
//
1123+
//
1124+
//
1125+
//
1126+
//
1127+
//
1128+
//
1129+
//
1130+
//
1131+
//
1132+
//
1133+
//
1134+
//
1135+
//
1136+
//
1137+
//
1138+
//
1139+
//
1140+
//
1141+
//
1142+
//
1143+
//
1144+
//
1145+
//
1146+
//
10991147

11001148

11011149

@@ -26094,6 +26142,23 @@ var render = function() {
2609426142
"prefix-icon": "el-icon-user",
2609526143
placeholder: "请输入用户名"
2609626144
},
26145+
nativeOn: {
26146+
keyup: function($event) {
26147+
if (
26148+
!$event.type.indexOf("key") &&
26149+
_vm._k(
26150+
$event.keyCode,
26151+
"enter",
26152+
13,
26153+
$event.key,
26154+
"Enter"
26155+
)
26156+
) {
26157+
return null
26158+
}
26159+
return _vm.handleSubmit("formValidate")
26160+
}
26161+
},
2609726162
model: {
2609826163
value: _vm.form.username,
2609926164
callback: function($$v) {
@@ -26117,6 +26182,23 @@ var render = function() {
2611726182
"show-password": "",
2611826183
placeholder: "请输入密码"
2611926184
},
26185+
nativeOn: {
26186+
keyup: function($event) {
26187+
if (
26188+
!$event.type.indexOf("key") &&
26189+
_vm._k(
26190+
$event.keyCode,
26191+
"enter",
26192+
13,
26193+
$event.key,
26194+
"Enter"
26195+
)
26196+
) {
26197+
return null
26198+
}
26199+
return _vm.handleSubmit("formValidate")
26200+
}
26201+
},
2612026202
model: {
2612126203
value: _vm.form.password,
2612226204
callback: function($$v) {
@@ -26173,7 +26255,7 @@ var render = function() {
2617326255
}
2617426256
}
2617526257
},
26176-
[_vm._v("登陆\n ")]
26258+
[_vm._v("登陆\n ")]
2617726259
)
2617826260
],
2617926261
1
@@ -27090,15 +27172,11 @@ var render = function() {
2709027172
"el-dropdown",
2709127173
{ staticClass: "mr-10" },
2709227174
[
27093-
_c(
27094-
"el-button",
27095-
{ attrs: { size: "medium", disabled: _vm.rows.length <= 0 } },
27096-
[
27097-
_c("span", [_vm._v("已选择 " + _vm._s(_vm.rows.length) + " 项")]),
27098-
_vm._v(" "),
27099-
_c("i", { staticClass: "el-icon-arrow-down el-icon--right" })
27100-
]
27101-
),
27175+
_c("el-button", { attrs: { disabled: _vm.rows.length <= 0 } }, [
27176+
_c("span", [_vm._v("已选择 " + _vm._s(_vm.rows.length) + " 项")]),
27177+
_vm._v(" "),
27178+
_c("i", { staticClass: "el-icon-arrow-down el-icon--right" })
27179+
]),
2710227180
_vm._v(" "),
2710327181
_c(
2710427182
"el-dropdown-menu",
@@ -27226,7 +27304,6 @@ var render = function() {
2722627304
"el-input",
2722727305
{
2722827306
attrs: {
27229-
size: "medium",
2723027307
placeholder: _vm.attrs.quickSearch.placeholder,
2723127308
clearable: true
2723227309
},
@@ -27277,11 +27354,7 @@ var render = function() {
2727727354
"el-button",
2727827355
{
2727927356
staticClass: "mr-10",
27280-
attrs: {
27281-
type: "primary",
27282-
size: "medium",
27283-
icon: "el-icon-plus"
27284-
}
27357+
attrs: { type: "primary", icon: "el-icon-plus" }
2728527358
},
2728627359
[_vm._v("新建")]
2728727360
)
@@ -29459,7 +29532,10 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
2945929532

2946029533

2946129534

29462-
vue__WEBPACK_IMPORTED_MODULE_3___default.a.use(element_ui__WEBPACK_IMPORTED_MODULE_9___default.a);
29535+
vue__WEBPACK_IMPORTED_MODULE_3___default.a.use(element_ui__WEBPACK_IMPORTED_MODULE_9___default.a, {
29536+
size: 'small',
29537+
zIndex: 3000
29538+
});
2946329539
vue__WEBPACK_IMPORTED_MODULE_3___default.a.component('Drawer', view_design_src_components_drawer__WEBPACK_IMPORTED_MODULE_2__["default"]);
2946429540
vue__WEBPACK_IMPORTED_MODULE_3___default.a.prototype.$Loading = view_design_src_components_loading_bar__WEBPACK_IMPORTED_MODULE_1__["default"];
2946529541
vue__WEBPACK_IMPORTED_MODULE_3___default.a.prototype.$Message = view_design_src_components_message__WEBPACK_IMPORTED_MODULE_0__["default"];
@@ -32850,7 +32926,7 @@ function getFileName(path) {
3285032926
/*! no static exports found */
3285132927
/***/ (function(module, exports, __webpack_require__) {
3285232928

32853-
module.exports = __webpack_require__(/*! E:\homestead\laravel-vue-admin\packages\SmallRuralDog\Admin\resources\js\app.js */"./resources/js/app.js");
32929+
module.exports = __webpack_require__(/*! E:\docker\php\miss-meijiu\packages\smallruraldog\laravel-vue-admin\resources\js\app.js */"./resources/js/app.js");
3285432930

3285532931

3285632932
/***/ })

‎public/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=73e309c5f38ff26e0a86",
2+
"/app.js": "/app.js?id=14188a22b7a480b67b12",
33
"/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
4-
"/vendor.js": "/vendor.js?id=f52001d4a64b7a49a9e6"
4+
"/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
55
}

0 commit comments

Comments
 (0)