diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
index 674ac056..55d98d62 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
@@ -15,7 +15,7 @@ export default class edittemplate extends React.Component {
model: {
top_image: "",
list: "2",
- font_color: "#f1f2f3",
+ font_color: "#000000",
button_color: "#FACD6A",
describe: { type: "", content: "", bg_image: '' },
checkedLarge: false
@@ -379,7 +379,7 @@ export default class edittemplate extends React.Component {
- { this.fontcolor('#f0f') }}>
+ { this.fontcolor('#000000') }}>
{ this.fontcolor('#04C160') }}>
{ this.fontcolor('#AE99D3') }}>
{ this.fontcolor('#FACD6A') }}>
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
index c6ffbf05..d6ca7f02 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
@@ -104,7 +104,7 @@ export default class edittemplate extends React.Component {
if (type === 'overMaxAmount') {
Notify.error(`最多可上传 ${data.maxAmount} 张图片`);
} else if (type === 'overMaxSize') {
- Notify.error(`图片大小超过 ${data.formattedMaxSize}`);
+ Notify.error(`图片大小不能超过 ${data.formattedMaxSize}`);
}
};
handleChange = (color) => {
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
index 5dcf0f34..29517e78 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
@@ -211,7 +211,7 @@ export default class edittemplate extends React.Component {
-
+
{ this.onactivityChange(e) }} value={this.state.model.describe.type}>
this.hasItemFn(1)} value={"1"}>居左
this.hasItemFn(2)} value={"2"}>居中
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
index d0cab8d9..86d5637d 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
@@ -203,32 +203,47 @@ export default class edittemplate extends React.Component {
diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index 5bdb2859..1c2fde79 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -847,13 +847,12 @@ export default class edittemplate extends React.Component {
{/* 组件库 */}
{
- this.state.showType==2? this.componentName(c)}/>:null
+ this.state.showType==2&&this.state.activeNavStatus==2? this.componentName(c)}/>:null
}
- {/* this.state.showType==2&&this.state.activeNavStatus==2? */}
-
+
{this.state.activeNavStatus == 1 ? (