yunzerwebsite/unicornshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yunzerwebsite:ee39010d5ea1df952a95afa8fb6c7fca34d7a8cd
Branches Tags
yunzerwebsite:master
..
compare: yunzerwebsite:8f4504441127ffbbb5a82e9d694f28be36b8528e
Branches Tags
yunzerwebsite:master

No commits in common. "ee39010d5ea1df952a95afa8fb6c7fca34d7a8cd" and "8f4504441127ffbbb5a82e9d694f28be36b8528e" have entirely different histories.
ee39010d5e ... 8f45044411

16 changed files with 22 additions and 22 deletions
Show Stats Expand all files Collapse all files

2
app/Admin/Forms/EmailTest.php
View File

@ -37,7 +37,7 @@ class EmailTest extends Form
'username' => $sysConfig['username'] ?? '',
'from' => [
'address' => $sysConfig['from_address'] ?? '',
'name' => $sysConfig['from_name'] ?? '云泽发卡'
'name' => $sysConfig['from_name'] ?? '独角发卡'
],
'password' => $sysConfig['password'] ?? '',
'encryption' => $sysConfig['encryption'] ?? 'ssl'

2
app/Jobs/BarkPush.php
View File

@ -76,7 +76,7 @@ class BarkPush implements ShouldQueue
. __('order.fields.order_created') .': '.$this->order->created_at,
"icon"=>url('assets/common/images/default.jpg'),
"level"=>"timeSensitive",
"group"=>dujiaoka_config_get('text_logo', '云泽数卡')
"group"=>dujiaoka_config_get('text_logo', '独角数卡')
];
if (dujiaoka_config_get('is_open_bark_push_url', 0) == BaseModel::STATUS_OPEN) {
$params["url"] = url('detail-order-sn/'.$this->order->order_sn);

2
app/Jobs/MailSend.php
View File

@ -65,7 +65,7 @@ class MailSend implements ShouldQueue
'username' => $sysConfig['username'] ?? '',
'from' => [
'address' => $sysConfig['from_address'] ?? '',
'name' => $sysConfig['from_name'] ?? '云泽发卡'
'name' => $sysConfig['from_name'] ?? '独角发卡'
],
'password' => $sysConfig['password'] ?? '',
'encryption' => $sysConfig['encryption'] ?? ''

2
app/Listeners/OrderUpdated.php
View File

@ -34,7 +34,7 @@ class OrderUpdated
$order = [
'created_at' => date('Y-m-d H:i'),
'ord_title' => $event->order->title,
'webname' => $sysCache['text_logo'] ?? '云泽数卡',
'webname' => $sysCache['text_logo'] ?? '独角数卡',
'weburl' => config('app.url'),
'order_id' => $event->order->order_sn,
'ord_price' => $event->order->actual_price,

4
app/Service/OrderProcessService.php
View File

@ -459,7 +459,7 @@ class OrderProcessService
$mailData = [
'created_at' => $order->create_at,
'product_name' => $order->goods->gd_name,
'webname' => dujiaoka_config_get('text_logo', '云泽数卡'),
'webname' => dujiaoka_config_get('text_logo', '独角数卡'),
'weburl' => config('app.url') ?? 'http://dujiaoka.com',
'ord_info' => str_replace(PHP_EOL, '<br/>', $order->info),
'ord_title' => $order->title,
@ -508,7 +508,7 @@ class OrderProcessService
$mailData = [
'created_at' => $order->create_at,
'product_name' => $order->goods->gd_name,
'webname' => dujiaoka_config_get('text_logo', '云泽数卡'),
'webname' => dujiaoka_config_get('text_logo', '独角数卡'),
'weburl' => config('app.url') ?? 'http://dujiaoka.com',
'ord_info' => implode('<br/>', $carmisInfo),
'ord_title' => $order->title,

8
config/admin.php
View File

@ -11,7 +11,7 @@ return [
| login page.
|
*/
'name' => '云泽数卡',
'name' => '独角数卡',
/*
|--------------------------------------------------------------------------
@ -22,7 +22,7 @@ return [
| `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
|
*/
'logo' => '<img src="/vendor/dujiaoka-admin/images/logo.png" width="35"> &nbsp;云泽 数卡',
'logo' => '<img src="/vendor/dujiaoka-admin/images/logo.jpg" width="35"> &nbsp;独角 数卡',
/*
|--------------------------------------------------------------------------
@ -34,7 +34,7 @@ return [
| '<img src="http://logo-url" alt="Admin logo">'.
|
*/
'logo-mini' => '<img src="/vendor/dujiaoka-admin/images/logo.png">',
'logo-mini' => '<img src="/vendor/dujiaoka-admin/images/logo.jpg">',
/*
|--------------------------------------------------------------------------
@ -88,7 +88,7 @@ return [
| Html title for all pages.
|
*/
'title' => '云泽数卡 - 后台控制中心',
'title' => '独角数卡 - 后台控制中心',
/*
|--------------------------------------------------------------------------

2
config/dujiaoka.php
View File

@ -11,7 +11,7 @@ return [
'dujiaoka_version' => '2.0.6',
// 模板集合
'templates' => [
'unicorn' => '官方[unicorn-云泽兽]',
'unicorn' => '官方[unicorn-独角兽]',
'luna' => 'Luna[Julyssn]',
'hyper' => 'hyper[Bimoe]'
],

2
public/assets/hyper/js/hyper.js vendored
View File

@ -63,7 +63,7 @@ $(function() {
localStorage.setItem("announcement",setTime);
}
// 版权
console.group("Faka");console.log("Name: 云泽数卡");console.log("Github: https://github.com/assimon/dujiaoka");console.groupEnd();
console.group("Faka");console.log("Name: 独角数卡");console.log("Github: https://github.com/assimon/dujiaoka");console.groupEnd();
console.group("Theme");console.log("Name: Hyper Theme");console.log("Author: Bimoes");console.groupEnd();
});
// 图片懒加载

BIN
public/vendor/dujiaoka-admin/images/logo.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
public/vendor/dujiaoka-admin/images/logo.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 150 KiB

4
resources/views/admin/dashboard/title.blade.php
View File

@ -27,10 +27,10 @@
<div class="dashboard-title card bg-primary">
<div class="card-body">
<div class="text-center ">
<img class="avatar img-circle shadow mt-1" src="/vendor/dujiaoka-admin/images/logo.png">
<img class="avatar img-circle shadow mt-1" src="/vendor/dujiaoka-admin/images/logo.jpg">
<div class="text-center mb-1">
<h1 class="mb-3 mt-2 text-white">云泽数卡 V{{ config('dujiaoka.dujiaoka_version', '2.0.0') }}</h1>
<h1 class="mb-3 mt-2 text-white">独角数卡 V{{ config('dujiaoka.dujiaoka_version', '2.0.0') }}</h1>
<div class="links">
<a href="https://github.com/assimon/dujiaoka" target="_blank">Github</a>
<a href="//shang.qq.com/wpa/qunwpa?idkey=37b6b06f7c941dae20dcd5784088905d6461064d7f33478692f0c4215546cee0" id="qq-group-link" target="_blank">

6
resources/views/common/install.blade.php
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>云泽数卡安装程序</title>
<title>独角数卡安装程序</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
<meta name="renderer" content="webkit">
@ -685,7 +685,7 @@ TkSuQmCC" />
</svg>
</h1>
<h2>云泽数卡 「{{ config('dujiaoka.dujiaoka_version') }}」</h2>
<h2>独角数卡 「{{ config('dujiaoka.dujiaoka_version') }}」</h2>
<div>
<p>每个梦想的路上，一起前行....！
@ -745,7 +745,7 @@ TkSuQmCC" />
<div class="form-group">
<div class="form-field">
<label>网站名称</label>
<input type="title" value="云泽数卡" name="title" required="">
<input type="title" value="独角数卡" name="title" required="">
</div>
<div class="form-field">

2
resources/views/hyper/layouts/_footer.blade.php
View File

@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="footer-links">
Powered by <a href="https://github.com/assimon/dujiaoka">@云泽数卡.</a>
Powered by <a href="https://github.com/assimon/dujiaoka">@独角数卡.</a>
</div>
</div>
<div class="col-md-6">

4
resources/views/luna/README.md
View File

@ -1,6 +1,6 @@
## 云泽数卡 - Luna模板
## 独角数卡 - Luna模板
一套简洁的云泽数卡模板
一套简洁的独角数卡模板
## 特殊用法

2
resources/views/luna/layouts/_footer.blade.php
View File

@ -2,7 +2,7 @@
<div class="layui-row">
<div class="layui-col-md8 layui-col-md-offset2 layui-col-sm12">
<div style="text-align: center">{!! dujiaoka_config_get('footer') !!}</div>
<p>Powered by <a href="https://github.com/assimon/dujiaoka" target="_blank">@云泽数卡.DJK</a></p>
<p>Powered by <a href="https://github.com/assimon/dujiaoka" target="_blank">@独角数卡.DJK</a></p>
</div>
</div>
</div>

2
resources/views/unicorn/layouts/_footer.blade.php
View File

@ -3,7 +3,7 @@
<div class="row">
<div class="col-12 text-center">
<div class="author">
Powered by：<a href="http://dujiaoka.com">@云泽数卡</a>
Powered by：<a href="http://dujiaoka.com">@独角数卡</a>
</div>
<div class="custom">
{!! dujiaoka_config_get('footer') !!}