feat: 商品详情的调整

components/FormCard/index.vue

@@ -61,8 +61,8 @@ const ERROR_MESSAGES = {
  * @typedef {Object} FormCardProps
  * @property {string} title - 表单标题
  * @property {Object} form - 表单数据对象
- * @property {string} form.name - 姓名
+ * @property {string} form.visitorName - 姓名
- * @property {string} form.phone - 手机号
+ * @property {string} form.contactPhone - 手机号
  * @property {boolean} showDeleteIcon - 是否显示删除图标
  */
 const props = defineProps({
@@ -73,12 +73,16 @@ const props = defineProps({
   form: {
     type: Object,
     default: () => ({
-      name: "",
+      visitorName: "",
-      phone: "",
+      contactPhone: "",
     }),
     validator: (value) => {
-      return value && typeof value === 'object' && 
+      return (
-             'name' in value && 'phone' in value;
+        value &&
+        typeof value === "object" &&
+        "visitorName" in value &&
+        "contactPhone" in value
+      );
     },
   },
   showDeleteIcon: {
@@ -90,11 +94,15 @@ const props = defineProps({
 /**
  * FormCard 组件事件
  * @typedef {Object} FormCardEmits
- * @property {Function} update:name - 更新姓名事件
+ * @property {Function} update:visitorName - 更新姓名事件
- * @property {Function} update:phone - 更新手机号事件
+ * @property {Function} update:contactPhone - 更新手机号事件
  * @property {Function} delete - 删除表单事件
  */
-const emit = defineEmits(["update:name", "update:phone", "delete"]);
+const emit = defineEmits([
+  "update:visitorName",
+  "update:contactPhone",
+  "delete",
+]);
 
 // 响应式状态
 const nameError = ref("");
@@ -102,16 +110,16 @@ const phoneError = ref("");
 
 // 计算属性 - 双向绑定
 const nameValue = computed({
-  get: () => props.form?.name || "",
+  get: () => props.form?.visitorName || "",
-  set: (value) => emit("update:name", value?.trim() || ""),
+  set: (value) => emit("update:visitorName", value?.trim() || ""),
 });
 
 const phoneValue = computed({
-  get: () => props.form?.phone || "",
+  get: () => props.form?.contactPhone || "",
   set: (value) => {
     // 只允许数字输入
     const numericValue = value.replace(/\D/g, "");
-    emit("update:phone", numericValue);
+    emit("update:contactPhone", numericValue);
   },
 });
 
@@ -145,11 +153,11 @@ const getPhoneError = (phone) => {
 
 // 验证方法
 const validateName = () => {
-  nameError.value = getNameError(props.form?.name);
+  nameError.value = getNameError(props.form?.visitorName);
 };
 
 const validatePhone = () => {
-  phoneError.value = getPhoneError(props.form?.phone);
+  phoneError.value = getPhoneError(props.form?.contactPhone);
 };
 
 // 事件处理

components/LocationCard/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <view class="store-address" @click="openMap">
+    <text class="location-label">位于 [{{ orderData.commodityAddress }}]</text>
+    <text class="address-text">{{ orderData.commodityAddress }}</text>
+  </view>
+</template>
+
+<script setup>
+import { defineProps } from "vue";
+
+const props = defineProps({
+  orderData: {
+    type: Object,
+    required: true,
+    default: () => ({}),
+  },
+});
+
+// 打开地图
+const openMap = () => {
+  const address = props.orderData.commodityAddress;
+  const latitude = Number(props.orderData.commodityLatitude);
+  const longitude = Number(props.orderData.commodityLongitude);
+
+  uni.getLocation({
+    type: "gcj02", //返回可以用于uni.openLocation的经纬度
+    success: (res) => {
+      console.log("当前经纬度", latitude, longitude);
+
+      uni.openLocation({
+        latitude: latitude,
+        longitude: longitude,
+        address: address,
+        success: () => {
+          console.log("success");
+        },
+      });
+    },
+  });
+};
+</script>
+
+<style scoped lang="scss">
+@import "./styles/index.scss";
+</style>

components/LocationCard/styles/index.scss

@@ -0,0 +1,49 @@
+.store-address {
+  display: flex;
+  align-items: start;
+  flex-direction: column;
+  padding: 16px 12px;
+  background-color: #f0f0f0;
+  background-image: url(""); // 预留背景图片位置，用户手动导入
+  background-size: cover;
+  background-position: center;
+  border-radius: 12px;
+  font-size: 14px;
+  color: #333;
+  position: relative;
+  overflow: hidden;
+
+  // 添加半透明遮罩层确保文字可读性
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.8);
+    z-index: 1;
+  }
+
+  // 确保内容在遮罩层之上
+  .location-label,
+  .address-text {
+    position: relative;
+    z-index: 2;
+  }
+
+  .location-label {
+    color: #333;
+    font-size: 14px;
+    margin-right: 4px;
+    font-weight: 500;
+  }
+
+  .address-text {
+    margin-top: 4px;
+    flex: 1;
+    color: #666;
+    font-size: 12px;
+    font-weight: 400;
+  }
+}

pages/goods/components/GoodConfirm/index.vue

@@ -83,8 +83,12 @@
               :form="item"
               :showDeleteIcon="userFormList.length > 1"
               :key="index"
-              @update:name="(value) => updateUserForm(index, 'name', value)"
+              @update:visitorName="
-              @update:phone="(value) => updateUserForm(index, 'phone', value)"
+                (value) => updateUserForm(index, 'visitorName', value)
+              "
+              @update:contactPhone="
+                (value) => updateUserForm(index, 'contactPhone', value)
+              "
               @delete="() => deleteUserForm(index)"
             />
           </scroll-view>
@@ -126,10 +130,10 @@ const showToast = (title, icon = "none", duration = 2000) => {
 const isValidUserForm = (user) => {
   return (
     user &&
-    typeof user.name === "string" &&
+    typeof user.visitorName === "string" &&
-    user.name.trim() !== "" &&
+    user.visitorName.trim() !== "" &&
-    typeof user.phone === "string" &&
+    typeof user.contactPhone === "string" &&
-    user.phone.trim() !== ""
+    user.contactPhone.trim() !== ""
   );
 };
 
@@ -165,7 +169,7 @@ const emits = defineEmits(["confirm", "close"]);
 
 // 工具函数
 const createEmptyUserForm = () => {
-  return { name: "", phone: "" };
+  return { visitorName: "", contactPhone: "" };
 };
 
 // 响应式数据
@@ -243,7 +247,7 @@ const updateUserForm = (index, field, value) => {
     return;
   }
 
-  if (!["name", "phone"].includes(field)) {
+  if (!["visitorName", "contactPhone"].includes(field)) {
     return;
   }
 
@@ -308,8 +312,8 @@ const confirmOrder = () => {
       quantity: quantity.value,
       totalPrice: parseFloat(totalPrice.value),
       userFormList: userFormList.value.map((user) => ({
-        name: user.name.trim(),
+        visitorName: user.visitorName.trim(),
-        phone: user.phone.trim(),
+        contactPhone: user.contactPhone.trim(),
       })),
       commodityType: props.goodsData?.commodityTypeCode,
       timestamp: Date.now(),

pages/goods/components/GoodInfo/index.vue

@@ -21,7 +21,7 @@
 
     <!-- 地址区域 -->
     <view class="address-section">
-      <LocationInfo :orderData="goodsData" />
+      <LocationCard :orderData="goodsData" />
     </view>
 
     <!-- 设施信息区域 -->
@@ -41,7 +41,7 @@
 
 <script setup>
 import { computed, defineProps, defineEmits } from "vue";
-import LocationInfo from "@/components/LocationInfo/index.vue";
+import LocationCard from "@/components/LocationCard/index.vue";
 
 // 事件定义
 const emits = defineEmits(["showCalendar"]);

pages/goods/components/GoodInfo/styles/index.scss

@@ -38,9 +38,7 @@
 
   // 地址区域
   .address-section {
-    padding: 12px 0;
+    padding: 6px 0;
-    border-top: 1px solid #f0f0f0;
-    border-bottom: 1px solid #f0f0f0;
 
     .address-item {
       display: flex;
@@ -61,8 +59,8 @@
     margin-top: 12px;
 
     .facilities-grid {
-      display: grid;
+      display: flex;
-      grid-template-columns: repeat(3, 1fr);
+      flex-wrap: wrap;
       gap: 8px;
 
       .facility-item {

pages/goods/index.vue

@@ -15,9 +15,42 @@
         <!-- 商品信息组件 -->
         <GoodInfo :goodsData="goodsData" @showCalendar="showCalendar" />
 
-        <ModuleTitle title="购买须知" />
+        <view v-if="goodsData.commodityPurchaseInstruction" class="use-notice">
+          <ModuleTitle
+            :title="goodsData.commodityPurchaseInstruction.templateTitle"
+          />
+          <view
+            class="use-notice-content"
+            v-for="(moduleItem, index) in goodsData.commodityPurchaseInstruction
+              .commodityPurchaseInstructionModuleEntityList"
+            :key="index"
+          >
+            <view
+              class="module-item"
+              :class="{
+                'border-bottom':
+                  index <
+                  goodsData.commodityPurchaseInstruction
+                    .commodityPurchaseInstructionModuleEntityList.length -
+                    1,
+              }"
+            >
+              <view class="module-icon">
+                <uni-icons fontFamily="znicons" size="20" color="#333">{{
+                  zniconsMap[moduleItem.moduleIcon]
+                }}</uni-icons>
+                <text class="module-title">{{ moduleItem.moduleTitle }}</text>
+              </view>
+              <text class="module-desc">{{ moduleItem.moduleContent }}</text>
+            </view>
+          </view>
+        </view>
 
-        <zero-markdown-view :markdown="goodsData.commodityTip" :aiMode='true' />
+        <zero-markdown-view
+          v-else
+          :markdown="goodsData.commodityTip"
+          :aiMode="true"
+        />
       </view>
     </scroll-view>
 
@@ -63,6 +96,7 @@ import GoodInfo from "./components/GoodInfo/index.vue";
 import ModuleTitle from "@/components/ModuleTitle/index.vue";
 import GoodConfirm from "./components/GoodConfirm/index.vue";
 import Calender from "@/components/Calender/index.vue";
+import { zniconsMap } from "@/static/fonts/znicons.js";
 
 const calendarVisible = ref(false);
 const goodsData = ref({});
@@ -246,4 +280,8 @@ const handleDateSelect = (data) => {
 
 <style scoped lang="scss">
 @import "./styles/index.scss";
+@font-face {
+  font-family: znicons;
+  src: url("@/static/fonts/znicons.ttf");
+}
 </style>

pages/goods/styles/index.scss

@@ -15,6 +15,47 @@ $button-hover-color: darken($button-color, 8%);
     flex-shrink: 0;
   }
 
+  // 使用须知样式
+  .use-notice {
+    margin: 16px 0;
+  }
+
+  .use-notice-content {
+    .module-item {
+      display: flex;
+      align-items: flex-start;
+      flex-direction: column;
+      padding: 12px 0;
+    
+      .module-icon {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-right: 8px;
+        flex-shrink: 0;
+
+        .module-title {
+          font-size: 14px;
+          color: #333;
+          text-align: center;
+          word-wrap: break-word;
+          margin-left: 4px;
+        }
+      }
+
+      .module-desc {
+        flex: 1;
+        font-size: 12px;
+        color: #666;
+        line-height: 1.5;
+        margin-top: 4px;
+      }
+    }
+    .border-bottom {
+      border-bottom: 1px solid #f0f0f0;
+    }
+  }
+
   .content-wrapper {
     flex: 1;
     height: 0; // 关键：让flex子项能够正确计算高度

static/fonts/znicons.js

@@ -0,0 +1,19 @@
+export const zniconsMap = {
+  "zn-wifi": "\ue681",
+  "zn-bath": "\ue682",
+  "zn-frame": "\ue683",
+  "zn-shower-gel": "\ue684",
+  "zn-a-washingmachine": "\ue685",
+  "zn-live": "\ue686",
+  "zn-user": "\ue687",
+  "zn-dish-cover": "\ue688",
+  "zn-glass-cup": "\ue689",
+  "zn-check-circle": "\ue68a",
+  "zn-send-filled": "\ue68b",
+  "zn-nav-arrow-right": "\ue68c",
+  "zn-nav-arrow-left": "\ue68d",
+  "zn-nav-arrow-down": "\ue68e",
+  "zn-fast-arrow-down": "\ue68f",
+  "zn-nav-arrow-up": "\ue690",
+  "zn-microphone": "\ue691",
+};