Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5

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:''
     }
   }

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'} />
             </FormItem>
           </Form>
         </div>

src/pages/exchangepage/edittemplate/couponConfig/bottomBar.js

@@ -5,7 +5,38 @@ 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
         }
     }
@@ -13,7 +44,6 @@ export default class bottomBar extends React.Component {
         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});

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%;
-}
+}
+.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;
+  }

src/pages/exchangepage/edittemplate/main.js

@@ -130,8 +130,8 @@ let couponProduct_list = {
        text:'我的券'
      }
     ],
-    defaultText:'',
-    selectText:'',
+    defaultText:'#ccc',
+    selectText:'#000',
     background:''                                                                  
   }
 }