From bffe74e9a3cb73a0e48dda52392f767efa76c386 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Thu, 21 Mar 2024 15:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=88=86=E7=B1=BB=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                             |  16 +--
 pages/recommend/index.vue              |   2 -
 pages/targetdata/culturalnumbers.vue   | 129 +++++++++++--------------
 pages/targetdata/culturalresources.vue | 129 +++++++++++--------------
 pages/targetdata/publicdata.vue        | 129 +++++++++++--------------
 pages/targetdata/supermarket.vue       | 129 +++++++++++--------------
 6 files changed, 224 insertions(+), 310 deletions(-)

diff --git a/pages.json b/pages.json
index 676289f..7404a85 100644
--- a/pages.json
+++ b/pages.json
@@ -325,6 +325,8 @@
     	"style" :
     	{
     		"navigationBarTitleText" : "公共数据专区",
+            "navigationBarTextStyle": "white",
+            "navigationBarBackgroundColor": "#1c223b",
     		"enablePullDownRefresh" : false
     	}
     },
@@ -333,14 +335,8 @@
     	"style" :
     	{
     		"navigationBarTitleText" : "数据超市",
-    		"enablePullDownRefresh" : false
-    	}
-    },
-    {
-    	"path" : "pages/targetdata/supermarket",
-    	"style" :
-    	{
-    		"navigationBarTitleText" : "数据超市",
+            "navigationBarTextStyle": "white",
+            "navigationBarBackgroundColor": "#1c223b",
     		"enablePullDownRefresh" : false
     	}
     },
@@ -349,6 +345,8 @@
     	"style" :
     	{
     		"navigationBarTitleText" : "文化资源数据",
+            "navigationBarTextStyle": "white",
+            "navigationBarBackgroundColor": "#1c223b",
     		"enablePullDownRefresh" : false
     	}
     },
@@ -357,6 +355,8 @@
     	"style" :
     	{
     		"navigationBarTitleText" : "文化数字内容",
+            "navigationBarTextStyle": "white",
+            "navigationBarBackgroundColor": "#1c223b",
     		"enablePullDownRefresh" : false
     	}
     },
diff --git a/pages/recommend/index.vue b/pages/recommend/index.vue
index 0e77a9c..5fddcf6 100644
--- a/pages/recommend/index.vue
+++ b/pages/recommend/index.vue
@@ -75,7 +75,6 @@ import MescrollCompMixin from '@/components/mescroll-uni/mixins/mescroll-comp'
 import {PageCategoryStyleEnum} from '@/common/enum/store/page/category'
 import * as GoodsApi from '@/api/goods'
 import Empty from '@/components/empty'
-import Secondary from './components/secondary'
 import {rpx2px, base64ToUint8Array} from '@/utils/util'
 
 
