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

sub-operation-service/src/layouts/index.vue

@@ -14,7 +14,7 @@ import Main from './component/Main';
 .basic-layout {
   width: 100%;
   min-width: 1200px;
-  height: 100%;
+  height: fit-content;
   &-container {
     position: relative;
     margin-left: 210px;

sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue

@@ -85,8 +85,8 @@
         </div>
         <div style="display: flex; justify-content: flex-start; text-align: left; margin-top: 20px">
           <div class="inputs" style="width: 100%">
-            <span class="labels" style="width: 14%">收货地址：</span>
+            <span class="labels" style="padding-right: 12px">收货地址：</span>
-            <el-input v-model="formData.address" maxlength="30" style="width: 100%" placeholder="请输入" show-word-limit type="textarea" />
+            <el-input v-model="formData.address" maxlength="30" style="width: 87%" placeholder="请输入" show-word-limit type="textarea" />
           </div>
         </div>
       </el-form>
@@ -193,7 +193,7 @@ defineExpose({
 .unit::after {
   content: 'kg';
   position: absolute;
-  right: 10px; /* 调整单位与输入框的距离 */
+  right: 65px; /* 调整单位与输入框的距离 */
   color: #000; /* 单位颜色 */
   pointer-events: none; /* 防止单位遮挡输入框 */
 }
@@ -207,8 +207,7 @@ defineExpose({
   display: flex;
   align-items: center;
   .labels {
-    width: 25%;
+    padding-right: 12px;
-    margin-right: 10px;
   }
   input {
     width: calc(74% - 20px);