- | {{ item.title }} {{ model_info(item.model) }} |
+
+ {{ item.title }}
+ {{ model_info(item.model) }}
+ |
{{ item.user_count }} |
{{ "%0.1f"|format(item.rating) }} |
diff --git a/app/Http/Home/Views/user/console/orders.volt b/app/Http/Home/Views/user/console/orders.volt
index 140fe31f..d43233e9 100644
--- a/app/Http/Home/Views/user/console/orders.volt
+++ b/app/Http/Home/Views/user/console/orders.volt
@@ -28,7 +28,7 @@
编号：{{ item.sn }}
时间：{{ date('Y-m-d H:i:s',item.create_time) }}
{% if item.promotion_type > 0 %}
- {{ promotion_type(item.promotion_type) }}
+ 促销：{{ promotion_type(item.promotion_type) }}
{% endif %}
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt
index f8c616e4..aa0eb43e 100644
--- a/app/Http/Home/Views/user/show.volt
+++ b/app/Http/Home/Views/user/show.volt
@@ -9,6 +9,7 @@
{% set qrcode_url = url({'for':'home.qrcode'},{'text':full_user_url}) %}
{% set user.area = user.area ? user.area : '火星' %}
{% set user.about = user.about ? user.about : '这个家伙很懒，什么都没留下！' %}
+ {% set avatar_class = user.vip == 1 ? 'avatar vip' : 'avatar' %}
@@ -25,8 +26,7 @@
- {{ vip_info(user.vip) }}
-
+
diff --git a/app/Library/Helper.php b/app/Library/Helper.php
index 424503dd..00b65823 100644
--- a/app/Library/Helper.php
+++ b/app/Library/Helper.php
@@ -184,23 +184,23 @@ function kg_config($path, $defaultValue = null)
}
/**
- * 获取默认头像路径
+ * 获取默认用户头像路径
*
* @return string
*/
-function kg_default_avatar_path()
+function kg_default_user_avatar_path()
{
- return '/img/default/avatar.png';
+ return '/img/default/user_avatar.png';
}
/**
- * 获取默认封面路径
+ * 获取默认群组头像路径
*
* @return string
*/
-function kg_default_cover_path()
+function kg_default_group_avatar_path()
{
- return '/img/default/cover.png';
+ return '/img/default/group_avatar.png';
}
/**
@@ -213,6 +213,16 @@ function kg_default_course_cover_path()
return '/img/default/course_cover.png';
}
+/**
+ * 获取默认课程封面路径
+ *
+ * @return string
+ */
+function kg_default_package_cover_path()
+{
+ return '/img/default/package_cover.png';
+}
+
/**
* 获取默认会员封面路径
*
@@ -223,6 +233,16 @@ function kg_default_vip_cover_path()
return '/img/default/vip_cover.png';
}
+/**
+ * 获取默认礼品封面路径
+ *
+ * @return string
+ */
+function kg_default_gift_cover_path()
+{
+ return '/img/default/gift_cover.png';
+}
+
/**
* 获取存储基准URL
*
@@ -256,29 +276,29 @@ function kg_cos_img_url($path, $style = null)
}
/**
- * 获取头像URL
+ * 获取用户头像URL
*
* @param string $path
* @param string $style
* @return string
*/
-function kg_cos_avatar_url($path, $style = null)
+function kg_cos_user_avatar_url($path, $style = null)
{
- $path = $path ?: kg_default_avatar_path();
+ $path = $path ?: kg_default_user_avatar_path();
return kg_cos_img_url($path, $style);
}
/**
- * 获取封面URL
+ * 获取群组头像URL
*
* @param string $path
* @param string $style
* @return string
*/
-function kg_cos_cover_url($path, $style = null)
+function kg_cos_group_avatar_url($path, $style = null)
{
- $path = $path ?: kg_default_cover_path();
+ $path = $path ?: kg_default_group_avatar_path();
return kg_cos_img_url($path, $style);
}
@@ -297,6 +317,20 @@ function kg_cos_course_cover_url($path, $style = null)
return kg_cos_img_url($path, $style);
}
+/**
+ * 获取套餐封面URL
+ *
+ * @param string $path
+ * @param string $style
+ * @return string
+ */
+function kg_cos_package_cover_url($path, $style = null)
+{
+ $path = $path ?: kg_default_package_cover_path();
+
+ return kg_cos_img_url($path, $style);
+}
+
/**
* 获取会员封面URL
*
@@ -311,6 +345,20 @@ function kg_cos_vip_cover_url($path, $style = null)
return kg_cos_img_url($path, $style);
}
+/**
+ * 获取礼品封面URL
+ *
+ * @param string $path
+ * @param string $style
+ * @return string
+ */
+function kg_cos_gift_cover_url($path, $style = null)
+{
+ $path = $path ?: kg_default_gift_cover_path();
+
+ return kg_cos_img_url($path, $style);
+}
+
/**
* 获取轮播封面URL
*
diff --git a/app/Models/Course.php b/app/Models/Course.php
index bcfc1291..b1ef8060 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -346,7 +346,7 @@ class Course extends Model
$this->score = (float)$this->score;
if (!Text::startsWith($this->cover, 'http')) {
- $this->cover = kg_cos_cover_url($this->cover);
+ $this->cover = kg_cos_course_cover_url($this->cover);
}
if (is_string($this->attrs)) {
diff --git a/app/Models/ImGroup.php b/app/Models/ImGroup.php
index c18fa829..209d6d77 100644
--- a/app/Models/ImGroup.php
+++ b/app/Models/ImGroup.php
@@ -164,7 +164,7 @@ class ImGroup extends Model
public function afterFetch()
{
if (!Text::startsWith($this->avatar, 'http')) {
- $this->avatar = kg_cos_avatar_url($this->avatar);
+ $this->avatar = kg_cos_group_avatar_url($this->avatar);
}
}
diff --git a/app/Models/ImUser.php b/app/Models/ImUser.php
index 8a7bf9dc..f3b9cb63 100644
--- a/app/Models/ImUser.php
+++ b/app/Models/ImUser.php
@@ -133,7 +133,7 @@ class ImUser extends Model
public function afterFetch()
{
if (!Text::startsWith($this->avatar, 'http')) {
- $this->avatar = kg_cos_avatar_url($this->avatar);
+ $this->avatar = kg_cos_user_avatar_url($this->avatar);
}
}
diff --git a/app/Models/Package.php b/app/Models/Package.php
index c24e9c12..a93017ee 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -137,7 +137,7 @@ class Package extends Model
public function afterFetch()
{
if (!Text::startsWith($this->cover, 'http')) {
- $this->cover = kg_cos_cover_url($this->cover);
+ $this->cover = kg_cos_package_cover_url($this->cover);
}
$this->market_price = (float)$this->market_price;
diff --git a/app/Models/PointGift.php b/app/Models/PointGift.php
index 9e0ec7f3..61f27896 100644
--- a/app/Models/PointGift.php
+++ b/app/Models/PointGift.php
@@ -202,7 +202,7 @@ class PointGift extends Model
public function afterFetch()
{
if (!Text::startsWith($this->cover, 'http')) {
- $this->cover = kg_cos_cover_url($this->cover);
+ $this->cover = kg_cos_gift_cover_url($this->cover);
}
if (is_string($this->attrs)) {
diff --git a/app/Models/Upload.php b/app/Models/Upload.php
index ed86f76e..46b06b8c 100644
--- a/app/Models/Upload.php
+++ b/app/Models/Upload.php
@@ -17,6 +17,7 @@ class Upload extends Model
const TYPE_RESOURCE = 4; // 课件资源
const TYPE_IM_IMG = 5; // IM图片
const TYPE_IM_FILE = 6; // IM文件
+ const TYPE_DEFAULT_IMG = 99; // 默认图片
/**
* 主键编号
diff --git a/app/Models/User.php b/app/Models/User.php
index f4d7703c..60601a19 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -226,7 +226,7 @@ class User extends Model
public function afterFetch()
{
if (!Text::startsWith($this->avatar, 'http')) {
- $this->avatar = kg_cos_avatar_url($this->avatar);
+ $this->avatar = kg_cos_user_avatar_url($this->avatar);
}
}
diff --git a/app/Services/Logic/FlashSale/OrderCreate.php b/app/Services/Logic/FlashSale/OrderCreate.php
index 00808266..a9eb7754 100644
--- a/app/Services/Logic/FlashSale/OrderCreate.php
+++ b/app/Services/Logic/FlashSale/OrderCreate.php
@@ -56,8 +56,6 @@ class OrderCreate extends \App\Services\Logic\Order\OrderCreate
$validator->checkIfBoughtCourse($user->id, $course->id);
- $this->handleCoursePromotion();
-
$order = $this->createCourseOrder($course, $user);
} elseif ($sale->item_type == FlashSaleModel::ITEM_PACKAGE) {
@@ -89,24 +87,15 @@ class OrderCreate extends \App\Services\Logic\Order\OrderCreate
}
}
- protected function handleCoursePromotion()
- {
- }
-
- protected function handlePackagePromotion()
- {
- }
-
- protected function handleVipPromotion()
- {
- }
-
protected function decrFlashSaleStock(FlashSaleModel $sale)
{
- if ($sale->stock > 1) {
- $sale->stock -= 1;
- $sale->update();
- }
+ if ($sale->stock < 1) return;
+
+ if ($sale->stock == 1) $sale->published = 0;
+
+ $sale->stock -= 1;
+
+ $sale->update();
}
protected function saveUserOrderCache($userId, $saleId)
diff --git a/app/Services/Logic/FlashSale/SaleList.php b/app/Services/Logic/FlashSale/SaleList.php
index 5b04c205..0764aa44 100644
--- a/app/Services/Logic/FlashSale/SaleList.php
+++ b/app/Services/Logic/FlashSale/SaleList.php
@@ -39,7 +39,7 @@ class SaleList extends Service
foreach ($dates as $date) {
$result[] = [
- 'date' => date('m-d', strtotime($date)),
+ 'date' => date('m / d', strtotime($date)),
'items' => $this->getDateSales($sales, $date),
];
}
diff --git a/app/Services/Logic/Order/OrderInfo.php b/app/Services/Logic/Order/OrderInfo.php
index 17a0ae95..7c91e022 100644
--- a/app/Services/Logic/Order/OrderInfo.php
+++ b/app/Services/Logic/Order/OrderInfo.php
@@ -96,7 +96,7 @@ class OrderInfo extends Service
protected function handleCourseInfo($itemInfo)
{
- $itemInfo['course']['cover'] = kg_cos_cover_url($itemInfo['course']['cover']);
+ $itemInfo['course']['cover'] = kg_cos_course_cover_url($itemInfo['course']['cover']);
return $itemInfo;
}
diff --git a/app/Services/Logic/User/Console/ProfileInfo.php b/app/Services/Logic/User/Console/ProfileInfo.php
index 4a7fd24c..c70c7fbf 100644
--- a/app/Services/Logic/User/Console/ProfileInfo.php
+++ b/app/Services/Logic/User/Console/ProfileInfo.php
@@ -17,7 +17,7 @@ class ProfileInfo extends Service
protected function handleUser(UserModel $user)
{
- $user->avatar = kg_cos_avatar_url($user->avatar);
+ $user->avatar = kg_cos_user_avatar_url($user->avatar);
$user->area = $this->handleArea($user->area);
diff --git a/app/Services/MyStorage.php b/app/Services/MyStorage.php
index 95608ed4..ea0c3491 100644
--- a/app/Services/MyStorage.php
+++ b/app/Services/MyStorage.php
@@ -17,6 +17,11 @@ class MyStorage extends Storage
const MIME_AUDIO = 'audio';
const MIME_FILE = 'file';
+ /**
+ * 上传测试文件
+ *
+ * @return bool|string
+ */
public function uploadTestFile()
{
$key = 'hello_world.txt';
@@ -25,33 +30,110 @@ class MyStorage extends Storage
return $this->putString($key, $value);
}
- public function uploadDefaultAvatar()
+ /**
+ * 上传默认用户头像
+ *
+ * @return false|mixed|string
+ */
+ public function uploadDefaultUserAvatar()
{
- $filename = static_path('admin/img/default_avatar.png');
+ $filename = static_path('admin/img/default/user_avatar.png');
- $key = '/img/default/avatar.png';
+ $key = '/img/default/user_avatar.png';
return $this->putFile($key, $filename);
}
- public function uploadDefaultCover()
+ /**
+ * 上传默认群组头像
+ *
+ * @return false|mixed|string
+ */
+ public function uploadDefaultGroupAvatar()
{
- $filename = static_path('admin/img/default_cover.png');
+ $filename = static_path('admin/img/default/group_avatar.png');
- $key = '/img/default/cover.png';
+ $key = '/img/default/group_avatar.png';
return $this->putFile($key, $filename);
}
+ /**
+ * 上传默认课程封面
+ *
+ * @return false|mixed|string
+ */
+ public function uploadDefaultCourseCover()
+ {
+ $filename = static_path('admin/img/default/course_cover.png');
+
+ $key = '/img/default/course_cover.png';
+
+ return $this->putFile($key, $filename);
+ }
+
+ /**
+ * 上传默认套餐封面
+ *
+ * @return false|mixed|string
+ */
+ public function uploadDefaultPackageCover()
+ {
+ $filename = static_path('admin/img/default/package_cover.png');
+
+ $key = '/img/default/package_cover.png';
+
+ return $this->putFile($key, $filename);
+ }
+
+ /**
+ * 上传默认会员封面
+ *
+ * @return false|mixed|string
+ */
public function uploadDefaultVipCover()
{
- $filename = static_path('admin/img/default_vip_cover.png');
+ $filename = static_path('admin/img/default/vip_cover.png');
$key = '/img/default/vip_cover.png';
return $this->putFile($key, $filename);
}
+ /**
+ * 上传默认礼品封面
+ *
+ * @return false|mixed|string
+ */
+ public function uploadDefaultGiftCover()
+ {
+ $filename = static_path('admin/img/default/gift_cover.png');
+
+ $key = '/img/default/gift_cover.png';
+
+ return $this->putFile($key, $filename);
+ }
+
+ /**
+ * 上传站点LOGO
+ *
+ * @return UploadModel|bool
+ */
+ public function uploadSiteLogo()
+ {
+ return $this->upload('/img/default/', self::MIME_IMAGE, UploadModel::TYPE_DEFAULT_IMG, 'logo.png');
+ }
+
+ /**
+ * 上传站点ICON
+ *
+ * @return UploadModel|bool
+ */
+ public function uploadSiteFavicon()
+ {
+ return $this->upload('/img/default/', self::MIME_IMAGE, UploadModel::TYPE_DEFAULT_IMG, 'favicon.ico');
+ }
+
/**
* 上传封面图片
*
@@ -116,9 +198,10 @@ class MyStorage extends Storage
* @param string $prefix
* @param string $mimeType
* @param int $uploadType
+ * @param string $fileName
* @return UploadModel|bool
*/
- protected function upload($prefix, $mimeType, $uploadType)
+ protected function upload($prefix, $mimeType, $uploadType, $fileName = null)
{
$list = [];
@@ -143,7 +226,13 @@ class MyStorage extends Storage
$name = $this->filter->sanitize($file->getName(), ['trim', 'string']);
$extension = $this->getFileExtension($file->getName());
- $keyName = $this->generateFileName($extension, $prefix);
+
+ if (empty($fileName)) {
+ $keyName = $this->generateFileName($extension, $prefix);
+ } else {
+ $keyName = $prefix . $fileName;
+ }
+
$path = $this->putFile($keyName, $file->getTempName());
$upload = new UploadModel();
diff --git a/app/Services/Refund.php b/app/Services/Refund.php
index 5b0736ad..f3c317cf 100644
--- a/app/Services/Refund.php
+++ b/app/Services/Refund.php
@@ -46,7 +46,7 @@ class Refund extends Service
{
$itemInfo = $order->item_info;
- $itemInfo['course']['cover'] = kg_cos_cover_url($itemInfo['course']['cover']);
+ $itemInfo['course']['cover'] = kg_cos_course_cover_url($itemInfo['course']['cover']);
$serviceFee = $this->getServiceFee($order);
$serviceRate = $this->getServiceRate($order);
@@ -91,7 +91,7 @@ class Refund extends Service
*/
foreach ($itemInfo['courses'] as &$course) {
- $course['cover'] = kg_cos_cover_url($course['cover']);
+ $course['cover'] = kg_cos_course_cover_url($course['cover']);
$refundPercent = 0.00;
$refundAmount = 0.00;
diff --git a/app/Services/Storage.php b/app/Services/Storage.php
index f11c8e78..a7d2fca1 100644
--- a/app/Services/Storage.php
+++ b/app/Services/Storage.php
@@ -248,9 +248,10 @@ class Storage extends Service
*/
protected function generateFileName($extension = '', $prefix = '')
{
+ $randDir = date('Y') . '/' . date('m') . '/';
$randName = date('YmdHis') . rand(100, 999) . rand(100, 999);
- return $prefix . $randName . '.' . $extension;
+ return $prefix . $randDir . $randName . '.' . $extension;
}
/**
diff --git a/db/migrations/20210314045908_schema_202103141300.php b/db/migrations/20210314045908_schema_202103141300.php
index 65778b87..d40a3dec 100644
--- a/db/migrations/20210314045908_schema_202103141300.php
+++ b/db/migrations/20210314045908_schema_202103141300.php
@@ -234,6 +234,7 @@ class Schema202103141300 extends Phinx\Migration\AbstractMigration
->save();
$nav = $this->getQueryBuilder()
+ ->select('*')
->from('kg_nav')
->orderDesc('id')
->execute()->fetch('assoc');
diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css
index 1d9d8779..4b545d0a 100644
--- a/public/static/admin/css/common.css
+++ b/public/static/admin/css/common.css
@@ -2,6 +2,10 @@
margin-right: 10px;
}
+.layui-table .layui-badge {
+ margin-bottom: 3px;
+}
+
.layui-badge, .layui-badge-rim {
padding-bottom: 1px;
}
diff --git a/public/static/admin/img/default/course_cover.png b/public/static/admin/img/default/course_cover.png
new file mode 100644
index 00000000..39ce024e
Binary files /dev/null and b/public/static/admin/img/default/course_cover.png differ
diff --git a/public/static/admin/img/default/gift_cover.png b/public/static/admin/img/default/gift_cover.png
new file mode 100644
index 00000000..6ffabcd3
Binary files /dev/null and b/public/static/admin/img/default/gift_cover.png differ
diff --git a/public/static/admin/img/default/group_avatar.png b/public/static/admin/img/default/group_avatar.png
new file mode 100644
index 00000000..579dc1c6
Binary files /dev/null and b/public/static/admin/img/default/group_avatar.png differ
diff --git a/public/static/admin/img/default/package_cover.png b/public/static/admin/img/default/package_cover.png
new file mode 100644
index 00000000..f1c21d35
Binary files /dev/null and b/public/static/admin/img/default/package_cover.png differ
diff --git a/public/static/admin/img/default/user_avatar.png b/public/static/admin/img/default/user_avatar.png
new file mode 100644
index 00000000..579dc1c6
Binary files /dev/null and b/public/static/admin/img/default/user_avatar.png differ
diff --git a/public/static/admin/img/default_vip_cover.png b/public/static/admin/img/default/vip_cover.png
similarity index 100%
rename from public/static/admin/img/default_vip_cover.png
rename to public/static/admin/img/default/vip_cover.png
diff --git a/public/static/admin/img/default_avatar.png b/public/static/admin/img/default_avatar.png
deleted file mode 100644
index 0344e7a7..00000000
Binary files a/public/static/admin/img/default_avatar.png and /dev/null differ
diff --git a/public/static/admin/img/default_cover.png b/public/static/admin/img/default_cover.png
deleted file mode 100644
index 39069d41..00000000
Binary files a/public/static/admin/img/default_cover.png and /dev/null differ
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index af012e71..e8ff6a1c 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -58,6 +58,10 @@
margin-right: 10px;
}
+.vip img {
+ border: 3px solid orange;
+}
+
.qrcode img {
width: 160px;
height: 160px;
@@ -392,11 +396,18 @@
float: left;
width: 100%;
height: 230px;
+ position: relative;
background-color: #fff;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
}
+.course-card .model {
+ position: absolute;
+ top: 15px;
+ right: 15px;
+}
+
.course-card .cover {
overflow: hidden;
}
@@ -1295,15 +1306,6 @@
border-radius: 100px;
}
-.user-profile .vip {
- position: absolute;
- top: 10px;
- left: 10px;
- height: 16px;
- padding: 0 3px;
- font-size: 10px;
-}
-
.user-profile .info {
float: left;
padding-top: 10px;
@@ -1433,16 +1435,6 @@
font-size: 12px;
}
-.user-card .vip {
- position: absolute;
- top: 10px;
- right: 10px;
- height: 16px;
- line-height: 16px;
- padding: 0 3px;
- font-size: 10px;
-}
-
.user-card .type {
position: absolute;
top: 18px;
@@ -1466,10 +1458,6 @@
height: 220px;
}
-.group-user-list .user-card .avatar {
- margin-top: 10px;
-}
-
.group-list {
margin-bottom: 20px;
}
@@ -1502,6 +1490,7 @@
}
.my-profile-card {
+ margin-bottom: 15px;
text-align: center;
}
@@ -1509,10 +1498,6 @@
margin-bottom: 10px;
}
-.my-profile-card .name {
- margin-bottom: 10px;
-}
-
.my-menu li {
line-height: 30px;
padding-left: 30px;
@@ -1776,14 +1761,6 @@
padding: 0 5px;
}
-.im-user-list .vip {
- top: 8px;
- right: 8px;
- height: 14px;
- line-height: 14px;
- font-size: 10px;
-}
-
.layim-msgbox {
margin: 15px;
}
|