diff --git a/config.js b/config.js
index d3ad51e..3b4b3dc 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
// 应用全局配置
module.exports = {
// baseUrl: 'https://www.nuoyunr.com',
- baseUrl: 'http://192.168.1.17:48080',
- // baseUrl: "http://localhost:48080",
+ // baseUrl: 'http://192.168.1.17:48080',
+ baseUrl: "http://192.168.1.4:48080",
imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
baseImageUrl: 'https://www.nuoyunr.com/minio/',
wsUrl: 'wss://www.nuoyunr.com',
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 271929b..2a384c8 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -1,100 +1,217 @@
-
-
-
-
-
-
-
- 维修中
-
-
-
- 等待维修
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}
+ 当前工单维修项目{{ ticketInfo.flag == '02' ? '已全部完成' : ticketInfo.statusStr }}
+
+
+
+ 车辆信息
+
+
+
+
+
+ 车架号
+ {{ ticketInfo.carVin }}
+
+
+
+
+
+
+ 注册日期
+ {{ ticketInfo.carRegisterDate }}
+
+
+
+
+
+ 年检时间
+ {{ ticketInfo.inspectionDate }}
+
+
+ 保险时间
+ {{ ticketInfo.insuranceDate }}
+
+
-
-
-
- {{ index + 1 }}
-
-
-
- {{ item.title }}
-
-
-
-
-
-
- {{item.desc}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 客户信息
+
+
+
+ 姓名
+ {{ ticketInfo.userName }}
+
+
+ 性别
+ {{ ticketInfo.customerInfo.sex === '1' ? '女' : '男' }}
+
+
+
+
+
+ 联系方式
+ {{ ticketInfo.userMobile }}
+
+
+ 生日
+ {{ ticketInfo.birthday }}
+
+
+
+
+
+
+
+ 维修项目
+
+
+
+
+ {{ item.itemName }}
+ ￥{{ item.itemMoney }}
+
+
+ 售价：{{ item.itemPrice }}
+ 数量：{{ item.itemCount }}
+ 单位：{{ item.itemUnit}}
+ 折扣：{{ item.itemDiscount }}
+ 金额：{{ item.itemMoney }}
+
+
+
+
+
+
+
+ 维修配件
+
+
+
-
-
- 姓名
- {{orderInfo.userName}}
-
-
- 联系电话
- {{orderInfo.userMobile}}
-
-
- 预约项目
- {{orderInfo.servicePackage.name}}
-
-
- 预约时间
- {{orderInfo.bookingTime}}
-
-
-
-
-
-
-
-
+
+ {{ item.itemName }}
+ ￥{{ item.itemMoney }}
+
+
+ 售价：{{ item.itemPrice }}
+ 数量：{{ item.itemCount }}
+ 单位：{{ item.itemUnit}}
+ 折扣：{{ item.itemDiscount }}
+ 金额：{{ item.itemMoney }}
+
+
+
+
+
+
+ 维修记录
+
+
+
+
+ {{item.typeStr }}【{{item.dealUserName}}】
+
+
+
+
+
+ {{ item.createTime }}
+
+
+
+ {{ item.remark }}
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/static/icons/bottom.png b/static/icons/bottom.png
new file mode 100644
index 0000000..83e78fc
Binary files /dev/null and b/static/icons/bottom.png differ
diff --git a/static/icons/date.png b/static/icons/date.png
new file mode 100644
index 0000000..ce35b6c
Binary files /dev/null and b/static/icons/date.png differ
diff --git a/static/icons/orderIng.png b/static/icons/orderIng.png
new file mode 100644
index 0000000..27330bb
Binary files /dev/null and b/static/icons/orderIng.png differ
diff --git a/utils/auth.js b/utils/auth.js
index 3b441f9..e0372dd 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -60,3 +60,34 @@ export function getJSONData(keyStr) {
export function setJSONData(keyStr,dataObj) {
return uni.setStorageSync(keyStr, JSON.stringify(dataObj))
}
+
+// 设置本地存储，并设置一个过期时间（单位为秒）
+export function setStorageWithExpiry(key, value, ttl) {
+ const now = new Date();
+ // 计算过期时间
+ const item = {
+ value: value,
+ expiry: now.getTime() + ttl * 1000,
+ };
+ // 将数据对象转换为字符串存储
+ uni.setStorageSync(key, JSON.stringify(item));
+}
+
+// 获取本地存储的数据，检查是否过期
+export function getStorageWithExpiry(key) {
+ // 从本地存储获取数据
+ const itemStr = uni.getStorageSync(key);
+ if (!itemStr) {
+ return null; // 未找到数据
+ }
+ const item = JSON.parse(itemStr);
+ const now = new Date();
+ // 检查项目是否过期
+ if (now.getTime() > item.expiry) {
+ // 如果过期，从存储中移除该项
+ uni.removeStorageSync(key);
+ return null;
+ }
+ return item.value; // 数据未过期，返回数据
+}
+
diff --git a/utils/utils.js b/utils/utils.js
index 9e3fe91..cebcc6e 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -1,3 +1,9 @@
+import request from '@/utils/request';
+import {
+ setStorageWithExpiry,
+ getStorageWithExpiry
+} from '@/utils/auth'
+
function getWXStatusHeight() {
// #ifdef MP-WEIXIN
// 获取距上
@@ -22,6 +28,135 @@ function getWXStatusHeight() {
// #endif
}
+/**
+ * 根据订单的状态获取订单的文字展示状态
+ * @param ticketsStatus 订单状态
+ * @param workStatus 维修工作状态
+ */
+function getOrderStatusText(ticketsStatus,workStatus){
+ let str = "";
+ if("04"==ticketsStatus){
+ //待派工
+ str = "待派工"
+ }else if("05"==ticketsStatus){
+ //维修中
+ str = "维修中"
+ }else if("01"==ticketsStatus){
+ //待结算
+ str = "待结算"
+ }else if("06"==ticketsStatus){
+ //挂单/记账
+ str = "挂单/记账"
+ }else if("02"==ticketsStatus){
+ //已结账
+ str = "已结账"
+ }else if("03"==ticketsStatus){
+ //已作废
+ str = "已作废"
+ }
+ return str;
+}
+
+
+/**
+ * 查询字典可选值
+ * @param dictCode
+ */
+function getDictByCode(dictCode){
+ let dictArray = getStorageWithExpiry(dictCode);
+ if(null==dictArray || undefined==dictArray){
+ request({
+ url: '/app-api/system/dict-data/type',
+ method: 'get',
+ tenantIdFlag:false,
+ params:{type:dictCode}
+ }).then((res) => {
+ console.log(res)
+ if (res.code == 200) {
+ setStorageWithExpiry(dictCode,res.data,3600)
+ return res.data
+ }
+ })
+ }else{
+ return dictArray
+ }
+}
+
+/**
+ * 翻译字典
+ * @param dictCode
+ */
+async function getDictTextByCodeAndValue(dictCode,value){
+ return new Promise((resolve, reject) => {
+ let dictArray = getStorageWithExpiry(dictCode);
+ console.log(dictCode, 'dictCode')
+ console.log(value, 'value')
+ if (null == dictArray || undefined == dictArray) {
+ request({
+ url: '/app-api/system/dict-data/type',
+ method: 'get',
+ tenantIdFlag: false,
+ params: {type: dictCode}
+ }).then((res) => {
+ console.log(res, 98)
+ console.log(res, 98)
+ if (res.code == 200) {
+ setStorageWithExpiry(dictCode, res.data, 3600)
+ dictArray = res.data
+ let dictObj = dictArray.find(item => item.value == value)
+ console.log(dictObj, "dictObj")
+ if (dictObj) {
+ resolve(dictObj.label);
+ // return dictObj.label
+ } else {
+ resolve("未知数据")
+ }
+ }
+ })
+ } else {
+ let dictObj = dictArray.find(item => item.value == value)
+ console.log(dictObj, "dictObj")
+ if (dictObj) {
+ resolve(dictObj.label);
+ } else {
+ resolve("未知数据")
+ }
+ }
+ });
+}
+
+function formatTimestamp(timestamp) {
+ // 将时间戳转换为Date对象
+ const date = new Date(timestamp);
+ // 获取年月日时分秒
+ const year = date.getFullYear();
+ const month = (date.getMonth() + 1).toString().padStart(2, '0');
+ const day = date.getDate().toString().padStart(2, '0');
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+ const seconds = date.getSeconds().toString().padStart(2, '0');
+ // 组合成日期时间字符串
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+function formatDate(timestamp) {
+ // 将时间戳转换为Date对象
+ const date = new Date(timestamp);
+ // 获取年月日时分秒
+ const year = date.getFullYear();
+ const month = (date.getMonth() + 1).toString().padStart(2, '0');
+ const day = date.getDate().toString().padStart(2, '0');
+ // 组合成日期时间字符串
+ return `${year}-${month}-${day}`;
+}
+
+
+
export {
getWXStatusHeight,
+ getOrderStatusText,
+ getDictByCode,
+ getDictTextByCodeAndValue,
+ formatTimestamp,
+ formatDate,
}
\ No newline at end of file