Merge branch 'test'

src/pages/mer/mer_detail/index.vue

@@ -184,7 +184,6 @@ const getStoreInfo = async () => {
     title: mer_info.value.name,
   });
   swiperList.value = mer_info.value.img.split(',');
-  console.log(res);
 };
 
 const clickPhone = () => {
@@ -211,7 +210,7 @@ const class_list = ref<
 >([]);
 const get_class_list = async () => {
   const res = await getMerCategory({
-    Bid: mer_info.value.bid,
+    Bid: bid.value,
   });
   class_list.value = res.data.data || [];
   await get_good_list(class_list.value[0]?.ID as number);
@@ -255,7 +254,7 @@ const get_good_list = async (id: number) => {
     mask: true,
   });
   const res = await getGoodList({
-    bid: mer_info.value.bid,
+    bid: bid.value,
     goods_class_id: id,
     status: 1,
     state: 1,