{{$t(`拼团中，还差`)}}{{ count }}{{$t(`人拼团成功`)}}
- ![]()
+ ![]()
+ {{$t(`团长`)}}
+
+
![]()
@@ -634,8 +637,9 @@
title: that.$t(`您的好友`) + that.userInfo.nickname + that.$t(`邀请您参团`) + that.storeCombination.title,
desc: that.storeCombination.title,
link: window.location.protocol + '//' + window.location.host +
- '/pages/activity/goods_combination_status/index?id=' + that.pinkId + '&bargain=' + that.userInfo.uid +
- '&spid=' +
+ '/pages/activity/goods_combination_status/index?id=' + that.pinkId + '&bargain=' + that
+ .userInfo.uid +
+ '&spid=' +
that.userInfo.uid,
imgUrl: that.storeCombination.image
};
@@ -838,6 +842,23 @@
margin: 0 0 29rpx 35rpx;
}
+ .group-con .wrapper .list .pictrue {
+ position: relative;
+ }
+
+ .group-con .wrapper .list .pictrue .dumpling {
+ width: 72rpx;
+ height: 32rpx;
+ font-size: 18rpx;
+ text-align: center;
+ color: #fff;
+ top: -12rpx;
+ right: -20rpx;
+ border-radius: 18rpx;
+ position: absolute;
+ background-color: var(--view-theme);
+ }
+
.group-con .wrapper .list .pictrue img,
.group-con .wrapper .list .pictrue image {
width: 100%;
@@ -931,6 +952,7 @@
position: relative;
}
+
.group-con .group-recommend .list .item .pictrue img {
width: 100%;
height: 100%;
From 53ac7b1b8face258d15ba9c6fdcb2e6268a256de Mon Sep 17 00:00:00 2001
From: From-wh
Date: Wed, 7 Jun 2023 15:56:11 +0800
Subject: [PATCH 16/48] =?UTF-8?q?improve:=20=E5=95=86=E5=93=81title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../uni-app/components/orderGoods/index.vue | 2 +-
.../pages/activity/goods_seckill/index.vue | 2 +-
.../pages/goods/order_details/index.vue | 44 ++++++++-----------
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/template/uni-app/components/orderGoods/index.vue b/template/uni-app/components/orderGoods/index.vue
index 6a3687446..2fb249a21 100644
--- a/template/uni-app/components/orderGoods/index.vue
+++ b/template/uni-app/components/orderGoods/index.vue
@@ -29,7 +29,7 @@
- {{item.productInfo.store_name}}
+ {{item.productInfo.store_name}}
x {{item.cart_num}}
{{item.productInfo.attrInfo.suk}}
diff --git a/template/uni-app/pages/activity/goods_seckill/index.vue b/template/uni-app/pages/activity/goods_seckill/index.vue
index f1c199f26..728f33d63 100644
--- a/template/uni-app/pages/activity/goods_seckill/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill/index.vue
@@ -29,7 +29,7 @@
- {{item.title}}
+ {{item.title}}
{{$t(`￥`)}}
{{item.price}}
{{$t(`￥`)}}{{item.ot_price}}
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 09625e51b..850fd9c48 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -1166,32 +1166,24 @@
},
cancelOrder() {
let self = this
- uni.showModal({
- title: this.$t(`提示`),
- content: this.$t(`确认取消该订单`),
- success: function(res) {
- if (res.confirm) {
- orderCancel(self.orderInfo.order_id)
- .then((data) => {
- // #ifndef MP
- self.$util.Tips({
- title: data.msg
- }, {
- tab: 3
- })
- // #endif
- // #ifdef MP
- self.$util.Tips({
- title: data.msg
- }, '/pages/goods/order_list/index');
- // #endif
- })
- .catch(() => {
- self.getOrderInfo();
- });
- } else if (res.cancel) {}
- }
- });
+ orderCancel(self.orderInfo.order_id)
+ .then((data) => {
+ // #ifndef MP
+ self.$util.Tips({
+ title: data.msg
+ }, {
+ tab: 3
+ })
+ // #endif
+ // #ifdef MP
+ self.$util.Tips({
+ title: data.msg
+ }, '/pages/goods/order_list/index');
+ // #endif
+ })
+ .catch(() => {
+ self.getOrderInfo();
+ });
},
}
}
From 7cc81db7211db1f0f51b7a959674860c410aacd9 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Wed, 7 Jun 2023 16:02:13 +0800
Subject: [PATCH 17/48] =?UTF-8?q?style:=20=E5=9B=A2=E9=95=BF=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../uni-app/pages/activity/goods_combination_status/index.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/template/uni-app/pages/activity/goods_combination_status/index.vue b/template/uni-app/pages/activity/goods_combination_status/index.vue
index 4898c05c5..0ffb4ba76 100644
--- a/template/uni-app/pages/activity/goods_combination_status/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_status/index.vue
@@ -829,7 +829,6 @@
.group-con .wrapper .list.result {
max-height: 240rpx;
- overflow: hidden;
}
.group-con .wrapper .list.result.on {
From 3fc91fdf9fd0ad1dd0822d5cd316f1e7a1a89c5a Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Wed, 7 Jun 2023 16:32:37 +0800
Subject: [PATCH 18/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8D=8E?=
=?UTF-8?q?=E4=B8=BA=E4=BA=91=E5=92=8C=E5=A4=A9=E7=BF=BC=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/crmeb/services/upload/Upload.php | 1 +
.../services/upload/extend/obs/Client.php | 3 +-
crmeb/crmeb/services/upload/storage/Obs.php | 106 +++++-------------
crmeb/crmeb/services/upload/storage/Tyoss.php | 18 +--
4 files changed, 37 insertions(+), 91 deletions(-)
diff --git a/crmeb/crmeb/services/upload/Upload.php b/crmeb/crmeb/services/upload/Upload.php
index 6b26ab177..150fabbf9 100644
--- a/crmeb/crmeb/services/upload/Upload.php
+++ b/crmeb/crmeb/services/upload/Upload.php
@@ -21,6 +21,7 @@ use think\facade\Config;
* @mixin \crmeb\services\upload\storage\COS
* @mixin \crmeb\services\upload\storage\Qiniu
* @mixin \crmeb\services\upload\storage\Jdoss
+ * @mixin \crmeb\services\upload\storage\Tyoss
*/
class Upload extends BaseManager
{
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index 9edfdf750..9f1993f37 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -368,7 +368,8 @@ class Client extends BaseClient
*/
protected function getRequestUrl(string $bucket, string $region)
{
- return $bucket . '.obs.' . $region . '.myhuaweicloud.com';
+// return $bucket . '.obs.' . $region . '.myhuaweicloud.com'; // 华为
+ return $bucket . '.obs.' . $region . '.ctyun.cn'; // 天翼
}
/**
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index 270eec724..aa0c017f1 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -160,15 +160,6 @@ class Obs extends BaseUpload
}
$this->storageRegion = $region;
$app = $this->app();
- //检测桶
- try {
- $app->headBucket($name, $region);
- } catch (\Throwable $e) {
- //桶不存在返回404
- if (strstr('404', $e->getMessage())) {
- return $this->setError('COS:' . $e->getMessage());
- }
- }
//创建桶
try {
$res = $app->createBucket($name, $region, $acl);
@@ -185,72 +176,7 @@ class Obs extends BaseUpload
public function getRegion()
{
- return [
- [
- 'value' => 'oos-hazz',
- 'label' => '郑州'
- ],
- [
- 'value' => 'oos-lnsy',
- 'label' => '沈阳'
- ],
- [
- 'value' => 'oos-sccd',
- 'label' => '四川成都'
- ],
- [
- 'value' => 'oos-xjwlmq',
- 'label' => '乌鲁木齐'
- ],
- [
- 'value' => 'oos-xjwlmq',
- 'label' => '乌鲁木齐'
- ],
- [
- 'value' => 'oos-gslz',
- 'label' => '甘肃兰州'
- ],
- [
- 'value' => 'oos-sdqd',
- 'label' => '山东青岛'
- ],
- [
- 'value' => 'oos-gzgy',
- 'label' => '贵州贵阳'
- ],
- [
- 'value' => 'oos-hbwh',
- 'label' => '湖北武汉'
- ],
- [
- 'value' => 'oos-xzls',
- 'label' => '西藏拉萨'
- ],
- [
- 'value' => 'oos-hbwh',
- 'label' => '湖北武汉'
- ],
- [
- 'value' => 'oos-ahwh',
- 'label' => '安徽芜湖'
- ],
- [
- 'value' => 'oos-gdsz',
- 'label' => '广东深圳'
- ],
- [
- 'value' => 'oos-jssz',
- 'label' => '江苏苏州'
- ],
- [
- 'value' => 'oos-sh2',
- 'label' => '上海2'
- ],
- [
- 'value' => 'cn-snxy1',
- 'label' => '西安2'
- ]
- ];
+ return $this->app()->getRegion();
}
public function deleteBucket(string $name, string $region = '')
@@ -263,9 +189,37 @@ class Obs extends BaseUpload
}
}
+ public function getDomian($name, $region)
+ {
+ try {
+ $res = $this->app()->GetBucketDomain($name, $region);
+ $domainRules = $res->toArray()['ListBucketCustomDomainsResult '];
+ return array_column($domainRules, 'Name');
+ } catch (\Throwable $e) {
+ }
+ return [];
+ }
+
public function bindDomian(string $name, string $domain, string $region = null)
{
- // TODO: Implement bindDomian() method.
+ $parseDomin = parse_url($domain);
+ try {
+ $res = $this->app()->putBucketDomain($name, '', [
+ 'domainname' => $parseDomin['host'],
+ ]);
+ if (method_exists($res, 'toArray')) {
+ $res = $res->toArray();
+ }
+ if ($res['RequestId'] ?? null) {
+ return true;
+ }
+ } catch (\Throwable $e) {
+ if ($message = $this->setMessage($e->getMessage())) {
+ return $this->setError($message);
+ }
+ return $this->setError($e->getMessage());
+ }
+ return false;
}
public function setBucketCors(string $name, string $region)
diff --git a/crmeb/crmeb/services/upload/storage/Tyoss.php b/crmeb/crmeb/services/upload/storage/Tyoss.php
index aa0aaef96..4c50204fd 100644
--- a/crmeb/crmeb/services/upload/storage/Tyoss.php
+++ b/crmeb/crmeb/services/upload/storage/Tyoss.php
@@ -160,24 +160,10 @@ class Tyoss extends BaseUpload
}
$this->storageRegion = $region;
$app = $this->app();
- //检测桶
- try {
- $app->headBucket($name, $region);
- } catch (\Throwable $e) {
- //桶不存在返回404
- if (strstr('404', $e->getMessage())) {
- return $this->setError('COS:' . $e->getMessage());
- }
- }
//创建桶
try {
$res = $app->createBucket($name, $region, $acl);
} catch (\Throwable $e) {
- if (strstr('[curl] 6', $e->getMessage())) {
- return $this->setError('COS:无效的区域!!');
- } else if (strstr('Access Denied.', $e->getMessage())) {
- return $this->setError('COS:无权访问');
- }
return $this->setError('COS:' . $e->getMessage());
}
return $res;
@@ -245,6 +231,10 @@ class Tyoss extends BaseUpload
[
'value' => 'oos-sh2',
'label' => '上海2'
+ ],
+ [
+ 'value' => 'cn-snxy1',
+ 'label' => '西安2'
]
];
}
From 91a20603503d74c40f6e35e3c176d5479712c6f9 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 7 Jun 2023 16:34:20 +0800
Subject: [PATCH 19/48] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../activity/combination/StorePinkServices.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php
index f17b9193f..9715a4f06 100644
--- a/crmeb/app/services/activity/combination/StorePinkServices.php
+++ b/crmeb/app/services/activity/combination/StorePinkServices.php
@@ -97,7 +97,7 @@ class StorePinkServices extends BaseServices
*/
public function getPinkMember(int $id)
{
- return $this->dao->getList(['k_id' => $id, 'is_refund' => 0]);
+ return $this->dao->getList(['k_id' => $id]);
}
/**
@@ -130,15 +130,15 @@ class StorePinkServices extends BaseServices
$res11 = $this->dao->update($id, ['k_id' => $kCount['id']], 'k_id');
$res12 = $this->dao->update($kCount['id'], ['stop_time' => $count['add_time'] + 86400, 'k_id' => 0]);
$res1 = $res11 && $res12;
- $res2 = $this->dao->update($id, ['stop_time' => time() - 1, 'k_id' => 0, 'is_refund' => $kCount['id'], 'status' => 3]);
+ $res2 = $this->dao->update($id, ['stop_time' => time() - 1, 'k_id' => $kCount['id'], 'is_refund' => $kCount['id'], 'status' => 3]);
} else {
$res1 = true;
- $res2 = $this->dao->update($id, ['stop_time' => time() - 1, 'k_id' => 0, 'is_refund' => $id, 'status' => 3]);
+ $res2 = $this->dao->update($id, ['stop_time' => time() - 1, 'is_refund' => $id, 'status' => 3]);
}
//修改结束时间为前一秒 团长ID为0
$res = $res1 && $res2;
} else if ($countY) {//团员
- $res = $this->dao->update($countY['id'], ['stop_time' => time() - 1, 'k_id' => 0, 'is_refund' => $id, 'status' => 3]);
+ $res = $this->dao->update($countY['id'], ['stop_time' => time() - 1, 'is_refund' => $id, 'status' => 3]);
}
return $res;
}
@@ -221,10 +221,10 @@ class StorePinkServices extends BaseServices
{
//查找拼团团员和团长
if ($pink['k_id']) {
- $pinkAll = $this->dao->getPinkUserList(['k_id' => $pink['k_id'], 'is_refund' => 0]);
+ $pinkAll = $this->dao->getPinkUserList(['k_id' => $pink['k_id']]);
$pinkT = $this->dao->getPinkUserOne($pink['k_id']);
} else {
- $pinkAll = $this->dao->getPinkUserList(['k_id' => $pink['id'], 'is_refund' => 0]);
+ $pinkAll = $this->dao->getPinkUserList(['k_id' => $pink['id']]);
$pinkT = $pink;
}
$count = count($pinkAll) + 1;
From 2f131368d23dca24467d1d267d3f819667a43527 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Wed, 7 Jun 2023 17:35:41 +0800
Subject: [PATCH 20/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8D=8E?=
=?UTF-8?q?=E4=B8=BA=E4=BA=91=E5=9F=9F=E5=90=8D=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../services/upload/extend/obs/Client.php | 12 +++++++--
crmeb/crmeb/services/upload/storage/Obs.php | 27 ++++++++-----------
crmeb/crmeb/services/upload/storage/Tyoss.php | 3 ++-
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index 9f1993f37..95b905af0 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -124,6 +124,8 @@ class Client extends BaseClient
*/
protected $baseUrl = 'obs.cn-north-1.myhuaweicloud.com';
+ protected $type = 'hw';
+
/**
* Client constructor.
* @param array $config
@@ -135,6 +137,7 @@ class Client extends BaseClient
$this->bucketName = $config['bucket'] ?? '';
$this->region = $config['region'] ?? 'ap-chengdu';
$this->uploadUrl = $config['uploadUrl'] ?? '';
+ $this->type = $config['type'] ?? 'hw';
}
/**
@@ -368,8 +371,13 @@ class Client extends BaseClient
*/
protected function getRequestUrl(string $bucket, string $region)
{
-// return $bucket . '.obs.' . $region . '.myhuaweicloud.com'; // 华为
- return $bucket . '.obs.' . $region . '.ctyun.cn'; // 天翼
+ if ($this->type == 'hw') {
+ return $bucket . '.obs.' . $region . '.myhuaweicloud.com'; // 华为
+ } else {
+ return $bucket . '.obs.' . $region . '.ctyun.cn'; // 天翼
+ }
+
+
}
/**
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index aa0c017f1..f88eb699b 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -162,16 +162,11 @@ class Obs extends BaseUpload
$app = $this->app();
//创建桶
try {
- $res = $app->createBucket($name, $region, $acl);
+ $app->createBucket($name, $region, $acl);
} catch (\Throwable $e) {
- if (strstr('[curl] 6', $e->getMessage())) {
- return $this->setError('COS:无效的区域!!');
- } else if (strstr('Access Denied.', $e->getMessage())) {
- return $this->setError('COS:无权访问');
- }
return $this->setError('COS:' . $e->getMessage());
}
- return $res;
+ return true;
}
public function getRegion()
@@ -193,8 +188,13 @@ class Obs extends BaseUpload
{
try {
$res = $this->app()->GetBucketDomain($name, $region);
- $domainRules = $res->toArray()['ListBucketCustomDomainsResult '];
- return array_column($domainRules, 'Name');
+ if ($res) {
+ $domainRules = $res->toArray()['ListBucketCustomDomainsResult '];
+ return array_column($domainRules, 'DomainName');
+ } else {
+ return [];
+ }
+
} catch (\Throwable $e) {
}
return [];
@@ -204,15 +204,10 @@ class Obs extends BaseUpload
{
$parseDomin = parse_url($domain);
try {
- $res = $this->app()->putBucketDomain($name, '', [
+ $this->app()->putBucketDomain($name, '', [
'domainname' => $parseDomin['host'],
]);
- if (method_exists($res, 'toArray')) {
- $res = $res->toArray();
- }
- if ($res['RequestId'] ?? null) {
- return true;
- }
+ return true;
} catch (\Throwable $e) {
if ($message = $this->setMessage($e->getMessage())) {
return $this->setError($message);
diff --git a/crmeb/crmeb/services/upload/storage/Tyoss.php b/crmeb/crmeb/services/upload/storage/Tyoss.php
index 4c50204fd..74175be2e 100644
--- a/crmeb/crmeb/services/upload/storage/Tyoss.php
+++ b/crmeb/crmeb/services/upload/storage/Tyoss.php
@@ -135,7 +135,8 @@ class Tyoss extends BaseUpload
'secretKey' => $this->secretKey,
'region' => $this->storageRegion ?: 'oos-hazz',
'bucket' => $this->storageName,
- 'uploadUrl' => $this->uploadUrl
+ 'uploadUrl' => $this->uploadUrl,
+ 'type' => 'ty'
]);
return $this->handle;
}
From cdf47b3d65ecef1aa3e8c8dd908bc84bf3ae9abe Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 7 Jun 2023 17:46:26 +0800
Subject: [PATCH 21/48] =?UTF-8?q?=E4=BA=91=E5=AD=98=E5=82=A8=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=94=99=E8=AF=AF=E5=A4=84?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/other/UploadService.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/other/UploadService.php b/crmeb/app/services/other/UploadService.php
index cd1d0007f..45822ad2c 100644
--- a/crmeb/app/services/other/UploadService.php
+++ b/crmeb/app/services/other/UploadService.php
@@ -134,7 +134,7 @@ class UploadService
/** @var SystemStorageServices $storageServices */
$storageServices = app()->make(SystemStorageServices::class);
$storageArr = $storageServices->cacheDriver()->remember('storage_list', function () use ($storageServices) {
- return $storageServices->selectList([], 'domain')->toArray();
+ return $storageServices->selectList([], 'domain,type')->toArray();
});
foreach ($storageArr as $item) {
if ($fileHost == $item['domain']) {
From dc32f5a4e31e016d643dfb34f4ebef2583d7cdfb Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 7 Jun 2023 18:14:14 +0800
Subject: [PATCH 22/48] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/adminapi/controller/v1/order/StoreOrder.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
index 1de01e8bd..7d6f50e40 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
@@ -465,7 +465,7 @@ class StoreOrder extends AuthController
*/
public function order_info($id)
{
- if (!$id || !($orderInfo = $this->services->get($id, [], ['refund']))) {
+ if (!$id || !($orderInfo = $this->services->get($id, [], ['refund','invoice']))) {
return app('json')->fail(400118);
}
/** @var UserServices $services */
From f40b69d77cc8c32d4c7104d053e68746ec0d9459 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Wed, 7 Jun 2023 18:16:27 +0800
Subject: [PATCH 23/48] =?UTF-8?q?style:=20=E5=95=86=E5=93=81title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../uni-app/components/recommend/index.vue | 2 +-
.../uni-app/pages/goods/goods_list/index.vue | 2 +-
.../pages/goods/order_details/index.vue | 44 ++++++++++-------
.../uni-app/pages/goods/order_list/index.vue | 48 +++++++++++--------
.../pages/order_addcart/order_addcart.vue | 2 +-
5 files changed, 58 insertions(+), 40 deletions(-)
diff --git a/template/uni-app/components/recommend/index.vue b/template/uni-app/components/recommend/index.vue
index 228f15a33..0a8ed8dfc 100644
--- a/template/uni-app/components/recommend/index.vue
+++ b/template/uni-app/components/recommend/index.vue
@@ -17,7 +17,7 @@
{{$t(`拼团`)}}
- {{item.store_name}}
+ {{item.store_name}}
{{$t(`￥`)}}{{item.price}}
{{$t(`￥`)}}{{item.vip_price}}
diff --git a/template/uni-app/pages/goods/goods_list/index.vue b/template/uni-app/pages/goods/goods_list/index.vue
index f2dc91f60..5ca8b3e1d 100644
--- a/template/uni-app/pages/goods/goods_list/index.vue
+++ b/template/uni-app/pages/goods/goods_list/index.vue
@@ -40,7 +40,7 @@
v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}
- {{item.store_name}}
+ {{item.store_name}}
{{$t(`￥`)}}{{item.price}}
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 850fd9c48..09625e51b 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -1166,24 +1166,32 @@
},
cancelOrder() {
let self = this
- orderCancel(self.orderInfo.order_id)
- .then((data) => {
- // #ifndef MP
- self.$util.Tips({
- title: data.msg
- }, {
- tab: 3
- })
- // #endif
- // #ifdef MP
- self.$util.Tips({
- title: data.msg
- }, '/pages/goods/order_list/index');
- // #endif
- })
- .catch(() => {
- self.getOrderInfo();
- });
+ uni.showModal({
+ title: this.$t(`提示`),
+ content: this.$t(`确认取消该订单`),
+ success: function(res) {
+ if (res.confirm) {
+ orderCancel(self.orderInfo.order_id)
+ .then((data) => {
+ // #ifndef MP
+ self.$util.Tips({
+ title: data.msg
+ }, {
+ tab: 3
+ })
+ // #endif
+ // #ifdef MP
+ self.$util.Tips({
+ title: data.msg
+ }, '/pages/goods/order_list/index');
+ // #endif
+ })
+ .catch(() => {
+ self.getOrderInfo();
+ });
+ } else if (res.cancel) {}
+ }
+ });
},
}
}
diff --git a/template/uni-app/pages/goods/order_list/index.vue b/template/uni-app/pages/goods/order_list/index.vue
index 62cba3dc7..a5f9b0359 100644
--- a/template/uni-app/pages/goods/order_list/index.vue
+++ b/template/uni-app/pages/goods/order_list/index.vue
@@ -270,25 +270,35 @@
return that.$util.Tips({
title: that.$t(`缺少订单号无法取消订单`)
});
- orderCancel(order_id)
- .then(res => {
- return that.$util.Tips({
- title: res.msg,
- icon: 'success'
- },
- function() {
- that.orderList.splice(index, 1);
- that.$set(that, 'orderList', that.orderList);
- that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
- that.getOrderData();
- }
- );
- })
- .catch(err => {
- return that.$util.Tips({
- title: err
- });
- });
+ uni.showModal({
+ title: this.$t(`提示`),
+ content: this.$t(`确认取消该订单`),
+ success: function(res) {
+ if (res.confirm) {
+ orderCancel(order_id)
+ .then(res => {
+ return that.$util.Tips({
+ title: res.msg,
+ icon: 'success'
+ },
+ function() {
+ that.orderList.splice(index, 1);
+ that.$set(that, 'orderList', that.orderList);
+ that.$set(that.orderData, 'unpaid_count', that
+ .orderData.unpaid_count - 1);
+ that.getOrderData();
+ }
+ );
+ })
+ .catch(err => {
+ return that.$util.Tips({
+ title: err
+ });
+ });
+ } else if (res.cancel) {}
+ }
+ });
+
},
/**
* 打开支付组件
diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue
index cdeed1abd..57ea2b49f 100644
--- a/template/uni-app/pages/order_addcart/order_addcart.vue
+++ b/template/uni-app/pages/order_addcart/order_addcart.vue
@@ -35,7 +35,7 @@
-
+
{{item.productInfo.store_name}}
From 6f324acc823fb0e5a8804d5a3b448695d6cdbeb5 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 09:56:21 +0800
Subject: [PATCH 24/48] =?UTF-8?q?improve:=20=E9=87=87=E9=9B=86=E8=A7=84?=
=?UTF-8?q?=E6=A0=BC=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/admin/src/pages/product/productAdd/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index 76bcce906..e2c38bee3 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -2081,7 +2081,7 @@ export default {
});
},
// 初始化数据展示
- infoData(data) {
+ infoData(data, isCopy) {
let cate_id = data.cate_id.map(Number);
let label_id = data.label_id.map(Number);
this.attrs = data.items || [];
@@ -2108,7 +2108,7 @@ export default {
this.oneFormValidate = [data.attr];
}
this.formValidate.header = [];
- this.generate(0);
+ if (!isCopy) this.generate(0);
// this.manyFormValidate = data.attrs;
this.$set(this, 'manyFormValidate', data.attrs);
this.spec_type = data.spec_type;
@@ -2139,7 +2139,7 @@ export default {
//关闭淘宝弹窗并生成数据；
onClose(data) {
this.modals = false;
- this.infoData(data);
+ this.infoData(data, 1);
},
checkMove(evt) {
From 05cdbae09473222737758a49c0031b3f47941650 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 10:06:12 +0800
Subject: [PATCH 25/48] =?UTF-8?q?improve:=20=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/admin/src/pages/product/productAdd/index.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index e2c38bee3..232b6c790 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -2108,7 +2108,8 @@ export default {
this.oneFormValidate = [data.attr];
}
this.formValidate.header = [];
- if (!isCopy) this.generate(0);
+ this.generate(0, isCopy);
+ if (isCopy) this.manyFormValidate = data.attrs;
// this.manyFormValidate = data.attrs;
this.$set(this, 'manyFormValidate', data.attrs);
this.spec_type = data.spec_type;
@@ -2506,7 +2507,7 @@ export default {
this.showIput = true;
},
// 立即生成
- generate(type) {
+ generate(type, isCopy) {
generateAttrApi(
{
attrs: this.attrs,
@@ -2519,7 +2520,7 @@ export default {
.then((res) => {
let info = res.data.info,
header1 = JSON.parse(JSON.stringify(info.header));
- if (this.$route.params.id !== '0' && (this.$route.query.type != -1 || type)) {
+ if (this.$route.params.id !== '0' && (this.$route.query.type != -1 || type) && !isCopy) {
this.manyFormValidate = info.value;
}
let header = info.header;
From 3d7b8a0a95e693201182fd4b145786b5a3edfa94 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 10:13:41 +0800
Subject: [PATCH 26/48] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E5=8F=91=E7=A5=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order/orderList/handle/orderDetails.vue | 98 ++++++++++++++++++-
1 file changed, 97 insertions(+), 1 deletion(-)
diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
index da07739af..e3083502a 100644
--- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
@@ -11,6 +11,7 @@
@@ -57,7 +58,10 @@
+
+
From ab6b53eabe7ccf713d7e516d310afdeb2afb1e50 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 10:32:47 +0800
Subject: [PATCH 27/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8D=8E?=
=?UTF-8?q?=E4=B8=BA=E5=88=9B=E5=BB=BA=E6=A1=B6=E5=92=8C=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E8=B7=A8=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/crmeb/services/upload/extend/obs/Client.php | 7 ++++---
crmeb/crmeb/services/upload/storage/Obs.php | 13 +++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index 95b905af0..5cdfd7cd0 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -255,7 +255,7 @@ class Client extends BaseClient
];
$res = $this->request('https://' . $header['Host'] . '/', 'PUT', [
- 'bucket' => $bucket
+ 'Location' => $region
], $header);
return $this->response($res);
@@ -335,9 +335,10 @@ class Client extends BaseClient
{
$header = [
'Host' => $this->getRequestUrl($bucket, $region),
+ 'content-md5' => base64_encode(md5(json_encode($data), true))
];
- $xml = $this->xmlBuild($data, 'CORSConfiguration', '');
- $res = $this->request('https://' . $header['Host'] . '/', 'PUT', [
+ $xml = $this->xmlBuild($data, 'CORSConfiguration', 'CORSRule');
+ $res = $this->request('https://' . $header['Host'] . '/cors ', 'PUT', [
'bucket' => $bucket,
'body' => $xml
], $header);
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index f88eb699b..643f53b67 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -3,6 +3,7 @@
namespace crmeb\services\upload\storage;
use crmeb\exceptions\AdminException;
+use crmeb\exceptions\UploadException;
use crmeb\services\upload\extend\obs\Client as TyClient;
use crmeb\services\upload\BaseUpload;
@@ -220,12 +221,12 @@ class Obs extends BaseUpload
public function setBucketCors(string $name, string $region)
{
try {
- $res = $this->app()->PutBucketCors($name, $region, [
- 'AllowedHeaders' => ['*'],
- 'AllowedMethods' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
- 'AllowedOrigins' => ['*'],
- 'ExposeHeaders' => ['ETag', 'Content-Length', 'x-cos-request-id'],
- 'MaxAgeSeconds' => 12
+ $this->app()->PutBucketCors($name, $region, [
+ 'AllowedHeader' => ['*'],
+ 'AllowedMethod' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
+ 'AllowedOrigin' => ['*'],
+ 'ExposeHeader' => ['ETag', 'Content-Length', 'x-cos-request-id'],
+ 'MaxAgeSeconds' => 100
]);
return true;
} catch (\Throwable $e) {
From e0da680a60e66b78e82fff61b18e0fcbf25553bd Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 10:44:09 +0800
Subject: [PATCH 28/48] =?UTF-8?q?improve:=20=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/pages/product/productAdd/index.vue | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index 232b6c790..06b2cef9c 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -2108,10 +2108,9 @@ export default {
this.oneFormValidate = [data.attr];
}
this.formValidate.header = [];
- this.generate(0, isCopy);
- if (isCopy) this.manyFormValidate = data.attrs;
+ this.generate(0, isCopy, data.attrs);
// this.manyFormValidate = data.attrs;
- this.$set(this, 'manyFormValidate', data.attrs);
+ // this.$set(this, 'manyFormValidate', data.attrs);
this.spec_type = data.spec_type;
this.formValidate.is_virtual = data.is_virtual;
if (data.spec_type === 0) {
@@ -2507,7 +2506,7 @@ export default {
this.showIput = true;
},
// 立即生成
- generate(type, isCopy) {
+ generate(type, isCopy, arr) {
generateAttrApi(
{
attrs: this.attrs,
@@ -2523,6 +2522,9 @@ export default {
if (this.$route.params.id !== '0' && (this.$route.query.type != -1 || type) && !isCopy) {
this.manyFormValidate = info.value;
}
+ if (isCopy) {
+ this.manyFormValidate = arr;
+ }
let header = info.header;
if ([1, 2].includes(this.formValidate.virtual_type)) {
this.columnsInstalM = header;
@@ -2532,7 +2534,7 @@ export default {
this.columnsInstalM = info.header;
}
this.checkAllGroup(this.formValidate.is_sub);
- if (!this.$route.params.id && this.formValidate.spec_type === 1) {
+ if (!this.$route.params.id && this.formValidate.spec_type === 1 && !isCopy) {
this.manyFormValidate.map((item) => {
item.pic = this.formValidate.image;
});
From 285b3ca92b88ff59cebc3a583028b2e3cd03cb8d Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 14:04:18 +0800
Subject: [PATCH 29/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8D=8E?=
=?UTF-8?q?=E4=B8=BA=E5=88=9B=E5=BB=BA=E6=A1=B6=E6=96=87=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/v1/setting/SystemStorage.php | 5 ++++-
crmeb/crmeb/services/upload/extend/obs/Client.php | 14 +++++++++-----
crmeb/crmeb/services/upload/storage/Obs.php | 12 +++++-------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemStorage.php b/crmeb/app/adminapi/controller/v1/setting/SystemStorage.php
index cdbefab4a..853bbea62 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemStorage.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemStorage.php
@@ -166,7 +166,10 @@ class SystemStorage extends AuthController
//设置跨域规则
try {
$upload = UploadService::init($info->type);
- $upload->setBucketCors($info->name, $info->region);
+ $res = $upload->setBucketCors($info->name, $info->region);
+ if (false === $res) {
+ return app('json')->fail($upload->getError());
+ }
} catch (\Throwable $e) {
}
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index 5cdfd7cd0..b33ba9bb6 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -252,10 +252,12 @@ class Client extends BaseClient
$header = [
'x-obs-acl' => $acl,
'Host' => $this->getRequestUrl($bucket, $region),
+ "Content-Type" => "application/xml"
];
-
+ $xml = "{$region} (\d+)<\/statusCode>
-
-
-
-
订单信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
发票信息
+ 联系信息
+
+
+
+
+
+
+
+
+
+
+ 表单信息
(.*?)<\/Code>(.*?)<\/Message>(.*?)<\/Resource>(.*?)<\/RequestId>/';
-
- preg_match($pattern, $errorXml, $matches);
-
- $error = [
- 'statusCode' => $matches[1],
- 'Code' => $matches[2],
- 'Message' => $matches[3],
- 'Resource' => $matches[4],
- 'RequestId' => $matches[5]
- ];
-
- return $error;
-
- }
}
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index 8d1bfcf53..860bc4756 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -148,7 +148,7 @@ class Obs extends BaseUpload
try {
$this->storageRegion = $region;
$res = $this->app()->listBuckets();
- return $res['Buckets']['Bucket'] ?? [];
+ return $res['Buckets'] ?? [];
} catch (\Throwable $e) {
return [];
}
@@ -169,7 +169,7 @@ class Obs extends BaseUpload
$data = [
'Statement' => [
'Sid' => '公共读' . $name,
- 'Effect' => 'Allow1',
+ 'Effect' => 'Allow',
'Principal' => [
'ID' => ['*']
],
From 1e6ccb1c7c188c0f1a555a1582c3bed68ef6cd3a Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 17:11:08 +0800
Subject: [PATCH 34/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=91?=
=?UTF-8?q?=E5=82=A8=E5=AD=98=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/config/SystemStorageServices.php | 7 +------
.../services/upload/extend/obs/Client.php | 21 +++++++++++--------
crmeb/crmeb/services/upload/storage/Obs.php | 2 +-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php
index 6fff59dbe..85d0c3f7e 100644
--- a/crmeb/app/services/system/config/SystemStorageServices.php
+++ b/crmeb/app/services/system/config/SystemStorageServices.php
@@ -373,11 +373,6 @@ class SystemStorageServices extends BaseServices
case 7:// cos 天翼云
$upload = UploadService::init($type);
$list = $upload->listbuckets();
- if (!empty($list['Name'])) {
- $newList = $list;
- $list = [];
- $list[] = $newList;
- }
$config = $this->getStorageConfig($type);
foreach ($list as $item) {
if (!$this->dao->count(['name' => $item['Name'], 'access_key' => $config['accessKey']])) {
@@ -388,7 +383,7 @@ class SystemStorageServices extends BaseServices
'region' => $item['Location'],
'acl' => 'public-read',
'status' => 0,
- 'domain' => sys_config('tengxun_appid') ? $this->getDomain($type, $item['Name'], $item['Location']) : '',
+ 'domain' => $this->getDomain($type, $item['Name'], $item['Location']),
'is_delete' => 0,
'add_time' => strtotime($item['CreationDate']),
'update_time' => time()
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index fb3129c3b..222b04b8f 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -220,7 +220,7 @@ class Client extends BaseClient
public function listBuckets()
{
$header = [
- 'Host' => $this->getRequestUrl($this->bucketName, $this->region),
+ 'Host' => $this->getRequestUrl('', $this->region),
];
$res = $this->request('https://' . $header['Host'] . '/', 'GET', [], []);
return $this->response($res);
@@ -413,19 +413,22 @@ class Client extends BaseClient
* @param string $bucket
* @param string $region
* @return string
- * @author 等风来
- * @email 136327134@qq.com
- * @date 2023/5/18
+ *
+ * @date 2023/06/08
+ * @author yyw
*/
- protected function getRequestUrl(string $bucket, string $region)
+ protected function getRequestUrl(string $bucket = '', string $region = '')
{
if ($this->type == 'hw') {
- return $bucket . '.obs.' . $region . '.myhuaweicloud.com'; // 华为
+ $url = '.myhuaweicloud.com'; // 华为
} else {
- return $bucket . '.obs.' . $region . '.ctyun.cn'; // 天翼
+ $url = $region . '.ctyun.cn'; // 天翼
+ }
+ if ($bucket) {
+ return $bucket . '.obs.' . $region . $url;
+ } else {
+ return 'obs.' . $region . $url;
}
-
-
}
/**
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index 860bc4756..fc0428a9b 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -148,7 +148,7 @@ class Obs extends BaseUpload
try {
$this->storageRegion = $region;
$res = $this->app()->listBuckets();
- return $res['Buckets'] ?? [];
+ return $res['Buckets']['Bucket'] ?? [];
} catch (\Throwable $e) {
return [];
}
From 39368b2e3d4bbbb6a0b5dde1e5fd16c17ddb5ecc Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 17:38:08 +0800
Subject: [PATCH 35/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=A4=A9?=
=?UTF-8?q?=E7=BF=BC=E4=BA=91=E4=BA=91=E5=82=A8=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/crmeb/services/upload/storage/Obs.php | 7 +-
crmeb/crmeb/services/upload/storage/Tyoss.php | 222 +++++++++++++-----
2 files changed, 165 insertions(+), 64 deletions(-)
diff --git a/crmeb/crmeb/services/upload/storage/Obs.php b/crmeb/crmeb/services/upload/storage/Obs.php
index fc0428a9b..c5a9910f5 100644
--- a/crmeb/crmeb/services/upload/storage/Obs.php
+++ b/crmeb/crmeb/services/upload/storage/Obs.php
@@ -136,17 +136,16 @@ class Obs extends BaseUpload
$this->handle = new TyClient([
'accessKey' => $this->accessKey,
'secretKey' => $this->secretKey,
- 'region' => $this->storageRegion ?: 'oos-hazz',
+ 'region' => $this->storageRegion ?: 'cn-north-1',
'bucket' => $this->storageName,
'uploadUrl' => $this->uploadUrl
]);
return $this->handle;
}
- public function listbuckets(string $region, bool $line = false, bool $shared = false)
+ public function listbuckets(string $region = null, bool $line = false, bool $shared = false)
{
try {
- $this->storageRegion = $region;
$res = $this->app()->listBuckets();
return $res['Buckets']['Bucket'] ?? [];
} catch (\Throwable $e) {
@@ -205,7 +204,7 @@ class Obs extends BaseUpload
try {
$res = $this->app()->GetBucketDomain($name, $region);
if ($res) {
- $domainRules = $res->toArray()['ListBucketCustomDomainsResult '];
+ $domainRules = $res->toArray()['ListBucketCustomDomainsResult'];
return array_column($domainRules, 'DomainName');
} else {
return [];
diff --git a/crmeb/crmeb/services/upload/storage/Tyoss.php b/crmeb/crmeb/services/upload/storage/Tyoss.php
index 74175be2e..61e9b862c 100644
--- a/crmeb/crmeb/services/upload/storage/Tyoss.php
+++ b/crmeb/crmeb/services/upload/storage/Tyoss.php
@@ -5,6 +5,7 @@ namespace crmeb\services\upload\storage;
use crmeb\exceptions\AdminException;
use crmeb\services\upload\extend\obs\Client as TyClient;
use crmeb\services\upload\BaseUpload;
+use GuzzleHttp\Psr7\Utils;
class Tyoss extends BaseUpload
{
@@ -69,7 +70,8 @@ class Tyoss extends BaseUpload
}
$key = $this->saveFileName($fileHandle->getRealPath(), $fileHandle->getOriginalExtension());
- $body = $fileHandle->getRealPath();
+ $body = fopen($fileHandle->getRealPath(), 'rb');
+ $body = (string)Utils::streamFor($body);
} else {
$key = $file;
$body = $fileContent;
@@ -77,7 +79,7 @@ class Tyoss extends BaseUpload
$key = $this->getUploadPath($key);
try {
- $uploadInfo = $this->app()->putObject($key, $body);
+ $uploadInfo = $this->app()->putObject($key, $body, 'application/octet-stream');
$this->fileInfo->uploadInfo = $uploadInfo;
$this->fileInfo->realName = $fileHandle->getOriginalName();
$this->fileInfo->filePath = ($this->cdn ?: $this->uploadUrl) . '/' . $key;
@@ -133,7 +135,7 @@ class Tyoss extends BaseUpload
$this->handle = new TyClient([
'accessKey' => $this->accessKey,
'secretKey' => $this->secretKey,
- 'region' => $this->storageRegion ?: 'oos-hazz',
+ 'region' => $this->storageRegion ?: 'cn-qhxn1',
'bucket' => $this->storageName,
'uploadUrl' => $this->uploadUrl,
'type' => 'ty'
@@ -141,10 +143,9 @@ class Tyoss extends BaseUpload
return $this->handle;
}
- public function listbuckets(string $region, bool $line = false, bool $shared = false)
+ public function listbuckets(string $region = null, bool $line = false, bool $shared = false)
{
try {
- $this->storageRegion = $region;
$res = $this->app()->listBuckets();
return $res['Buckets']['Bucket'] ?? [];
} catch (\Throwable $e) {
@@ -163,79 +164,156 @@ class Tyoss extends BaseUpload
$app = $this->app();
//创建桶
try {
- $res = $app->createBucket($name, $region, $acl);
+ $app->createBucket($name, $region, $acl);
+ $data = [
+ 'Statement' => [
+ 'Sid' => '公共读' . $name,
+ 'Effect' => 'Allow',
+ 'Principal' => [
+ 'ID' => ['*']
+ ],
+ 'Action' => ['HeadBucket', 'GetBucketLocation', 'ListBucketVersions', 'GetObject', 'RestoreObject', 'GetObjectVersion'],
+ 'Resource' => [$name, $name . '/*']
+ ]
+ ];
+
+ $app->putPolicy($name, $region, $data);
} catch (\Throwable $e) {
return $this->setError('COS:' . $e->getMessage());
}
- return $res;
+ return true;
}
public function getRegion()
{
return [
[
- 'value' => 'oos-hazz',
+ 'value' => 'cn-gz1',
+ 'label' => '贵州'
+ ],
+ [
+ 'value' => 'cn-fz1',
+ 'label' => '福州'
+ ],
+ [
+ 'value' => 'cn-hz1',
+ 'label' => '杭州'
+ ],
+ [
+ 'value' => 'cn-sz1',
+ 'label' => '深圳'
+ ],
+ [
+ 'value' => 'cn-gdgz1',
+ 'label' => '广州'
+ ],
+ [
+ 'value' => 'cn-jssz1',
+ 'label' => '苏州'
+ ],
+ [
+ 'value' => 'cn-sh1',
+ 'label' => '上海'
+ ],
+ [
+ 'value' => 'cn-ahwh1',
+ 'label' => '芜湖'
+ ],
+ [
+ 'value' => 'cn-bj1',
+ 'label' => '北京'
+ ],
+ [
+ 'value' => 'cn-sccd1',
+ 'label' => '成都'
+ ],
+ [
+ 'value' => 'cn-hazz1',
'label' => '郑州'
],
[
- 'value' => 'oos-lnsy',
- 'label' => '沈阳'
+ 'value' => 'cn-hncs1',
+ 'label' => '长沙'
],
[
- 'value' => 'oos-sccd',
- 'label' => '四川成都'
+ 'value' => 'cn-gxnn1',
+ 'label' => '南宁'
],
[
- 'value' => 'oos-xjwlmq',
- 'label' => '乌鲁木齐'
+ 'value' => 'cn-jxnc1',
+ 'label' => '南昌'
],
[
- 'value' => 'oos-xjwlmq',
- 'label' => '乌鲁木齐'
- ],
- [
- 'value' => 'oos-gslz',
- 'label' => '甘肃兰州'
- ],
- [
- 'value' => 'oos-sdqd',
- 'label' => '山东青岛'
- ],
- [
- 'value' => 'oos-gzgy',
- 'label' => '贵州贵阳'
- ],
- [
- 'value' => 'oos-hbwh',
- 'label' => '湖北武汉'
- ],
- [
- 'value' => 'oos-xzls',
- 'label' => '西藏拉萨'
- ],
- [
- 'value' => 'oos-hbwh',
- 'label' => '湖北武汉'
- ],
- [
- 'value' => 'oos-ahwh',
- 'label' => '安徽芜湖'
- ],
- [
- 'value' => 'oos-gdsz',
- 'label' => '广东深圳'
- ],
- [
- 'value' => 'oos-jssz',
- 'label' => '江苏苏州'
- ],
- [
- 'value' => 'oos-sh2',
- 'label' => '上海2'
+ 'value' => 'cn-sdqd1',
+ 'label' => '青岛'
],
[
'value' => 'cn-snxy1',
- 'label' => '西安2'
+ 'label' => '咸阳'
+ ],
+ [
+ 'value' => 'cn-xjcj1',
+ 'label' => '新疆'
+ ],
+ [
+ 'value' => 'cn-ynkm1',
+ 'label' => '昆明'
+ ],
+ [
+ 'value' => 'cn-hihk1',
+ 'label' => '海口'
+ ],
+ [
+ 'value' => 'cn-hbwh1',
+ 'label' => '武汉'
+ ],
+ [
+ 'value' => 'cn-cq1',
+ 'label' => '重庆'
+ ],
+ [
+ 'value' => 'cn-qhxn1',
+ 'label' => '西宁'
+ ],
+ [
+ 'value' => 'cn-gslz1',
+ 'label' => '兰州'
+ ],
+ [
+ 'value' => 'cn-nxyc1',
+ 'label' => '银川'
+ ],
+ [
+ 'value' => 'cn-sxty1',
+ 'label' => '太原'
+ ],
+ [
+ 'value' => 'cn-hesjz1',
+ 'label' => '石家庄'
+ ],
+ [
+ 'value' => 'cn-tj1',
+ 'label' => '天津'
+ ],
+ [
+ 'value' => 'cn-jlcc1',
+ 'label' => '长春'
+ ],
+ [
+ 'value' => 'cn-hlhrb1',
+ 'label' => '哈尔滨'
+ ],
+ [
+ 'value' => 'cn-nmhh1',
+ 'label' => '内蒙古'
+ ],
+ [
+ 'value' => 'cn-lnsy1',
+ 'label' => '沈阳'
+ ],
+ [
+ 'value' => 'cn-north1',
+ 'label' => '华北'
]
];
}
@@ -250,20 +328,44 @@ class Tyoss extends BaseUpload
}
}
+ public function getDomian($name, $region)
+ {
+ try {
+ $res = $this->app()->GetBucketDomain($name, $region);
+ if ($res) {
+ $domainRules = $res->toArray()['ListBucketCustomDomainsResult'];
+ return array_column($domainRules, 'DomainName');
+ } else {
+ return [];
+ }
+
+ } catch (\Throwable $e) {
+ }
+ return [];
+ }
+
public function bindDomian(string $name, string $domain, string $region = null)
{
- // TODO: Implement bindDomian() method.
+ $parseDomin = parse_url($domain);
+ try {
+ $this->app()->putBucketDomain($name, $region, [
+ 'domainname' => $parseDomin['host'],
+ ]);
+ return true;
+ } catch (\Throwable $e) {
+ return $this->setError($e->getMessage());
+ }
}
public function setBucketCors(string $name, string $region)
{
try {
- $res = $this->app()->PutBucketCors($name, $region, [
+ $this->app()->PutBucketCors($name, $region, [
'AllowedHeaders' => ['*'],
'AllowedMethods' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
'AllowedOrigins' => ['*'],
'ExposeHeaders' => ['ETag', 'Content-Length', 'x-cos-request-id'],
- 'MaxAgeSeconds' => 12
+ 'MaxAgeSeconds' => 100
]);
return true;
} catch (\Throwable $e) {
From 52052ad3a18f1365b6feeb47b4673249bf368aad Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 18:15:18 +0800
Subject: [PATCH 36/48] =?UTF-8?q?feat:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/linkaddress/index.vue | 57 ++++++++++++-------
1 file changed, 38 insertions(+), 19 deletions(-)
diff --git a/template/admin/src/components/linkaddress/index.vue b/template/admin/src/components/linkaddress/index.vue
index 79a3532a3..540dcf459 100644
--- a/template/admin/src/components/linkaddress/index.vue
+++ b/template/admin/src/components/linkaddress/index.vue
@@ -250,31 +250,38 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -403,8 +410,10 @@ export default {
categoryId: '', //左侧分类id
treeSelect: [],
customdate: {
- // name:'',
url: '',
+ appid: '',
+ mpUrl: '',
+ status: 1,
},
customNum: 1,
ruleValidate: {
@@ -493,7 +502,13 @@ export default {
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid) {
- this.$emit('linkUrl', this.customdate.url);
+ let url = this.customdate.url;
+ if (this.customdate.status == 1) {
+ url = this.customdate.url;
+ } else {
+ url = this.customdate.mpUrl + '@APPID=' + this.customdate.appid;
+ }
+ this.$emit('linkUrl', url);
this.modals = false;
this.reset();
// saveLink(this.customdate,this.categoryId).then(res=>{
@@ -838,7 +853,11 @@ export default {
min-width: 121px;
}
}
-
+.radioGroup{
+ /deep/.ivu-radio-wrapper{
+ margin-right 30px;
+ }
+}
.table_box {
margin-top: 14px;
display: flex;
From 85ff894003bbd871afc8b8e3649888e30e2cdc71 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 18:15:59 +0800
Subject: [PATCH 37/48] =?UTF-8?q?feat:=20=E8=B7=B3=E8=BD=AC=E6=96=B9?=
=?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/uni-app/components/guide/index.vue | 22 +-
.../uni-app/components/recommend/index.vue | 4 +-
.../activity/goods_combination/index.vue | 749 +++++++-------
.../uni-app/pages/activity/presell/index.vue | 958 +++++++++---------
.../pages/columnGoods/HotNewGoods/index.vue | 371 ++++---
.../uni-app/pages/goods_cate/goods_cate1.vue | 11 +
.../index/diy/components/activeParty.vue | 11 +-
.../pages/index/diy/components/menus.vue | 492 +++++----
.../pages/index/diy/components/news.vue | 270 +++--
.../index/diy/components/pictureCube.vue | 640 ++++++------
.../pages/index/diy/components/swiperBg.vue | 22 +-
.../pages/index/diy/components/titles.vue | 140 +--
template/uni-app/pages/index/index.vue | 2 +-
.../visualization/components/activity.vue | 19 +-
.../visualization/components/mBanner.vue | 20 +-
.../index/visualization/components/menus.vue | 21 +-
.../visualization/components/newGoods.vue | 4 +-
.../index/visualization/components/news.vue | 364 ++++---
.../visualization/components/popular.vue | 10 +-
.../visualization/components/promotion.vue | 4 +-
.../visualization/components/swiperBg.vue | 28 +-
template/uni-app/pages/points_mall/index.vue | 805 ++++++++-------
.../pages/users/wechat_login/index.vue | 2 +-
template/uni-app/static/css/style.scss | 2 +-
template/uni-app/utils/util.js | 56 +-
25 files changed, 2448 insertions(+), 2579 deletions(-)
diff --git a/template/uni-app/components/guide/index.vue b/template/uni-app/components/guide/index.vue
index 312caa8f9..83e6ce9f6 100644
--- a/template/uni-app/components/guide/index.vue
+++ b/template/uni-app/components/guide/index.vue
@@ -44,9 +44,9 @@
},
mounted() {
this.timer()
- },
- onHide() {
- clearInterval(this.timecount)
+ },
+ onHide() {
+ clearInterval(this.timecount)
},
methods: {
timer() {
@@ -70,22 +70,8 @@
jump(url) {
if (url) {
clearInterval(this.timecount)
- if (url.indexOf("http") != -1) {
- uni.navigateTo({
- url: `/pages/annex/web_view/index?url=${url}`
- });
- } else {
- uni.reLaunch({
- url: url,
- fail: () => {
- uni.switchTab({
- url
- })
- }
- })
- }
+ this.$util.JumpPath(url);
}
-
},
}
}
diff --git a/template/uni-app/components/recommend/index.vue b/template/uni-app/components/recommend/index.vue
index 0a8ed8dfc..ebcaaed91 100644
--- a/template/uni-app/components/recommend/index.vue
+++ b/template/uni-app/components/recommend/index.vue
@@ -19,14 +19,14 @@
{{item.store_name}}
{{$t(`￥`)}}{{item.price}}
-
+
diff --git a/template/uni-app/pages/activity/goods_combination/index.vue b/template/uni-app/pages/activity/goods_combination/index.vue
index 38f74acdd..403e86250 100644
--- a/template/uni-app/pages/activity/goods_combination/index.vue
+++ b/template/uni-app/pages/activity/goods_combination/index.vue
@@ -1,384 +1,367 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{pinkCount}}{{$t(`人参与`)}}
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
- {{$t(`￥`)}}{{item.product_price}}
- {{$t(`￥`)}}{{item.price}}
-
-
-
-
- {{item.people}}{{$t(`人团`)}}
- {{$t(`去拼团`)}}
-
- {{$t(`已售罄`)}}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/activity/presell/index.vue b/template/uni-app/pages/activity/presell/index.vue
index fd2a2faeb..02b94dbed 100644
--- a/template/uni-app/pages/activity/presell/index.vue
+++ b/template/uni-app/pages/activity/presell/index.vue
@@ -1,464 +1,496 @@
-
-
-
-
- ![]()
-
-
-
-
-
-
- {{item.name || ''}}
-
-
-
-
-
-
-
-
-
-
- {{item.store_name || ''}}
-
- {{$t(`已预定`)}}{{item.sales ? item.sales : 0}}{{item.unit_name || ''}}
- {{$t(`未开始`)}}
-
-
-
-
-
-
-
-
-
-
- {{$t(`预售价`)}}
- {{$t(`￥`)}} {{ item.price }}
-
- {{ active === 2 ? $t(`立即预定`) : $t(`已结束`) }}
-
-
- {{$t(`开售时间`)}}
- {{ new Date(item.presale_start_time*1000).getMonth()+1 }}/{{ new Date(item.presale_start_time*1000).getDate() }}
- {{ new Date(item.presale_start_time*1000).getHours()<10?'0'+
- new Date(item.presale_start_time*1000).getHours():new Date(item.presale_start_time*1000).getHours() || '00'}}:
- {{ new Date(item.presale_start_time*1000).getMinutes()<10?"0" + new Date(item.presale_start_time*1000).getMinutes():
- new Date(item.presale_start_time*1000).getMinutes() || '00'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
index 667bcfa59..5748ace66 100644
--- a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
+++ b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
@@ -1,194 +1,179 @@
-
-
+
+
+
+
+
+
+ {{$t(`全部商品`)}}
+
-
-
-
-
-
-
-
-
-
-
- {{ $t(itemn.info[0].value) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t(item.info[0].value) }}
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/index/diy/components/news.vue b/template/uni-app/pages/index/diy/components/news.vue
index 555b01284..13a97d985 100644
--- a/template/uni-app/pages/index/diy/components/news.vue
+++ b/template/uni-app/pages/index/diy/components/news.vue
@@ -1,138 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.chiild[0].val}}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/index/diy/components/pictureCube.vue b/template/uni-app/pages/index/diy/components/pictureCube.vue
index 22cd534be..326c214ab 100644
--- a/template/uni-app/pages/index/diy/components/pictureCube.vue
+++ b/template/uni-app/pages/index/diy/components/pictureCube.vue
@@ -1,331 +1,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/index/diy/components/swiperBg.vue b/template/uni-app/pages/index/diy/components/swiperBg.vue
index d40e3c654..1b29eca4e 100644
--- a/template/uni-app/pages/index/diy/components/swiperBg.vue
+++ b/template/uni-app/pages/index/diy/components/swiperBg.vue
@@ -117,27 +117,7 @@
},
goDetail(url) {
let urls = url.info[1].value
- if (urls.indexOf("http") != -1) {
- // #ifdef H5
- location.href = urls
- // #endif
- // #ifdef MP || APP-PLUS
- uni.navigateTo({
- url: `/pages/annex/web_view/index?url=${urls}`
- });
- // #endif
- } else {
- if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
- .indexOf(urls) == -1) {
- uni.navigateTo({
- url: urls
- })
- } else {
- uni.reLaunch({
- url: urls
- })
- }
- }
+ this.$util.JumpPath(urls);
}
}
}
diff --git a/template/uni-app/pages/index/diy/components/titles.vue b/template/uni-app/pages/index/diy/components/titles.vue
index 78d8233a4..0990bfe84 100644
--- a/template/uni-app/pages/index/diy/components/titles.vue
+++ b/template/uni-app/pages/index/diy/components/titles.vue
@@ -1,67 +1,75 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue
index 845a2908f..e5fd894c8 100644
--- a/template/uni-app/pages/index/index.vue
+++ b/template/uni-app/pages/index/index.vue
@@ -68,7 +68,7 @@
this.$util.Tips({
title: err
});
- // #endiff
+ // #endif
})
},
// 微信分享；
diff --git a/template/uni-app/pages/index/visualization/components/activity.vue b/template/uni-app/pages/index/visualization/components/activity.vue
index 8328aab98..ec4e3c584 100644
--- a/template/uni-app/pages/index/visualization/components/activity.vue
+++ b/template/uni-app/pages/index/visualization/components/activity.vue
@@ -81,24 +81,7 @@
methods: {
gopage(url) {
goPage().then(res => {
- if (url.indexOf("http") != -1) {
- // #ifdef H5
- location.href = url
- // #endif
- } else {
- if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart',
- '/pages/user/index'
- ].indexOf(url) ==
- -1) {
- uni.navigateTo({
- url: url
- })
- } else {
- uni.navigateTo({
- url: url
- })
- }
- }
+ this.$util.JumpPath(url);
})
}
}
diff --git a/template/uni-app/pages/index/visualization/components/mBanner.vue b/template/uni-app/pages/index/visualization/components/mBanner.vue
index ab21eef28..2b3e0a1ee 100644
--- a/template/uni-app/pages/index/visualization/components/mBanner.vue
+++ b/template/uni-app/pages/index/visualization/components/mBanner.vue
@@ -103,25 +103,7 @@
},
goDetail(url) {
goPage().then(res => {
- let urls = url.info[1].value
- if (urls.indexOf("http") != -1) {
- // #ifdef H5 || APP-PLUS
- location.href = urls
- // #endif
- } else {
- if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart',
- '/pages/user/index'
- ].indexOf(urls) ==
- -1) {
- uni.navigateTo({
- url: urls
- })
- } else {
- uni.navigateTo({
- url: urls
- })
- }
- }
+ this.$util.JumpPath(urls);
})
}
}
diff --git a/template/uni-app/pages/index/visualization/components/menus.vue b/template/uni-app/pages/index/visualization/components/menus.vue
index d22211153..02fc58f1f 100644
--- a/template/uni-app/pages/index/visualization/components/menus.vue
+++ b/template/uni-app/pages/index/visualization/components/menus.vue
@@ -71,26 +71,7 @@
methods: {
menusTap(url) {
goPage().then(res => {
- if (url.indexOf("http") != -1) {
- // #ifdef H5
- location.href = url
- // #endif
- } else {
- // uni.navigateTo({
- // url: url
- // })
- if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart',
- '/pages/user/index'
- ].indexOf(url) == -1) {
- uni.navigateTo({
- url: url
- })
- } else {
- uni.switchTab({
- url: url
- })
- }
- }
+ this.$util.JumpPath(url);
})
}
}
diff --git a/template/uni-app/pages/index/visualization/components/newGoods.vue b/template/uni-app/pages/index/visualization/components/newGoods.vue
index e20ee77fe..efca0c73c 100644
--- a/template/uni-app/pages/index/visualization/components/newGoods.vue
+++ b/template/uni-app/pages/index/visualization/components/newGoods.vue
@@ -207,9 +207,7 @@
},
gopage(url) {
goPage().then(res => {
- uni.navigateTo({
- url: url
- })
+ this.$util.JumpPath(url);
})
},
goDetail(item) {
diff --git a/template/uni-app/pages/index/visualization/components/news.vue b/template/uni-app/pages/index/visualization/components/news.vue
index c7fc6d615..54bc96502 100644
--- a/template/uni-app/pages/index/visualization/components/news.vue
+++ b/template/uni-app/pages/index/visualization/components/news.vue
@@ -1,191 +1,175 @@
-
-
- {{$t(`暂无新闻，请上传新闻`)}}
-
-
-
-
-
-
-
-
-
- {{item.chiild[0].val}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.chiild[0].val}}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/index/visualization/components/popular.vue b/template/uni-app/pages/index/visualization/components/popular.vue
index 05f862e3e..523f39a62 100644
--- a/template/uni-app/pages/index/visualization/components/popular.vue
+++ b/template/uni-app/pages/index/visualization/components/popular.vue
@@ -223,9 +223,7 @@
},
gopage(url) {
goPage().then(res => {
- uni.navigateTo({
- url: url
- })
+ this.$util.JumpPath(url);
})
}
}
@@ -235,7 +233,7 @@
diff --git a/template/uni-app/pages/users/wechat_login/index.vue b/template/uni-app/pages/users/wechat_login/index.vue
index dca49328f..b0e010a20 100644
--- a/template/uni-app/pages/users/wechat_login/index.vue
+++ b/template/uni-app/pages/users/wechat_login/index.vue
@@ -315,7 +315,7 @@
}, {
tab: 3
});
- // #endiff
+ // #endif
}
},
// #ifdef MP
diff --git a/template/uni-app/static/css/style.scss b/template/uni-app/static/css/style.scss
index 35e0a61fd..4c758f37b 100644
--- a/template/uni-app/static/css/style.scss
+++ b/template/uni-app/static/css/style.scss
@@ -340,7 +340,7 @@
.coupon-list .item.svip .line1 .image{width:30rpx;height:30rpx;margin-right:10rpx;vertical-align:middle;z-index:0;}
.noCommodity {
- border-top: 7rpx solid #f5f5f5
+ // border-top: 7rpx solid #f5f5f5
}
.noCommodity .pictrue {
diff --git a/template/uni-app/utils/util.js b/template/uni-app/utils/util.js
index 7844fcb22..79942f99b 100644
--- a/template/uni-app/utils/util.js
+++ b/template/uni-app/utils/util.js
@@ -746,10 +746,10 @@ export default {
}
return 0
- },
- /*
- * 获取当前时间
- */
+ },
+ /*
+ * 获取当前时间
+ */
getNowTime() {
let today = new Date();
let year = today.getFullYear(); // 获取当前年份
@@ -995,6 +995,52 @@ export default {
}
return status;
},
- }
+ },
+ /**
+ * 跳转路径封装函数
+ * @param url 跳转路径
+ */
+ JumpPath: function(url) {
+ let arr = url.split('@APPID=');
+ if (arr.length > 1) {
+ //#ifdef MP
+ uni.navigateToMiniProgram({
+ appId: arr[arr.length - 1], // 此为生活缴费appid
+ path: arr[0], // 此为生活缴费首页路径
+ envVersion: "release",
+ success: res => {
+ console.log("打开成功", res);
+ },
+ fail: err => {
+ console.log('sgdhgf', err);
+ }
+ })
+ //#endif
+ //#ifndef MP
+ this.Tips({
+ title: 'h5与app端不支持跳转外部小程序'
+ });
+ //#endif
+ } else {
+ if (url.indexOf("http") != -1) {
+ uni.navigateTo({
+ url: `/pages/annex/web_view/index?url=${url}`
+ });
+ } else {
+ if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index',
+ '/pages/index/index'
+ ]
+ .indexOf(url) == -1) {
+ uni.navigateTo({
+ url
+ })
+ } else {
+ uni.switchTab({
+ url
+ })
+ }
+ }
+ }
+ },
}
From de66adad1f69bb281e064488b84ebae9d2d21947 Mon Sep 17 00:00:00 2001
From: From-wh
Date: Thu, 8 Jun 2023 18:16:17 +0800
Subject: [PATCH 38/48] =?UTF-8?q?improve:=20=E4=B8=8B=E5=8D=95=E9=85=8D?=
=?UTF-8?q?=E9=80=81=E6=96=B9=E5=BC=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/goods/order_confirm/index.vue | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index 0f51afceb..6fb43d562 100644
--- a/template/uni-app/pages/goods/order_confirm/index.vue
+++ b/template/uni-app/pages/goods/order_confirm/index.vue
@@ -10,7 +10,18 @@
+
+
+
+ {{shippingType==0?'商城配送':'门店自提'}}
+
+ {{$t(`由平台为您提供配送服务`)}}
+ {{$t(`线上下单，到店自提`)}}
+
+
+
{{addressInfo.real_name || ''}}
{{addressInfo.phone || ''}}
@@ -1517,6 +1528,53 @@
background: linear-gradient(to bottom, var(--view-theme) 0%, #f5f5f5 100%);
padding-top: 100rpx;
margin-bottom: 12rpx;
+
+ .add-title {
+ height: 72rpx;
+ margin: 0 26rpx;
+ border-bottom: 1px solid #eee;
+ background-color: #fff;
+ width: 710rpx;
+ margin: 0 auto;
+ padding: 0 26rpx;
+ border-radius: 12rpx 12rpx 0 0;
+
+ .icon {
+ height: 32rpx;
+ background: #1890FF;
+ border-radius: 4rpx;
+ font-size: 20rpx;
+ font-weight: 400;
+ color: #FFFFFF;
+ text-align: center;
+ line-height: 32rpx;
+ padding: 0 6rpx;
+
+ &.orange {
+ background: #FE960F;
+ }
+
+ &.red {
+ background: #E93323;
+ }
+ }
+
+ .add-text {
+ margin-left: 14rpx;
+ width: 360rpx;
+ }
+
+ .text {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #999999;
+
+ .icon-jiantou {
+ display: inline-block;
+ font-size: 20rpx;
+ }
+ }
+ }
}
.order-submission .allAddress .nav {
From 01990a29d5f958146b36df1f14d66fa310bc4d3f Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 8 Jun 2023 18:27:40 +0800
Subject: [PATCH 39/48] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=A2=86?=
=?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=87=8F=E5=B0=91=E6=95=B0=E9=87=8F=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../services/activity/coupon/StoreCouponIssueServices.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
index 1fddd623e..58fa7795e 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
@@ -374,9 +374,13 @@ class StoreCouponIssueServices extends BaseServices
$issueUserService = app()->make(StoreCouponIssueUserServices::class);
/** @var StoreCouponUserServices $couponUserService */
$couponUserService = app()->make(StoreCouponUserServices::class);
- $this->transaction(function () use ($issueUserService, $uid, $id, $couponUserService, $issueCouponInfo) {
+ $this->transaction(function () use ($issueUserService, $uid, $id, $couponUserService, $issueCouponInfo, $is_receive) {
$issueUserService->save(['uid' => $uid, 'issue_coupon_id' => $id, 'add_time' => time()]);
$couponUserService->addUserCoupon($uid, $issueCouponInfo, "send");
+ if ($issueCouponInfo['total_count'] > 0 && $is_receive) {
+ $issueCouponInfo['remain_count'] -= 1;
+ $issueCouponInfo->save();
+ }
});
}
From 7f2cf94e8850c00bc6ec32960819473925a39e30 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 8 Jun 2023 18:28:18 +0800
Subject: [PATCH 40/48] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/dao/product/product/StoreProductDao.php | 2 +-
.../services/product/product/StoreCategoryServices.php | 10 +++++-----
.../services/product/product/StoreProductServices.php | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/crmeb/app/dao/product/product/StoreProductDao.php b/crmeb/app/dao/product/product/StoreProductDao.php
index 61eefcc97..e3daf7407 100644
--- a/crmeb/app/dao/product/product/StoreProductDao.php
+++ b/crmeb/app/dao/product/product/StoreProductDao.php
@@ -122,7 +122,7 @@ class StoreProductDao extends BaseDao
})->when(isset($where['cid']) && $where['cid'], function ($query) use ($where) {
$query->whereIn('id', function ($query) use ($where) {
$query->name('store_product_cate')->whereIn('cate_id', function ($query) use ($where) {
- $query->name('store_category')->where('pid', $where['cid'])->field('id')->select();
+ $query->name('store_category')->where('pid', $where['cid'])->whereOr('id', $where['cid'])->field('id')->select();
})->field('product_id')->select();
});
})->when(isset($where['coupon_category_id']) && $where['coupon_category_id'] != '', function ($query) use ($where) {
diff --git a/crmeb/app/services/product/product/StoreCategoryServices.php b/crmeb/app/services/product/product/StoreCategoryServices.php
index c096dca60..77dbe2757 100644
--- a/crmeb/app/services/product/product/StoreCategoryServices.php
+++ b/crmeb/app/services/product/product/StoreCategoryServices.php
@@ -97,11 +97,11 @@ class StoreCategoryServices extends BaseServices
if ($show !== '') $where['is_show'] = $show;
if (!$type) $where['pid'] = 0;
$data = get_tree_children($this->dao->getTierList($where, ['id', 'id as value', 'cate_name as label', 'cate_name as title', 'pid']), 'children', 'id');
- foreach ($data as &$item) {
- if (!isset($item['children'])) {
- $item['disabled'] = true;
- }
- }
+// foreach ($data as &$item) {
+// if (!isset($item['children'])) {
+// $item['disabled'] = true;
+// }
+// }
return $data;
}
diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php
index 26c3d2f86..7437859fa 100644
--- a/crmeb/app/services/product/product/StoreProductServices.php
+++ b/crmeb/app/services/product/product/StoreProductServices.php
@@ -620,7 +620,7 @@ class StoreProductServices extends BaseServices
$cateGory = $storeCategoryServices->getColumn([['id', 'IN', $cate_id]], 'id,pid', 'id');
foreach ($cate_id as $cid) {
if ($cid && isset($cateGory[$cid]['pid'])) {
- $cateData[] = ['product_id' => $id, 'cate_id' => $cid, 'cate_pid' => $cateGory[$cid]['pid'], 'status' => $data['is_show'], 'add_time' => $time];
+ $cateData[] = ['product_id' => $id, 'cate_id' => $cid, 'cate_pid' => $cateGory[$cid]['pid'] ?: $cid, 'status' => $data['is_show'], 'add_time' => $time];
}
}
$storeProductCateServices->change($id, $cateData);
From 362b2054115a61835ad547b7a2eba85d7925cc78 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 8 Jun 2023 18:28:37 +0800
Subject: [PATCH 41/48] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=88=B8=E4=B8=8D=E6=89=A3=E4=BC=98=E6=83=A0=E5=88=B8=E6=95=B0?=
=?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/services/activity/lottery/LuckLotteryRecordServices.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
index 3f4d9ac1e..6574e769e 100644
--- a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
+++ b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
@@ -212,7 +212,7 @@ class LuckLotteryRecordServices extends BaseServices
/** @var StoreCouponIssueServices $couponIssueService */
$couponIssueService = app()->make(StoreCouponIssueServices::class);
try {
- $couponIssueService->issueUserCoupon($prize['coupon_id'], $userInfo, true);
+ $couponIssueService->issueUserCoupon($prize['coupon_id'], $userInfo);
} catch (\Throwable $e) {
Log::error('抽奖领取优惠券失败，原因：' . $e->getMessage());
}
From 96e872306c8db8e49dbfc0bce4ed9d8ebcfe7657 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 18:32:35 +0800
Subject: [PATCH 42/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=A4=A9?=
=?UTF-8?q?=E7=BF=BC=E4=BA=91=E4=BA=91=E5=82=A8=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/services/system/config/SystemStorageServices.php | 6 +++---
crmeb/crmeb/services/upload/extend/obs/Client.php | 2 +-
crmeb/crmeb/services/upload/storage/Tyoss.php | 9 ++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php
index 85d0c3f7e..381b2d2b2 100644
--- a/crmeb/app/services/system/config/SystemStorageServices.php
+++ b/crmeb/app/services/system/config/SystemStorageServices.php
@@ -437,13 +437,13 @@ class SystemStorageServices extends BaseServices
$domainName = 'https://' . $name . ($appid ? '-' . $appid : '') . '.cos.' . $reagion . '.myqcloud.com';
break;
case 5:// cos 京东云
- $domainName = 'https://' . $name . '.cos.' . $reagion . '.jdcloud-oss.com';
+ $domainName = 'https://' . $name . '.s3.' . $reagion . '.jdcloud-oss.com';
break;
case 6:// cos 华为云
- $domainName = 'https://' . $name . '.cos.' . $reagion . '.myhuaweicloud.com';
+ $domainName = 'https://' . $name . '.obs.' . $reagion . '.myhuaweicloud.com';
break;
case 7:// cos 天翼云
- $domainName = 'https://' . $name . '.cos.' . $reagion . '.ctyun.cn';
+ $domainName = 'https://' . $name . '.obs.' . $reagion . '.ctyun.cn';
break;
}
return $domainName;
diff --git a/crmeb/crmeb/services/upload/extend/obs/Client.php b/crmeb/crmeb/services/upload/extend/obs/Client.php
index 222b04b8f..b2ad87782 100644
--- a/crmeb/crmeb/services/upload/extend/obs/Client.php
+++ b/crmeb/crmeb/services/upload/extend/obs/Client.php
@@ -422,7 +422,7 @@ class Client extends BaseClient
if ($this->type == 'hw') {
$url = '.myhuaweicloud.com'; // 华为
} else {
- $url = $region . '.ctyun.cn'; // 天翼
+ $url = '.ctyun.cn'; // 天翼
}
if ($bucket) {
return $bucket . '.obs.' . $region . $url;
diff --git a/crmeb/crmeb/services/upload/storage/Tyoss.php b/crmeb/crmeb/services/upload/storage/Tyoss.php
index 61e9b862c..1e90dad7c 100644
--- a/crmeb/crmeb/services/upload/storage/Tyoss.php
+++ b/crmeb/crmeb/services/upload/storage/Tyoss.php
@@ -361,10 +361,10 @@ class Tyoss extends BaseUpload
{
try {
$this->app()->PutBucketCors($name, $region, [
- 'AllowedHeaders' => ['*'],
- 'AllowedMethods' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
- 'AllowedOrigins' => ['*'],
- 'ExposeHeaders' => ['ETag', 'Content-Length', 'x-cos-request-id'],
+ 'AllowedHeader' => ['*'],
+ 'AllowedMethod' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
+ 'AllowedOrigin' => ['*'],
+ 'ExposeHeader' => ['ETag', 'Content-Length', 'x-cos-request-id'],
'MaxAgeSeconds' => 100
]);
return true;
@@ -372,7 +372,6 @@ class Tyoss extends BaseUpload
return $this->setError($e->getMessage());
}
}
-
public function getTempKeys()
{
// TODO: Implement getTempKeys() method.
From 123a918ce7689b5f1dfbfd1b423d85556d628ed7 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 18:49:43 +0800
Subject: [PATCH 43/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=A1=B6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/app/services/system/config/SystemStorageServices.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php
index 381b2d2b2..bce4921c8 100644
--- a/crmeb/app/services/system/config/SystemStorageServices.php
+++ b/crmeb/app/services/system/config/SystemStorageServices.php
@@ -189,7 +189,10 @@ class SystemStorageServices extends BaseServices
try {
$upload = UploadService::init($storageInfo->type);
- $upload->deleteBucket($storageInfo->name, $storageInfo->region);
+ $res = $upload->deleteBucket($storageInfo->name, $storageInfo->region);
+ if (false === $res) {
+ throw new AdminException($upload->getError());
+ }
} catch (\Throwable $e) {
throw new AdminException($e->getMessage());
}
From 02dd5044fcbf99538a12ecda494bf3bc2bcae0b2 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 19:11:51 +0800
Subject: [PATCH 44/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=AC?=
=?UTF-8?q?=E4=B8=9C=E4=BA=91=E5=90=8C=E6=AD=A5=E5=82=A8=E5=AD=98=E7=A9=BA?=
=?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/config/SystemStorageServices.php | 27 +++++++++++++++++++
crmeb/crmeb/services/upload/storage/Jdoss.php | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php
index bce4921c8..d59cf6084 100644
--- a/crmeb/app/services/system/config/SystemStorageServices.php
+++ b/crmeb/app/services/system/config/SystemStorageServices.php
@@ -372,10 +372,37 @@ class SystemStorageServices extends BaseServices
}
break;
case 5:// cos 京东云
+ $upload = UploadService::init($type);
+ $res = $upload->listbuckets();
+ $list = $res['Buckets'];
+ $location = explode('.', $res['@metadata']['effectiveUri'])[1] ?? 'cn-north-1';
+ $config = $this->getStorageConfig($type);
+ foreach ($list as $item) {
+ if (!$this->dao->count(['name' => $item['Name'], 'access_key' => $config['accessKey']])) {
+ $data[] = [
+ 'type' => $type,
+ 'access_key' => $config['accessKey'],
+ 'name' => $item['Name'],
+ 'region' => $location,
+ 'acl' => 'public-read',
+ 'status' => 0,
+ 'domain' => $this->getDomain($type, $item['Name'], $location),
+ 'is_delete' => 0,
+ 'add_time' => time(),
+ 'update_time' => time()
+ ];
+ }
+ }
+ break;
case 6:// cos 华为云
case 7:// cos 天翼云
$upload = UploadService::init($type);
$list = $upload->listbuckets();
+ if (!empty($list['Name'])) {
+ $newList = $list;
+ $list = [];
+ $list[] = $newList;
+ }
$config = $this->getStorageConfig($type);
foreach ($list as $item) {
if (!$this->dao->count(['name' => $item['Name'], 'access_key' => $config['accessKey']])) {
diff --git a/crmeb/crmeb/services/upload/storage/Jdoss.php b/crmeb/crmeb/services/upload/storage/Jdoss.php
index 867a63275..5959bfbe2 100644
--- a/crmeb/crmeb/services/upload/storage/Jdoss.php
+++ b/crmeb/crmeb/services/upload/storage/Jdoss.php
@@ -207,7 +207,7 @@ class Jdoss extends BaseUpload
{
try {
$res = $this->app()->listBuckets();
- return $res['ListAllMyBucketsResult']['Buckets'] ?? [];
+ return $res ?? [];
} catch (\Throwable $e) {
return [];
}
From 00c6b32119cf8ccc2f82da9fec883b8b5f7134df Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Thu, 8 Jun 2023 19:22:10 +0800
Subject: [PATCH 45/48] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=AC?=
=?UTF-8?q?=E4=B8=9C=E4=BA=91=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/crmeb/services/upload/storage/Jdoss.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/crmeb/crmeb/services/upload/storage/Jdoss.php b/crmeb/crmeb/services/upload/storage/Jdoss.php
index 5959bfbe2..b8c5d1f72 100644
--- a/crmeb/crmeb/services/upload/storage/Jdoss.php
+++ b/crmeb/crmeb/services/upload/storage/Jdoss.php
@@ -277,8 +277,7 @@ class Jdoss extends BaseUpload
try {
$this->storageRegion = $region;
$this->app()->deleteBucket([
- 'bucketName' => $name, // REQUIRED
- 'forceDelete' => false
+ 'Bucket' => $name, // REQUIRED
]);
return true;
} catch (AcmException $e) {
From 4908b685332c26d0ca42954943954410d2b9c2ac Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Fri, 9 Jun 2023 09:14:45 +0800
Subject: [PATCH 46/48] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E4=BA=91=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/pages/setting/storage/index.vue | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/template/admin/src/pages/setting/storage/index.vue b/template/admin/src/pages/setting/storage/index.vue
index 3b0f0f41f..fab0b5b78 100644
--- a/template/admin/src/pages/setting/storage/index.vue
+++ b/template/admin/src/pages/setting/storage/index.vue
@@ -29,6 +29,15 @@
七牛云存储
阿里云存储
腾讯云存储
+ 京东云存储
+ 华为云存储
+ 天翼云存储
-
+
@@ -482,7 +494,10 @@ export default {
{ label: '七牛云储存', value: '2' },
{ label: '阿里云储存', value: '3' },
{ label: '腾讯云储存', value: '4' },
- // { label: "缩略图配置", value: "5" },
+ { label: '京东云储存', value: '5' },
+ { label: '华为云储存', value: '6' },
+ { label: '天翼云储存', value: '7' },
+ // { label: "缩略图配置", value: "10" },
],
columns: [
{
From bf6fd8dd167a61d5bd44f90792d9e265e0cbc10e Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 9 Jun 2023 10:26:12 +0800
Subject: [PATCH 47/48] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
template/uni-app/pages/goods/order_confirm/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index 6fb43d562..86109f46c 100644
--- a/template/uni-app/pages/goods/order_confirm/index.vue
+++ b/template/uni-app/pages/goods/order_confirm/index.vue
@@ -18,7 +18,8 @@
{{$t(`由平台为您提供配送服务`)}}
{{$t(`线上下单，到店自提`)}}
- {{shippingType == 0 ? $t('切换地址') : $t('切换门店')}}
+
@@ -45,7 +46,7 @@
{{system_store.address}}{{", " + system_store.detailed_address}}
-
{{$t(`暂无门店信息`)}}
From ac898f8ca3d6c6a13daaa3f133b0014c7857fd6f Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 9 Jun 2023 11:42:07 +0800
Subject: [PATCH 48/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=AF=E5=90=A6=E9=80=80?=
=?UTF-8?q?=E5=9B=9E=E5=BC=80=E5=85=B3=EF=BC=8C=E5=95=86=E5=93=81=E6=88=90?=
=?UTF-8?q?=E5=8A=9F=E9=80=80=E6=AC=BE=E5=90=8E=EF=BC=8C=E9=80=80=E5=9B=9E?=
=?UTF-8?q?/=E4=B8=8D=E9=80=80=E5=9B=9E=E4=BD=BF=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order/StoreOrderRefundServices.php | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index b366faa4e..860fb9b69 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -434,18 +434,22 @@ class StoreOrderRefundServices extends BaseServices
/** @var StoreOrderStatusServices $statusService */
$statusService = app()->make(StoreOrderStatusServices::class);
$res = true;
- //取消的订单退回优惠券
- if ($type == 'cancel' && $order['coupon_id'] && $order['coupon_price']) {
+ //取消或者退款的订单退回优惠券
+ if ($order['coupon_id'] && $order['coupon_price']) {
/** @var StoreCouponUserServices $couponUserServices */
$couponUserServices = app()->make(StoreCouponUserServices::class);
- $res = $couponUserServices->recoverCoupon((int)$order['coupon_id']);
- $statusService->save([
- 'oid' => $order['id'],
- 'change_type' => 'coupon_back',
- 'change_message' => '商品退优惠券',
- 'change_time' => time()
- ]);
+ //未支付取消订单，或者退优惠券开关打开之后的主订单以及最后一个子订单退还优惠券
+ if ($type == 'cancel' || (sys_config('coupon_return_open', 1) && ($order['pid'] == 0 || $this->storeOrderServices->count(['pid' => $order['pid'], 'refund_status' => 0]) == 1))) {
+ $res = $couponUserServices->recoverCoupon((int)$order['coupon_id']);
+ $statusService->save([
+ 'oid' => $order['id'],
+ 'change_type' => 'coupon_back',
+ 'change_message' => '商品退优惠券',
+ 'change_time' => time()
+ ]);
+ }
}
+
//回退积分
$order = $this->regressionIntegral($order);
$statusService->save([
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue
index 1d4610f7e..42cb83da9 100644
--- a/template/uni-app/pages/goods_cate/goods_cate1.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate1.vue
@@ -35,6 +35,16 @@
-
-
-
-
- {{ typeName[type]}}
-
-
- {{titleConfig}}
- 腾讯云cos开通方法：点击查看
++ 京东云cos开通方法：点击查看 +
++ 华为云cos开通方法：点击查看 +
++ 天翼云cos开通方法：点击查看 +
第一步： 添加【存储空间】（空间名称不能重复）
第二步： 开启【使用状态】
@@ -52,6 +61,9 @@我去恶趣味我去