Merge branch 'xieying' of gitadmin/tuoheng_qmhh_web into develop

package_first/pages/AttentionMethod/index.wxss

@@ -2,11 +2,12 @@
 .attention_container{
     position: relative;
     width: 100%;
+    background-color: RGBA(224, 235, 255, 1);
 }
 .main{
     width: 100%;
-    /* height: 2640rpx; */
-    height: 2000rpx;
+    height: 1940rpx;
+    padding-bottom: 40rpx;
 }
 .button{
     width: calc(100% - 60rpx);
@@ -20,6 +21,6 @@
     text-align: center;
     line-height: 95rpx;
     position: fixed;
-    bottom: 55rpx;
+    bottom: 30rpx;
     left: 30rpx;
 }

package_first/pages/videoDetail/index.js

@@ -64,7 +64,9 @@ Page({
         }
       this.setData({
         'detail.status': params.status,
+        control : true
       })
+      console.log(this.data.detail.status);
     })
   }
 })