diff --git a/src/App.vue b/src/App.vue
index 3c9f428..69941a5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,117 @@
-
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 37e43c8..8ad7d42 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -1,6 +1,6 @@
@@ -57,7 +61,7 @@ const toDetail = async (v: any) => {
{{ v.phone }}
- 营业时间：
+ 营业时间：
{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}
{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}
{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}
diff --git a/src/sheep/api/individualOrder.ts b/src/sheep/api/individualOrder.ts
index db28c53..a03969b 100644
--- a/src/sheep/api/individualOrder.ts
+++ b/src/sheep/api/individualOrder.ts
@@ -10,4 +10,21 @@ export default {
showLoading: false,
},
}),
+ refuseRefund: (data: { id: string; auditReason: string }) =>
+ request({
+ url: "/hard/hard-after-sale/app/mch-disagree",
+ method: "POST",
+ data,
+ custom: {
+ showLoading: false,
+ },
+ }),
+ agreeRefund: (params: { id: string }) =>
+ request({
+ url: `/hard/hard-after-sale/app/mch-agree?id=${params.id}`,
+ method: "POST",
+ custom: {
+ showLoading: false,
+ },
+ }),
}
diff --git a/src/sheep/hooks/use-unit.ts b/src/sheep/hooks/use-unit.ts
index cd4295c..91f4321 100644
--- a/src/sheep/hooks/use-unit.ts
+++ b/src/sheep/hooks/use-unit.ts
@@ -1,70 +1,66 @@
export const useMoney = (num) => {
- if (typeof num === "undefined") return "0.00";
- const parsedNumber = typeof num === "string" ? parseFloat(num) : num;
- return (parsedNumber / 100.0).toFixed(1);
-};
+ if (typeof num === "undefined") return "0.00"
+ const parsedNumber = typeof num === "string" ? parseFloat(num) : num
+ return (parsedNumber / 100.0).toFixed(2)
+}
-export function useFormatNum(
- prefix: string,
- type: "exact" | string,
- num: number
-) {
- num = num || 0;
- if (type === "exact") {
- return prefix + num;
- }
- if (num < 10) {
- return `${prefix}≤10`;
- }
- // 情况三：大于 10，除第一位外，其它位都显示为0
- // 例如：100 - 199 显示为 100+
- // 9000 - 9999 显示为 9000+
- const numStr = num.toString();
- const first = numStr[0];
- const other = "0".repeat(numStr.length - 1);
- return `${prefix}${first}${other}+`;
+export function useFormatNum(prefix: string, type: "exact" | string, num: number) {
+ num = num || 0
+ if (type === "exact") {
+ return prefix + num
+ }
+ if (num < 10) {
+ return `${prefix}≤10`
+ }
+ // 情况三：大于 10，除第一位外，其它位都显示为0
+ // 例如：100 - 199 显示为 100+
+ // 9000 - 9999 显示为 9000+
+ const numStr = num.toString()
+ const first = numStr[0]
+ const other = "0".repeat(numStr.length - 1)
+ return `${prefix}${first}${other}+`
}
export function useTime(time, pattern) {
- if (arguments.length === 0 || !time) {
- return null;
- }
- const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
- let date;
- if (typeof time === "object") {
- date = time;
- } else {
- if (typeof time === "string" && /^[0-9]+$/.test(time)) {
- time = parseInt(time);
- } else if (typeof time === "string") {
- time = time
- .replace(new RegExp(/-/gm), "/")
- .replace("T", " ")
- .replace(new RegExp(/\.[\d]{3}/gm), "");
- }
- if (typeof time === "number" && time.toString().length === 10) {
- time = time * 1000;
- }
- date = new Date(time);
- }
- const formatObj = {
- y: date.getFullYear(),
- m: date.getMonth() + 1,
- d: date.getDate(),
- h: date.getHours(),
- i: date.getMinutes(),
- s: date.getSeconds(),
- a: date.getDay(),
- };
- const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
- let value = formatObj[key];
- if (key === "a") {
- return ["日", "一", "二", "三", "四", "五", "六"][value];
- }
- if (result.length > 0 && value < 10) {
- value = "0" + value;
- }
- return value || 0;
- });
- return time_str;
+ if (arguments.length === 0 || !time) {
+ return null
+ }
+ const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}"
+ let date
+ if (typeof time === "object") {
+ date = time
+ } else {
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+ time = parseInt(time)
+ } else if (typeof time === "string") {
+ time = time
+ .replace(new RegExp(/-/gm), "/")
+ .replace("T", " ")
+ .replace(new RegExp(/\.[\d]{3}/gm), "")
+ }
+ if (typeof time === "number" && time.toString().length === 10) {
+ time = time * 1000
+ }
+ date = new Date(time)
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 1,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay(),
+ }
+ const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+ let value = formatObj[key]
+ if (key === "a") {
+ return ["日", "一", "二", "三", "四", "五", "六"][value]
+ }
+ if (result.length > 0 && value < 10) {
+ value = "0" + value
+ }
+ return value || 0
+ })
+ return time_str
}
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 3d07e3a..bba1f5c 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -113,6 +113,8 @@ const checkAndRefreshToken = async (tokenStorage: any) => {
// 请求拦截器
http.interceptors.request.use(async (config) => {
+ console.log("请求之前")
+
const tokenStorage = uni.getStorageSync(TOKEN_KEY)
const config_header: any = config?.header || {}
diff --git a/src/static/tabbar/canteen-select.png b/src/static/tabbar/canteen-select.png
new file mode 100644
index 0000000..7887b99
Binary files /dev/null and b/src/static/tabbar/canteen-select.png differ
diff --git a/src/static/tabbar/canteen.png b/src/static/tabbar/canteen.png
new file mode 100644
index 0000000..75f8244
Binary files /dev/null and b/src/static/tabbar/canteen.png differ