Merge branch 'dev-cz' into dev

5 years ago · 433219c3f6
parent 46e5b1198c 2e8f7ba410
commit 433219c3f6
5 changed files with 11 additions and 4 deletions
--- a/Application/Mobile/View/Ssg/home.html
+++ b/Application/Mobile/View/Ssg/home.html
@ -23,14 +23,14 @@
                    请在<text style="color:yellow">Safari</text>中打开
                </div>
            </div>
-            <!-- <div class="alert_copy">
+            <div class="alert_copy">
                <div>
                    <input id="copyVal" type="text" readonly='' value="">
                    <a href="javascript:" id="copy" data-clipboard-target="#copyVal" style="background:url('__IMG__/ssg/home/copybt.png') no-repeat top center/cover;">
                        复制
                    </a>
                </div>    
-            </div> -->
+            </div>
        </div>
    </div>

--- a/Application/Mobile/View/Ssg/login.html
+++ b/Application/Mobile/View/Ssg/login.html
@ -327,9 +327,9 @@
    function countDown() {  
        codeflag = false; 
        i = i - 1;  
-        $("#getPhoneCode").html(i+"秒后重发").css("backgroundColor","#A9A9A9");  
+        $("#getPhoneCode").html(i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");  
        if (i == 0) {  
-            $("#getPhoneCode").html("重新发送").css("backgroundColor","#21B1EB");  
+            $("#getPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");  
            codeflag = true;  
            i = 60;  
            return;  
--- a/Application/Sdk/View/default/Ipa365/pay.html
+++ b/Application/Sdk/View/default/Ipa365/pay.html
@ -16,6 +16,10 @@

 body{
    min-height: 100vh;
+    background-color: #F5F5F5;
+}
+.m-order{
+    background-color: #F5F5F5;
 }
 .title{
    display: flex;
@ -30,6 +34,9 @@ body{
    width: .3rem;
    height: .3rem;
 }
+.order-payinfo-item{
+    border-top: 1px solid #f5f5f5;
+}
 </style>

 <body>
--- a/Public/Mobile/images/ssg/home/alertbg.png
+++ b/Public/Mobile/images/ssg/home/alertbg.png
--- a/Public/Mobile/images/ssg/process/pay-2.png
+++ b/Public/Mobile/images/ssg/process/pay-2.png