Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

components/index/video-item/index.vue

@@ -211,7 +211,7 @@ export default {
 	},
     watch: {
         item(newVal, old) {
-            console.log(newVal);
+            // console.log(newVal);
             this.item = newVal;
         },
         deep: true

pageB/components/userinfo/index.vue

@@ -82,6 +82,7 @@
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
+        text-shadow: 0px 0px 4rpx #999999;
     }
 
     .operat-img {

pageB/photo/index.vue

@@ -169,6 +169,7 @@
 		}
     }
     .userinfo{
+        z-index: 9999;
         position: absolute;
         right: 30rpx;
         top: 50%;

pageD/activity/activity.vue

@@ -47,7 +47,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
     page {
         background-color: #ECECEC;
     }