景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 c47732cf7a9b09b0a0e09413919c92ec8510f694 1 个父辈 f02d414d
1 个管道 的构建 通过 耗费 2 秒

修改个人资料，弹出视频等问题

内嵌 并排对比
正在显示 6 个修改的文件 包含 104 行增加 和 85 行删除
@@ -857,25 +857,22 @@ @@ -857,25 +857,22 @@
857 <script src="__TMPL__/public/assets/js/public.js"></script> 857 <script src="__TMPL__/public/assets/js/public.js"></script>
858 <script> 858 <script>
859 // 弹框视频 859 // 弹框视频
860 - var users = $('#users').val();  
861 - if(users == 1){  
862 - $('.mask').css('display','block');  
863 - var video2 = document.getElementById("video2"); //获取ID   
864 - console.log(video2);  
865 - $(function() {  
866 - if (video2.paused) { //判读是否播放      
867 -// video2.paused = false;              
868 - video2.play(); //没有就播放        
869 - }  
870 - });  
871 - var nos = document.getElementById("nos");  
872 - var mask = document.getElementById("mask");  
873 -  
874 - nos.onclick = function nos() {  
875 - mask.style.display = "none";  
876 - video2.pause();  
877 - };  
878 - } 860 + $('.mask').css('display','block');
  861 + var video2 = document.getElementById("video2"); //获取ID 
  862 + console.log(video2);
  863 + $(function() {
  864 + if (video2.paused) { //判读是否播放    
  865 + // video2.paused = false;            
  866 + video2.play(); //没有就播放      
  867 + }
  868 + });
  869 + var nos = document.getElementById("nos");
  870 + var mask = document.getElementById("mask");
  871 +
  872 + nos.onclick = function nos() {
  873 + mask.style.display = "none";
  874 + video2.pause();
  875 + };
