Merge remote-tracking branch 'origin/dev-ly' into dev-jcq

source/index/certificate.php

@@ -100,8 +100,14 @@ class certificate extends Base
             display:none;
         }
         .addBox{
-        //其他属性
-        z-index:999;
+            /* 其他属性 */
+            z-index:999;
+        }
+
+        @media (max-width: 768px) {
+            .container {
+                width: 100%;
+            }
         }
     </style>
         </head>
@@ -109,7 +115,7 @@ class certificate extends Base
         <?php 
 		$this->header();
 		?>  
-     <span class="icon-menu iconfont phone-menu visible-xs"></span>
+     <span class="icon-menu iconfont phone-menu visible-xs" style="display: none!important;"></span>
 <div class="phone-shadow"></div>
 <script src="/static/cloud/static/js/html2canvas.js"></script>
 <script src="/static/cloud/static/js/canvas2image.js"></script>

source/index/jiexi.php

@@ -20,6 +20,7 @@ class jiexi extends Base
             <link rel="stylesheet" type="text/css" href="/static/index/css/bootstrap.min.css"/>
             <link rel="stylesheet" type="text/css" href="/static/index/css/base.css"/>
             <link rel="stylesheet" type="text/css" href="/static/index/css/main.css"/>
+            <link rel="stylesheet" type="text/css" href="/static/index/css/h5.css"/>
             <link href="/jiexi/css/base.css" rel="stylesheet">
             <link href="/jiexi/css/app.css" rel="stylesheet">
             <link rel="stylesheet" href="/styles/index.css" />
@@ -35,7 +36,7 @@ class jiexi extends Base
               <style>
     .ms-badge12 {
     background-color: #ffffff;
-    width: 50px;
+    /* width: 50px; */
     height: 25px;
     line-height: 26px;
     display: inline-block;
@@ -79,6 +80,18 @@ class jiexi extends Base
           width: 200px;
           height: 200px;
         }
+footer {
+    position: fixed;
+    bottom: 0;
+}
+@media (max-width: 767px) {
+    footer {
+        position: static;
+    }
+    .container {
+        width: auto;
+    }
+}
 </style>
    <style>
         #qrcode {
@@ -104,8 +117,8 @@ class jiexi extends Base
 		?>  
 
 
-        <div class="container generate_qrcode_box tab-content" style="height: 63rem;">
-    <div class="row" id="decode_box">
+        <div class="generate_qrcode_box tab-content clearfix">
+    <div id="decode_box">
     	<div class="col-md-6 decode_upload_box clearfix">
     		<div class="decode_upload_left">
     			<lable class="decode_upload_btn_lable">上传二维码解码</lable>：

static/index/css/apps.css

@@ -38,15 +38,6 @@
         padding-left: 0.32rem;
     }
 
-    .crumbs {
-        padding: 0.48rem 0 0.24rem;
-        color: rgba(143, 149, 159, 1);
-        font-family: Source Han Sans SC;
-        font-weight: 350;
-        font-size: 0.32rem;
-        line-height: 0.32rem;
-    }
-
     .release-app2>.row>.col-sm-2 {
         margin-bottom: 0.24rem;
     }

static/index/css/ly.css

@@ -496,4 +496,21 @@ body .price-pay .price-list3 .list3 li {
     .super-btn-box .total {
         float: none;
     }
+    #decode_box .decode_upload_left {
+        float: none !important;
+        /* padding-top: 1.2rem; */
+    }
+    #decode_box .decode_upload_right {
+        float: none !important;
+        width: 4rem;
+    }
+    #decode_box .decode_upload_right p {
+        width: 4rem;
+    }
+    .decode_results {
+        width: 6rem;
+    }
+    #decode_box .decode_results_textarea {
+        width: 80%;
+    }
 }

static/index/css/main.css

@@ -15669,6 +15669,14 @@ aside.aside-left ul li:hover a .iconfont {
 }
 
 @media (max-width: 768px) {
+    .crumbs {
+        padding: 0.48rem 0 0.24rem;
+        color: rgba(143, 149, 159, 1);
+        font-family: Source Han Sans SC;
+        font-weight: 350;
+        font-size: 0.32rem;
+        line-height: 0.32rem;
+    }
     .login-common .form-group .iconfont {
         width: 0.4rem;
         height: 0.4rem;