fix:bug修复

source/index/BaseUser.php

@@ -314,15 +314,15 @@ class BaseUser extends Base
                             class="ms-btn ml10 details-merge cancel_merge" data-toggle="modal"
                             data-target="#myModal2">
                             <span class="iconfont icon-merge"></span>
-                            <span class="text">取消</span>
+                            <span class="text">取消合并</span>
                         </button>
                     <?php
                     } else {
-                    ?> <button title="合并" class="ms-btn ml10 details-merge btn-success" data-toggle="modal"
+                    ?> <button title="合并应用" class="ms-btn ml10 details-merge btn-success" data-toggle="modal"
                             data-target="#myModal"
                             app_id="<?php echo bees_encrypt($_var_1["in_id"]); ?>">
                             <span class="iconfont icon-merge"></span>
-                            <span class="text">合并</span>
+                            <span class="text">合并应用</span>
                         </button>
                 <?php
                     }

static/index/css/apps-detail.css

@@ -757,6 +757,10 @@
         padding: 0 0.24rem;
     }
 
+    .form-control::placeholder {
+        font-size: 0.28rem;
+    }
+
     #updateModal .modal-body {
         padding: 15px;
     }
@@ -1017,4 +1021,8 @@
         min-height: unset;
         padding-bottom: 0.74rem;
     }
+
+    .table>tbody>tr>td>a {
+        font-size: 0.28rem;
+    }
 }

static/index/css/apps-info-top.css

@@ -102,7 +102,7 @@
     font-family: Source Han Sans SC;
     font-weight: 500;
     line-height: 40px;
-    padding: 0 20px;
+    padding: 0 15px;
 }
 
 .app-details .my-apps-detail-top .details-merge {
@@ -117,7 +117,7 @@
 }
 
 .app-details .my-apps-detail-top .d-right {
-    width: 379px;
+    width: 364px;
     margin-top: 0;
     flex-shrink: 0;
     display: flex;
@@ -155,7 +155,7 @@
     position: relative;
     top: -1px !important;
     margin-left: 0;
-    font-size: 16px;
+    font-size: 15px;
 }
 
 @media (min-width: 768px) and (max-width: 1199px) {
@@ -206,7 +206,7 @@
     }
 
     .app-details .my-apps-detail-top .information dt .version {
-        top: -0.06rem;
+        top: -0.14rem;
         left: -0.1rem;
         font-weight: 500;
         font-size: 0.26rem;
@@ -254,7 +254,7 @@
     .app-details .my-apps-detail-top .details-upload-new-version,
     .app-details .my-apps-detail-top .details-preview,
     .app-details .my-apps-detail-top .details-merge {
-        padding: 0 0.24rem;
+        padding: 0 0.20rem;
         font-size: 0;
         box-shadow: unset;
         height: 0.68rem;