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

src/main.ts

@@ -2,7 +2,7 @@ import { createSSRApp } from 'vue';
 import App from './App.vue';
 import store from './store';
 import '@/assets/iconfont/iconfont.css'; // 引入自定义图标样式文件
-import Vconsole from 'vconsole';
+// import Vconsole from 'vconsole';
 import './styles/flex.scss';
 import { install } from './directive';
 // 字体
@@ -12,8 +12,8 @@ export function createApp() {
   const app = createSSRApp(App);
   app.component('Search', Search);
   install(app);
-  const vConsole = new Vconsole();
-  app.use(store, vConsole);
+  // const vConsole = new Vconsole();
+  app.use(store);
   return {
     app,
   };

src/pages/index/index.vue

@@ -219,6 +219,7 @@ let listParams = {
   size: 10,
   lon: 106.68650025025502,
   lat: 26.567192352601154,
+  categoryIds: ['6'],
 };
 const coupon = ref([]);
 const top = ref(null);
@@ -369,6 +370,7 @@ const reset = () => {
     size: 10,
     lon: 106.68650025025502,
     lat: 26.567192352601154,
+    categoryIds: ['6'],
   };
   shopCardData.value = {};
   cardData.value = [];

src/pages/index/listFood.vue

@@ -103,11 +103,12 @@ let total;
 const paramsId = {
   parentId: null,
 };
-const listParams = {
+let listParams = {
   current: 1,
   size: 10,
   lon: 106.68650025025502,
   lat: 26.567192352601154,
+  categoryIds: ['6'],
 };
 onMounted(() => {
   getMerchantList();
@@ -162,7 +163,13 @@ const popular = (communityName) => {
 };
 // 重置数据
 const reset = () => {
-  listParams.current = 1;
+  listParams = {
+    current: 1,
+    size: 10,
+    lon: 106.68650025025502,
+    lat: 26.567192352601154,
+    categoryIds: ['6'],
+  };
   cardData.value = [];
   show.value = false;
 };