Skip to content

Commit bf8f693

Browse files
committed
feat: image util, complex field number support, style optimized
1 parent 3b6870a commit bf8f693

Some content is hidden

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

51 files changed

+2654
-213
lines changed

module/Blog/View/pc/blog/message.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
style="background-image:url({{$record['_memberUser']['avatar']}})"></div>
3838
@else
3939
<div class="ub-cover-1-1 tw-rounded-full"
40-
style="background-image:url( @asset('asset/image/avatar.png') )"></div>
40+
style="background-image:url( @asset('asset/image/avatar.svg') )"></div>
4141
@endif
4242
</div>
4343
<div class="tw-flex-grow tw-ml-4">
@@ -87,7 +87,7 @@
8787
<div class="pb-blog-comment">
8888
<div class="tw-flex">
8989
<div class="tw-w-10">
90-
<div class="ub-cover-1-1 tw-rounded-full" style="background-image:url({{\ModStart\Core\Assets\AssetsUtil::fixOrDefault(empty($_memberUser)?'':$_memberUser['avatar'],'asset/image/avatar.png')}})"></div>
90+
<div class="ub-cover-1-1 tw-rounded-full" style="background-image:url({{\ModStart\Core\Assets\AssetsUtil::fixOrDefault(empty($_memberUser)?'':$_memberUser['avatar'],'asset/image/avatar.svg')}})"></div>
9191
</div>
9292
<div class="tw-flex-grow tw-leading-10 tw-ml-4 tw-text-lg">
9393
@if(!empty($_memberUser))

module/Vendor/Tecmz/Tecmz.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,22 @@ public function docToImageQuery($jobId)
200200
}
201201

202202

203-
public function imageCompress($format, $imageData)
203+
public function imageCompress($format, $imageData = null, $imageUrl = null, $name = null, $param = [])
204204
{
205205
$ret = $this->request('/image_compress/prepare', []);
206-
if (Response::isError($ret)) {
206+
if (Response::isError($ret)) {
207207
return $ret;
208208
}
209209
$post = [];
210210
$post['format'] = $format;
211-
$post['imageData'] = base64_encode($imageData);
211+
if (!empty($imageData)) {
212+
$post['imageData'] = base64_encode($imageData);
213+
}
214+
if (!empty($imageUrl)) {
215+
$post['imageUrl'] = $imageUrl;
216+
}
217+
$post['name'] = $name;
218+
$post['param'] = json_encode($param, JSON_UNESCAPED_UNICODE);
212219
$server = $ret['data']['server'];
213220
$ret = CurlUtil::postJSONBody($server, $post);
214221
if (Response::isError($ret)) {

module/Vendor/Util/ApiUtil.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ public static function config()
2626
$data['siteFavIco'] = AssetsUtil::fixFull($config->get('siteFavIco'));
2727
$data['siteBeian'] = $config->get('siteBeian');
2828
$data['siteCDN'] = AssetsUtil::fixFull(AssetsUtil::cdn(), false);
29-
29+
3030
$data['modules'] = ModuleManager::listAllEnableModuleNames();
3131

3232
$data['payAlipayOn'] = $config->getBoolean('payAlipayOn');
3333
$data['payAlipayWebOn'] = $config->getBoolean('payAlipayWebOn');
3434
$data['payWechatOn'] = $config->getBoolean('payWechatOn');
35+
$data['payMemberMoneyOn'] = $config->getBoolean('payMemberMoneyOn');
3536

3637
$data['dataUpload'] = [];
3738
$data['dataUpload'] = [

public/asset/common/base.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/editorMarkdown.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/file.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/common/uploadButton.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/entry/importExportWork.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.

0 commit comments

Comments
 (0)