Merge branch 'master' of http://114.55.54.52:3000/zmm/GBRSGB

CZKJ.GBRS2.WebMVC/CZKJ.GBRS2.WebMVC.csproj

@@ -23,6 +23,12 @@
     <ProjectReference Include="..\CZKJ.GBRS2\CZKJ.GBRS2.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="Views\Shared\Components\Header\Default - 复制.cshtml">
+      <Pack>$(IncludeRazorContentInPack)</Pack>
+    </Content>
+  </ItemGroup>
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="http://json.schemastore.org/chrome-manifest" /></VisualStudio></ProjectExtensions>
 
 </Project>

CZKJ.GBRS2.WebMVC/Views/Home/Index.cshtml

@@ -208,10 +208,7 @@
                     马上行动吧！喂养“国国”宝宝“啦点击
                     捐竹子已有300万网友赠送竹子喽！
                 </p>
-                <button class="addLeaf">点击捐竹子</button>
-                <img class="hand" src="/assets/homeImg/hand.png" alt="">
-
-
+                <button class="addLeaf">点击捐竹子<img class="hand" src="/assets/homeImg/hand.png" alt=""></button>
             </div>
             <div class="con">
                 <div class="swiper-container" id="videoBanner">

CZKJ.GBRS2.WebMVC/Views/Shared/_Layout.cshtml

@@ -221,11 +221,6 @@
                     $('.rightPopUp').css('right', 0);
                 }
             }
-
-
-
-
-
         })
 
     </script>