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

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/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 +838,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;