Merge remote-tracking branch 'origin/master'

src/views/channelpage/templateMobile1.vue

@@ -301,6 +301,8 @@
 <style scoped lang="scss">
 .template_img{
     position: relative;
+    height: 100vh;
+    overflow: auto;
     >img{
         width: 100%;
     }