chen
/
huaxia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改冲突

master
chen 2021-09-22 16:12:35 +08:00
parent eecf9963df
commit da580b310d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/huaxia.js
View File

@ -361,16 +361,8 @@ $(function(){
if ($(e.target).next().attr("class")!="upImg") { if ($(e.target).next().attr("class")!="upImg") {
console.log(123); console.log(123);
$(".uptoux").attr('src',$filePath); $(".uptoux").attr('src',$filePath);
<<<<<<< HEAD $(".ty_topimgtx").css("display","block")
} }
$(".ty_topimgtx").css("display","block")
=======
$(".ty_topimgtx").css("display","block")
}
>>>>>>> ea0028c366c205a72ec0c2ce140272053e047979
}) })
// 立即投稿 // 立即投稿
$('#submitTG').click(function(){ $('#submitTG').click(function(){