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

src/components/index/Search.vue

 <template>
-  <view class="content" :style="{ height: contentHeight, background: backgroundBox }">
+  <view class="searchComponent" :style="{ height: contentHeight, background: backgroundBox }">
     <view class="search" :style="{ background }">
       <wd-icon
         v-if="show"
@@ -48,13 +48,10 @@ const props = defineProps({
   },
 });
 const contentHeight = ref('100rpx');
-const emit = defineEmits(['toSearch']);
-// const title = ref('小程序平台');
-const { countInfo, addCount } = useCountStore();
 onLoad(() => {
   xma.xh.getSystemInfo({
     success(res) {
-      console.log('设备信息', res); // 设备信息
+      // console.log('设备信息', res); // 设备信息
     },
   });
   xma.xh.getMenuButtonBoundingClientRect({
@@ -69,10 +66,6 @@ onLoad(() => {
     },
   });
 });
-const search = (res) => {
-  const keyword = res.detail.value;
-  emit('toSearch', keyword);
-};
 
 // 返回上一级
 const back = () => {
@@ -80,17 +73,10 @@ const back = () => {
     delta: 1,
   });
 };
-function toUIComponentsDoc() {
-  window.open('https://wot-design-uni.netlify.app/component/button.html');
-}
-
-function onHandleClick() {
-  addCount();
-}
 </script>
 
 <style lang="scss">
-.content {
+.searchComponent {
   position: sticky;
   top: 0;
   z-index: 999999;

src/pages/index/index.vue

@@ -256,8 +256,8 @@ function jumpProductDetails(item) {
 //   });
 // };
 // 搜索
-const toSearch = (keyword) => {
-  listParams.keyword = keyword;
+const toSearch = (res) => {
+  listParams.keyword = res.detail.value;
   reset();
   getMerchantList();
 };