From d263241445ddbb8e947e2e9a386ef8ab520df300 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sat, 15 Apr 2023 11:05:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=98=9F=E5=88=97?=
=?UTF-8?q?=E5=90=8E=E9=87=87=E9=9B=86=E5=95=86=E5=93=81=E7=9A=84=E5=9B=BE?=
=?UTF-8?q?=E7=89=87=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/jobs/ProductCopyJob.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/crmeb/app/jobs/ProductCopyJob.php b/crmeb/app/jobs/ProductCopyJob.php
index 8941bbc59..14ef48cc8 100644
--- a/crmeb/app/jobs/ProductCopyJob.php
+++ b/crmeb/app/jobs/ProductCopyJob.php
@@ -48,7 +48,7 @@ class ProductCopyJob extends BaseJobs
$d_image = 'http://' . ltrim($image, '\//');
}
$description_cache = CacheService::get('desc_images_' . $id);
- if ($description_cache === null) {
+ if ($description_cache === null || $description_cache === '') {
$description_cache = $description;
CacheService::set('desc_images_count' . $id, 0);
}
@@ -64,7 +64,7 @@ class ProductCopyJob extends BaseJobs
CacheService::set('desc_images_count' . $id, $desc_count);
}
} catch (\Throwable $e) {
- Log::error('下载商品详情图片失败,失败原因:' . $e->getMessage());
+ Log::error('下载商品详情图片失败,失败原因:' . $e->getMessage() . '_' . $e->getFile() . '_' . $e->getLine());
}
return true;
}
@@ -86,9 +86,9 @@ class ProductCopyJob extends BaseJobs
//下载图片
$res = $copyTaobao->downloadCopyImage($image);
//获取缓存中的轮播图
- $slider_images = CacheService::get('slider_images_' . $id);
+ $slider_images = CacheService::get('slider_images_' . $id) ?? [];
//缓存为null则赋值[]
- if ($slider_images === null) $slider_images = [];
+ if ($slider_images === null || $slider_images === '') $slider_images = [];
//将下载的图片插入数组
array_push($slider_images, $res);
//如果$slider_images中图片数量和传入的$count相等,说明已经下载完成,写入商品表,如果不等则继续插入缓存
@@ -102,7 +102,7 @@ class ProductCopyJob extends BaseJobs
CacheService::set('slider_images_' . $id, $slider_images);
}
} catch (\Throwable $e) {
- Log::error('下载商品轮播图片失败,失败原因:' . $e->getMessage());
+ Log::error('下载商品轮播图片失败,失败原因:' . $e->getMessage() . '_' . $e->getFile() . '_' . $e->getLine());
}
return true;
}
From 86d1a791f1d685b0ebc6efd1a8213155f19e7a99 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sat, 15 Apr 2023 11:06:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?=
=?UTF-8?q?=E7=AD=89=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=96=B9=E6=8E=A8?=
=?UTF-8?q?=E8=8D=90=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87=E5=88=B7=E6=96=B0?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../users/user_distribution_level/index.vue | 1196 +++++++++--------
1 file changed, 602 insertions(+), 594 deletions(-)
diff --git a/template/uni-app/pages/users/user_distribution_level/index.vue b/template/uni-app/pages/users/user_distribution_level/index.vue
index a21ac9299..9602d00e9 100644
--- a/template/uni-app/pages/users/user_distribution_level/index.vue
+++ b/template/uni-app/pages/users/user_distribution_level/index.vue
@@ -1,595 +1,603 @@
-
-
-
-
-
-
-
-
-
-
-
- {{$t(`快速升级技巧`)}}
-
-
-
-
- {{ taskNum }}
-
-
- /{{ task.length}}
-
-
-
-
-
-
-
-
- {{$t(item.name)}}
-
-
-
- {{item.finish?$t(`已完成`):$t(`未完成`)}}
-
-
-
-
-
- {{item.finish ? '' : $t(item.task_type_title)}}
-
- {{item.new_number}}
- /{{item.number}}
-
-
-
-
-
-
-
-
-
- {{illustrate}}
-
-
-
-
-
-
-
-
-