diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 7e0d92d5..db462c81 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -578,7 +578,7 @@ export default {
const isLt2M = file.size / 1024 / 1024 < 2
if (!isImage) {
- this.$message.error('上传头像图片只能是 JPG 格式!')
+ this.$message.error('上传头像图片只能是 jpg/png 格式!')
}
if (!isLt2M) {
this.$message.error('上传头像图片大小不能超过 2MB!')
@@ -601,7 +601,7 @@ export default {
const isLt2M = file.size / 1024 / 1024 < 2
if (!isImage) {
- this.$message.error('上传头像图片只能是 JPG 格式!')
+ this.$message.error('上传头像图片只能是 jpg/png 格式!')
}
if (!isLt2M) {
this.$message.error('上传头像图片大小不能超过 2MB!')
diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue
index 81159a55..f215bd10 100644
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@@ -138,6 +138,7 @@
})
const init = (id) => {
+ console.log(id, '-------------------------------------------------')
if (id) {
selectOne(id).then((res) => {
// console.clear()
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue
index a32c4304..455161db 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue
@@ -39,12 +39,45 @@
obj.attrValue = JSON.parse(obj.attrValue)
// dataFrom.value = obj
obj.attrValue.map((item) => {
- let params = {
- title: item.type,
- content: item.desc,
- value: item.price,
- time: '/年起',
- unit: '¥',
+ let params = {}
+ switch (item.type) {
+ case '一次性买断':
+ params = {
+ title: item.type,
+ content: item.desc,
+ value: item.price,
+ time: '',
+ unit: '¥',
+ }
+ break
+ case '按调用次数':
+ params = {
+ title: item.type,
+ content: item.desc,
+ value: item.price,
+ time: '/次',
+ unit: '¥',
+ }
+ break
+
+ case '按并发路数':
+ params = {
+ title: item.type,
+ content: item.desc,
+ value: item.price,
+ time: '/路',
+ unit: '¥',
+ }
+ break
+ case '按年计费':
+ params = {
+ title: item.type,
+ content: item.desc,
+ value: item.price,
+ time: '/年',
+ unit: '¥',
+ }
+ break
}
dataFrom.value.push(params)
})
@@ -70,7 +103,7 @@
title: item.type,
content: item.desc,
value: item.price,
- time: '/元',
+ time: '',
unit: '¥',
}
break
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index f7ed512b..6d2288af 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -162,8 +162,8 @@
}
.lable-father {
position: absolute;
- min-width: 2.5rem;
- right: -2.5rem;
+ min-width: 3.5rem;
+ right: -3.5rem;
top: 0;
}
.label {
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index f49ebce5..121718e2 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -73,13 +73,13 @@
titleSon: '调用接口',
link: {
name: '接口地址:',
- value: 'http://localhost:9999/#/details?id=1532278256619307010',
+ value: '',
},
postMethod: {
name: '请求方式:',
- value: 'POST',
+ value: '',
},
- contact: '联系厂商:',
+ contact: '联系厂商',
facilitator: { name: '服务商:', value: '科大讯飞' },
people: { name: '联系人:', value: '李四' },
phone: {
@@ -116,8 +116,12 @@
dataFrom.value.content[0].people.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
- } else if (item.attrType === '技术文档') {
- dataFrom.value.link = item.attrValue || '--'
+ }
+ // } else if (item.attrType === '技术文档') {
+ // dataFrom.value.link = item.attrValue || '--'
+ // }
+ else if (item.attrType === '服务接口') {
+ dataFrom.value.content[0].link.value = item.attrValue || '--'
}
})
}
@@ -143,8 +147,12 @@
dataFrom.value.content[0].people.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
- } else if (item.attrType === '技术文档') {
- dataFrom.value.link = item.attrValue || '--'
+ }
+ // else if (item.attrType === '技术文档') {
+ // dataFrom.value.link = item.attrValue || '--'
+ // }
+ else if (item.attrType === '服务接口') {
+ dataFrom.value.content[0].link.value = item.attrValue || '--'
}
})
}
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 1e3c06f0..42b48cc9 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -148,8 +148,8 @@
}
.lable-father {
position: absolute;
- min-width: 2.5rem;
- right: -2.5rem;
+ min-width: 3.5rem;
+ right: -3.5rem;
top: 0;
}
.label {
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 42bea3df..33ffb300 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -162,8 +162,8 @@
}
.lable-father {
position: absolute;
- min-width: 2.5rem;
- right: -2.5rem;
+ min-width: 3.5rem;
+ right: -3.5rem;
top: 0;
}
.label {
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index 4eeea3ba..e7c71332 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -161,8 +161,8 @@
}
.lable-father {
position: absolute;
- min-width: 2.5rem;
- right: -2.5rem;
+ min-width: 3.5rem;
+ right: -3.5rem;
top: 0;
}
.label {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index f307a4fe..c8c5b45b 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -162,8 +162,8 @@
}
.lable-father {
position: absolute;
- min-width: 2.5rem;
- right: -2.8rem;
+ min-width: 3.5rem;
+ right: -3.5rem;
top: 0;
}
.label {
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 13fdcfac..c22c6c89 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -174,15 +174,15 @@
>
查看详情
-
免费试用
-
- -->
+
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 970ada79..15f9cf34 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -295,7 +295,7 @@
showMap.value = true
clickList.value[1].content = []
clickList.value[indexFather].content[0] = name
- tabList.value[1].content = ['333333', '213124']
+ tabList.value[1].content = []
} else {
clickList.value[indexFather].content.push(name)
}