i

src/pages/hotGoods/index/index.vue

@@ -20,7 +20,7 @@
             </view>
         </view>
         <!--  商品列表  -->
-        <view class="goodBox">
+        <!-- <view class="goodBox">
             <view
                 class="good"
                 v-for="item in list"
@@ -41,37 +41,97 @@
                     </view>
                 </view>
             </view>
+        </view> -->
+        <view class="goodBox">
+            <view
+                class="good"
+                v-for="item in (merdata as any)"
+                :key="item.ID"
+                @click.stop="toMerDetails(item)"
+            >
+                <image :src="(item.head_photo as string)" />
+                <view class="good-text-box">
+                    <text class="good-text">{{ item.name }}</text>
+                    <text style="color: #999"
+                        >距离我{{
+                            calculateDistance(
+                                userLocalNum.t,
+                                userLocalNum.l,
+                                Number(item.lat),
+                                Number(item.lon)
+                            )
+                        }}</text
+                    >
+                </view>
+            </view>
         </view>
     </view>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { useLoad, navigateTo } from "@tarojs/taro";
-import { getActiveGoods } from "../../../api/goods";
+import Taro from "@tarojs/taro";
+import {
+    // getActiveGoods,
+    getMerList,
+} from "../../../api/goods";
 import { IconFont } from "@nutui/icons-vue-taro";
+import { calculateDistance } from "@/utils";
 
-const list = ref<any>([]);
+// const list = ref<any>([]);
 
-useLoad(() => {
-    getList();
+Taro.useLoad(() => {
+    // getList();
+    get_mer_list();
 });
 
-const getList = async () => {
-    const res = await getActiveGoods();
-    console.log(res);
-    list.value = res.data.data;
-};
+// const getList = async () => {
+//     const res = await getActiveGoods();
+//     console.log(res);
+//     list.value = res.data.data;
+// };
 
-const toGoodDetails = (id: number) => {
-    navigateTo({
-        url: `/pages/goods/goods_detail/index?gid=${id}&type=1`,
+// const toGoodDetails = (id: number) => {
+//     Taro.navigateTo({
+//         url: `/pages/goods/goods_detail/index?gid=${id}&type=1`,
+//     });
+// };
+
+const hotGoodsDetail = () => {
+    Taro.navigateTo({
+        url: `/pages/hotGoods/hot_list/index`,
     });
 };
 
-const hotGoodsDetail = () => {
-    navigateTo({
-        url: `/pages/hotGoods/hot_list/index`,
+const merdata = ref([]);
+
+const userLocalNum = ref({
+    l: 0,
+    t: 0,
+});
+
+const get_mer_list = async () => {
+    Taro.getLocation({
+        type: "wgs84",
+        success: (res) => {
+            userLocalNum.value.l = res.longitude;
+            userLocalNum.value.t = res.latitude;
+        },
+    });
+
+    const res = await getMerList({
+        PageNum: 1,
+        PageSize: 10,
+        Btype: 1,
+        classid: 0,
+    });
+    merdata.value = res.data.data;
+};
+
+const toMerDetails = (item: any) => {
+    Taro.setStorageSync("mer_info", item);
+    Taro.navigateTo({
+        url: `/pages/mer/mer_detail/index`,
     });
 };
 </script>