Merge pull request #922 from Tencent/develop

feat: weui v2.5.12

CHANGELOG.md

@@ -1,3 +1,13 @@
+### v2.5.12 (2022-09-06)
+
+#### Features
+* fix: 加入公安备案信息
+
+#### Bugfixes
+* fix: toast、toptips层级调整至5500
+
+
+
 ### v2.5.11 (2022-08-16)
 
 #### Features

dist/example/example.js

@@ -311,6 +311,9 @@ $(() => {
     window.home = function () {
       location.hash = '';
     };
+
+    var year = new Date().getFullYear();
+    document.getElementById('js_copyright_year').innerHTML = year;
   }
   init();
 });

dist/example/index.html

@@ -4278,9 +4278,18 @@ <h1 class="page__title">TopTips</h1>
             <div class="page_logo_wrp">
               <a href="javascript:home()"><img src="images/icon_footer_link.png" /></a>
             </div>
-            <a href="//beian.miit.gov.cn/" class="page_copyright">
-              备案号：粤B2-20090059
-            </a>
+            <div class="weui-footer">
+              <div class="weui-footer__text">
+                <a class="weui-footer__text__meta" href="//beian.miit.gov.cn/">备案号：粤B2-20090059</a>
+                <a class="weui-footer__text__meta gongan_meta" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=44030502009285"><img src="./images/pic_gongan.png">粤公网安备 44030502009285号</a>
+
+                <span class="weui-footer__text__meta">公司地址：深圳市南山区粤海街道麻岭社区科技中一路腾讯大厦35层</span>
+                <span class="weui-footer__text__meta">联系电话：4006 700 700</span>
+              </div>
+              <div class="weui-footer__text">
+                Copyright © 1998 - <span id="js_copyright_year"></span> Tencent All Rights Reserved.
+              </div>
+            </div>
         </div>
     </script>
     <script src="./zepto.min.js"></script>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "weui",
-    "version": "2.5.11",
+    "version": "2.5.12",
     "description": "A UI library by WeChat official design team, includes the most useful widgets/modules in mobile web applications.",
     "keywords": [
         "weui",

src/example/example.js

@@ -311,6 +311,9 @@ $(() => {
     window.home = function () {
       location.hash = '';
     };
+
+    var year = new Date().getFullYear();
+    document.getElementById('js_copyright_year').innerHTML = year;
   }
   init();
 });

src/example/example.less

@@ -91,9 +91,9 @@ body,
 
 .page__ft {
     padding-top: 40px;
-    padding-bottom: 10px;
-    padding-bottom: calc(10px ~"+ constant(safe-area-inset-bottom)");
-    padding-bottom: calc(10px ~"+ env(safe-area-inset-bottom)");
+    padding-bottom: 32px;
+    padding-bottom: calc(32px ~"+ constant(safe-area-inset-bottom)");
+    padding-bottom: calc(32px ~"+ env(safe-area-inset-bottom)");
     text-align: center;
     img {
         height: 19px;
@@ -107,6 +107,39 @@ body,
         left: 0;
         right: 0;
     }
+    .weui-footer{
+      display:none;
+      padding:16px 0 0;
+    }
+    .weui-footer__text{
+      margin-bottom:8px;
+      &:last-child{
+        margin-bottom:0;
+      }
+    }
+    .weui-footer__text__meta{
+      margin:0 6px;
+    }
+    a.weui-footer__text__meta{
+      color:rgba(0,0,0,.2);
+      .dark({
+        color:rgba(255,255,255,.2);
+      });
+      &:active{
+        opacity:.5;
+      }
+    }
+    .gongan_meta{
+      display:inline-flex;
+      vertical-align:bottom;
+      align-items:center;
+
+      img{
+        margin-right:2px;
+        width:18px;
+        height:18px;
+      }
+    }
 }
 
 .page__title {
@@ -605,21 +638,6 @@ body,
     vertical-align:bottom;
   }
 } 
-.page_copyright{
-  &&{
-    margin-top:12px;
-    line-height:1.4;
-    color:rgba(0,0,0,.2);
-    font-size:12px;
-    text-align:center;
-    .dark({
-      color:rgba(255,255,255,.2);
-    });
-    &:active{
-      opacity:.5;
-    }
-  }
-}
 
 
 // iphone x
@@ -652,3 +670,12 @@ body,
         }
     }
 }
+
+@media (min-device-width: 768px) {
+  .page__ft{
+    padding-bottom:48px;
+    .weui-footer{
+      display:block;
+    }
+  }
+}

src/example/index.html

@@ -81,9 +81,18 @@
             <div class="page_logo_wrp">
               <a href="javascript:home()"><img src="images/icon_footer_link.png" /></a>
             </div>
-            <a href="//beian.miit.gov.cn/" class="page_copyright">
-              备案号：粤B2-20090059
-            </a>
+            <div class="weui-footer">
+              <div class="weui-footer__text">
+                <a class="weui-footer__text__meta" href="//beian.miit.gov.cn/">备案号：粤B2-20090059</a>
+                <a class="weui-footer__text__meta gongan_meta" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=44030502009285"><img src="./images/pic_gongan.png">粤公网安备 44030502009285号</a>
+
+                <span class="weui-footer__text__meta">公司地址：深圳市南山区粤海街道麻岭社区科技中一路腾讯大厦35层</span>
+                <span class="weui-footer__text__meta">联系电话：4006 700 700</span>
+              </div>
+              <div class="weui-footer__text">
+                Copyright © 1998 - <span id="js_copyright_year"></span> Tencent All Rights Reserved.
+              </div>
+            </div>
         </div>
     </script>
     <script src="./zepto.min.js"></script>

src/style/widget/weui-tips/weui-toast.less

@@ -18,7 +18,7 @@
 
 .weui-toast {
     position: fixed;
-    z-index: 5000;
+    z-index: 5500;
     font-size: 10px;
     width: 13.6em;
     height: 13.6em;

src/style/widget/weui-tips/weui-toptips.less

@@ -28,7 +28,7 @@
     font-size: 14px;
     text-align: center;
     color: #fff; // 固定色值
-    z-index: 5000;
+    z-index: 5500;
     .text_wrap();
 }
 .weui-toptips_warn {