Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/components/index/Search.vue

@@ -90,7 +90,7 @@ const back = () => {
     width: 710rpx;
     height: 80rpx;
     // background: rgba(255, 255, 255, 0.8);
-    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    // border-radius: 16rpx 16rpx 16rpx 16rpx;
     opacity: 0.8;
     margin: 0 auto;
     // margin-top: 44rpx;
@@ -98,7 +98,6 @@ const back = () => {
     align-items: center;
     // padding-left: 20rpx;
     box-sizing: border-box;
-    text-align: center;
     .arrow {
       width: 15rpx;
       height: 24rpx;
@@ -110,9 +109,11 @@ const back = () => {
     }
 
     .title {
-      width: 100%;
+      // width: 100%;
       font-size: 36rpx;
       font-family: PingFang SC;
+      margin: 0 auto;
+      display: inline-block;
     }
   }
 }

src/pages/address/addressEdit.vue

 <template>
   <view class="container">
-    <Header :title="newAddressFlag ? '新增收货地址' : '编辑收货地址'"></Header>
-
+    <Search :showTitle="true" :title="newAddressFlag ? '新增收货地址' : '编辑收货地址'" backgroundBox="white"></Search>
     <view class="content">
       <wd-form ref="reForm" :model="forMData" id="form">
         <wd-cell-group>
@@ -177,7 +176,7 @@ page {
   font-feature-settings: 'kern' on;
 
   .content {
-    padding-top: 88rpx;
+   // padding-top: 88rpx;
 
     #form {
       width: 710rpx;

src/pages/address/addressList.vue

 <template>
   <view class="container">
-    <Search :showTitle="true" title="地址管理" backgroundBox="white"/>
+    <Search :showTitle="true" title="地址管理" backgroundBox="white" />
     <view class="content">
       <view class="empty_list" v-if="isAdressEmpty">
         <img src="@/static/address/address.png" />

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -3,12 +3,27 @@
     <view class="container">
       <view class="top">
         <Search
-          background="rgba(255, 255, 255, 0.8)"
-          backIcon="black"
-          iconSrc="/static/assistingAgriculture/assets/left.png"
-          placeholderText="请输入要搜索的关键词"
-          @search="toSearch"
-        ></Search>
+          style="position: fixed; top: 0; width: 100%"
+          :backgroundBox="backgroundBox"
+          :backIcon="backIcon"
+        >
+          <view class="searchBox" :style="{ border }">
+            <image
+              class="magnifyingGlass"
+              src="../../../static/index/magnifyingGlass.png"
+              mode="aspectFit|aspectFill|widthFix"
+            />
+            <input
+              type="text"
+              class="text"
+              @confirm="toSearch"
+              placeholder="请输入要搜索的关键词"
+              @input="updateModelValue"
+              @keyup.enter="toSearch"
+              @focus="toSearch"
+            />
+          </view>
+        </Search>
       </view>
       <view class="bac-img">
         <img
@@ -167,14 +182,14 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Search from '../../../components/index/Search.vue';
 import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
 import DepartureDate from '../../../components/assistingAgriculture/index/DepartureDate.vue';
 import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
 import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
 import { getPopularList, getProdList, getTour } from '@/api/assistingAgriculture/village';
 import { getPresaleList } from '@/api/assistingAgriculture/building';
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import fab from '../../../components/fab/fab.vue';
 onMounted(async () => {
   getProd();
@@ -198,6 +213,9 @@ const sortRef = ref(null);
 const departureDateRef = ref(null);
 const scenicSpotsRef = ref(null);
 const screenRef = ref(null);
+const backgroundBox = ref('');
+const border = ref('');
+
 const locationFiltering = (index) => {
   switch (index) {
     case 0:
@@ -374,6 +392,16 @@ function toSpecialOfferZoneList() {
     url: '/pages/assistingAgriculture/RuralTravel/specialOfferZoneList',
   });
 }
+// 监听页面滚动
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backgroundBox.value = '#fff';
+    border.value = '1rpx solid gray';
+  } else {
+    backgroundBox.value = '';
+    border.value = '';
+  }
+});
 </script>
 
 <style lang="scss" scoped>
@@ -601,14 +629,28 @@ page {
   margin-top: 10rpx;
   width: 400rpx;
 }
-::v-deep .search {
-  margin-top: 60rpx;
-}
-::v-deep .icon {
-  width: 56rpx;
-  height: 56rpx;
-}
 .detail-score {
   margin-top: 30rpx;
 }
+.searchBox {
+  opacity: 1;
+  width: 440rpx;
+  height: 56rpx;
+  background: #ffffff;
+  border-radius: 28rpx 28rpx 28rpx 28rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 20rpx;
+  margin-left: 80rpx;
+  text-align: start;
+  .magnifyingGlass {
+    width: 26rpx;
+    height: 26rpx;
+  }
+  .text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+    color: #ffffff;
+  }
+}
 </style>

src/pages/assistingAgriculture/detail/comment.vue

 <template>
   <view class="container">
     <!--    顶部搜索框-->
-    <view class="header">
+    <Search backgroundBox="white">
+      <view class="searchBoxs">
+        <view class="search1">
+          <wd-icon name="search" size="24rpx" color="#ABAAAA"></wd-icon>
+          <input
+            type="text"
+            :value="catalog.evaluation"
+            class="text"
+            placeholder="点评关键词/特色"
+            placeholder-style="font-size:22rpx;"
+            @confirm="handleSearch"
+            @input="handleInput"
+            confirm-type="搜索"
+          />
+        </view>
+        <wd-icon
+          name="error-fill"
+          size="30rpx"
+          color="#999"
+          v-if="catalog.evaluation"
+          @tap="handleClear"
+        ></wd-icon>
+      </view>
+    </Search>
+    <!-- <view class="header">
       <wd-icon
         class="icon"
         name="arrow-left"
@@ -31,7 +55,7 @@
           @tap="handleClear"
         ></wd-icon>
       </view>
-    </view>
+    </view> -->
 
     <view class="content">
       <view class="tabs">
@@ -146,7 +170,7 @@ const rateList = ref({
   },
   5: {
     url: '../../../static/assistingAgriculture/detail/fiveStars.png',
-    text: '还行',
+    text: '超赞',
   },
 });
 
