From 03289ae434e37d2cd7b088415c275e0197d36071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Wed, 7 Sep 2022 18:55:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=A0=8Frender=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edittemplate/couponConfig/bottomBar.js | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js b/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js index 1db98797..111037e4 100644 --- a/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js +++ b/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js @@ -5,11 +5,43 @@ export default class bottomBar extends React.Component { constructor(props) { super(props) this.state={ - navList:[], + navList:[ + { + id:1, + iswitch:true, + name:'index', + pic:{ + show:'', + selectShow:'' + }, + text:'首页' + }, + { + id:2, + iswitch:true, + name:'order', + pic:{ + show:'', + selectShow:'' + }, + text:'订单' + }, + { + id:3, + iswitch:true, + name:'coupon', + pic:{ + show:'', + selectShow:'' + }, + text:'我的券' + } + ], active:0 } } componentWillReceiveProps(nextProps){ + console.log(1313); let navList=nextProps.bottomBarConfig.navlist; let naVisual=navList.filter(item=>item.iswitch); this.setState({navList:naVisual}); From d6da93a358e84d211e9204b080c0138e9dd39820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Wed, 7 Sep 2022 18:56:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js b/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js index 111037e4..d70da39c 100644 --- a/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js +++ b/src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js @@ -41,11 +41,9 @@ export default class bottomBar extends React.Component { } } componentWillReceiveProps(nextProps){ - console.log(1313); let navList=nextProps.bottomBarConfig.navlist; let naVisual=navList.filter(item=>item.iswitch); this.setState({navList:naVisual}); - console.log(66,nextProps); } clickIcon(e,index){ this.setState({active:index}); From 10463263e30fd1aeaf3b638a1d85c910373a3a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Thu, 8 Sep 2022 11:16:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=B8=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exchangepage/couponTemplate/goodsPage/config/bottomBar.js | 4 ++-- .../exchangepage/couponTemplate/goodsPage/config/searchBar.js | 2 +- src/pages/exchangepage/edittemplate/main.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js index e463f953..c5fedfae 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js @@ -47,8 +47,8 @@ export default class edittemplate extends React.Component { text:'我的券' } ], - defaultText:'', - selectText:'', + defaultText:'#ccc', + selectText:'#000', background:'' } } diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js index f388b034..c77686c4 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js @@ -101,7 +101,7 @@ export default class Searchbar extends React.Component { this.setState({ placeholder: '' }) Bus.emit('placeholder', '') }} - value={placeholder} placeholder={"请输入"} labelWidth={'0px'} maxLength={10} height={'36px'} width={'300px'} alignment={'left'} /> + value={placeholder} placeholder={"请输入"} labelWidth={'0px'} maxLength={9} height={'36px'} width={'300px'} alignment={'left'} /> diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 782fa043..b02791b6 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -130,8 +130,8 @@ let couponProduct_list = { text:'我的券' } ], - defaultText:'', - selectText:'', + defaultText:'#ccc', + selectText:'#000', background:'' } } From eff0085d73d9c51d29c28eb4c8849796ee8da749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Thu, 8 Sep 2022 15:03:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E4=BC=98=E6=83=A0=E5=88=B8=E6=BB=9A=E5=8A=A8=E6=9D=A1?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edittemplate/goodstemplate.less | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.less b/src/pages/exchangepage/edittemplate/goodstemplate.less index f6fc1aaa..d745fb74 100644 --- a/src/pages/exchangepage/edittemplate/goodstemplate.less +++ b/src/pages/exchangepage/edittemplate/goodstemplate.less @@ -118,7 +118,7 @@ } .goodstemplate { - + overflow-y: auto; .selectBorder { z-index: 2; -webkit-box-sizing: border-box; @@ -285,4 +285,23 @@ //优惠券图片 .picture { width: 100%; -} \ No newline at end of file +} +.goodstemplate::-webkit-scrollbar { + + width: 6px; + + } + + .goodstemplate::-webkit-scrollbar-track { + + background-color:#F3F4F5; + border-radius: 4px; + } + + .goodstemplate::-webkit-scrollbar-thumb { + background-color:#C1C1C1; + border-radius: 4px; + opacity: 0.7; + width: 6px; + height: 4px; + } \ No newline at end of file