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

src/frontend/views/my-income/index.php

@@ -39,7 +39,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
 
 <?php if ($count > 0) { ?>
 <div class="con-md-12">
-    <div class="table-responsive table-box">
+    <div class="table-box">
         <table class="table table-hover">
             <thead>
             <tr>

src/frontend/views/my-member/index.php

@@ -28,7 +28,7 @@ $this->title = '我的会员';
 
 <?php if ($count > 0) { ?>
 <div class="con-md-12">
-    <div class="table-responsive table-box">
+    <div class="table-box">
         <table class="table table-hover">
             <thead>
             <tr>

src/frontend/views/site/error.php

@@ -30,7 +30,7 @@ $this->title = $name;
         html,body{
             height: 100%;
             width: 100%;
-            background-color: #f4f7f7;
+            background-color: #fff;
             font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
         }
         .vertical-obj {
@@ -45,8 +45,8 @@ $this->title = $name;
             vertical-align: middle;
         }
         .main-box {
-            min-width: 690px;
-            min-height: 440px;
+            width: 690px;
+            height: 440px;
             position: relative;
             display: inline-block;
             background-color: #fff;
@@ -86,6 +86,16 @@ $this->title = $name;
             background-color: #f6c269;
             color: #fff;
         }
+        @media (max-width: 767px) {
+            .main-box {
+                width: 100%;
+                height: 440px;
+            }
+            .main-box {
+                background-color: #fff;
+                box-shadow: none;
+            }
+        }
     </style>
 </head>
 <body>

src/frontend/views/site/notfound.php

@@ -83,6 +83,15 @@ $this->title = $name;
         .main-box img {
             max-width: 690px;
         }
+        @media (max-width: 767px) {
+            .main-box img {
+                width: 100%;
+            }
+            .main-box {
+                background-color: #f4f7f7;
+                box-shadow: none;
+            }
+        }
     </style>
 </head>
 <body>

src/frontend/views/site/warn.php

@@ -5,20 +5,22 @@
 $css = <<<CSS
 html {
 	background-color: #f7f7f7;
+	font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
 }
 .danger-tip {
+    margin-top: 100px;
 	text-align: center;
 	background-color: #f7f7f7;
-	margin-top: 200px;
 }
 .danger-tip img {
 	width: 150px;
 }
 .danger-tip h3 {
-	font-size: 24px;
+	font-size: 18px;
+	font-weight: normal;
 }
 .danger-tip p {
-	width: 400px;
+	max-width: 400px;
 	font-size: 14px;
 	color: #999;
 	margin: 20px auto;
@@ -28,6 +30,31 @@ html {
 	padding: 20px;
 	border-left:3px solid #ccc;
 }
+.btn {
+    display: inline-block;
+    padding: 6px 12px;
+    outline: none;
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1.42857143;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+    touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    background-color: #00a5e8;
+    color: #fff;
+    font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
+}
 CSS;
 
 $this->registerCss($css);

src/frontend/web/css/style.css

@@ -116,7 +116,7 @@ a:link, a:active, a:visited {
 
 .accordion .link {
     display: block;
-    padding: 15px 15px 5px 10px;
+    padding: 10px 15px 5px 10px;
     color: #7fa6ad;
     font-size: 12px;
     position: relative;
@@ -1416,9 +1416,8 @@ textarea.input-r-control {
 }
 
 .buy-recode-top .col-md-4 {
-    margin: 10px 0;
     border-right: 1px solid #f3f3f3;
-    height: 130px;
+    height: 150px;
     padding-left: 30px;
 }
 
@@ -1430,7 +1429,7 @@ textarea.input-r-control {
     font-size: 14px;
     font-weight: normal;
     color: #666;
-    margin-top: 35px;
+    padding-top: 25px;
 }
 
 .buy-recode-top .col-md-4 p {
@@ -1611,9 +1610,9 @@ textarea.input-r-control {
     position: absolute;
     display: inline-block;
     width: 225px;
-    height: 50px;
+    height: 44px;
     text-align: center;
-    line-height: 50px;
+    line-height: 44px;
     bottom: 0;
     left: 0;
     background-color: #313a46;
@@ -1701,6 +1700,12 @@ textarea.input-r-control {
     .tab-headbox li:first-child {
         margin-left: 20px;
     }
+    .buy-recode-top {
+        height: 450px;
+    }
+    .buy-recode-top .col-md-4 {
+        border-bottom: 1px solid #f3f3f3;
+    }
 }
 
 .menu-mask {