Skip to content

Commit f844929

Browse files
modstartmodstart
committed
ueditor upgrade
1 parent 4e55cb4 commit f844929

File tree

49 files changed

+386
-135
lines changed

Some content is hidden

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

49 files changed

+386
-135
lines changed

‎module/Member/Lang/en.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
return [
3+
"ChangeAvatar" => "ChangeAvatar",
4+
"ChangePassword" => "ChangePassword",
5+
"Credit" => "Credit",
6+
"MenuAccount" => "MenuAccount",
7+
"MenuLogout" => "MenuLogout",
8+
"MenuMessage" => "MenuMessage",
9+
"MenuSecurity" => "MenuSecurity",
10+
"MenuWallet" => "MenuWallet",
11+
"My" => "My"
12+
];

‎module/Member/View/pc/memberVip/indexDialog.blade.php‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
@section('headAppend')
1212
@parent
1313
<style>
14-
.vip-list .item .item-active-show{ display:none; }
15-
.vip-list .item.active .item-active-show{ display:block; }
14+
.vip-list .item .item-active-show {
15+
display: none;
16+
}
17+
18+
.vip-list .item.active .item-active-show {
19+
display: block;
20+
}
1621
</style>
1722
@endsection
1823

@@ -42,17 +47,13 @@
4247
</div>
4348
<div class="tw-mt-1">
4449
@if(empty($_memberUser))
45-
<a href="{{modstart_web_url('login',['redirect'=>\ModStart\Core\Input\Request::currentPageUrl()])}}"
50+
<a href="{{modstart_web_url('login',['dialog'=>1,'redirect'=>\ModStart\Core\Input\Request::currentPageUrl()])}}"
4651
class="vip-button">
4752
注册/登录
4853
</a>
4954
@else
50-
<a href="{{modstart_web_url('member')}}"
51-
class="vip-button">
52-
用户中心
53-
</a>
5455
@if(!empty(\Module\Member\Auth\MemberVip::get()))
55-
<div class="tw-inline-block tw-ml-3">
56+
<div class="tw-inline-block">
5657
您当前是
5758
<span class="vip-text ub-text-bold">
5859
{{\Module\Member\Auth\MemberVip::get('title')}}
@@ -67,23 +68,29 @@ class="vip-button">
6768
</div>
6869
</div>
6970
<div class="tw-text-right tw-flex-grow">
70-
&nbsp;
71+
@if(\Module\Member\Auth\MemberUser::isLogin())
72+
<a href="{{modstart_web_url('member')}}"
73+
class="vip-button tw-mr-3">
74+
用户中心
75+
</a>
76+
@endif
7177
</div>
7278
</div>
7379
</div>
7480
</div>
7581
<div class="body">
7682
<div class="pb-member-vip">
7783
<form action="{{$__msRoot}}api/member_vip/buy" method="post" data-ajax-form>
78-
<input type="hidden" name="redirect" value="{{\ModStart\Core\Input\Request::currentPageUrl()}}" />
79-
<input type="hidden" name="vipId" value="0" />
80-
<input type="hidden" name="voucherId" value="0" />
84+
<input type="hidden" name="redirect" value="{{\ModStart\Core\Input\Request::currentPageUrl()}}"/>
85+
<input type="hidden" name="vipId" value="0"/>
86+
<input type="hidden" name="voucherId" value="0"/>
8187
<div class="vip-list-container-box margin-bottom">
8288
<div class="vip-list-container">
8389
<div class="vip-list vip-bg tw-rounded">
8490
@foreach($memberVips as $memberVip)
8591
@if(!$memberVip['isDefault'])
86-
<div class="item tw-relative" data-vip-id="{{$memberVip['id']}}" style="padding:1rem 5px;">
92+
<div class="item tw-relative" data-vip-id="{{$memberVip['id']}}"
93+
style="padding:1rem 5px;">
8794
<div class="tw-text-xl tw-font-bold margin-bottom tw-pt-2">
8895
{{$memberVip['title']}}
8996
</div>
@@ -100,7 +107,8 @@ class="vip-button">
100107
{{$memberVip['desc']?$memberVip['desc']:'[会员简要说明]'}}
101108
</div>
102109
@if($memberVip['priceMarket']>$memberVip['price'])
103-
<div class="item-active-show tw-absolute tw-left-0 tw-top-0 tw-p-1 tw-text-sm tw-bg-red-500 tw-rounded-tl-lg tw-rounded-br-lg tw-text-white">
110+
<div
111+
class="item-active-show tw-absolute tw-left-0 tw-top-0 tw-p-1 tw-text-sm tw-bg-red-500 tw-rounded-tl-lg tw-rounded-br-lg tw-text-white">
104112
限时立减 {{bcsub($memberVip['priceMarket'],$memberVip['price'],2)}}
105113
</div>
106114
@endif
@@ -115,7 +123,7 @@ class="btn btn-block btn-lg btn-vip btn-round">
115123
@else
116124
<a class="btn btn-block btn-lg btn-vip btn-round"
117125
target="_parent"
118-
href="{{modstart_web_url('login',['redirect'=>\ModStart\Core\Input\Request::currentPageUrl()])}}">
126+
href="{{modstart_web_url('login',['dialog'=>1,'redirect'=>\ModStart\Core\Input\Request::currentPageUrl()])}}">
119127
<i class="iconfont icon-vip"></i>
120128
登录后开通
121129
</a>
@@ -133,16 +141,19 @@ class="btn btn-block btn-lg btn-vip btn-round">
133141
</a>
134142
</div>
135143
</div>
136-
<div class="lg:tw-px-12 lg:tw-text-left tw-text-center tw-py-4 vip-bg tw-rounded margin-bottom tw-flex lg:tw-flex-row tw-flex-col tw-items-center">
144+
<div
145+
class="lg:tw-px-12 lg:tw-text-left tw-text-center tw-py-4 vip-bg tw-rounded margin-bottom tw-flex lg:tw-flex-row tw-flex-col tw-items-center">
137146
<div class="tw-flex-grow">
138147
@if(!empty($memberVipRights))
139148
<div class="vip-bg tw-py-3 margin-bottom tw-rounded-lg" data-vip-right-list>
140149
<div class="row">
141150
@foreach($memberVipRights as $r)
142-
<div class="col-md-4 col-6" style="display:none;" data-vip-right="{{join(',',$r['vipIds'])}}">
151+
<div class="col-md-4 col-6" style="display:none;"
152+
data-vip-right="{{join(',',$r['vipIds'])}}">
143153
<div class="tw-flex tw-items-center ub-text-sm margin-bottom">
144154
<div class="tw-pr-2">
145-
<img class="tw-w-8 tw-h-8 tw-object-cover tw-rounded-full" src="{{$r['image']}}" />
155+
<img class="tw-w-8 tw-h-8 tw-object-cover tw-rounded-full"
156+
src="{{$r['image']}}"/>
146157
</div>
147158
<div>
148159
<div class="vip-text">{{$r['title']}}</div>
@@ -157,12 +168,16 @@ class="btn btn-block btn-lg btn-vip btn-round">
157168
</div>
158169
<div>
159170
<div class="tw-inline-block tw-py-1 tw-px-3">
160-
<div data-vip-open-list class="swiper tw-overflow-hidden tw-h-48 tw-w-64 tw--mb-3" style="overflow:hidden;">
171+
<div data-vip-open-list class="swiper tw-overflow-hidden tw-h-48 tw-w-64 tw--mb-3"
172+
style="overflow:hidden;">
161173
<div class="swiper-wrapper">
162174
@foreach(modstart_config('Member_VipOpenUsers',[]) as $u)
163175
<div class="swiper-slide">
164-
<div class="tw-flex tw-items-center tw-bg-white tw-rounded-full tw-px-3 tw-py-1">
165-
<div class="tw-w-20 tw-text-left">{{mb_substr($u['name'],0,2)}}******</div>
176+
<div
177+
class="tw-flex tw-items-center tw-bg-white tw-rounded-full tw-px-3 tw-py-1">
178+
<div class="tw-w-20 tw-text-left">{{mb_substr($u['name'],0,2)}}
179+
******
180+
</div>
166181
<div class="tw-w-8 tw-text-yellow-400">{{$u['time']}}</div>
167182
<div class="tw-w-32 tw-text-right">购买了 {{$u['title']}}</div>
168183
</div>