879 // 禁止下载 876 // 禁止下载
880 $('video').bind('contextmenu', function() { 877 $('video').bind('contextmenu', function() {
881 return false; 878 return false;
@@ -19,33 +19,37 @@ @@ -19,33 +19,37 @@
19 <div class="mask"> 19 <div class="mask">
20 20
21 </div> 21 </div>
22 - <div class="personal_center" style="height:273px;">  
23 - <!--頭像-->  
24 - <div class="personal_center_avatar">  
25 - <notempty name="user.avatar">  
26 - <img src="{:cmf_get_image_url($user.avatar)}" alt="">  
27 - <else/>  
28 - <img src="__TMPL__/public/assets/starImg/aicon_82.png" alt="">  
29 - </notempty> 22 + <div class="info_boxs">
  23 + <div class="personal_center" style="height:273px;">
  24 + <!--頭像-->
  25 + <div class="personal_center_avatar">
  26 + <notempty name="user.avatar">
  27 + <img src="{:cmf_get_image_url($user.avatar)}" alt="">
  28 + <else/>
  29 + <img src="__TMPL__/public/assets/starImg/aicon_82.png" alt="">
  30 + </notempty>
  31 + </div>
  32 + <div class="updateInfo">
  33 + <span class="nickname" >昵称</span>
  34 + <notempty name="user.user_nickname">
  35 + <input type="text" value="{$user.user_nickname}" id="nickname"/>
  36 + <else/>
  37 + <input type="text" value="" id="nickname"/>
  38 + </notempty>
  39 + </div>
  40 + <!--編輯頭像-->
  41 + <div class="save_info">
  42 + <span>保存</span>
  43 + </div>
30 </div> 44 </div>
31 - <div class="updateInfo">  
32 - <span class="nickname" >昵称</span>  
33 - <notempty name="user.user_nickname">  
34 - <input type="text" value="{$user.user_nickname}" id="nickname"/>  
35 - <else/>  
36 - <input type="text" value="" id="nickname"/>  
37 - </notempty>  
38 - </div>  
39 - <!--編輯頭像-->  
40 - <div class="save_info">  
41 - <span>保存</span> 45 + <div class="Keep">
  46 + Copyright © 2004-2019 独角星球 版权所有
42 </div> 47 </div>
43 </div> 48 </div>
44 49
  50 +
45 </main> 51 </main>
46 - <div class="Keep" style="margin-top:157px;">  
47 - Copyright © 2004-2019 独角星球 版权所有  
48 - </div> 52 +
49 </body> 53 </body>
50 </html> 54 </html>
51 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> 55 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
@@ -19,42 +19,47 @@ @@ -19,42 +19,47 @@
19 <div class="mask"> 19 <div class="mask">
20 20
21 </div> 21 </div>
22 - <div class="personal_center">  
23 - <!--頭像-->  
24 - <div class="personal_center_avatar">  
25 - <notempty name="user.avatar">  
26 - <img src="{:cmf_get_image_url($user.avatar)}" alt="">  
27 - <else/>  
28 - <img src="__TMPL__/public/assets/starImg/aicon_82.png" alt="">  
29 - </notempty>  
30 - </div>  
31 - <!--編輯頭像-->  
32 - <div class="Editor_avatar clearfix">  
33 - <div class="Editor_avatar_icon">  
34 - <img src="__TMPL__/public/assets/starImg/aicon_84.png" alt=""> 22 + <div class="info_boxs">
  23 + <div class="personal_center">
  24 + <!--頭像-->
  25 + <div class="personal_center_avatar">
  26 + <notempty name="user.avatar">
  27 + <img src="{:cmf_get_image_url($user.avatar)}" alt="">
  28 + <else/>
  29 + <img src="__TMPL__/public/assets/starImg/aicon_82.png" alt="">
  30 + </notempty>
35 </div> 31 </div>
36 - <span><input type="file" id="personal-photo" name="avatar">编辑头像</span>  
37 - </div>  
38 - <!--修改資料-->  
39 - <div class="Modifying clearfix" id="editInfo">  
40 - <div class="Modifying_icon">  
41 - <img src="__TMPL__/public/assets/starImg/aicon_85.png" alt=""> 32 + <!--編輯頭像-->
  33 + <div class="Editor_avatar clearfix">
  34 + <div class="Editor_avatar_icon">
  35 + <img src="__TMPL__/public/assets/starImg/aicon_84.png" alt="">
  36 + </div>
  37 + <span><input type="file" id="personal-photo" name="avatar">编辑头像</span>
42 </div> 38 </div>
43 - <span>修改资料</span>  
44 - </div>  
45 - <!--我的收藏-->  
46 - <div class="Collection clearfix" id="myCollection">  
47 - <div class="Collection_icon">  
48 - <img src="__TMPL__/public/assets/starImg/aicon_86.png" alt=""> 39 + <!--修改資料-->
  40 + <div class="Modifying clearfix" id="editInfo">
  41 + <div class="Modifying_icon">
  42 + <img src="__TMPL__/public/assets/starImg/aicon_85.png" alt="">
  43 + </div>
  44 + <span>修改资料</span>
  45 + </div>
  46 + <!--我的收藏-->
  47 + <div class="Collection clearfix" id="myCollection">
  48 + <div class="Collection_icon">
  49 + <img src="__TMPL__/public/assets/starImg/aicon_86.png" alt="">
  50 + </div>
  51 + <span>我的收藏</span>
49 </div> 52 </div>
50 - <span>我的收藏</span> 53 +
  54 + </div>
  55 + <div class="Keep">
  56 + Copyright © 2004-2019 独角星球 版权所有
51 </div> 57 </div>
52 </div> 58 </div>
53 59
  60 +
54 </main> 61 </main>
55 - <div class="Keep">  
56 - Copyright © 2004-2019 独角星球 版权所有  
57 - </div> 62 +
58 </body> 63 </body>
59 </html> 64 </html>
60 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> 65 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
@@ -98,8 +98,8 @@ p { @@ -98,8 +98,8 @@ p {
98 width: 80px; 98 width: 80px;
99 z-index: 10; 99 z-index: 10;
100 position: fixed; 100 position: fixed;
101 - right: 30px;  
102 - top: 600px; 101 + right: 2.4%;
  102 + bottom: 6%;
103 } 103 }
104 104
105 .index_sidebar img { 105 .index_sidebar img {
@@ -79,13 +79,14 @@ body { @@ -79,13 +79,14 @@ body {
79 margin: 0 auto; 79 margin: 0 auto;
80 } 80 }
81 81
82 -main {  
83 - padding-top: 140px;  
84 - padding-bottom: 100px;  
85 -} 82 +/*main {*/
  83 + /*padding-top: 140px;*/
  84 + /*padding-bottom: 100px;*/
  85 +/*}*/
86 86
87 .login { 87 .login {
88 height: 460px; 88 height: 460px;
  89 + margin-top: 14%;
89 } 90 }
90 91
91 /*登陆左边背景*/ 92 /*登陆左边背景*/
@@ -193,5 +194,8 @@ main { @@ -193,5 +194,8 @@ main {
193 .Keep { 194 .Keep {
194 text-align: center; 195 text-align: center;
195 color: #FFFEFE; 196 color: #FFFEFE;
196 - font-synthesis: 16px; 197 + margin-top:30px ;
  198 + font-size: 16px;
  199 + margin-bottom: 20px;
  200 + /*font-synthesis: 16px;*/
197 } 201 }
  1 +.info_boxs{
  2 + position: absolute;
  3 + top:60%;
  4 + left: 50%;
  5 + transform:translate(-50%,-50%);
  6 + -webkit-transform:translate(-50%,-50%);
  7 + -o-transform:translate(-50%,-50%);
  8 + -moz-transform:translate(-50%,-50%);
  9 + -ms-transform:translate(-50%,-50%);
  10 +}
1 .personal_center { 11 .personal_center {
2 width: 519px; 12 width: 519px;
3 - height: 432px; 13 + height: 386px;
4 background: rgba(255, 255, 255, 1); 14 background: rgba(255, 255, 255, 1);
5 box-shadow: 0px 32px 36px 2px rgba(0, 0, 0, 0.04); 15 box-shadow: 0px 32px 36px 2px rgba(0, 0, 0, 0.04);
6 border-radius: 20px; 16 border-radius: 20px;
7 margin: 0 auto; 17 margin: 0 auto;
8 - position: relative;  
9 padding: 0 160px; 18 padding: 0 160px;
10 - padding-top: 116px; 19 + padding-top: 94px;
11 box-sizing: border-box; 20 box-sizing: border-box;
12 } 21 }
13 22
14 .personal_center_avatar { 23 .personal_center_avatar {
15 - width: 150px;  
16 - height: 150px; 24 + width: 140px;
  25 + height: 140px;
17 background: #fff; 26 background: #fff;
18 border-radius: 50%; 27 border-radius: 50%;
19 top: -75px; 28 top: -75px;
20 position: absolute; 29 position: absolute;
21 - left: 185px; 30 + left: 191px;
22 } 31 }
23 32
24 .personal_center_avatar img { 33 .personal_center_avatar img {
25 margin: 5px; 34 margin: 5px;
26 - width:140px;  
27 - height:140px; 35 + width:130px;
  36 + height:130px;
28 border-radius:50%; 37 border-radius:50%;
29 } 38 }
30 39