Merge branch 'deposit-migrate' into deposit-coupons

# Conflicts:
#	src/components/coupons/myCoupons/index.js

src/components/coupons/myCoupons/index.js

@@ -276,11 +276,12 @@ class UseCoupon extends PureComponent {
     })
   }
 
-  endExpansion = id => {
+  endExpansion = (id, validId) => {
     this.setState({
-      couponList: this.state.couponList.map(item => {
+      valid_coupons: this.state.valid_coupons.map(item => {
         if (item.id === id) {
           delete item.start_amount
+          item.id = validId
         }
         return item
       })

src/components/detail/index.scss

@@ -60,6 +60,7 @@
         font-size: 14px;
         color: $color_666;
         margin-top: 10px;
+        line-height: 16px;
       }
 
       .des {

src/components/expand/share.js

@@ -164,8 +164,7 @@ class ExpandShare extends Component {
                         step: 2,
                         helpData: data
                     })
-
-                    console.log(data)
+                    this.getListorData()
                 } else if (errno === 17018 || errno === 17020) {
                     this.setState({
                         isShow: true,

src/components/expand/share.scss

@@ -569,6 +569,7 @@
         color: #fff;
         font-size: 15px;
         margin-top: 20px;
+        border: none;
       }
 
     }
@@ -596,6 +597,7 @@
         border-radius: 17px;
         color: #fff;
         font-size: 15px;
+        border: none;
       }
 
     }