From 5e981b6de34093610ff87c5e1ce9edb62e26f482 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Mon, 20 Oct 2025 20:36:33 +0800
Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CreateServiceOrder/index.vue   | 246 ++++++------------
 .../CreateServiceOrder/styles/index.scss      | 178 +------------
 src/components/Feedback/index.vue             |  42 +--
 src/components/Feedback/styles/index.scss     |   5 +
 .../components/module/MoreService/index.vue   |   1 -
 src/static/scss/background.scss               |   4 +
 src/static/scss/margin.scss                   |   8 +
 src/static/scss/width.scss                    |   4 +
 8 files changed, 140 insertions(+), 348 deletions(-)

diff --git a/src/components/CreateServiceOrder/index.vue b/src/components/CreateServiceOrder/index.vue
index 9df5d89..9a2639d 100644
--- a/src/components/CreateServiceOrder/index.vue
+++ b/src/components/CreateServiceOrder/index.vue
@@ -1,87 +1,73 @@
 <template>
   <view class="create-service-order">
-    <view class="create-service-wrapper">
-      <view class="order-header">
-        <text>创建服务工单</text>
+    <view
+      class="w-full bg-white border-box border-ff overflow-hidden rounded-20"
+    >
+      <view
+        class="border-box order-header w-vw flex flex-items-center flex-justify-between bg-EEF8FF"
+      >
+        <text class="font-size-18 font-500 color-171717 text-left ml-12">
+          {{ isCallSuccess ? "服务已创建" : "呼叫服务" }}
+        </text>
+        <image
+          class="header-icon"
+          src="https://oss.nianxx.cn/mp/static/version_101/home/feedback.png"
+        />
       </view>
-      <view class="order-content">
-        <view class="order-item">
-          <image src="./images/icon_service.png" class="order-icon"></image>
-          <uni-data-select
-            v-if="!isCallSuccess && workOrderTypeList.length > 0"
-            class="order-select"
-            placeholder="请选择服务工单"
-            v-model="workOrderTypeName"
-            :localdata="workOrderTypeListSelectData"
-            @change="changeWorkOrderType"
-          ></uni-data-select>
-          <text v-else class="order-description">{{ workOrderTypeName }}</text>
-        </view>
-        <view class="order-line"></view>
-        <view class="order-details">
-          <view class="detail-item">
-            <text class="detail-label">房间号：</text>
-            <input
-              v-if="!isCallSuccess"
-              class="detail-input"
-              placeholder="请填写房间号"
-              v-model="roomId"
-            />
-            <text v-else class="detail-value">{{ roomId }}</text>
-          </view>
-          <view class="detail-item">
-            <text class="detail-label">服务时间：</text>
-            <text class="detail-value">2025-08-11 14:00</text>
-          </view>
-          <view class="detail-item">
-            <text class="detail-label">联系房客：</text>
-            <!-- 呼叫成功后显示为文本，否则显示输入框 -->
-            <input
-              v-if="!isCallSuccess"
-              class="detail-input"
-              placeholder="请填写联系人"
-              v-model="contactName"
-            />
-            <text v-else class="detail-value">{{ contactName }}</text>
-          </view>
-          <view class="detail-item">
-            <text class="detail-label">联系电话：</text>
-            <!-- 呼叫成功后显示为文本，否则显示输入框 -->
-            <input
-              v-if="!isCallSuccess"
-              class="detail-input"
-              placeholder="请填写联系电话"
-              v-model="contactPhone"
-            />
-            <text v-else class="detail-value">{{ contactPhone }}</text>
-          </view>
+
+      <view v-if="!isCallSuccess" class="order-content border-box p-12">
+        <view
+          class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
+        >
+          <text class="font-500 line-height-22 mr-20">房间号</text>
+          <input placeholder="请填写房间号" v-model="roomId" />
         </view>
 
-        <!-- 呼叫前显示立即呼叫按钮 -->
-        <button v-if="!isCallSuccess" class="order-button" @click="handleCall">
-          立即呼叫
-        </button>
+        <view
+          class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
+        >
+          <text class="font-500 line-height-22 mr-20">联系电话</text>
+          <input placeholder="请填写联系电话" v-model="contactPhone" />
+        </view>
 
-        <!-- 呼叫成功后显示两个按钮 -->
-        <view v-else class="order-buttons">
-          <button class="order-button-secondary" @click="viewWorkOrder">
-            查看工单
-          </button>
-          <button
-            v-if="!isMarkCompleted"
-            class="order-button-primary"
-            @click="markCompleted"
+        <view
+          class="bg-F5F7FA border-box p-12 rounded-10 font-size-14 font-500 color-171717 mb-12"
+        >
+          <view class="font-500 line-height-22 mb-12">需求信息描述</view>
+          <textarea
+            placeholder="请输入需求信息描述"
+            maxlength="100"
+            v-model="contactText"
+          />
+        </view>
+      </view>
+
+      <view v-else class="border-box card-content flex flex-items-center p-12">
+        <view class="border-box left flex-full pr-20">
+          <view class="font-size-12 color-525866 line-height-20 mb-4"
+            >房间号：{{ roomId }}</view
+          >
+          <view class="font-size-12 color-525866 line-height-20 mb-4"
+            >联系方式: {{ contactPhone }}</view
+          >
+          <view class="font-size-12 color-525866 line-height-20 ellipsis-2"
+            >需求描述: {{ contactText }}</view
           >
-            已完成
-          </button>
         </view>
-      </view>
-    </view>
 
-    <view class="footer-help">
-      <image src="./images/icon_volume.png" class="help-icon"></image>
-      <text class="help-text">没解决问题？给我打电话吧！</text>
-      <text class="help-phone" @click="makePhoneCall">15185111210</text>
+        <image
+          class="right rounded-6"
+          src="https://picsum.photos/300/300"
+          mode="aspectFill"
+        />
+      </view>
+
+      <view
+        class="btn rounded-50 color-white bg-button flex flex-items-center flex-justify-center ml-12 mr-12 mb-12"
+        @click="handleCall"
+      >
+        {{ isCallSuccess ? "查看服务" : "立即呼叫" }}
+      </view>
     </view>
   </view>
 </template>
@@ -89,49 +75,20 @@
 <script setup>
 import { ref, onMounted, nextTick } from "vue";
 import { SCROLL_TO_BOTTOM } from "@/constant/constant";
+import { createWorkOrder } from "@/request/api/OrderApi";
 
-import {
-  createWorkOrder,
-  workOrderTypeListForBiz,
-} from "@/request/api/OrderApi";
 const workOrderTypeId = ref("");
-const workOrderTypeName = ref("");
 const roomId = ref("");
-const contactName = ref("");
 const contactPhone = ref("");
