Skip to content

Commit f454c50

Browse files
committed
feat: grid sm,lg,xl size gap, file util download optimized
1 parent f049fc8 commit f454c50

File tree

104 files changed

+1850
-28890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1850
-28890
lines changed

module/AdminManager/Asset/entry/upgrade.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/AdminManager/resources/asset/src/pages/Upgrade.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,9 @@ export default {
344344
}
345345
},
346346
doMemberLoginSubmit() {
347+
if (!this.memberLoginInfo.username || !this.memberLoginInfo.password || !this.memberLoginInfo.captcha) {
348+
return
349+
}
347350
if (!this.memberLoginInfo.agree) {
348351
this.$dialog.tipError('请先同意使用协议')
349352
return

module/Blog/Docs/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 2.9.0
1+
## 2.9.0 优化:博客主题色自动切换优化
22

33
- 优化:博客主题色自动切换优化
44

module/ModuleStore/Asset/entry/moduleStore.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/ModuleStore/Util/ModuleStoreUtil.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class ModuleStoreUtil
1919
{
2020
const REMOTE_BASE = 'https://modstart.com';
21-
21+
2222
public static function remoteModuleData()
2323
{
2424
$input = InputPackage::buildFromInput();

module/ModuleStore/resources/asset/src/pages/ModuleStore.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ export default {
611611
}
612612
},
613613
doMemberLoginSubmit() {
614+
if (!this.memberLoginInfo.username || !this.memberLoginInfo.password || !this.memberLoginInfo.captcha) {
615+
return
616+
}
614617
if (!this.memberLoginInfo.agree) {
615618
this.$dialog.tipError('请先同意使用协议')
616619
return

module/Site/Api/Controller/SiteController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class SiteController extends Controller
1212
{
13-
public function get()
13+
public function contact()
1414
{
1515
$data = [];
1616
$data['email'] = modstart_config('Site_ContactEmail', '');

module/Site/Api/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
],
77
], function () use ($router) {
88

9-
$router->match(['post'], 'site/get', 'SiteController@get');
9+
$router->match(['post'], 'site/contact', 'SiteController@contact');
1010

1111
});

module/Site/Docs/release.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.6.0
2+
3+
- 新增:增加联系客服页面 site/contact(支持弹窗)
4+
5+
---
6+
17
## 1.5.0 网站联系信息配置项
28

39
- 新增:网站联系信息配置项
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
@extends($_viewFrame)
2+
3+
@section('pageTitleMain')联系客服@endsection
4+
5+
@section('bodyContent')
6+
7+
{!! \ModStart\ModStart::js('asset/common/clipboard.js') !!}
8+
9+
<div class="ub-container narrow margin-top margin-bottom">
10+
<div class="ub-panel">
11+
<div class="head">
12+
<div class="title">
13+
联系客服
14+
</div>
15+
</div>
16+
<div class="body">
17+
<table class="ub-table">
18+
<tbody>
19+
@if(modstart_config('Site_ContactEmail'))
20+
<tr>
21+
<td>
22+
<div class="btn btn-sm btn-round">
23+
<i class="iconfont icon-email tw-w-6"></i>
24+
</div>
25+
<a target="_blank" href="mailto:{{modstart_config('Site_ContactEmail')}}">
26+
{{modstart_config('Site_ContactEmail')}}
27+
</a>
28+
</td>
29+
</tr>
30+
@endif
31+
@if(modstart_config('Site_ContactPhone'))
32+
<tr>
33+
<td>
34+
<div class="btn btn-sm btn-round">
35+
<i class="iconfont icon-address tw-w-6"></i>
36+
</div>
37+
<a target="_blank" href="tel:{{modstart_config('Site_ContactPhone')}}">
38+
{{modstart_config('Site_ContactPhone')}}
39+
</a>
40+
</td>
41+
</tr>
42+
@endif
43+
@if(modstart_config('Site_ContactAddress'))
44+
<tr>
45+
<td>
46+
<div class="btn btn-sm btn-round">
47+
<i class="iconfont icon-address tw-w-6"></i>
48+
</div>
49+
{{modstart_config('Site_ContactEmail')}}
50+
</td>
51+
</tr>
52+
@endif
53+
@if(modstart_config('Site_ContactQrcode'))
54+
<tr>
55+
<td>
56+
<img src="{{modstart_config('Site_ContactQrcode')}}" class="tw-shadow-lg tw-rounded"
57+
style="max-width:200px;"/>
58+
</td>
59+
</tr>
60+
@endif
61+
</tbody>
62+
</table>
63+
</div>
64+
</div>
65+
</div>
66+
67+
@endsection

0 commit comments

Comments
 (0)