@@ -92,7 +91,6 @@ let lastRefreshTime;
 export default {
   components: {
     Empty,
-    Secondary,
   },
   mixins: [MescrollCompMixin],
   data() {
diff --git a/pages/targetdata/culturalnumbers.vue b/pages/targetdata/culturalnumbers.vue
index 359cfe5..8e7a0d2 100644
--- a/pages/targetdata/culturalnumbers.vue
+++ b/pages/targetdata/culturalnumbers.vue
@@ -1,21 +1,15 @@
 <template>
   <view class="container">
     <!-- 搜索 -->
-    <view class="sozone">
-      <view class="sovue">
-        <view class="search-wrapper">
-          <view class="search-input">
-            <view class="search-input-wrapper">
-              <view class="left">
-                <text class="search-icon iconfont icon-search"></text>
-              </view>
-              <view class="right">
-                <input v-model="searchValue" class="input" focus="true" placeholder="请输入搜索关键词" type="text">
-              </view>
-            </view>
-          </view>
-          <view class="search-button">
-            <view class="button" @click="onSearch">搜索</view>
+    <view class="search">
+      <view class="search-wrapper">
+        <view class="index-search">
+          <view class="index-cont-search t-c">
+            <text class="search-icon iconfont icon-search"></text>
+            <text class="search-text">
+              <input type="text" placeholder="请输入搜索关键字" v-model="searchValue">
+            </text>
+            <button class="search-text-bu" @click="onSearch">搜索</button>
           </view>
         </view>
       </view>
@@ -216,89 +210,73 @@ export default {
 
   position: relative;
   min-height: 100vh;
+  background-color: #efefef;
 
   // 搜索
-  .sozone{
-    position: relative;
-    z-index: 70;
-
-    .sovue{
-      padding: 20rpx;
-      position: absolute;
-      top: 20rpx;
-      left: 4rpx;
-      width: 100%;
-    }
+  .search {
+    position: fixed;
+    float: top;
+    top: var(--window-top);
+    left: var(--window-left);
+    right: var(--window-right);
+    z-index: 19;
 
     .search-wrapper {
-      display: flex;
-      height: 84rpx;
+      background: #1c223b;
+      padding: 0rpx 20rpx 20rpx 20rpx;
     }
 
-    // 搜索输入框
-    .search-input {
-      width: 80%;
+    .index-search {
+      border-bottom: 0;
       background: #fff;
-      border-radius: 10rpx 0 0 10rpx;
-      box-sizing: border-box;
+      border-radius: 50rpx;
       overflow: hidden;
+      font-size: 28rpx;
+      color: #6d6d6d;
+      box-sizing: border-box;
+      height: 74rpx;
+      line-height: 74rpx;
 
-      .search-input-wrapper {
+      .index-cont-search {
+        width: 100%;
+        font-size: 28rpx;
+        background: #f7f7f7;
         display: flex;
+        justify-content: center;
+        align-items: center;
 
-        .left {
-          display: flex;
-          width: 60rpx;
-          justify-content: center;
-          align-items: center;
-
-          .search-icon {
-            display: block;
-            color: #b4b4b4;
-            font-size: 28rpx;
-          }
-
+        .search-icon {
+          font-size: 34rpx;
+          margin-left: 50rpx;
         }
 
-        .right {
-          flex: 1;
+        .search-text {
+          text-align: left;
+          float: left;
+          margin-left: 20rpx;
+          width: 100%;
 
           input {
-            font-size: 28rpx;
-            height: 84rpx;
-            display: flex;
-            align-items: center;
-
-            .input-placeholder {
-              color: #aba9a9;
-            }
+            font-size: 20rpx;
           }
-
         }
-      }
-    }
-
-    // 搜索按钮
-    .search-button {
-      width: 20%;
-      box-sizing: border-box;
-
-      .button {
-        height: 84rpx;
-        font-size: 28rpx;
-        border-radius: 0 10rpx 10rpx 0;
-        background: #4399ff;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+        .search-text-bu {
+          margin-right: 20rpx;
+          color: #ffffff;
+          background-color: #1c223b;
+          font-size: 20rpx;
+          width: 120rpx;
+          height: 50rpx;
+          text-align: center;
+          border-radius: 50rpx;
+        }
       }
     }
   }
 
   .order {
     display: flex;
-    padding: 150rpx 10rpx 20rpx;
+    padding: 110rpx 10rpx 20rpx;
     margin-left: -55rpx;
     z-index: 65;
 
@@ -323,6 +301,7 @@ export default {
     .goods-list {
       padding: 4rpx;
       box-sizing: border-box;
+      margin-top: -20rpx;
 
       .goods-item {
         // background-color: #fff;
diff --git a/pages/targetdata/culturalresources.vue b/pages/targetdata/culturalresources.vue
index 7f64c77..b5989a2 100644
--- a/pages/targetdata/culturalresources.vue
+++ b/pages/targetdata/culturalresources.vue
@@ -1,21 +1,15 @@
 <template>
   <view class="container">
     <!-- 搜索 -->
-    <view class="sozone">
-      <view class="sovue">
-        <view class="search-wrapper">
-          <view class="search-input">
-            <view class="search-input-wrapper">
-              <view class="left">
-                <text class="search-icon iconfont icon-search"></text>
-              </view>
-              <view class="right">
-                <input v-model="searchValue" class="input" focus="true" placeholder="请输入搜索关键词" type="text">
-              </view>
-            </view>
-          </view>
-          <view class="search-button">
-            <view class="button" @click="onSearch">搜索</view>
+    <view class="search">
+      <view class="search-wrapper">
+        <view class="index-search">
+          <view class="index-cont-search t-c">
+            <text class="search-icon iconfont icon-search"></text>
+            <text class="search-text">
+              <input type="text" placeholder="请输入搜索关键字" v-model="searchValue">
+            </text>
+            <button class="search-text-bu" @click="onSearch">搜索</button>
           </view>
         </view>
       </view>
@@ -216,89 +210,73 @@ export default {
 
   position: relative;
   min-height: 100vh;
+  background-color: #efefef;
 
   // 搜索
-  .sozone{
-    position: relative;
-    z-index: 70;
-
-    .sovue{
-      padding: 20rpx;
-      position: absolute;
-      top: 20rpx;
-      left: 4rpx;
-      width: 100%;
-    }
+  .search {
+    position: fixed;
+    float: top;
+    top: var(--window-top);
+    left: var(--window-left);
+    right: var(--window-right);
+    z-index: 19;
 
     .search-wrapper {
-      display: flex;
-      height: 84rpx;
+      background: #1c223b;
+      padding: 0rpx 20rpx 20rpx 20rpx;
     }
 
-    // 搜索输入框
-    .search-input {
-      width: 80%;
+    .index-search {
+      border-bottom: 0;
       background: #fff;
-      border-radius: 10rpx 0 0 10rpx;
-      box-sizing: border-box;
+      border-radius: 50rpx;
       overflow: hidden;
+      font-size: 28rpx;
+      color: #6d6d6d;
+      box-sizing: border-box;
+      height: 74rpx;
+      line-height: 74rpx;
 
-      .search-input-wrapper {
+      .index-cont-search {
+        width: 100%;
+        font-size: 28rpx;
+        background: #f7f7f7;
         display: flex;
+        justify-content: center;
+        align-items: center;
 
-        .left {
-          display: flex;
-          width: 60rpx;
-          justify-content: center;
-          align-items: center;
-
-          .search-icon {
-            display: block;
-            color: #b4b4b4;
-            font-size: 28rpx;
-          }
-
+        .search-icon {
+          font-size: 34rpx;
+          margin-left: 50rpx;
         }
 
-        .right {
-          flex: 1;
+        .search-text {
+          text-align: left;
+          float: left;
+          margin-left: 20rpx;
+          width: 100%;
 
           input {
-            font-size: 28rpx;
-            height: 84rpx;
-            display: flex;
-            align-items: center;
-
-            .input-placeholder {
-              color: #aba9a9;
-            }
+            font-size: 20rpx;
           }
-
         }
-      }
-    }
-
-    // 搜索按钮
-    .search-button {
-      width: 20%;
-      box-sizing: border-box;
-
-      .button {
-        height: 84rpx;
-        font-size: 28rpx;
-        border-radius: 0 10rpx 10rpx 0;
-        background: #4399ff;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+        .search-text-bu {
+          margin-right: 20rpx;
+          color: #ffffff;
+          background-color: #1c223b;
+          font-size: 20rpx;
+          width: 120rpx;
+          height: 50rpx;
+          text-align: center;
+          border-radius: 50rpx;
+        }
       }
     }
   }
 
   .order {
     display: flex;
-    padding: 150rpx 10rpx 20rpx;
+    padding: 110rpx 10rpx 20rpx;
     margin-left: -55rpx;
     z-index: 65;
 
@@ -323,6 +301,7 @@ export default {
     .goods-list {
       padding: 4rpx;
       box-sizing: border-box;
+      margin-top: -20rpx;
 
       .goods-item {
         // background-color: #fff;
diff --git a/pages/targetdata/publicdata.vue b/pages/targetdata/publicdata.vue
index 527eece..a260587 100644
--- a/pages/targetdata/publicdata.vue
+++ b/pages/targetdata/publicdata.vue
@@ -1,21 +1,15 @@
 <template>
   <view class="container">
     <!-- 搜索 -->
-    <view class="sozone">
-      <view class="sovue">
-        <view class="search-wrapper">
-          <view class="search-input">
-            <view class="search-input-wrapper">
-              <view class="left">
-                <text class="search-icon iconfont icon-search"></text>
-              </view>
-              <view class="right">
-                <input v-model="searchValue" class="input" focus="true" placeholder="请输入搜索关键词" type="text">
-              </view>
-            </view>
-          </view>
-          <view class="search-button">
-            <view class="button" @click="onSearch">搜索</view>
+    <view class="search">
+      <view class="search-wrapper">
+        <view class="index-search">
+          <view class="index-cont-search t-c">
+            <text class="search-icon iconfont icon-search"></text>
+            <text class="search-text">
+              <input type="text" placeholder="请输入搜索关键字" v-model="searchValue">
+            </text>
+            <button class="search-text-bu" @click="onSearch">搜索</button>
           </view>
         </view>
       </view>
@@ -216,89 +210,73 @@
 
   position: relative;
   min-height: 100vh;
+  background-color: #efefef;
 
   // 搜索
-  .sozone{
-    position: relative;
-    z-index: 70;
-
-    .sovue{
-      padding: 20rpx;
-      position: absolute;
-      top: 20rpx;
-      left: 4rpx;
-      width: 100%;
-    }
+  .search {
+    position: fixed;
+    float: top;
+    top: var(--window-top);
+    left: var(--window-left);
+    right: var(--window-right);
+    z-index: 19;
 
     .search-wrapper {
-      display: flex;
-      height: 84rpx;
+      background: #1c223b;
+      padding: 0rpx 20rpx 20rpx 20rpx;
     }
 
-    // 搜索输入框
-    .search-input {
-      width: 80%;
+    .index-search {
+      border-bottom: 0;
       background: #fff;
-      border-radius: 10rpx 0 0 10rpx;
-      box-sizing: border-box;
+      border-radius: 50rpx;
       overflow: hidden;
+      font-size: 28rpx;
+      color: #6d6d6d;
+      box-sizing: border-box;
+      height: 74rpx;
+      line-height: 74rpx;
 
-      .search-input-wrapper {
+      .index-cont-search {
+        width: 100%;
+        font-size: 28rpx;
+        background: #f7f7f7;
         display: flex;
+        justify-content: center;
+        align-items: center;
 
-        .left {
-          display: flex;
-          width: 60rpx;
-          justify-content: center;
-          align-items: center;
-
-          .search-icon {
-            display: block;
-            color: #b4b4b4;
-            font-size: 28rpx;
-          }
-
+        .search-icon {
+          font-size: 34rpx;
+          margin-left: 50rpx;
         }
 
-        .right {
-          flex: 1;
+        .search-text {
+          text-align: left;
+          float: left;
+          margin-left: 20rpx;
+          width: 100%;
 
           input {
-            font-size: 28rpx;
-            height: 84rpx;
-            display: flex;
-            align-items: center;
-
-            .input-placeholder {
-              color: #aba9a9;
-            }
+            font-size: 20rpx;
           }
-
         }
-      }
-    }
-
-    // 搜索按钮
-    .search-button {
-      width: 20%;
-      box-sizing: border-box;
-
-      .button {
-        height: 84rpx;
-        font-size: 28rpx;
-        border-radius: 0 10rpx 10rpx 0;
-        background: #4399ff;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+        .search-text-bu {
+          margin-right: 20rpx;
+          color: #ffffff;
+          background-color: #1c223b;
+          font-size: 20rpx;
+          width: 120rpx;
+          height: 50rpx;
+          text-align: center;
+          border-radius: 50rpx;
+        }
       }
     }
   }
 
   .order {
     display: flex;
-    padding: 150rpx 10rpx 20rpx;
+    padding: 110rpx 10rpx 20rpx;
     margin-left: -55rpx;
     z-index: 65;
 
@@ -323,6 +301,7 @@
     .goods-list {
       padding: 4rpx;
       box-sizing: border-box;
+      margin-top: -20rpx;
 
       .goods-item {
         // background-color: #fff;
diff --git a/pages/targetdata/supermarket.vue b/pages/targetdata/supermarket.vue
index 6242359..bdb4992 100644
--- a/pages/targetdata/supermarket.vue
+++ b/pages/targetdata/supermarket.vue
@@ -1,21 +1,15 @@
 <template>
   <view class="container">
     <!-- 搜索 -->
-    <view class="sozone">
-      <view class="sovue">
-        <view class="search-wrapper">
-          <view class="search-input">
-            <view class="search-input-wrapper">
-              <view class="left">
-                <text class="search-icon iconfont icon-search"></text>
-              </view>
-              <view class="right">
-                <input v-model="searchValue" class="input" focus="true" placeholder="请输入搜索关键词" type="text">
-              </view>
-            </view>
-          </view>
-          <view class="search-button">
-            <view class="button" @click="onSearch">搜索</view>
+    <view class="search">
+      <view class="search-wrapper">
+        <view class="index-search">
+          <view class="index-cont-search t-c">
+            <text class="search-icon iconfont icon-search"></text>
+            <text class="search-text">
+              <input type="text" placeholder="请输入搜索关键字" v-model="searchValue">
+            </text>
+            <button class="search-text-bu" @click="onSearch">搜索</button>
           </view>
         </view>
       </view>
@@ -216,89 +210,73 @@ export default {
 
   position: relative;
   min-height: 100vh;
+  background-color: #efefef;
 
   // 搜索
-  .sozone{
-    position: relative;
-    z-index: 70;
-
-    .sovue{
-      padding: 20rpx;
-      position: absolute;
-      top: 20rpx;
-      left: 4rpx;
-      width: 100%;
-    }
+  .search {
+    position: fixed;
+    float: top;
+    top: var(--window-top);
+    left: var(--window-left);
+    right: var(--window-right);
+    z-index: 19;
 
     .search-wrapper {
-      display: flex;
-      height: 84rpx;
+      background: #1c223b;
+      padding: 0rpx 20rpx 20rpx 20rpx;
     }
 
-    // 搜索输入框
-    .search-input {
-      width: 80%;
+    .index-search {
+      border-bottom: 0;
       background: #fff;
-      border-radius: 10rpx 0 0 10rpx;
-      box-sizing: border-box;
+      border-radius: 50rpx;
       overflow: hidden;
+      font-size: 28rpx;
+      color: #6d6d6d;
+      box-sizing: border-box;
+      height: 74rpx;
+      line-height: 74rpx;
 
-      .search-input-wrapper {
+      .index-cont-search {
+        width: 100%;
+        font-size: 28rpx;
+        background: #f7f7f7;
         display: flex;
+        justify-content: center;
+        align-items: center;
 
-        .left {
-          display: flex;
-          width: 60rpx;
-          justify-content: center;
-          align-items: center;
-
-          .search-icon {
-            display: block;
-            color: #b4b4b4;
-            font-size: 28rpx;
-          }
-
+        .search-icon {
+          font-size: 34rpx;
+          margin-left: 50rpx;
         }
 
-        .right {
-          flex: 1;
+        .search-text {
+          text-align: left;
+          float: left;
+          margin-left: 20rpx;
+          width: 100%;
 
           input {
-            font-size: 28rpx;
-            height: 84rpx;
-            display: flex;
-            align-items: center;
-
-            .input-placeholder {
-              color: #aba9a9;
-            }
+            font-size: 20rpx;
           }
-
         }
-      }
-    }
-
-    // 搜索按钮
-    .search-button {
-      width: 20%;
-      box-sizing: border-box;
-
-      .button {
-        height: 84rpx;
-        font-size: 28rpx;
-        border-radius: 0 10rpx 10rpx 0;
-        background: #4399ff;
-        color: #fff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+        .search-text-bu {
+          margin-right: 20rpx;
+          color: #ffffff;
+          background-color: #1c223b;
+          font-size: 20rpx;
+          width: 120rpx;
+          height: 50rpx;
+          text-align: center;
+          border-radius: 50rpx;
+        }
       }
     }
   }
 
   .order {
     display: flex;
-    padding: 150rpx 10rpx 20rpx;
+    padding: 110rpx 10rpx 20rpx;
     margin-left: -55rpx;
     z-index: 65;
 
@@ -323,6 +301,7 @@ export default {
     .goods-list {
       padding: 4rpx;
       box-sizing: border-box;
+      margin-top: -20rpx;
 
       .goods-item {
         // background-color: #fff;