+const contactText = ref("");
+const contentImgUrl = ref("");
 const isCallSuccess = ref(false); // 呼叫成功状态
 const workOrderId = ref(0); // 工单ID
-const workOrderTypeList = ref([]);
-const workOrderTypeListSelectData = ref([]);
-const isMarkCompleted = ref(false);
-
-const changeWorkOrderType = (index) => {
-  if (index < 0 || index >= workOrderTypeListSelectData.value.length) {
-    return;
-  }
-  const item = workOrderTypeList.value[index];
-  console.log("item:", item);
-  workOrderTypeId.value = item.id;
-  workOrderTypeName.value = item.workOrderTypeName;
-};
 
 const handleCall = async () => {
-  // 验证输入
-  if (!roomId.value.trim()) {
-    uni.showToast({
-      title: "请填写房间号",
-      icon: "none",
-      duration: 2000,
-    });
-    return;
-  }
-
-  if (!contactName.value.trim()) {
-    uni.showToast({
-      title: "请填写联系人",
-      icon: "none",
-      duration: 2000,
-    });
+  if (isCallSuccess.value) {
+    // 查看工单
+    viewWorkOrder();
     return;
   }
 
@@ -144,6 +101,15 @@ const handleCall = async () => {
     return;
   }
 
+  if (!contactText.value.trim()) {
+    uni.showToast({
+      title: "请填写需求信息描述内容",
+      icon: "none",
+      duration: 2000,
+    });
+    return;
+  }
+
   sendCreateWorkOrder();
 };
 
@@ -151,33 +117,34 @@ const handleCall = async () => {
 const sendCreateWorkOrder = async () => {
   try {
     const res = await createWorkOrder({
-      contactName: contactName.value,
-      contactPhone: contactPhone.value,
       workOrderTypeId: workOrderTypeId.value,
       roomId: roomId.value,
+      contactPhone: contactPhone.value,
+      content: contactText.value,
+      contentImgUrl: contentImgUrl.value,
     });
 
     if (res.code === 0) {
       // 保存工单ID
       workOrderId.value = res.data?.id || "";
 
-      // 设置呼叫成功状态
+      // 设置成功状态
       isCallSuccess.value = true;
 
       uni.showToast({
-        title: "工单创建成功",
+        title: "呼叫成功",
         icon: "success",
         duration: 2000,
       });
     } else {
       uni.showToast({
-        title: res.message || "创建工单失败",
+        title: res.message || "呼叫失败",
         icon: "none",
         duration: 2000,
       });
     }
   } catch (error) {
-    console.error("创建工单失败:", error);
+    console.error("呼叫失败:", error);
     uni.showToast({
       title: "网络错误，请重试",
       icon: "none",
@@ -186,25 +153,6 @@ const sendCreateWorkOrder = async () => {
   }
 };
 
-/// 获取工单类型
-const getWorkOrderType = async () => {
-  const res = await workOrderTypeListForBiz();
-  if (res.code === 0) {
-    workOrderTypeList.value = res.data;
-    workOrderTypeList.value.forEach((item, index) => {
-      workOrderTypeListSelectData.value.push({
-        value: index,
-        text: item.workOrderTypeName,
-      });
-    });
-
-    if (workOrderTypeList.value.length > 0) {
-      workOrderTypeId.value = workOrderTypeList.value[0].id;
-      workOrderTypeName.value = workOrderTypeList.value[0].workOrderTypeName;
-    }
-  }
-};
-
 // 查看工单
 const viewWorkOrder = () => {
   console.log("查看工单:", workOrderId.value);
@@ -214,35 +162,7 @@ const viewWorkOrder = () => {
   });
 };
 
-// 标记已完成
-const markCompleted = () => {
-  console.log("标记工单已完成:", workOrderId.value);
-  uni.showModal({
-    title: "确认完成",
-    content: "确认标记此工单为已完成吗？",
-    success: (res) => {
-      if (res.confirm) {
-        isMarkCompleted.value = true;
-        // 这里可以调用API标记工单完成
-        uni.showToast({
-          title: "工单已完成",
-          icon: "success",
-          duration: 2000,
-        });
-      }
-    },
-  });
-};
-
-const makePhoneCall = () => {
-  // 使用 uniapp 的 API 拨打电话
-  uni.makePhoneCall({
-    phoneNumber: "15185111210",
-  });
-};
-
 onMounted(() => {
-  getWorkOrderType();
   nextTick(() => {
     setTimeout(() => {
       uni.$emit(SCROLL_TO_BOTTOM, true);
diff --git a/src/components/CreateServiceOrder/styles/index.scss b/src/components/CreateServiceOrder/styles/index.scss
index 7251bf8..a6c319b 100644
--- a/src/components/CreateServiceOrder/styles/index.scss
+++ b/src/components/CreateServiceOrder/styles/index.scss
@@ -1,179 +1,25 @@
-.create-service-wrapper {
-  padding: 12px 0;
-}
-
 .order-header {
-  font-size: $uni-font-size-base;
-  font-weight: 500;
-  margin-bottom: 10px;
-  color: $uni-text-color;
+  height: 48px;
 }
 
+.header-icon {
+  width: 98px;
+  height: 48px;
+}
 .order-content {
-  width: 100%;
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 12px;
-  border-radius: 8px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-}
-
-.order-item {
-  display: flex;
-  align-items: center;
-  margin-bottom: 12px;
-}
-
-.order-icon {
-  width: 24px;
-  height: 24px;
-  margin-right: 8px;
-  border-radius: $uni-border-radius-circle;
-  background-color: #ffa500;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.order-description {
-  font-size: $uni-font-size-base;
-  font-weight: 500;
-  color: $uni-text-color;
-}
-
-.order-line {
-  position: relative;
-  border: 1px dashed #eeeeee;
-  margin-left: -12px;
-  margin-right: -12px;
-
-  &::before,
-  &::after {
-    content: "";
-    position: absolute;
-    top: -8px;
-    width: 16px;
-    height: 16px;
-    border-radius: $uni-border-radius-50px;
-    background-color: #eff6fa;
-  }
-
-  &::before {
-    left: -8px;
-  }
-
-  &::after {
-    right: -8px;
-  }
-}
-
-.order-details {
-  margin-top: 12px;
-}
-
-.detail-item {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-  font-size: $uni-font-size-base;
-  color: $uni-text-color;
-}
-
-.detail-label {
-  width: 70px;
-  margin-right: 10px;
-}
-
-.detail-value {
-  color: $uni-text-color;
-}
-
-.detail-input {
-  border: none;
-  outline: none;
-  width: calc(100% - 80px);
-  font-size: $uni-font-size-base;
-  color: $uni-text-color;
-  border-bottom: 1px solid #ddd;
-}
-
-.order-select {
-  border: none;
-  outline: none;
-  width: 100%;
-  font-size: $uni-font-size-base;
-  color: $uni-text-color;
-}
-
-.order-button {
-  width: 300px;
-  height: 42px;
-  background: linear-gradient(90deg, #ff7e00, #ffba00);
-  color: #fff;
-  font-size: $uni-font-size-base;
-  font-weight: 600;
-  border-radius: 20px;
-  margin-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-// 呼叫成功后的按钮容器
-.order-buttons {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 20px;
-  gap: 12px;
-}
-
-// 查看工单按钮（次要按钮）
-.order-button-secondary {
-  flex: 1;
-  height: 42px;
-  background: linear-gradient(90deg, #0256ff, #00a6ff);
-  color: #fff;
-  font-size: $uni-font-size-base;
-  font-weight: 600;
-  border: none;
-  border-radius: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-// 已完成按钮（主要按钮）
-.order-button-primary {
-  flex: 1;
-  height: 42px;
-  background: linear-gradient(90deg, #ff7e00, #ffba00);
-  color: #fff;
-  font-size: $uni-font-size-base;
-  font-weight: 600;
-  border-radius: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.footer-help {
-  margin-bottom: 12px;
-  display: flex;
-  align-items: center;
-  font-size: $uni-font-size-base;
-  color: #ed6a0c;
+  width: 335px;
 }
 
 .help-icon {
   width: 16px;
-  height: 14px;
-  margin-right: 5px;
+  height: 16px;
 }
 
-.help-text {
-  margin-right: 5px;
+.btn {
+  height: 44px;
 }
 
-.help-phone {
-  cursor: pointer;
+.right {
+  height: 88px;
+  width: 88px;
 }
diff --git a/src/components/Feedback/index.vue b/src/components/Feedback/index.vue
index ece6d51..89d4ed6 100644
--- a/src/components/Feedback/index.vue
+++ b/src/components/Feedback/index.vue
@@ -3,38 +3,37 @@
     <view
       class="w-full bg-white border-box border-ff overflow-hidden rounded-20"
     >
-      <image
-        class="order-header w-full"
-        src="https://oss.nianxx.cn/mp/static/version_101/home/feedback_1.png"
-        mode="aspectFill"
-      />
-      <view class="order-content border-box p-12">
+      <view
+        class="border-box order-header w-vw flex flex-items-center flex-justify-between bg-EEF8FF"
+      >
+        <text class="font-size-18 font-500 color-171717 text-left ml-12">
+          {{ isCallSuccess ? "反馈已创建" : "反馈意见" }}
+        </text>
+        <image
+          class="header-icon"
+          src="https://oss.nianxx.cn/mp/static/version_101/home/feedback.png"
+        />
+      </view>
+
+      <view v-if="!isCallSuccess" class="order-content border-box p-12">
         <view
           class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
         >
           <text class="font-500 line-height-22 mr-20">联系电话</text>
-          <input
-            v-if="!isCallSuccess"
-            placeholder="请填写联系电话"
-            v-model="contactPhone"
-          />
-          <text v-else class="detail-value">{{ contactPhone }}</text>
+          <input placeholder="请填写联系电话" v-model="contactPhone" />
         </view>
         <view
           class="bg-F5F7FA border-box p-12 rounded-10 font-size-14 font-500 color-171717 mb-12"
         >
           <view class="font-500 line-height-22 mb-12">意见内容</view>
           <textarea
-            v-if="!isCallSuccess"
             placeholder="请输入反馈意见"
             maxlength="100"
             v-model="contactText"
           />
-          <text v-else class="detail-value">{{ contactText }}</text>
         </view>
 
         <view
-          v-if="!isCallSuccess"
           class="btn rounded-50 color-white bg-button flex flex-items-center flex-justify-center"
           @click="handleCall"
         >
@@ -42,9 +41,16 @@
         </view>
       </view>
 
-      <view
-        class="footer-help flex flex-items-center flex-justify-center mb-12"
-      >
+      <view v-else class="border-box left flex-full p-12">
+        <view class="font-size-12 color-525866 line-height-20 mb-4"
+          >联系方式: {{ contactPhone }}</view
+        >
+        <view class="font-size-12 color-525866 line-height-20 ellipsis-2"
+          >意见内容: {{ contactText }}</view
+        >
+      </view>
+
+      <view class="footer-help flex flex-items-center pl-12 mb-12">
         <image class="help-icon mr-4" src="./images/icon_volume.png" />
         <text class="font-size-12 font-500 color-FA7319">
           {{ appName }}收到您的意见将第一时间为您处理!
diff --git a/src/components/Feedback/styles/index.scss b/src/components/Feedback/styles/index.scss
index 56d093f..312a8c4 100644
--- a/src/components/Feedback/styles/index.scss
+++ b/src/components/Feedback/styles/index.scss
@@ -2,6 +2,11 @@
   height: 48px;
 }
 
+.header-icon {
+  width: 98px;
+  height: 48px;
+}
+
 .order-content {
   width: 335px;
 }
diff --git a/src/pages/index/components/module/MoreService/index.vue b/src/pages/index/components/module/MoreService/index.vue
index 4e3a772..fc35aec 100644
--- a/src/pages/index/components/module/MoreService/index.vue
+++ b/src/pages/index/components/module/MoreService/index.vue
@@ -13,7 +13,6 @@
           class="item border-box border-bottom pt-20 pb-20"
           v-for="(item, index) in list"
           :key="index"
-          @click="handleClick(item)"
         >
           <view class="flex flex-items-center flex-justify-center">
             <image v-if="item.icon" class="left" :src="item.icon" />
diff --git a/src/static/scss/background.scss b/src/static/scss/background.scss
index 6c46fe4..aae9d34 100644
--- a/src/static/scss/background.scss
+++ b/src/static/scss/background.scss
@@ -19,6 +19,10 @@
   background-color: #f5f7fa;
 }
 
+.bg-EEF8FF {
+  background-color: #eef8ff;
+}
+
 .bg-liner {
   background: linear-gradient(205deg, #8ae3fc 0%, rgba(138, 227, 252, 0) 20%),
     linear-gradient(155deg, #fef7e1 0%, rgba(254, 247, 225, 0) 20%),
diff --git a/src/static/scss/margin.scss b/src/static/scss/margin.scss
index a2e5203..d5897e5 100644
--- a/src/static/scss/margin.scss
+++ b/src/static/scss/margin.scss
@@ -55,6 +55,10 @@
   margin: 12px;
 }
 
+.mt-12 {
+  margin-top: 12px;
+}
+
 .mb-12 {
   margin-bottom: 12px;
 }
@@ -63,6 +67,10 @@
   margin-left: 12px;
 }
 
+.mr-12 {
+  margin-right: 12px;
+}
+
 .ml-16 {
   margin-left: 16px;
 }
diff --git a/src/static/scss/width.scss b/src/static/scss/width.scss
index 5d91e65..3fb544a 100644
--- a/src/static/scss/width.scss
+++ b/src/static/scss/width.scss
@@ -2,6 +2,10 @@
   width: 100%;
 }
 
+.w-vw {
+  width: 100vw;
+}
+
 .w-50 {
   width: 50%;
 }

From a3aabc2752637bfc44a1fd1a7366bfb508483295 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 18:59:53 +0800
Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CreateServiceOrder/index.vue | 44 +++++++++++++++++++++
 src/components/Feedback/index.vue           |  2 +
 src/request/api/UpdateFile.js               | 32 +++++++++++++++
 src/static/scss/height.scss                 |  4 ++
 src/static/scss/padding.scss                |  4 ++
 src/static/scss/rounded.scss                |  4 ++
 6 files changed, 90 insertions(+)
 create mode 100644 src/request/api/UpdateFile.js

diff --git a/src/components/CreateServiceOrder/index.vue b/src/components/CreateServiceOrder/index.vue
index 9a2639d..01f8846 100644
--- a/src/components/CreateServiceOrder/index.vue
+++ b/src/components/CreateServiceOrder/index.vue
@@ -35,11 +35,25 @@
         >
           <view class="font-500 line-height-22 mb-12">需求信息描述</view>
           <textarea
+            class="h-80"
             placeholder="请输入需求信息描述"
+            placeholder-class="font-size-14 font-400"
             maxlength="100"
             v-model="contactText"
           />
         </view>
+
+        <view
+          class="bg-F5F7FA border-box p-12 rounded-10 font-size-14 font-500 color-171717 mb-12"
+        >
+          <view class="font-500 line-height-22 mb-12">照片上传</view>
+          <view
+            class="bg-white p-24 rounded-5 inline-block"
+            @click="handleChooseImage"
+          >
+            <uni-icons type="closeempty" size="24" color="#6A717F" />
+          </view>
+        </view>
       </view>
 
       <view v-else class="border-box card-content flex flex-items-center p-12">
@@ -76,6 +90,7 @@
 import { ref, onMounted, nextTick } from "vue";
 import { SCROLL_TO_BOTTOM } from "@/constant/constant";
 import { createWorkOrder } from "@/request/api/OrderApi";
+import { updateImageFile } from "@/request/api/UpdateFile";
 
 const workOrderTypeId = ref("");
 const roomId = ref("");
@@ -85,6 +100,35 @@ const contentImgUrl = ref("");
 const isCallSuccess = ref(false); // 呼叫成功状态
 const workOrderId = ref(0); // 工单ID
 
+// 处理图片上传
+const handleChooseImage = () => {
+  console.log("选择图片");
+  uni.chooseImage({
+    count: 1,
+    success: (res) => {
+      const file = res.tempFilePaths[0];
+      updateImagehandle(file);
+    },
+    fail: (err) => {
+      console.error("选择图片失败:", err);
+      uni.showToast({
+        title: "选择图片失败",
+        icon: "none",
+        duration: 2000,
+      });
+    },
+  });
+};
+
+const updateImagehandle = (file) => {
+  if (!file) {
+    return;
+  }
+  updateImageFile(file).then((res) => {
+    contentImgUrl.value = res.data?.url || "";
+  });
+};
+
 const handleCall = async () => {
   if (isCallSuccess.value) {
     // 查看工单
diff --git a/src/components/Feedback/index.vue b/src/components/Feedback/index.vue
index 89d4ed6..90d22bb 100644
--- a/src/components/Feedback/index.vue
+++ b/src/components/Feedback/index.vue
@@ -27,7 +27,9 @@
         >
           <view class="font-500 line-height-22 mb-12">意见内容</view>
           <textarea
+            class="h-80"
             placeholder="请输入反馈意见"
+            placeholder-class="font-size-14 font-400"
             maxlength="100"
             v-model="contactText"
           />
diff --git a/src/request/api/UpdateFile.js b/src/request/api/UpdateFile.js
new file mode 100644
index 0000000..c8fa4d5
--- /dev/null
+++ b/src/request/api/UpdateFile.js
@@ -0,0 +1,32 @@
+import { BASE_URL } from "@/request/base/baseUrl";
+import { getCurrentConfig } from "@/constant/base";
+
+export const updateImageFile = (file) => {
+  const url = BASE_URL + "/common/upload";
+  const token = uni.getStorageSync("token");
+  const clientId = getCurrentConfig().clientId;
+
+  return new Promise((resolve, reject) => {
+    uni.uploadFile({
+      url,
+      filePath: file,
+      name: "file",
+      header: {
+        "Content-Type": "multipart/form-data",
+        Authorization: `Bearer ${token}`,
+        clientId: clientId,
+      },
+      formData: {
+        file: "file",
+      },
+      success: (uploadFileRes) => {
+        console.log(uploadFileRes.data);
+        resolve(uploadFileRes.data);
+      },
+      fail: (err) => {
+        console.error("上传图片失败:", err);
+        reject(err);
+      },
+    });
+  });
+};
diff --git a/src/static/scss/height.scss b/src/static/scss/height.scss
index 40ebcb7..da01276 100644
--- a/src/static/scss/height.scss
+++ b/src/static/scss/height.scss
@@ -1,3 +1,7 @@
 .h-screen {
   height: 100vh;
 }
+
+.h-80 {
+  height: 80px;
+}
diff --git a/src/static/scss/padding.scss b/src/static/scss/padding.scss
index be158fc..45fef9c 100644
--- a/src/static/scss/padding.scss
+++ b/src/static/scss/padding.scss
@@ -99,6 +99,10 @@
   padding-bottom: 20px;
 }
 
+.p-24 {
+  padding: 24px;
+}
+
 .pb-safe-area {
   padding-bottom: Max(env(safe-area-inset-bottom), 12px);
 }
diff --git a/src/static/scss/rounded.scss b/src/static/scss/rounded.scss
index 39d5e45..aed980d 100644
--- a/src/static/scss/rounded.scss
+++ b/src/static/scss/rounded.scss
@@ -3,6 +3,10 @@
   border-radius: 4px;
 }
 
+.rounded-5 {
+  border-radius: 5px;
+}
+
 .rounded-6 {
   border-radius: 6px;
 }

From 4d12c765891f6bbe1ddb2c3c79375a07ac49a84d Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 19:08:56 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CreateServiceOrder/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/CreateServiceOrder/index.vue b/src/components/CreateServiceOrder/index.vue
index 01f8846..f2ae5b2 100644
--- a/src/components/CreateServiceOrder/index.vue
+++ b/src/components/CreateServiceOrder/index.vue
@@ -51,7 +51,9 @@
             class="bg-white p-24 rounded-5 inline-block"
             @click="handleChooseImage"
           >
-            <uni-icons type="closeempty" size="24" color="#6A717F" />
+            <uni-icons fontFamily="znicons" size="24" color="#6A717F">
+              {{ zniconsMap["zn-camera"] }}
+            </uni-icons>
           </view>
         </view>
       </view>
@@ -91,6 +93,7 @@ import { ref, onMounted, nextTick } from "vue";
 import { SCROLL_TO_BOTTOM } from "@/constant/constant";
 import { createWorkOrder } from "@/request/api/OrderApi";
 import { updateImageFile } from "@/request/api/UpdateFile";
+import { zniconsMap } from "@/static/fonts/znicons.js";
 
 const workOrderTypeId = ref("");
 const roomId = ref("");

From bb7b6d5c355741f0b6290d49438e2129dc618804 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 19:19:04 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E6=9B=B4=E5=A4=9A=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/components/module/MoreService/index.vue | 3 ++-
 src/static/scss/margin.scss                             | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/index/components/module/MoreService/index.vue b/src/pages/index/components/module/MoreService/index.vue
index fc35aec..5d4c6b6 100644
--- a/src/pages/index/components/module/MoreService/index.vue
+++ b/src/pages/index/components/module/MoreService/index.vue
@@ -2,7 +2,8 @@
   <uni-popup ref="popup" type="bottom" :safe-area="false">
     <view class="popup-content border-box pt-12 pl-12 pr-12">
       <view class="header flex flex-items-center pb-12">
-        <view class="title flex-full font-size-17 color-000 font-500"
+        <view
+          class="title flex-full text-center font-size-17 color-000 font-500 ml-24"
           >更多服务</view
         >
         <uni-icons type="close" size="24" color="#CACFD8" @click="close" />
diff --git a/src/static/scss/margin.scss b/src/static/scss/margin.scss
index d5897e5..5db5140 100644
--- a/src/static/scss/margin.scss
+++ b/src/static/scss/margin.scss
@@ -82,3 +82,7 @@
 .mr-20 {
   margin-right: 20px;
 }
+
+.ml-24 {
+  margin-left: 24px;
+}

From 91b2f4094c2b9cb20a1312a4630d4b2082116a8e Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 19:40:00 +0800
Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E6=AC=A2=E8=BF=8E=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=BA=A4=E4=BA=92=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/chat/ChatMoreTips/index.vue      | 17 ++++-------------
 .../components/chat/ChatTopWelcome/index.vue    |  4 ++--
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/pages/index/components/chat/ChatMoreTips/index.vue b/src/pages/index/components/chat/ChatMoreTips/index.vue
index 98c506b..6a26536 100644
--- a/src/pages/index/components/chat/ChatMoreTips/index.vue
+++ b/src/pages/index/components/chat/ChatMoreTips/index.vue
@@ -18,27 +18,18 @@
 </template>
 
 <script setup>
+import { SEND_MESSAGE_CONTENT_TEXT } from "@/constant/constant";
 import { defineProps } from "vue";
 
-const emits = defineEmits(["replySent"]);
-
 defineProps({
   guideWords: {
     type: Array,
-    default: [
-      "定温泉票",
-      "定酒店",
-      "优惠套餐",
-      "亲子玩法",
-      "了解交通",
-      "看看酒店",
-      "看看美食",
-    ],
+    default: [],
   },
 });
 
-const sendReply = (text) => {
-  emits("replySent", text);
+const sendReply = (item) => {
+  uni.$emit(SEND_MESSAGE_CONTENT_TEXT, item);
 };
 </script>
 
diff --git a/src/pages/index/components/chat/ChatTopWelcome/index.vue b/src/pages/index/components/chat/ChatTopWelcome/index.vue
index db4653d..6c76b51 100644
--- a/src/pages/index/components/chat/ChatTopWelcome/index.vue
+++ b/src/pages/index/components/chat/ChatTopWelcome/index.vue
@@ -6,7 +6,7 @@
       >
         <image
           class="ip relative"
-          :src="initPageImages.logoImageUrl"
+          :src="initPageImages?.logoImageUrl"
           mode="aspectFit"
         />
         <view
@@ -16,7 +16,7 @@
         </view>
       </view>
 
-      <ChatMoreTips :guideWords="guideWords" @replySent="handleReply" />
+      <ChatMoreTips :guideWords="guideWords" />
     </view>
   </view>
 </template>

From 2f05a40918876088a1afe01d9acaa46c854f6ea2 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 20:00:51 +0800
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=20=E5=91=BC=E5=8F=AB=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/model/ChatModel.js                                    | 4 ++--
 src/pages/index/components/chat/ChatMainList/index.vue    | 2 +-
 src/pages/index/components/chat/ChatQuickAccess/index.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/model/ChatModel.js b/src/model/ChatModel.js
index 53993bd..902aede 100644
--- a/src/model/ChatModel.js
+++ b/src/model/ChatModel.js
@@ -19,7 +19,7 @@ export const CompName = {
   // 快速预定卡片
   quickBookingCard: "quickBookingCard",
   // 服务工单卡片
-  createWorkOrderCard: "createWorkOrderCard",
+  callServiceCard: "callServiceCard",
   // 意见反馈卡片
   feedbackCard: "feedbackCard",
   // 探索发现卡片
@@ -37,7 +37,7 @@ export const Command = {
   // 探索发现
   discovery: "Command.discovery",
   // 呼叫服务
-  createWorkOrderCard: "Command.createWorkOrderCard",
+  callServiceCard: "Command.callServiceCard",
   // 更多
   more: "Command.more",
   // 我的订单
diff --git a/src/pages/index/components/chat/ChatMainList/index.vue b/src/pages/index/components/chat/ChatMainList/index.vue
index 36c079c..c2ccef4 100644
--- a/src/pages/index/components/chat/ChatMainList/index.vue
+++ b/src/pages/index/components/chat/ChatMainList/index.vue
@@ -41,7 +41,7 @@
               />
               <CreateServiceOrder
                 v-else-if="
-                  item.toolCall.componentName === CompName.createWorkOrderCard
+                  item.toolCall.componentName === CompName.callServiceCard
                 "
               />
               <Feedback
diff --git a/src/pages/index/components/chat/ChatQuickAccess/index.vue b/src/pages/index/components/chat/ChatQuickAccess/index.vue
index a45f79f..98bc89e 100644
--- a/src/pages/index/components/chat/ChatQuickAccess/index.vue
+++ b/src/pages/index/components/chat/ChatQuickAccess/index.vue
@@ -37,7 +37,7 @@ const itemList = ref([
   {
     icon: "",
     title: "呼叫服务",
-    type: Command.createWorkOrderCard,
+    type: Command.callServiceCard,
   },
   {
     icon: "https://oss.nianxx.cn/mp/static/version_101/home/more.png",

From bd953e9e10a0681fbfdd6ddaf80a483208b702e0 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 21 Oct 2025 21:52:17 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoodDetail/index.vue           | 22 +++++----
 src/components/GoodDetail/styles/index.scss   | 40 ----------------
 src/components/ModuleTitle/styles/index.scss  |  2 +-
 .../goods/components/GoodFacility/index.vue   | 47 +++++++++++++++++++
 src/pages/goods/index.vue                     |  6 ++-
 src/static/scss/margin.scss                   | 20 ++++++++
 6 files changed, 85 insertions(+), 52 deletions(-)
 delete mode 100644 src/components/GoodDetail/styles/index.scss
 create mode 100644 src/pages/goods/components/GoodFacility/index.vue

diff --git a/src/components/GoodDetail/index.vue b/src/components/GoodDetail/index.vue
index aa54ebf..ef63e9f 100644
--- a/src/components/GoodDetail/index.vue
+++ b/src/components/GoodDetail/index.vue
@@ -1,18 +1,17 @@
 <template>
-  <view>
-    <view v-if="goodsData.commodityPurchaseInstruction" class="use-notice">
+  <view class="mt-16">
+    <view v-if="goodsData.commodityPurchaseInstruction">
       <ModuleTitle
         v-if="showTitle"
         :title="goodsData.commodityPurchaseInstruction.templateTitle"
       />
       <view
-        class="use-notice-content"
         v-for="(moduleItem, index) in goodsData.commodityPurchaseInstruction
           .commodityPurchaseInstructionModuleEntityList"
         :key="index"
       >
         <view
-          class="module-item"
+          class="flex flex-items-start flex-col pt-12 pb-12"
           :class="{
             'border-bottom':
               index <
@@ -21,13 +20,18 @@
                 1,
           }"
         >
-          <view class="module-icon">
+          <view class="flex flex-items-center flex-row flex-shrink-0 mr-8">
             <uni-icons fontFamily="znicons" size="20" color="#333">{{
               zniconsMap[moduleItem.moduleIcon]
             }}</uni-icons>
-            <text class="module-title">{{ moduleItem.moduleTitle }}</text>
+            <text class="font-size-14 color-171717 line-height-20">{{
+              moduleItem.moduleTitle
+            }}</text>
           </view>
-          <text class="module-desc">{{ moduleItem.moduleContent }}</text>
+          <text
+            class="flex-full font-size-12 color-525866 line-height-20 mt-4"
+            >{{ moduleItem.moduleContent }}</text
+          >
         </view>
       </view>
     </view>
@@ -57,6 +61,4 @@ const props = defineProps({
 });
 </script>
 
-<style scoped lang="scss">
-@import "./styles/index.scss";
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/components/GoodDetail/styles/index.scss b/src/components/GoodDetail/styles/index.scss
deleted file mode 100644
index 7ea1b28..0000000
--- a/src/components/GoodDetail/styles/index.scss
+++ /dev/null
@@ -1,40 +0,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: $uni-font-size-base;
-        color: $uni-text-color;
-        text-align: center;
-        word-wrap: break-word;
-        margin-left: 4px;
-      }
-    }
-
-    .module-desc {
-      flex: 1;
-      font-size: $uni-font-size-sm;
-      color: #666;
-      line-height: 1.5;
-      margin-top: 4px;
-    }
-  }
-  .border-bottom {
-    border-bottom: 1px solid #f0f0f0;
-  }
-}
diff --git a/src/components/ModuleTitle/styles/index.scss b/src/components/ModuleTitle/styles/index.scss
index c809e87..304970e 100644
--- a/src/components/ModuleTitle/styles/index.scss
+++ b/src/components/ModuleTitle/styles/index.scss
@@ -6,7 +6,7 @@
 
 .module-title {
   font-size: 18px;
-  color: #000;
+  color: #171717;
   position: relative;
   z-index: 1;
 }
diff --git a/src/pages/goods/components/GoodFacility/index.vue b/src/pages/goods/components/GoodFacility/index.vue
new file mode 100644
index 0000000..7d0b13c
--- /dev/null
+++ b/src/pages/goods/components/GoodFacility/index.vue
@@ -0,0 +1,47 @@
+<template>
+  <view class="mt-16">
+    <view
+      v-for="(moduleItem, index) in goodsData.commodityPurchaseInstruction
+        .commodityPurchaseInstructionModuleEntityList"
+      :key="index"
+    >
+      <view
+        class="flex flex-items-start flex-col pt-12 pb-12"
+        :class="{
+          'border-bottom':
+            index <
+            goodsData.commodityPurchaseInstruction
+              .commodityPurchaseInstructionModuleEntityList.length -
+              1,
+        }"
+      >
+        <view class="flex flex-items-center flex-row flex-shrink-0 mr-8">
+          <uni-icons fontFamily="znicons" size="20" color="#171717">{{
+            zniconsMap[moduleItem.moduleIcon]
+          }}</uni-icons>
+          <text class="font-size-12 color-171717 line-height-20">{{
+            moduleItem.moduleTitle
+          }}</text>
+        </view>
+        <text class="flex-full font-size-12 color-525866 line-height-20 mt-4">{{
+          moduleItem.moduleContent
+        }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { zniconsMap } from "@/static/fonts/znicons.js";
+import { defineProps } from "vue";
+
+// Props定义
+const props = defineProps({
+  goodsData: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index ec7bf79..facb344 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="goods-container">
+  <view class="goods-container bg-gray">
     <TopNavBar title="商品详情" />
 
     <!-- 滚动区域 -->
@@ -29,6 +29,9 @@
           :nights="selectedDate.totalDays"
         />
 
+        <!-- 商品设施组件 -->
+        <GoodFacility :goodsData="goodsData" />
+
         <!-- 商品详情组件 -->
         <GoodDetail :goodsData="goodsData" />
       </view>
@@ -79,6 +82,7 @@ import Calender from "@/components/Calender/index.vue";
 import LocationCard from "@/components/LocationCard/index.vue";
 import DateSelector from "./components/DateSelector/index.vue";
 import GoodDetail from "@/components/GoodDetail/index.vue";
+import GoodFacility from "./components/GoodFacility/index.vue";
 
 const calendarVisible = ref(false);
 const goodsData = ref({});
diff --git a/src/static/scss/margin.scss b/src/static/scss/margin.scss
index 5db5140..70fa6b8 100644
--- a/src/static/scss/margin.scss
+++ b/src/static/scss/margin.scss
@@ -7,10 +7,18 @@
   margin: 4px;
 }
 
+.ml-4 {
+  margin-left: 4px;
+}
+
 .mr-4 {
   margin-right: 4px;
 }
 
+.mt-4 {
+  margin-top: 4px;
+}
+
 .mb-4 {
   margin-bottom: 4px;
 }
@@ -71,10 +79,22 @@
   margin-right: 12px;
 }
 
+.mt-16 {
+  margin-top: 16px;
+}
+
+.mb-16 {
+  margin-bottom: 16px;
+}
+
 .ml-16 {
   margin-left: 16px;
 }
 
+.mr-16 {
+  margin-right: 16px;
+}
+
 .ml-20 {
   margin-left: 20px;
 }

From df5e9e92a1201382f8d25c4c35134d81c9628dab Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Wed, 22 Oct 2025 18:37:50 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoodDetail/index.vue           |   7 +++++-
 .../goods/components/GoodFacility/index.vue   |  22 +++++++++---------
 src/static/fonts/znicons.ttf                  | Bin 5788 -> 10300 bytes
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/GoodDetail/index.vue b/src/components/GoodDetail/index.vue
index ef63e9f..f752996 100644
--- a/src/components/GoodDetail/index.vue
+++ b/src/components/GoodDetail/index.vue
@@ -61,4 +61,9 @@ const props = defineProps({
 });
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+@font-face {
+  font-family: znicons;
+  src: url("@/static/fonts/znicons.ttf");
+}
+</style>
diff --git a/src/pages/goods/components/GoodFacility/index.vue b/src/pages/goods/components/GoodFacility/index.vue
index 7d0b13c..47bd671 100644
--- a/src/pages/goods/components/GoodFacility/index.vue
+++ b/src/pages/goods/components/GoodFacility/index.vue
@@ -1,30 +1,25 @@
 <template>
   <view class="mt-16">
     <view
-      v-for="(moduleItem, index) in goodsData.commodityPurchaseInstruction
-        .commodityPurchaseInstructionModuleEntityList"
+      v-for="(moduleItem, index) in goodsData.commodityEquipment"
       :key="index"
     >
       <view
         class="flex flex-items-start flex-col pt-12 pb-12"
         :class="{
-          'border-bottom':
-            index <
-            goodsData.commodityPurchaseInstruction
-              .commodityPurchaseInstructionModuleEntityList.length -
-              1,
+          'border-bottom': index < goodsData.commodityEquipment.length - 1,
         }"
       >
         <view class="flex flex-items-center flex-row flex-shrink-0 mr-8">
           <uni-icons fontFamily="znicons" size="20" color="#171717">{{
-            zniconsMap[moduleItem.moduleIcon]
+            zniconsMap[moduleItem.icon]
           }}</uni-icons>
           <text class="font-size-12 color-171717 line-height-20">{{
-            moduleItem.moduleTitle
+            moduleItem.title
           }}</text>
         </view>
         <text class="flex-full font-size-12 color-525866 line-height-20 mt-4">{{
-          moduleItem.moduleContent
+          moduleItem.desc
         }}</text>
       </view>
     </view>
@@ -44,4 +39,9 @@ const props = defineProps({
 });
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+@font-face {
+  font-family: znicons;
+  src: url("@/static/fonts/znicons.ttf");
+}
+</style>
diff --git a/src/static/fonts/znicons.ttf b/src/static/fonts/znicons.ttf
index dd09de6188b7a967ff5181b1a183d728375c15b6..4d8fabdab10a3feadc0efa74ed7cc184932d26a7 100644
GIT binary patch
delta 5377
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

delta 931
zcmYk3O-vI}5XWbBx4R(i(w26iCRE!kg|uahwbTd|deB5;f|?LKh>?nD4^*1i806CW
z0SY2km!nrM#1JDMIdJmqK|C4{@?s3}K;p#&>%2Zqe97<4d$Tk1pLx4=@l|iltSkZG
zG5}0W7W1Va%X=1plq2SDP2an@b3SnvK=}rs_Y|h`Hxl31JQVwd$P~z-eU`WByhTI`
z#q#XsAe{jBXd9iLnauZ;6GN2GzbA_M*%C(K0e$bF`_bF^;*_#qabE&xbCcke(#)N5
zX8!CNfPb2T`TzmsYP|~MN{kXfAt$&0Eq}v9-hqj8AFs7$e?kjI(fYdkh6ej*>+1^0
zV{~l-iF;}BN`ANtsM%pGV$`nTFs|AkFl6^jeRf_-P0jt4D}&rPCCDD4%sJ|WUWImr
z``K!}PWyen)1B)p-~bggl53`n7I1<KbZ7-Pc)$y7;G;?s&qdWfCjYW?a&yH=c?}tE
zDS|2rctu99#-X~v9tubS*dqaH0h<?)DzF6s=>vN#;Jvda0_q9aqJX*swp8I83Ao5U
z6;R8-mIc&2uxA1q1K5gy1_Jh6K%)Vx31~=QF9eNYUecMM!GYNV{x8_70FwNN@Kr!3
zR&ie%mEOr-xu!_UxU%g?I943*9eb)z&8iFPhUVLRZS2Yws!%_WH)Mp9aE6{Qof$;G
z&q!rXVLBSeu#TN*hSg5=8SR>mK`Aqg#_>?<M7uGB=_C#z4>Uts$nVq9423Q1M=Rio
z2h2dqjGF^yERxEm^(IaA7)DdH^9YUwgIz8&;MCLE)al5<r>eAWjaa|etqZ+U)f<R=
z0|9T`Ooa!{om3>2D@F7squs5l&0U(-<-!irrAJCRDmxZSj#$=6a<g{$pauQ*N;HOG
RU+qpfl<WC&!Cvfs`v=EAx&r_J


From 6eadcb46cd92759b59afadbcfbf5c2e15ec5494d Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Wed, 22 Oct 2025 19:29:27 +0800
Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=E5=9B=BE=E7=89=87=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageSwiper/index.vue         | 16 +++--
 src/components/ImageSwiper/styles/index.scss | 61 ++++++++++----------
 src/pages/goods/index.vue                    |  2 +-
 src/pages/goods/styles/index.scss            |  2 +-
 4 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/components/ImageSwiper/index.vue b/src/components/ImageSwiper/index.vue
index f6154c7..872bf4a 100644
--- a/src/components/ImageSwiper/index.vue
+++ b/src/components/ImageSwiper/index.vue
@@ -22,10 +22,6 @@
       </swiper-item>
     </swiper>
 
-    <view class="custom-indicator">
-      图片{{ active + 1 }}/{{ thumbnails.length }}
-    </view>
-
     <!-- 缩略图部分 -->
     <view
       v-if="showThumbnails"
@@ -52,16 +48,26 @@
               :src="thumb.photoUrl"
               mode="aspectFill"
             ></image>
-            <text>{{ thumb.photoName }}</text>
           </view>
         </view>
       </scroll-view>
+
+      <view class="custom-indicator">
+        <uni-icons fontFamily="znicons" size="10" color="#fff">{{
+          zniconsMap["zn-camera"]
+        }}</uni-icons>
+        <text class="custom-indicator-text">{{ thumbnails.length }}</text>
+        <uni-icons fontFamily="znicons" size="10" color="#fff">{{
+          zniconsMap["zn-nav-arrow-right"]
+        }}</uni-icons>
+      </view>
     </view>
   </view>
 </template>
 
 <script setup>
 import { ref, computed, nextTick } from "vue";
+import { zniconsMap } from "@/static/fonts/znicons.js";
 
 // Props定义
 const props = defineProps({
diff --git a/src/components/ImageSwiper/styles/index.scss b/src/components/ImageSwiper/styles/index.scss
index e4c7f42..66e0eb9 100644
--- a/src/components/ImageSwiper/styles/index.scss
+++ b/src/components/ImageSwiper/styles/index.scss
@@ -1,3 +1,8 @@
+@font-face {
+  font-family: znicons;
+  src: url("@/static/fonts/znicons.ttf");
+}
+
 .image-swiper {
   position: relative;
   width: 100%;
@@ -13,27 +18,32 @@
   height: 100%;
 }
 
-.custom-indicator {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  z-index: 10;
-  background: rgba(0, 0, 0, 0.5);
-  border-radius: $uni-border-radius-50px;
-  padding: 3px 8px;
-  font-size: 8px;
-  color: #fff;
-}
-
 .thumbnail-box {
   position: absolute;
   left: 12px;
   right: 12px;
-  height: 60px;
+  display: flex;
+  align-items: flex-end;
+  flex-direction: row;
+}
+
+.custom-indicator {
+  margin-left: 12px;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: $uni-border-radius-50px;
+  padding: 0 6px 4px 8px;
+}
+
+.custom-indicator-text {
+  margin: 0 4px;
+  font-size: 10px;
+  text-align: center;
+  align-items: center;
+  color: #fff;
 }
 
 .thumbnail-scroll {
-  width: 100%;
+  flex: 1;
   height: 100%;
   white-space: nowrap;
 }
@@ -42,7 +52,6 @@
   display: flex;
   align-items: center;
   gap: 10px;
-  padding: 0 5px;
 }
 
 .thumbnail-item {
@@ -52,29 +61,17 @@
 
   &.active {
     .thumbnail-image {
-      border: 1px solid #fff;
+      border: 2px solid #fff;
     }
   }
 }
 
 .thumbnail-item .thumbnail-image {
-  width: 48px;
-  height: 38px;
-  border-radius: 4px;
+  width: 36px;
+  height: 36px;
+  border-radius: 8px;
   box-sizing: border-box;
-  border: 1px solid transparent;
+  border: 2px solid transparent;
   transition: all 0.3s ease;
   display: block;
 }
-
-.thumbnail-item text {
-  color: #fff;
-  font-size: 8px;
-  display: block;
-  margin-top: 4px;
-  transition: all 0.3s ease;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 48px;
-}
diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index facb344..9ddbd54 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -8,7 +8,7 @@
         :border-radius="0"
         :height="300"
         :images="goodsData.commodityPhotoList"
-        thumbnailBottom="36px"
+        thumbnailBottom="42px"
       />
 
       <view class="goods-content">
diff --git a/src/pages/goods/styles/index.scss b/src/pages/goods/styles/index.scss
index a724944..a2ba0ce 100644
--- a/src/pages/goods/styles/index.scss
+++ b/src/pages/goods/styles/index.scss
@@ -63,7 +63,7 @@ $button-color: #00a6ff;
   }
 
   .goods-content {
-    border-radius: 12px 12px 0 0;
+    border-radius: 28px 28px 0 0;
     background-color: #fff;
     padding: 12px;
     position: relative;

From f272a57aa3c26c9b1feb2211d873e4cf71b09a95 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Wed, 22 Oct 2025 20:08:05 +0800
Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E6=BB=9A=E5=8A=A8=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/goods/index.vue         | 21 +++++++++++++++++++--
 src/pages/goods/styles/index.scss |  5 ++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index 9ddbd54..546416b 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -1,9 +1,14 @@
 <template>
   <view class="goods-container bg-gray">
-    <TopNavBar title="商品详情" />
+    <TopNavBar
+      title="商品详情"
+      :backgroundColor="`rgba(217, 238, 255, ${navOpacity})`"
+      :titleColor="navOpacity < 0.5 ? '#ffffff' : '#000000'"
+      :backIconColor="navOpacity < 0.5 ? '#ffffff' : '#000000'"
+    />
 
     <!-- 滚动区域 -->
-    <scroll-view class="content-wrapper" scroll-y>
+    <scroll-view class="content-wrapper" scroll-y @scroll="handleScroll">
       <ImageSwiper
         :border-radius="0"
         :height="300"
@@ -76,6 +81,9 @@ import {
 import { ThrottleUtils } from "@/utils";
 import TopNavBar from "@/components/TopNavBar/index.vue";
 import ImageSwiper from "@/components/ImageSwiper/index.vue";
+
+// 导航栏透明度 - 默认透明，随滚动变为不透明
+const navOpacity = ref(0);
 import GoodInfo from "./components/GoodInfo/index.vue";
 import GoodConfirm from "./components/GoodConfirm/index.vue";
 import Calender from "@/components/Calender/index.vue";
@@ -88,6 +96,15 @@ const calendarVisible = ref(false);
 const goodsData = ref({});
 const goodConfirmRef = ref(null);
 
+// 处理滚动事件
+const handleScroll = (e) => {
+  const scrollTop = e.detail.scrollTop;
+  // 设置一个阈值，当滚动超过200px时，导航栏完全不透明
+  const threshold = 200;
+  // 计算透明度，范围从0到1
+  navOpacity.value = Math.min(scrollTop / threshold, 1);
+};
+
 // 格式化日期为 yyyy-mm-dd 格式
 const formatDate = (date) => {
   const year = date.getFullYear();
diff --git a/src/pages/goods/styles/index.scss b/src/pages/goods/styles/index.scss
index a2ba0ce..b49bc90 100644
--- a/src/pages/goods/styles/index.scss
+++ b/src/pages/goods/styles/index.scss
@@ -8,10 +8,13 @@ $button-color: #00a6ff;
 
   // 顶部导航栏固定样式
   :deep(.top-nav-bar) {
-    position: sticky;
+    position: fixed;
     top: 0;
+    left: 0;
+    right: 0;
     z-index: 100;
     flex-shrink: 0;
+    transition: background-color 0.3s ease;
   }
 
   // 使用须知样式