From b407c3e6101b35ef8ff522fb548ef8475d426b5b Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Tue, 19 Jul 2022 09:57:38 +0800
Subject: [PATCH 1/6] bug626
---
.../Algorithm/AlgorithmTopDetails.vue | 2 -
.../Application/ApplicationTopDetails.vue | 2 -
.../Business/BusinessTopDetails.vue | 2 -
.../Developer/DeveloperTopDetails.vue | 2 -
.../LayerService/LayerServiceTopDetails.vue | 2 -
.../newHome/components/PopularAbility.vue | 329 +++++++++---------
6 files changed, 163 insertions(+), 176 deletions(-)
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 8185cf2d..64311f72 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -316,8 +316,6 @@
}
.ant-btn:nth-of-type(3) {
width: 145px;
- background: #fff;
- color: #526aff;
}
}
}
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 3f1c9f01..3f8bc1e0 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -305,8 +305,6 @@
.ant-btn:nth-of-type(3) {
width: 1.45rem;
- background: #fff;
- color: #526aff;
}
}
}
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 160a84dd..688297ce 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -308,8 +308,6 @@
}
.ant-btn:nth-of-type(3) {
width: 145px;
- background: #fff;
- color: #526aff;
}
}
}
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index 3896918d..a6969519 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -304,8 +304,6 @@
}
.ant-btn:nth-of-type(3) {
width: 1.45rem;
- background: #fff;
- color: #526aff;
}
}
}
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index 06ba2cf3..10d88d02 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -298,8 +298,6 @@
}
.ant-btn:nth-of-type(3) {
width: 1.45rem;
- background: #fff;
- color: #526aff;
}
}
}
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index 72f7144f..0ec931e8 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -153,200 +153,197 @@
}
From ed5ed8c8282bccaaafb1f431fbe49e631fa8d5aa Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 19 Jul 2022 10:22:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20=20?=
=?UTF-8?q?=20=20=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E7=89=B9=E6=AE=8A?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/apply.vue | 53 +++++++++++++++++++---------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index e4ff9bc0..849231e5 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -454,11 +454,11 @@
if (res.data.msg === 'success') {
mybus.emit('getSgcNum')
router.push({
- path: '/DetailsPageconetent',
- query: {
- select: '组件服务',
- },
- })
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
}
})
}
@@ -468,29 +468,36 @@
})
console.log('提交数据==========================>', formName, ids)
if (formName.system.length !== 0) {
+ if (formName.applicationSystem.length == 0) {
+ formName.applicationSystem = ''
+ }
submitApply(formName).then((res) => {
// applySuccess.value = false
message.success('申请提交成功，请到消息中心查看！')
console.log('能力申请================>', res)
- if (ids && ids.length > 0) {
- sgcDel({ ids: ids }).then((res) => {
- if (res.data.msg === 'success') {
- mybus.emit('getSgcNum')
- router.push({
- path: '/DetailsPageconetent',
- query: {
- select: '组件服务',
- },
- })
- }
- })
+ if (res.data.code == 0) {
+ if (ids && ids.length > 0) {
+ sgcDel({ ids: ids }).then((res) => {
+ if (res.data.msg === 'success') {
+ mybus.emit('getSgcNum')
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
+ }
+ })
+ } else {
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
+ }
} else {
- router.push({
- path: '/DetailsPageconetent',
- query: {
- select: '组件服务',
- },
- })
+ message.error('申请失败！')
}
})
}
From b15efd9206a5b3615561e03c79a6f3dd1c02d9de Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Tue, 19 Jul 2022 10:25:10 +0800
Subject: [PATCH 3/6] bug629
---
.../capacityOnTheShelf/components/PutOnTheShelf.vue | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index d7a45ddb..896a724f 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -138,10 +138,18 @@
>
{{ item.name }}
+
Date: Tue, 19 Jul 2022 11:08:32 +0800
Subject: [PATCH 4/6] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Algorithm/AlgorithmTopDetails.vue | 76 +++++++++----------
1 file changed, 37 insertions(+), 39 deletions(-)
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 64311f72..3a1dc63b 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-08 11:56:28
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:30:19
+ * @LastEditTime: 2022-07-19 11:07:46
* @Description: 算法详情页头部
-->
@@ -62,7 +62,7 @@
加入申购车
- {{ scFlag ? '已' : '' }}收藏
+ {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏
@@ -127,40 +127,6 @@
})
}
const componentType = ref('')
- // 收藏
- const scFlag = ref(props.dataList.isCollect)
- const scFlag2 = ref(true)
- const goTOCollection = () => {
- console.log('收藏===================》', props.dataList)
- if (scFlag2.value) {
- scFlag2.value = false
- if (scFlag.value) {
- scDel([props.dataList.id]).then((res) => {
- if (res.data.msg === 'success') {
- message.success('取消成功')
- scFlag.value = false
- scFlag2.value = true
- }
- })
- } else {
- scInsert([
- {
- resourceId: props.dataList.id,
- },
- ]).then((res) => {
- if (res.data.msg === 'success') {
- message.success('添加收藏成功！')
- scFlag.value = true
- scFlag2.value = true
- }
- })
- }
- }
- // scInsert([{ resourceId: props.dataList.id }]).then((res) => {
- // console.log(res)
- // message.success('收藏成功')
- // })
- }
if (props.dataList.infoList) {
applicationArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域'
@@ -217,12 +183,44 @@
if (obj) {
componentType.value = obj.attrValue
}
- if (val.isCollect) {
- scFlag.value = true
- }
}
}
)
+ // 收藏
+ const scFlag2 = ref(true)
+ const goTOCollection = () => {
+ console.log('收藏===================》', props.dataList)
+ if (scFlag2.value) {
+ scFlag2.value = false
+ if (props.dataList.isCollect == 'true') {
+ scDel([props.dataList.id]).then((res) => {
+ if (res.data.msg === 'success') {
+ message.success('取消成功')
+ // eslint-disable-next-line vue/no-mutating-props
+ props.dataList.isCollect = 'false'
+ scFlag2.value = true
+ }
+ })
+ } else {
+ scInsert([
+ {
+ resourceId: props.dataList.id,
+ },
+ ]).then((res) => {
+ if (res.data.msg === 'success') {
+ message.success('添加收藏成功！')
+ // eslint-disable-next-line vue/no-mutating-props
+ props.dataList.isCollect = 'true'
+ scFlag2.value = true
+ }
+ })
+ }
+ }
+ // scInsert([{ resourceId: props.dataList.id }]).then((res) => {
+ // console.log(res)
+ // message.success('收藏成功')
+ // })
+ }