Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud

src/pages/shop/detail.vue

@@ -141,7 +141,7 @@ onLoad((options: any) => {
 });
 onShow(async () => {
   await getDetail();
-  // await getShopCar();
+  await getShopCar();
   await getClassify();
 });
 
@@ -151,7 +151,7 @@ const getDetail = async () => {
 };
 
 const getShopCar = async () => {
-  const { data } = await foodApi.getShopCar({ merchantId: state.detailId });
+  const { data } = await foodApi.getShopCar({ merchantId: state.merchantId, hardType: "SUPERMARKET" });
   state.carList = data ?? [];
   state.totPrice = state.carList.map((v) => v.totalPrice).reduce((pre, next) => pre + next, 0);
   state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0);