‎module/Vendor/Admin/Controller/SecurityController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function secondVerify(AdminPage $page)
3434
$password = $data['password'];
3535
$passwordCorrectMd5 = modstart_config('Vendor_SecuritySecondVerifyPassword');
3636
BizException::throwsIf('密码不正确', md5($password) != $passwordCorrectMd5);
37-
Session::set('Vendor_SecuritySecondVerifyTime', time() + 3600);
37+
Session::put('Vendor_SecuritySecondVerifyTime', time() + 3600);
3838
return Response::send(0, null, null, $redirect);
3939
});
4040
}

‎module/Vendor/Tecmz/TecmzUtil.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
class TecmzUtil
77
{
8-
public static function url()
8+
public static function url($module = null)
99
{
10-
return 'https://api.tecmz.com';
10+
return 'https://api.tecmz.com' . ($module ? '/m/' . $module : '');
1111
}
1212

1313
/**

‎module/Vendor/Traits/SecurityTrait.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ private function checkSecuritySecondVerify()
2424
]));
2525
exit();
2626
}
27-
Session::set('Vendor_SecuritySecondVerifyTime', time() + 3600);
27+
Session::put('Vendor_SecuritySecondVerifyTime', time() + 3600);
2828
}
2929
}

‎public/asset/common/editor.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.

‎public/asset/common/photoswipe.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.

‎public/asset/common/share.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.

‎public/asset/vendor/ueditor/dialogs/attachment/attachment.html‎

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

5656
</div>
5757
</div>
58-
<script type="text/javascript" src="attachment.js?b17a61b0"></script>
58+
<script type="text/javascript" src="attachment.js?30c88b65"></script>
5959

6060
</body>
6161
</html>

0 commit comments

Comments
 (0)