diff --git a/src/components/CreateServiceOrder/index.vue b/src/components/CreateServiceOrder/index.vue
index f2ae5b2..ce74316 100644
--- a/src/components/CreateServiceOrder/index.vue
+++ b/src/components/CreateServiceOrder/index.vue
@@ -47,13 +47,38 @@
class="bg-F5F7FA border-box p-12 rounded-10 font-size-14 font-500 color-171717 mb-12"
>
照片上传
+
-
- {{ zniconsMap["zn-camera"] }}
-
+
+
+
+
+
+
+
+
+ {{ zniconsMap["zn-camera"] }}
+
+
@@ -72,8 +97,9 @@
@@ -123,12 +149,16 @@ const handleChooseImage = () => {
});
};
+const handleDeleteImage = () => {
+ contentImgUrl.value = "";
+};
+
const updateImagehandle = (file) => {
if (!file) {
return;
}
updateImageFile(file).then((res) => {
- contentImgUrl.value = res.data?.url || "";
+ contentImgUrl.value = res.data;
});
};
@@ -165,8 +195,8 @@ const sendCreateWorkOrder = async () => {
try {
const res = await createWorkOrder({
workOrderTypeId: workOrderTypeId.value,
- roomId: roomId.value,
- contactPhone: contactPhone.value,
+ roomNo: roomId.value,
+ userPhone: contactPhone.value,
content: contactText.value,
contentImgUrl: contentImgUrl.value,
});
@@ -205,7 +235,7 @@ const viewWorkOrder = () => {
console.log("查看工单:", workOrderId.value);
// 这里可以跳转到工单详情页面
uni.navigateTo({
- url: `/pages-order/order/list?id=${workOrderId.value}`,
+ url: `/pages-service/order/list`,
});
};
@@ -220,4 +250,9 @@ onMounted(() => {
diff --git a/src/components/ImageSwiper/index.vue b/src/components/ImageSwiper/index.vue
index 872bf4a..fe7edf9 100644
--- a/src/components/ImageSwiper/index.vue
+++ b/src/components/ImageSwiper/index.vue
@@ -52,7 +52,7 @@
-
+
{{
zniconsMap["zn-camera"]
}}
@@ -68,6 +68,8 @@
diff --git a/src/pages/index/components/chat/ChatMainList/index.vue b/src/pages/index/components/chat/ChatMainList/index.vue
index c2ccef4..91995ee 100644
--- a/src/pages/index/components/chat/ChatMainList/index.vue
+++ b/src/pages/index/components/chat/ChatMainList/index.vue
@@ -540,7 +540,7 @@ const initTypewriterManager = () => {
}
typewriterManager = new TypewriterManager({
- typingSpeed: 30,
+ typingSpeed: 10,
cursorText: "",
});
diff --git a/src/pages/index/components/module/AttachListComponent/styles/index.scss b/src/pages/index/components/module/AttachListComponent/styles/index.scss
index 80727d6..fbbfba7 100644
--- a/src/pages/index/components/module/AttachListComponent/styles/index.scss
+++ b/src/pages/index/components/module/AttachListComponent/styles/index.scss
@@ -16,6 +16,6 @@
}
.tag-text {
- color: #00a6ff; /* 蓝色文字,可根据设计调整 */
+ color: #2d91ff; /* 蓝色文字,可根据设计调整 */
font-size: $uni-font-size-base;
}
diff --git a/src/pages/index/components/module/DetailCardCompontent/index.vue b/src/pages/index/components/module/DetailCardCompontent/index.vue
index 4d91458..d707896 100644
--- a/src/pages/index/components/module/DetailCardCompontent/index.vue
+++ b/src/pages/index/components/module/DetailCardCompontent/index.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/pages/index/components/module/RecommendPostsList/index.vue b/src/pages/index/components/module/RecommendPostsList/index.vue
index 267be4b..2081ca7 100644
--- a/src/pages/index/components/module/RecommendPostsList/index.vue
+++ b/src/pages/index/components/module/RecommendPostsList/index.vue
@@ -20,7 +20,7 @@
-
+
{{ item.topic }}
diff --git a/src/request/api/OrderApi.js b/src/request/api/OrderApi.js
index 69404e0..3bfbe74 100644
--- a/src/request/api/OrderApi.js
+++ b/src/request/api/OrderApi.js
@@ -19,6 +19,11 @@ const createWorkOrder = (args) => {
return request.post("/hotelBiz/workOrder/createWorkOrder", args);
};
+// 关闭工单
+const closeWorkOrder = (args) => {
+ return request.post("/hotelBiz/workOrder/closeWorkOrder", args);
+};
+
// 获取订单详情
const userOrderDetail = (args) => {
return request.post("/hotelBiz/order/userOrderDetail", args);
@@ -49,6 +54,7 @@ export {
userWorkOrderList,
workOrderTypeListForBiz,
createWorkOrder,
+ closeWorkOrder,
userOrderDetail,
preOrder,
orderCancel,
diff --git a/src/request/api/UpdateFile.js b/src/request/api/UpdateFile.js
index c8fa4d5..db9912c 100644
--- a/src/request/api/UpdateFile.js
+++ b/src/request/api/UpdateFile.js
@@ -2,7 +2,7 @@ import { BASE_URL } from "@/request/base/baseUrl";
import { getCurrentConfig } from "@/constant/base";
export const updateImageFile = (file) => {
- const url = BASE_URL + "/common/upload";
+ const url = BASE_URL + "/hotelBiz/hotBizCommon/upload";
const token = uni.getStorageSync("token");
const clientId = getCurrentConfig().clientId;
@@ -20,8 +20,8 @@ export const updateImageFile = (file) => {
file: "file",
},
success: (uploadFileRes) => {
- console.log(uploadFileRes.data);
- resolve(uploadFileRes.data);
+ console.log("uploadFileRes: ", uploadFileRes);
+ resolve(JSON.parse(uploadFileRes.data));
},
fail: (err) => {
console.error("上传图片失败:", err);
diff --git a/src/static/scss/background.scss b/src/static/scss/background.scss
index 00eaf32..c531c27 100644
--- a/src/static/scss/background.scss
+++ b/src/static/scss/background.scss
@@ -41,3 +41,7 @@
.bg-button {
background: linear-gradient(90deg, #2d91ff 0%, #4de4ff 100%);
}
+
+.bg-transparent {
+ background-color: transparent;
+}
diff --git a/src/static/scss/height.scss b/src/static/scss/height.scss
index da01276..b041705 100644
--- a/src/static/scss/height.scss
+++ b/src/static/scss/height.scss
@@ -2,6 +2,10 @@
height: 100vh;
}
+.h-full {
+ height: 100%;
+}
+
.h-80 {
height: 80px;
}
diff --git a/src/static/scss/overflow.scss b/src/static/scss/overflow.scss
index bd67572..c440df7 100644
--- a/src/static/scss/overflow.scss
+++ b/src/static/scss/overflow.scss
@@ -2,3 +2,7 @@
.overflow-hidden {
overflow: hidden;
}
+
+.overflow-auto {
+ overflow: auto;
+}
diff --git a/src/static/scss/padding.scss b/src/static/scss/padding.scss
index 9f8fe70..801a6a0 100644
--- a/src/static/scss/padding.scss
+++ b/src/static/scss/padding.scss
@@ -111,6 +111,14 @@
padding: 24px;
}
+.pt-24 {
+ padding-top: 24px;
+}
+
+.pb-24 {
+ padding-bottom: 24px;
+}
+
.pb-safe-area {
padding-bottom: Max(env(safe-area-inset-bottom), 12px);
}
diff --git a/src/static/scss/width.scss b/src/static/scss/width.scss
index 3fb544a..97edd43 100644
--- a/src/static/scss/width.scss
+++ b/src/static/scss/width.scss
@@ -9,3 +9,6 @@
.w-50 {
width: 50%;
}
+.w-80 {
+ width: 80px;
+}
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 622c0c7..440fefc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -4,9 +4,10 @@ export const useAppStore = defineStore("app", {
state() {
return {
title: "",
- sceneId: "",
- hasToken: false,
- tokenExpired: false,
+ sceneId: "", /// 分身场景id
+ hasToken: false, /// 是否有token
+ tokenExpired: false, /// token是否过期
+ previewImageData: [], /// 预览图片数据
};
},
getters: {},
@@ -24,6 +25,9 @@ export const useAppStore = defineStore("app", {
setTokenExpired(status) {
this.tokenExpired = status;
},
+ setPreviewImageData(data) {
+ this.previewImageData = data;
+ },
},
unistorage: true,
diff --git a/src/uni_modules/zero-markdown-view/components/zero-markdown-view/zero-markdown-view.vue b/src/uni_modules/zero-markdown-view/components/zero-markdown-view/zero-markdown-view.vue
index c1c9256..61ee1d1 100644
--- a/src/uni_modules/zero-markdown-view/components/zero-markdown-view/zero-markdown-view.vue
+++ b/src/uni_modules/zero-markdown-view/components/zero-markdown-view/zero-markdown-view.vue
@@ -35,7 +35,7 @@ export default {
},
themeColor: {
type: String,
- default: "#00A6FF",
+ default: "#2D91FF",
},
codeBgColor: {
type: String,
@@ -45,6 +45,14 @@ export default {
type: String,
default: "PingFang SC, PingFang SC",
},
+ fontColor: {
+ type: String,
+ default: "#171717",
+ },
+ fontSubColor: {
+ type: String,
+ default: "#4D4D4D",
+ },
aiMode: {
type: Boolean,
default: false,
@@ -97,12 +105,15 @@ export default {
const themeColor = this.themeColor;
const codeBgColor = this.codeBgColor;
const fontFamily = this.fontFamily;
+ const fontColor = this.fontColor;
+ const fontSubColor = this.fontSubColor;
let zeroStyle = {
p: `
margin:4px 0;
font-size: 15px;
- line-height:1.65;
+ line-height:1.55;
font-family: ${fontFamily};
+ color: ${fontColor};
`,
// 一级标题
h1: `
@@ -149,12 +160,14 @@ export default {
`,
// 列表
ul: `
+ font-size: 14px;
margin: 4px 0;
- color: #555;
+ color: ${fontSubColor};
`,
li: `
+ font-size: 14px;
margin: 4px 0;
- color: #555;
+ color: ${fontSubColor};
`,
// 链接
a: `
@@ -168,6 +181,7 @@ export default {
`,
// 斜体
em: `
+ font-size: 14px;
color: ${themeColor};
font-family: ${fontFamily};
letter-spacing:0.3em;
@@ -191,11 +205,11 @@ export default {
`,
th: `
border: 1px solid #202121;
- color: #555;
+ color: ${fontSubColor};
`,
td: `
- color:#555;
- border: 1px solid #555555;
+ color: ${fontSubColor};
+ border: 1px solid ${fontSubColor};
`,
pre: `
border-radius: 5px;
@@ -211,12 +225,15 @@ export default {
const themeColor = this.themeColor;
const codeBgColor = this.codeBgColor;
const fontFamily = this.fontFamily;
+ const fontColor = this.fontColor;
+ const fontSubColor = this.fontSubColor;
let zeroStyle = {
p: `
margin:4px 0;
font-size: 15px;
line-height:1.55;
font-family: ${fontFamily};
+ color: ${fontColor};
`,
// 一级标题
h1: `
@@ -272,11 +289,13 @@ export default {
// 列表
ul: `
margin: 4px 0;
- color: #555;
+ font-size: 14px;
+ color: ${fontSubColor};
`,
li: `
margin: 4px 0;
- color: #555;
+ font-size: 14px;
+ color: ${fontSubColor};
`,
// 链接
a: `
@@ -311,12 +330,12 @@ export default {
border-collapse: collapse;
`,
th: `
- border: 1px solid #202121;
- color: #555;
+ border: 1px solid ${fontSubColor};
+ color: ${fontSubColor};
`,
td: `
- color:#555;
- border: 1px solid #555555;
+ color: ${fontSubColor};
+ border: 1px solid ${fontSubColor};
`,
pre: `
border-radius: 5px;
diff --git a/src/utils/TypewriterManager.js b/src/utils/TypewriterManager.js
index b183a50..9d80676 100644
--- a/src/utils/TypewriterManager.js
+++ b/src/utils/TypewriterManager.js
@@ -6,7 +6,7 @@ class TypewriterManager {
constructor(options = {}) {
// 配置选项
this.options = {
- typingSpeed: 50, // 打字速度(毫秒)
+ typingSpeed: 10, // 打字速度(毫秒)- 调整为更快的速度
cursorText: "", // 光标样式
...options,
};