@@ -299,9 +323,10 @@ page {
     align-items: center;
     padding: 0 40rpx;
     gap: 32rpx;
+  }
 
-    .searchBox {
-      width: 492rpx;
+  .searchBoxs {
+    width: 480rpx;
     height: 56rpx;
     background: #f3f3f3;
     border-radius: 28rpx 28rpx 28rpx 28rpx;
@@ -310,8 +335,9 @@ page {
     justify-content: space-between;
     padding: 0rpx 20rpx;
     gap: 10rpx;
+    margin-left: 40rpx;
 
-      .search {
+    .search1 {
       gap: 10rpx;
       display: flex;
       align-items: center;
@@ -322,10 +348,9 @@ page {
       }
     }
   }
-  }
 
   .content {
-    padding: 98rpx 20rpx 30rpx;
+    padding: 10rpx 20rpx 30rpx;
     display: flex;
     flex-direction: column;
     gap: 10rpx;

src/pages/assistingAgriculture/index/building.vue

 <template>
+  <Search :backgroundBox="backgroundBox" background="rgba(255, 255, 255, 0.8)">
+    <view class="searchBox">
+      <image
+        class="magnifyingGlass"
+        src="../../../static/index/magnifyingGlass.png"
+        mode="aspectFit|aspectFill|widthFix"
+      />
+      <input
+        type="text"
+        class="text"
+        @confirm="toSearch"
+        placeholder="请输入要搜索的内容"
+        @input="updateModelValue"
+        @keyup.enter="toSearch"
+        @focus="toSearch"
+      />
+    </view>
+  </Search>
   <view class="container">
     <!--    顶部搜索框-->
-    <view class="top">
-      <Search
-        background="rgba(255, 255, 255, 0.8)"
-        backIcon="black"
-        iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
-        placeholderText="请输入要搜索的内容"
-        @search="toSearch"
-      ></Search>
-    </view>
+    <!--    <view class="top">-->
+    <!--      <Search-->
+    <!--        background="rgba(255, 255, 255, 0.8)"-->
+    <!--        backIcon="black"-->
+    <!--        iconSrc="/static/assistingAgriculture/assets/blackLeft.png"-->
+    <!--        placeholderText="请输入要搜索的内容"-->
+    <!--        @search="toSearch"-->
+    <!--      ></Search>-->
+    <!--    </view>-->
     <!--    轮播图-->
     <view class="nav">
       <wd-swiper
@@ -130,7 +148,7 @@
 </template>
 
 <script setup>
-import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Search from '../../../components/index/Search.vue';
 import fab from '../../../components/fab/fab.vue';
 import {
   getGoodSaleProdList,
@@ -139,6 +157,7 @@ import {
 import { getshoppingCartList } from '@/api/packageDetail';
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
+const backgroundBox = ref('#ffffff');
 
 const current = ref(0);
 const rightList = ref([]);
@@ -442,10 +461,6 @@ page {
 ::v-deep .wd-badge__content.is-fixed {
   margin-top: 20rpx;
 }
-::v-deep.icon {
-  width: 56rpx;
-  height: 56rpx;
-}
 .container1 {
   display: flex;
 }
@@ -473,4 +488,24 @@ img.rice {
   position: relative;
   top: -20rpx;
 }
+.searchBox {
+  opacity: 1;
+  width: 440rpx;
+  height: 56rpx;
+  background: #f4f4f4;
+  border-radius: 28rpx 28rpx 28rpx 28rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 20rpx;
+  margin-left: 80rpx;
+  text-align: start;
+  .magnifyingGlass {
+    width: 26rpx;
+    height: 26rpx;
+  }
+  .text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+  }
+}
 </style>

src/pages/assistingAgriculture/index/index.vue

@@ -2,12 +2,27 @@
   <view>
     <view class="container">
       <Search
-        background="rgba(255, 255, 255, 0.8)"
-        backIcon="black"
-        iconSrc="/static/assistingAgriculture/assets/return.png"
-        placeholderText="请输入要搜索的内容"
-        @search="toSearch"
-      ></Search>
+        style="position: fixed; top: 0; width: 100%"
+        :backgroundBox="backgroundBox"
+        :backIcon="backIcon"
+      >
+        <view class="searchBox" :style="{ border }">
+          <image
+            class="magnifyingGlass"
+            src="../../../static/index/magnifyingGlass.png"
+            mode="aspectFit|aspectFill|widthFix"
+          />
+          <input
+            type="text"
+            class="text"
+            @confirm="toSearch"
+            placeholder="请输入要搜索的内容"
+            @input="updateModelValue"
+            @keyup.enter="toSearch"
+            @focus="toSearch"
+          />
+        </view>
+      </Search>
       <view>
         <wd-swiper
           :list="swiperList"
@@ -64,7 +79,7 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Search from '../../../components/index/Search.vue';
 import fab from '../../../components/fab/fab.vue';
 import {
   getPresaleCategory,
@@ -77,6 +92,9 @@ const list = ref([]);
 const sortList = ref([]);
 const swiperList = ref([]);
 const current = ref(0);
+const backgroundBox = ref('');
+const border = ref('');
+// const backIcon = ref('white');
 // 轮播图数据
 let lunboData;
 onMounted(async () => {
@@ -143,6 +161,16 @@ const toBuilding = (item) => {
     });
   }
 };
+// 监听页面滚动
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backgroundBox.value = '#fff';
+    border.value = '1rpx solid gray';
+  } else {
+    backgroundBox.value = '';
+    border.value = '';
+  }
+});
 // 跳转详情页
 function toDetail(item) {
   // TODO: 跳转到详情页
@@ -156,14 +184,6 @@ function toDetail(item) {
 page {
   background-color: #f3f3f3;
 }
-.container {
-  position: relative;
-  left: 0rpx;
-  top: 0rpx;
-  width: 750rpx;
-  height: 440rpx;
-  opacity: 1;
-}
 .img1 {
   display: flex;
 }
@@ -273,9 +293,25 @@ page {
   margin-top: -23rpx;
   color: #fa5151;
 }
-::v-deep .icon {
-  width: 40rpx;
-  height: 40rpx;
-  margin-left: 40rpx;
+.searchBox {
+  opacity: 1;
+  width: 440rpx;
+  height: 56rpx;
+  background: #ffffff;
+  border-radius: 28rpx 28rpx 28rpx 28rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 20rpx;
+  margin-left: 80rpx;
+  text-align: start;
+  .magnifyingGlass {
+    width: 26rpx;
+    height: 26rpx;
+  }
+  .text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+    color: #ffffff;
+  }
 }
 </style>

src/pages/assistingAgriculture/index/presale.vue

@@ -2,12 +2,27 @@
   <view class="container">
     <view class="top">
       <Search
-        background="rgba(255, 255, 255, 0.8)"
-        backIcon="black"
-        iconSrc="/static/assistingAgriculture/assets/left.png"
-        placeholderText="输入商品名称"
-        @search="toSearch"
-      ></Search>
+        style="position: fixed; top: 0; width: 100%"
+        :backgroundBox="backgroundBox"
+        :backIcon="backIcon"
+      >
+        <view class="searchBox" :style="{ border }">
+          <image
+            class="magnifyingGlass"
+            src="../../../static/index/magnifyingGlass.png"
+            mode="aspectFit|aspectFill|widthFix"
+          />
+          <input
+            type="text"
+            class="text"
+            @confirm="toSearch"
+            placeholder="输入商品名称"
+            @input="updateModelValue"
+            @keyup.enter="toSearch"
+            @focus="toSearch"
+          />
+        </view>
+      </Search>
     </view>
     <view class="nav">
       <wd-swiper
@@ -125,7 +140,7 @@
 </template>
 
 <script setup>
-import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Search from '../../../components/index/Search.vue';
 import { useRoute } from 'vue-router';
 import { ref, onMounted } from 'vue';
 import {
@@ -154,6 +169,8 @@ const params = {
 };
 const subscript = ref(0);
 const tabsList = ref([]);
+const backgroundBox = ref('');
+const border = ref('');
 onMounted(async () => {
   getPresale();
   presaleSortList();
@@ -255,6 +272,16 @@ function toDetail(item) {
     url: `/pages/assistingAgriculture/detail/detail?prodId=${item.prodId}`,
   });
 }
+// 监听页面滚动
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backgroundBox.value = '#fff';
+    border.value = '1rpx solid gray';
+  } else {
+    backgroundBox.value = '';
+    border.value = '';
+  }
+});
 </script>
 
 <style lang="scss" scoped>
@@ -485,13 +512,30 @@ page {
 ::v-deep .wd-badge__content.is-fixed {
   margin-top: 20rpx;
 }
-::v-deep.icon {
-  width: 56rpx;
-  height: 56rpx;
-}
-img.add {
+.add {
   position: relative;
   left: 200rpx;
   top: 30rpx;
 }
+.searchBox {
+  opacity: 1;
+  width: 440rpx;
+  height: 56rpx;
+  background: #ffffff;
+  border-radius: 28rpx 28rpx 28rpx 28rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 20rpx;
+  margin-left: 80rpx;
+  text-align: start;
+  .magnifyingGlass {
+    width: 26rpx;
+    height: 26rpx;
+  }
+  .text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+    color: #ffffff;
+  }
+}
 </style>

src/pages/assistingAgriculture/order/detail.vue

@@ -8,7 +8,7 @@
       v-if="logisticsDetail"
     ></web-view>
     <!-- <view style="height: 600rpx; background-color: aquamarine"></view> -->
-    <view class="content1" v-if="orderDetail">
+    <view class="content" v-if="orderDetail">
       <view class="info">
         <view class="top" v-if="logisticsDetail">
           <view class="left">
@@ -636,7 +636,7 @@ page {
   width: 375 * 2rpx;
   margin: 0 auto;
 
-  .content1 {
+  .content {
     position: relative;
     top: -20rpx;
     border-radius: 20rpx 20rpx 0 0;

src/pages/order/afterSales.vue

 <template>
   <view class="container">
-    <Header title="售后详情"></Header>
+    <Search :showTitle="true" title="售后详情" backgroundBox="white"></Search>
 
     <view class="content">
       <view class="box box1" v-if="afterSaleDetail">
@@ -54,7 +54,6 @@
 </template>
 
 <script setup>
-import Header from '@/pages/order/components/Header/index.vue';
 import { afterSale } from '@/api/order';
 const fileDomain = import.meta.env.VITE_APP_IMG_URL;
 const orderNumber = ref('');
@@ -83,7 +82,7 @@ page {
   margin: 0 auto;
 
   .content {
-    padding-top: 88rpx;
+    //padding-top: 88rpx;
     .box1 {
       display: flex;
       flex-direction: column;

src/pages/order/order.vue

@@ -2,8 +2,8 @@
   <view class="container">
     <!--    顶部搜索框-->
     <Search backgroundBox="#f3f3f3">
-      <view class="searchBox">
-        <view class="search">
+      <view class="searchBoxs">
+        <view class="search1">
           <wd-icon name="search" size="30rpx" color="#999"></wd-icon>
           <input
             type="text"
@@ -708,7 +708,7 @@ page {
   padding: 0 30rpx;
   gap: 14rpx;
 }
-.searchBox {
+.searchBoxs {
   width: 492rpx;
   height: 66rpx;
   background: #f3f3f3;
@@ -721,7 +721,7 @@ page {
 
   background-color: #fff;
 
-  .search {
+  .search1 {
     gap: 10rpx;
     display: flex;
     align-items: center;

src/pages/order/remark.vue

@@ -72,11 +72,9 @@
   </view>
 </template>
 <script setup lang="ts">
-import Header from './components/Header/index.vue';
 import { getToken } from '@/utils/auth';
 import { evaluation } from '@/api/order';
 import { useToast } from 'wot-design-uni';
-import Search from '@/components/index/Search.vue';
 const uToast = useToast();
 const form = ref();
 const token = getToken();

src/pages/storeEntry/detail.vue

 <template>
   <view class="container">
-    <Header title="商家入驻"></Header>
+    <Search :showTitle="true" title="商家入驻" backgroundBox="white"></Search>
+
     <view class="content">
       <view class="formmain">
         <wd-form ref="form" :model="formData" :rules="rules">
@@ -836,7 +837,7 @@ page {
   padding-bottom: 40rpx;
 
   .content {
-    padding-top: 88rpx;
+    // padding-top: 88rpx;
     padding-bottom: 44rpx;
   }
 

src/pages/storeEntry/index.vue

 <template>
   <view class="container">
-    <Header title="我的店铺"></Header>
-
+    <Search :showTitle="true" title="我的店铺" backgroundBox="white"></Search>
     <view class="content">
       <!-- 列表 -->
       <view class="listcon">
@@ -124,7 +123,7 @@ const deleteShop = (shopId) => {
   min-height: calc(100vh - 160rpx);
 
   .content {
-    padding-top: 88rpx;
+  //  padding-top: 88rpx;
 
     .listcon {
       margin-top: 10px;