From 4792e1c40256c2cb254c6d951479d849df3c4f08 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 22 May 2024 16:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/subPackages/order/list/index.vue | 8 ++++++--
src/subPackages/site/details/index.vue | 2 +-
src/utils/request.js | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/subPackages/order/list/index.vue b/src/subPackages/order/list/index.vue
index 9191a89..05586f5 100644
--- a/src/subPackages/order/list/index.vue
+++ b/src/subPackages/order/list/index.vue
@@ -150,7 +150,7 @@ export default {
timeHandle(item) {
let create = new Date(item.createTime).getTime();
let now = new Date().getTime();
- let diff = create + 1000 * 60 * 10 - now;
+ let diff = create + 1000 * 60 * 5 - now;
if (diff < 0) return;
@@ -158,8 +158,12 @@ export default {
item["countdown"] = `${minutes}：${seconds}`;
let instance = setInterval(() => {
- if (diff < 0) {
+ if (diff <= 0) {
clearInterval(instance);
+
+ this.paramter.currentPage = 1;
+ this.isReachBottom = false;
+ this.getCInfoByPage();
}
diff -= 1000;
let { minutes, seconds } = this.$utils.dateTimeHandle(diff);
diff --git a/src/subPackages/site/details/index.vue b/src/subPackages/site/details/index.vue
index 8acb72a..2a792d9 100644
--- a/src/subPackages/site/details/index.vue
+++ b/src/subPackages/site/details/index.vue
@@ -54,7 +54,7 @@
<text>￥</text>
<input
v-model="params.sitePriceAmount"
- type="number"
+ type="digit"
maxlength="4"
placeholder="输入金额，实时计算优惠"
placeholder-class="placeholder-class"
diff --git a/src/utils/request.js b/src/utils/request.js
index 16215d9..24cfbed 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import axiosMiniprogramAdapter from "axios-miniprogram-adapter";
import utils from "@/utils/encode";
let env;
env = "test";
-// env = "production";
+env = "production";
let testUrl = "http://192.168.110.77:38080";
let productUrl = "http://uat.xingoil.com/guest-api";
@@ -12,7 +12,7 @@ let productUrl = "http://uat.xingoil.com/guest-api";
const instance = axios.create({
baseURL: env == "production" ? productUrl : testUrl,
adapter: axiosMiniprogramAdapter,
- timeout: 5000,
+ timeout: 10000,
});
instance.interceptors.request.use(