Ver Fonte

修复bug

weixin_52219567 há 3 semanas atrás
pai
commit
85321903bd

+ 6 - 7
src/views/breg/index.vue

@@ -453,13 +453,12 @@ const onAgree = () => {
     .form-bos {
       padding-left: 20px;
 
-      :deep(.el-input__wrapper) {
-        border: none;
-        /* 可选:去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
+      // :deep(.el-input__wrapper) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
 
       .form-title {
         font-size: 14px;

+ 20 - 23
src/views/greg/index.vue

@@ -706,29 +706,26 @@ onUnmounted(() => {
     .form-bos {
       padding: 0 20px;
 
-      :deep(.el-input__wrapper) {
-        border: none;
-        /* 可选:去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
-
-      :deep(.el-select__wrapper) {
-        border: none;
-        /* 可选:去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
-
-      :deep(.el-textarea__inner) {
-        border: none;
-        /* 可选:去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
+      // :deep(.el-input__wrapper) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
+
+      // :deep(.el-select__wrapper) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
+
+      // :deep(.el-textarea__inner) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
 
       .form-title {
         font-size: 14px;

+ 2 - 2
src/views/home/index.vue

@@ -1184,8 +1184,8 @@ const onlogout = () => {
         padding: 32px 20px 0 20px;
 
         img {
-          width: 152px;
-          height: 29px;
+          width: 120px;
+          height: 50px;
         }
 
         .bigBrand1 {

+ 2 - 1
src/views/home/pccomponents/pages/head.vue

@@ -513,7 +513,8 @@ const onPath2 = (row: any) => {
 
   // 头部
   .head-pages {
-    width: 1200px;
+    // width: 1200px;
+    width: 100%;
     margin: 0 auto;
     background-size: 100% 100%;
     background-repeat: no-repeat;

+ 1 - 1
src/views/item/index.vue

@@ -404,7 +404,7 @@ getRecommendedCategoryProductList({}).then((res) => {
       padding: 20px 20px 30px 20px;
 
       .right-title {
-        height: 56px;
+        min-height: 56px;
         font-weight: 600;
         font-size: 20px;
         color: #101828;

+ 1 - 1
src/views/order/orderManage/detail.vue

@@ -362,7 +362,7 @@ const handleBack = () => {
   }
 }
 .page-content {
-  padding: 20px;
+  padding: 20px 0;
 }
 .progress-section {
   background: #fff;

+ 54 - 50
src/views/search/index.vue

@@ -71,7 +71,8 @@
           </div>
         </div>
       </div>
-
+    </div>
+    <div class="flex-row-between">
       <div class="head-bos">
         <div class="head-sort flex-row-center" @click="onSort(1)" :class="sortField1 != '' ? 'hig' : ''">
           <div>智能匹配</div>
@@ -110,17 +111,18 @@
           <el-checkbox label="可定制" value="isCustomize" />
         </el-checkbox-group>
       </div>
+      <!-- 游标分页控制 -->
+      <pagination
+        v-show="dataList.length > 0"
+        v-model:page="httpObj.pageNum"
+        v-model:limit="httpObj.pageSize"
+        v-model:way="way"
+        :cursor-mode="true"
+        :has-more="hasMore"
+        @pagination="getList"
+      />
     </div>
-    <!-- 游标分页控制 -->
-    <pagination
-      v-show="dataList.length > 0"
-      v-model:page="httpObj.pageNum"
-      v-model:limit="httpObj.pageSize"
-      v-model:way="way"
-      :cursor-mode="true"
-      :has-more="hasMore"
-      @pagination="getList"
-    />
+
     <!-- 商品 -->
     <div class="expert-bos">
       <div v-for="(item, index) in dataList" :key="index" class="expert-list" @click="onPath('/item?id=' + item.id)">
@@ -153,7 +155,6 @@ import { getPcProductPage, getBrandPage, getBrandByCategoryList } from '@/api/se
 import { getProductCategoryTree } from '@/api/home/index';
 import { onPath } from '@/utils/siteConfig';
 import Pagination from '@/components/Pagination/index.vue';
-import { get } from 'http';
 const route = useRoute();
 const type = ref<any>(1);
 const dataList = ref<any>([]);
@@ -342,6 +343,7 @@ const onSort = (type: number) => {
 const initData = () => {
   httpObj.value.searchKeyword = '';
   httpObj.value.topCategoryId = '';
+  httpObj.value.pageNum = 1;
   type.value = route.query.type;
   if (route.query.input) {
     httpObj.value.searchKeyword = route.query.input;
@@ -383,49 +385,51 @@ onMounted(() => {
     padding: 0 15px 15px 15px;
     font-size: 14px;
     color: #101828;
-    .head-bos {
+  }
+  .head-bos {
+    display: flex;
+    .head-title {
+      width: 70px;
+      padding-top: 15px;
+    }
+    .head-box {
       display: flex;
-      .head-title {
-        width: 70px;
-        padding-top: 15px;
-      }
-      .head-box {
-        display: flex;
-        flex-wrap: wrap;
-        flex: 1;
-        width: 0;
-        gap: 10px 15px;
-        border-bottom: 1px solid #e5e7eb;
-        padding: 15px 0;
-        .classify-list {
-          cursor: pointer;
-          &.hig {
-            color: var(--el-color-primary);
-          }
+      flex-wrap: wrap;
+      flex: 1;
+      width: 0;
+      gap: 10px 15px;
+      border-bottom: 1px solid #e5e7eb;
+      padding: 15px 0;
+      .classify-list {
+        cursor: pointer;
+        &.hig {
+          color: var(--el-color-primary);
         }
       }
-      .head-sort {
-        margin: 15px 15px 0 0;
-        width: 108px;
+    }
+    .head-sort {
+      margin: 15px 15px 0 0;
+      width: 108px;
+      height: 32px;
+      border: 1px solid #e5e7eb;
+      border-radius: 2px 2px 2px 2px;
+      cursor: pointer;
+      font-size: 14px;
+      background-color: #ffffff;
+      &.hig {
+        border: 1px solid var(--el-color-primary);
+      }
+      .sort-box {
+        margin-left: 10px;
+        position: relative;
         height: 32px;
-        border: 1px solid #e5e7eb;
-        border-radius: 2px 2px 2px 2px;
-        cursor: pointer;
-        &.hig {
-          border: 1px solid var(--el-color-primary);
+        .icon1 {
+          position: absolute;
+          top: 6px;
         }
-        .sort-box {
-          margin-left: 10px;
-          position: relative;
-          height: 32px;
-          .icon1 {
-            position: absolute;
-            top: 6px;
-          }
-          .icon2 {
-            position: absolute;
-            bottom: 6px;
-          }
+        .icon2 {
+          position: absolute;
+          bottom: 6px;
         }
       }
     }

+ 1 - 1
src/views/solve/real.vue

@@ -7,7 +7,7 @@
         <div class="real-html" v-html="dataInfo.announcementContent"></div>
       </div>
     </div>
-    <el-affix :offset="0">
+    <el-affix :offset="0" target=".real-pages">
       <div class="related-bos">
         <div class="related-box">
           <div class="flex-row-between related-title">