diff --git a/src/assets/images/style/79.png b/src/assets/images/style/79.png
index 90d1f51..2b42b1e 100644
Binary files a/src/assets/images/style/79.png and b/src/assets/images/style/79.png differ
diff --git a/src/assets/images/style/80.png b/src/assets/images/style/80.png
index afde0c4..5020f88 100644
Binary files a/src/assets/images/style/80.png and b/src/assets/images/style/80.png differ
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index f689bf8..daf085a 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -31,7 +31,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -193,7 +193,8 @@
设置
-
@@ -312,8 +313,8 @@
-
+
-
+
@@ -369,7 +370,7 @@
-
+
@@ -566,10 +567,14 @@ export default {
isJournal () {
return this.form.articleTemplate === 26
},
- // 人物详情
+ // 人员信息+富文本内容详情
isPeople () {
return this.form.articleTemplate === 72
},
+ // 人员信息+富文本内容详情
+ isRichText () {
+ return this.form.articleTemplate === 80
+ },
// 组织架构
isOrg () {
return this.form.articleTemplate === 69
@@ -836,10 +841,10 @@ export default {
getTemplate () {
this.$post(this.api.individualTemplateDetailsStyle).then(({ data }) => {
const result = []
+ // 不显示产品、课程详情(id为79),产品课程详情在/add/product里添加
data.map(e => {
- result.find(n => n.style === e.style) || result.push(e)
+ e.id !== 79 && result.push(e)
})
- result.pop() // 不显示产品、课程详情,产品课程详情在/add/product里添加
this.detailStyle = result
}).catch(err => { })
},
@@ -1355,11 +1360,11 @@ $upload-lg-height: 102px;
display: flex;
flex-wrap: wrap;
width: 955px;
- // height: 320px;
margin-top: 20px;
overflow: auto;
li {
+ width: 170px;
margin: 0 20px 10px 0;
text-align: center;
cursor: pointer;
@@ -1369,11 +1374,15 @@ $upload-lg-height: 102px;
}
}
+ /deep/.el-radio {
+ white-space: normal;
+ line-height: 1.6;
+ }
+
.review {
display: flex;
justify-content: center;
align-items: center;
- width: 170px;
height: 112px;
margin-bottom: 10px;
border: 1px solid #dcdee0;
diff --git a/src/pages/article/add/product.vue b/src/pages/article/add/product.vue
index 748d3cc..ec21225 100644
--- a/src/pages/article/add/product.vue
+++ b/src/pages/article/add/product.vue
@@ -190,7 +190,7 @@
-
+
@@ -199,7 +199,6 @@
{{ scope.row.name }}
- 否
@@ -218,7 +217,7 @@
-
+
@@ -227,7 +226,6 @@
{{ scope.row.name }}
- 否
@@ -266,7 +264,7 @@ export default {
style: '产品、课程详情'
},
{
- id: 72,
+ id: 80,
style: '富文本'
},
{
diff --git a/src/setting.js b/src/setting.js
index ae214af..e2b7b9b 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,7 +5,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = location.origin
if (isDev) {
host = 'https://huorantech.com'
- host = 'http://192.168.31.217:10000'
+ // host = 'http://192.168.31.217:10000'
}
const Setting = {